# HG changeset patch
# User Gloval
# Date 1361506995 -14400
# Node ID c606cabd7cbfc9107604247fd5b9a3dceab35f14
# Parent  f0f66f690777d1b1511777d49179b5d062729d61# Parent  85edec9da96bac4ef4da3fa6ec7e32928c38001e
Merge

diff -r f0f66f690777 -r c606cabd7cbf GUIWindow.cpp
--- a/GUIWindow.cpp	Fri Feb 22 08:20:59 2013 +0400
+++ b/GUIWindow.cpp	Fri Feb 22 08:23:15 2013 +0400
@@ -1171,7 +1171,7 @@
           sub_4B6478();
           break;
         case 1:
-          sub_4B910F();
+          _4B910F_shop_interaction();
           break;
         case 2:
           sub_4BA928();
@@ -1233,14 +1233,14 @@
 LABEL_58:
   if ( array_5913D8[6] == (NPCData *)uNumDialogueNPCPortraits && uHouse_ExitPic )
   {
-    pRenderer->DrawTextureIndexed(0x22Cu, 0x1C3u, (Texture *)(uTextureID_x_x_u != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_x_x_u] : 0));
+    pRenderer->DrawTextureIndexed(0x22Cu, 0x1C3u, (Texture *)(uTextureID_x_x_u != -1 ? &pIcons_LOD->pTextures[uTextureID_x_x_u] : 0));
     v16 = (Texture *)(uTextureID_x_ok_u != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_x_ok_u] : 0);
     v14 = 451;
     v12 = 476;
   }
   else
   {
-    v16 = (Texture *)(uTextureID_506438 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_506438] : 0);
+    v16 = (Texture *)(uTextureID_506438 != -1 ? &pIcons_LOD->pTextures[uTextureID_506438] : 0);
     v14 = 445;
     v12 = 471;
   }
diff -r f0f66f690777 -r c606cabd7cbf Items.cpp
--- a/Items.cpp	Fri Feb 22 08:20:59 2013 +0400
+++ b/Items.cpp	Fri Feb 22 08:23:15 2013 +0400
@@ -1410,13 +1410,10 @@
 //----- (00456499) --------------------------------------------------------
 const char *ItemGen::GetDisplayName()
 {
-  const char *result; // eax@2
-
-  if ( this->uAttributes & ITEM_IDENTIFIED )
-    result = GetIdentifiedName();
+  if (Identified())
+    return GetIdentifiedName();
   else
-    result = pItemsTable->pItems[uItemID].pUnidentifiedName;
-  return result;
+    return pItemsTable->pItems[uItemID].pUnidentifiedName;
 }
 
 //----- (004564B3) --------------------------------------------------------
diff -r f0f66f690777 -r c606cabd7cbf mm7_2.cpp
--- a/mm7_2.cpp	Fri Feb 22 08:20:59 2013 +0400
+++ b/mm7_2.cpp	Fri Feb 22 08:23:15 2013 +0400
@@ -1005,7 +1005,7 @@
 
 
 //----- (004B910F) --------------------------------------------------------
-char *__cdecl sub_4B910F()
+char *__cdecl _4B910F_shop_interaction()
 {
   Player *v0; // ebx@1
   char *result; // eax@6
diff -r f0f66f690777 -r c606cabd7cbf mm7_data.h
--- a/mm7_data.h	Fri Feb 22 08:20:59 2013 +0400
+++ b/mm7_data.h	Fri Feb 22 08:23:15 2013 +0400
@@ -2333,7 +2333,7 @@
 void __cdecl sub_4B8285_prolly_draw_arcomage_result();
 void *__cdecl GenerateShopItems();
 void *__cdecl sub_4B8F94();
-char *__cdecl sub_4B910F();
+char *__cdecl _4B910F_shop_interaction();
 POINT *__cdecl sub_4B9CC6();
 void __cdecl sub_4BA928();
 signed int __fastcall sub_4BB756(signed int a1);
diff -r f0f66f690777 -r c606cabd7cbf mm7text_ru.cpp
--- a/mm7text_ru.cpp	Fri Feb 22 08:20:59 2013 +0400
+++ b/mm7text_ru.cpp	Fri Feb 22 08:23:15 2013 +0400
@@ -872,6 +872,7 @@
   {"Томас", 0},
   {"Тон", 0},
   {"Тони", 0},
+  {"Тор", 0},
   {"Тран", 0},
   {"Трейси", 1},
   {"Трент", 0},