From 7e341be73d63a8123cd0b55c12f40534281ffe44 Mon Sep 17 00:00:00 2001
From: Celtic Minstrel <celtic.minstrel.ca@some.place>
Date: Mon, 26 Jan 2015 18:55:40 -0500
Subject: [PATCH] Add key labels to get item dialog and make it more clear when
 items are not identified.

---
 rsrc/dialogs/get-items.xml | 20 ++++++++------------
 src/boe.items.cpp          |  5 +++++
 src/boe.newgraph.cpp       |  2 +-
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/rsrc/dialogs/get-items.xml b/rsrc/dialogs/get-items.xml
index ab1bd4e8..d75c6ae5 100644
--- a/rsrc/dialogs/get-items.xml
+++ b/rsrc/dialogs/get-items.xml
@@ -19,40 +19,36 @@
 	<pict name='pc5-g' type='pc' num='0' top='393' left='208'/>
 	<pict name='pc6-g' type='pc' num='0' top='393' left='293'/>
 	<text name='title' size='large' top='6' left='64' width='199' height='18'>You Find:</text>
-	<!-- Note: It seems this text exists solely to create a frame. -->
 	<text framed='true' top='31' left='73' width='327' height='309'/>
-	<!--
-	 TODO: In the browser preview, the text in these sections looks too far to the left. Will that occur in-game too?
-	 -->
-	<text name='item1-key' top='37' left='80' width='311' height='36'/>
+	<text name='item1-key' top='37' left='74' width='311' height='36'/>
 	<pict name='item1-g' type='item' num='0' top='37' left='80'/>
 	<text name='item1-name' top='37' left='107' width='212' height='18'/>
 	<text name='item1-detail' top='55' left='116' width='275' height='17'/>
-	<text name='item2-key' top='74' left='80' width='311' height='36'/>
+	<text name='item2-key' top='74' left='74' width='311' height='36'/>
 	<pict name='item2-g' type='item' num='0' top='74' left='80'/>
 	<text name='item2-name' top='74' left='107' width='212' height='18'/>
 	<text name='item2-detail' top='92' left='116' width='275' height='17'/>
-	<text name='item3-key' top='111' left='80' width='311' height='36'/>
+	<text name='item3-key' top='111' left='74' width='311' height='36'/>
 	<pict name='item3-g' type='item' num='0' top='111' left='80'/>
 	<text name='item3-name' top='111' left='107' width='212' height='18'/>
 	<text name='item3-detail' top='129' left='116' width='275' height='17'/>
-	<text name='item4-key' top='148' left='80' width='311' height='36'/>
+	<text name='item4-key' top='148' left='74' width='311' height='36'/>
 	<pict name='item4-g' type='item' num='0' top='148' left='80'/>
 	<text name='item4-name' top='148' left='107' width='212' height='18'/>
 	<text name='item4-detail' top='166' left='116' width='275' height='17'/>
-	<text name='item5-key' top='185' left='80' width='311' height='36'/>
+	<text name='item5-key' top='185' left='74' width='311' height='36'/>
 	<pict name='item5-g' type='item' num='0' top='185' left='80'/>
 	<text name='item5-name' top='185' left='107' width='212' height='18'/>
 	<text name='item5-detail' top='203' left='116' width='275' height='17'/>
-	<text name='item6-key' top='222' left='80' width='311' height='36'/>
+	<text name='item6-key' top='222' left='74' width='311' height='36'/>
 	<pict name='item6-g' type='item' num='0' top='222' left='80'/>
 	<text name='item6-name' top='222' left='107' width='212' height='18'/>
 	<text name='item6-detail' top='240' left='116' width='275' height='17'/>
-	<text name='item7-key' top='259' left='80' width='311' height='36'/>
+	<text name='item7-key' top='259' left='74' width='311' height='36'/>
 	<pict name='item7-g' type='item' num='0' top='259' left='80'/>
 	<text name='item7-name' top='259' left='107' width='212' height='18'/>
 	<text name='item7-detail' top='277' left='116' width='275' height='17'/>
-	<text name='item8-key' top='297' left='80' width='311' height='36'/>
+	<text name='item8-key' top='297' left='74' width='311' height='36'/>
 	<pict name='item8-g' type='item' num='0' top='297' left='80'/>
 	<text name='item8-name' top='297' left='107' width='212' height='18'/>
 	<text name='item8-detail' top='315' left='116' width='275' height='17'/>
diff --git a/src/boe.items.cpp b/src/boe.items.cpp
index 9b60b6e5..b8001508 100644
--- a/src/boe.items.cpp
+++ b/src/boe.items.cpp
@@ -413,6 +413,7 @@ void set_town_attitude(short lo,short hi,short att) {
 static void put_item_graphics(cDialog& me, size_t& first_item_shown, short& current_getting_pc, const std::vector<cItem*>& item_array) {
 	short i;
 	cItem item;
+	char key_stash[2] = "a";
 	
 	// First make sure all arrays for who can get stuff are in order.
 	if(current_getting_pc < 6 && (univ.party[current_getting_pc].main_status != eMainStatus::ALIVE
@@ -454,6 +455,8 @@ static void put_item_graphics(cDialog& me, size_t& first_item_shown, short& curr
 		sout << "item" << i + 1;
 		std::string pict = sout.str() + "-g", name = sout.str() + "-name";
 		std::string detail = sout.str() + "-detail", weight = sout.str() + "-weight";
+		std::string key = sout.str() + "-key";
+		key_stash[0] = 'a' + i;
 		
 		try {
 			if(item_array.at(i + first_item_shown)->variety == eItemType::NO_ITEM)
@@ -469,11 +472,13 @@ static void put_item_graphics(cDialog& me, size_t& first_item_shown, short& curr
 			else pic.setPict(item.graphic_num, PIC_ITEM);
 			me[detail].setText(get_item_interesting_string(item));
 			me[weight].setText("Weight: " + std::to_string(item.item_weight()));
+			me[key].setText(key_stash);
 		} catch(std::out_of_range) { // erase the spot
 			me[pict].hide();
 			me[name].setText("");
 			me[detail].setText("");
 			me[weight].setText("");
+			me[key].setText("");
 		}
 	}
 	
diff --git a/src/boe.newgraph.cpp b/src/boe.newgraph.cpp
index cd3fe72e..5c04c6a8 100644
--- a/src/boe.newgraph.cpp
+++ b/src/boe.newgraph.cpp
@@ -894,7 +894,7 @@ std::string get_item_interesting_string(cItem item) {
 		return "Not yours.";
 	}
 	if(!item.ident) {
-		return "";
+		return "Not identified.";
 	}
 	if(item.cursed) {
 		return "Cursed item.";