changeset 1748:19684d4bbe9a

Merge
author Grumpy7
date Mon, 30 Sep 2013 05:59:06 +0200
parents cecb080929c4 (current diff) f305a00a6d98 (diff)
children 42a1874a2171
files UI/UIHouses.cpp UI/UIShops.cpp
diffstat 6 files changed, 875 insertions(+), 2046 deletions(-) [+]
line wrap: on
line diff
--- a/UI/UIHouses.cpp	Mon Sep 30 05:48:32 2013 +0200
+++ b/UI/UIHouses.cpp	Mon Sep 30 05:59:06 2013 +0200
@@ -988,41 +988,14 @@
 void __fastcall OnSelectShopDialogueOption(signed int uMessageParam)
 {
   int experience_for_next_level; // eax@5
-  GUIWindow *v8; // esi@10
   int v16; // eax@32
-  int v17; // eax@33
-  int v18; // eax@34
-  int v19; // eax@35
-  __int16 v20; // ax@37
-  __int16 v21; // ax@76
-  __int16 v22; // ax@107
-  __int16 v23; // ax@132
   __int16 v24; // ax@163
-  unsigned int v34; // eax@211
   signed int v36; // esi@227
-  int v37; // ecx@227
-  int v38; // esi@230
-  int v39; // edx@235
-  int v40; // edi@243
-  unsigned __int64 v41; // qax@243
-  signed int v43; // edi@244
-  int v44; // edx@244
-  int v45; // eax@246
-  unsigned int v46; // eax@247
-  void *v47; // eax@250
-  signed int v48; // edi@250
-  int v49; // eax@252
-  int v50; // eax@256
-  unsigned int v51; // eax@257
-  void *v52; // eax@260
-  signed int v53; // edi@260
-  int v54; // eax@262
+  int pPrice; // ecx@227
 
   if ( !pDialogueWindow->pNumPresenceButton )
     return;
   pRenderer->ClearZBuffer(0, 479);
-  if ( dialog_menu_id != HOUSE_DIALOGUE_MAIN)
-    v8 = window_SpeakInHouse;
   if (dialog_menu_id == HOUSE_DIALOGUE_MAIN)
   {
     if ( in_current_building_type == BuildingType_Training )
@@ -1044,11 +1017,9 @@
       pBtn_ExitCancel = pDialogueWindow->CreateButton(526, 445, 75, 33, 1, 0, UIMSG_Escape, 0, 0, pGlobalTXT_LocalizationStrings[74],// "End Conversation"
                                                        pIcons_LOD->GetTexture(uTextureID_BUTTDESC2), 0);
       pDialogueWindow->CreateButton(8, 8, 450, 320, 1, 0, UIMSG_BuyInShop_Identify_Repair, 0, 0, "", nullptr);
-      v8 = window_SpeakInHouse;
     }
     if ( in_current_building_type != BuildingType_Training )
     {
-      v8 = window_SpeakInHouse;
       if ((in_current_building_type == BuildingType_Stables || in_current_building_type == BuildingType_Boats) &&
            transport_schedule[transport_routes[(unsigned int)window_SpeakInHouse->ptr_1C - HOUSE_STABLES_HARMONDALE][uMessageParam - HOUSE_DIALOGUE_TRANSPORT_SCHEDULE_1]].pSchedule[pParty->uDaysPlayed % 7]
           || in_current_building_type != BuildingType_Temple || uMessageParam != BuildingType_MindGuild )
@@ -1058,21 +1029,16 @@
         pBtn_ExitCancel = pDialogueWindow->CreateButton(526, 445, 75, 33, 1, 0, UIMSG_Escape, 0, 0, pGlobalTXT_LocalizationStrings[74],// "End Conversation"
                                                          pIcons_LOD->GetTexture(uTextureID_BUTTDESC2), 0);
         pDialogueWindow->CreateButton(8, 8, 450, 320, 1, 0, UIMSG_BuyInShop_Identify_Repair, 0, 0, "", nullptr);
-        v8 = window_SpeakInHouse;
       }
       else if (uActiveCharacter)
       {
         if ( !pPlayers[uActiveCharacter]->IsPlayerHealableByTemple() )
           return;
-        v8 = window_SpeakInHouse;
       }
     }
     dialog_menu_id = (HOUSE_DIALOGUE_MENU)uMessageParam;
     if ( in_current_building_type < BuildingType_19 )
-    {
       ShopTexture = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture(off_4F03B8[(int)in_current_building_type], TEXTURE_16BIT_PALETTE)];
-      v8 = window_SpeakInHouse;
-    }
   }
   
   //NEW
@@ -1095,12 +1061,8 @@
       {
         for ( uint i = 0; i < 12; ++i )
         {
-          if ( pParty->SpellBooksInGuilds[v8->par1C-139][i].uItemID )
-          {
-            v34 = pIcons_LOD->LoadTexture(pParty->SpellBooksInGuilds[v8->par1C-139][i].GetIconName(), TEXTURE_16BIT_PALETTE);
-            v8 = window_SpeakInHouse;
-            ItemsInShopTexture[i] = &pIcons_LOD->pTextures[v34];
-          }
+          if ( pParty->SpellBooksInGuilds[window_SpeakInHouse->par1C - 139][i].uItemID )
+            ItemsInShopTexture[i] = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture(pParty->SpellBooksInGuilds[window_SpeakInHouse->par1C - 139][i].GetIconName(), TEXTURE_16BIT_PALETTE)];
         }
       }
       else//generation new books
@@ -1115,17 +1077,17 @@
     {
       if ( uMessageParam == HOUSE_DIALOGUE_TOWNHALL_MESSAGE )
       {
-        if ( pParty->PartyTimes.bountyHunting_next_generation_time[(int)((char *)v8->ptr_1C - 102)] < (signed __int64)pParty->uTimePlayed )//new generation
+        if ( pParty->PartyTimes.bountyHunting_next_generation_time[(int)((char *)window_SpeakInHouse->ptr_1C - 102)] < (signed __int64)pParty->uTimePlayed )//new generation
         {
-          pParty->monster_for_hunting_killed[(int)((char *)v8->ptr_1C - 102)] = false;
-          pParty->PartyTimes.bountyHunting_next_generation_time[(int)((char *)v8->ptr_1C - 102)] = (signed __int64)((double)(309657600 * (pParty->uCurrentMonth + 12i64 * pParty->uCurrentYear - 14015)) * 0.033333335);
-          pParty->monster_id_for_hunting[(int)((char *)v8->ptr_1C - 102)] = rand() % 258 + 1;
+          pParty->monster_for_hunting_killed[(int)((char *)window_SpeakInHouse->ptr_1C - 102)] = false;
+          pParty->PartyTimes.bountyHunting_next_generation_time[(int)((char *)window_SpeakInHouse->ptr_1C - 102)] = (signed __int64)((double)(309657600 * (pParty->uCurrentMonth + 12i64 * pParty->uCurrentYear - 14015)) * 0.033333335);
+          pParty->monster_id_for_hunting[(int)((char *)window_SpeakInHouse->ptr_1C - 102)] = rand() % 258 + 1;
           v16 = (int)((char *)window_SpeakInHouse->ptr_1C - 102);
           if ( !v16 )
           {
             while ( 1 )
             {
-              v24 = pParty->monster_id_for_hunting[(int)((char *)v8->ptr_1C - 102)];
+              v24 = pParty->monster_id_for_hunting[(int)((char *)window_SpeakInHouse->ptr_1C - 102)];
               if ( (unsigned __int16)v24 < 115 || (unsigned __int16)v24 > 132 )
               {
                 if ( ((unsigned __int16)v24 < 235 || (unsigned __int16)v24 > 252)
@@ -1141,144 +1103,144 @@
                   && ((unsigned __int16)v24 < 0x61u || (unsigned __int16)v24 > 0x63u) )
                   break;
               }
-              pParty->monster_id_for_hunting[(int)((char *)v8->ptr_1C - 102)] = rand() % 258 + 1;
+              pParty->monster_id_for_hunting[(int)((char *)window_SpeakInHouse->ptr_1C - 102)] = rand() % 258 + 1;
             }
           }
           if ( v16 == 1 )
           {
             while ( 1 )
             {
-              v23 = pParty->monster_id_for_hunting[(int)((char *)v8->ptr_1C - 102)];
-              if ( (unsigned __int16)v23 < 115 || (unsigned __int16)v23 > 132 )
+              v24 = pParty->monster_id_for_hunting[(int)((char *)window_SpeakInHouse->ptr_1C - 102)];
+              if ( (unsigned __int16)v24 < 115 || (unsigned __int16)v24 > 132 )
               {
-                if ( ((unsigned __int16)v23 < 0xE8u || (unsigned __int16)v23 > 0xF9u)
-                  && ((unsigned __int16)v23 < 0x85u || (unsigned __int16)v23 > 0x96u)
-                  && ((unsigned __int16)v23 < 0x97u || (unsigned __int16)v23 > 0xBAu)
-                  && ((unsigned __int16)v23 < 0xBEu || (unsigned __int16)v23 > 0xC0u)
-                  && ((unsigned __int16)v23 < 0xC4u || (unsigned __int16)v23 > 0xC6u)
-                  && ((unsigned __int16)v23 < 0x2Bu || (unsigned __int16)v23 > 0x2Du)
-                  && ((unsigned __int16)v23 < 0x52u || (unsigned __int16)v23 > 0x54u)
-                  && ((unsigned __int16)v23 < 4 || (unsigned __int16)v23 > 6)
-                  && ((unsigned __int16)v23 < 0x37u || (unsigned __int16)v23 > 0x39u)
-                  && ((unsigned __int16)v23 < 0x3Au || (unsigned __int16)v23 > 0x3Cu)
-                  && ((unsigned __int16)v23 < 0x3Du || (unsigned __int16)v23 > 0x3Fu)
-                  && ((unsigned __int16)v23 < 0xFDu || (unsigned __int16)v23 > 0xFFu)
-                  && ((unsigned __int16)v23 < 0x61u || (unsigned __int16)v23 > 0x63u)
-                  && ((unsigned __int16)v23 < 0xCDu || (unsigned __int16)v23 > 0xCFu) )
+                if ( ((unsigned __int16)v24 < 0xE8u || (unsigned __int16)v24 > 0xF9u)
+                  && ((unsigned __int16)v24 < 0x85u || (unsigned __int16)v24 > 0x96u)
+                  && ((unsigned __int16)v24 < 0x97u || (unsigned __int16)v24 > 0xBAu)
+                  && ((unsigned __int16)v24 < 0xBEu || (unsigned __int16)v24 > 0xC0u)
+                  && ((unsigned __int16)v24 < 0xC4u || (unsigned __int16)v24 > 0xC6u)
+                  && ((unsigned __int16)v24 < 0x2Bu || (unsigned __int16)v24 > 0x2Du)
+                  && ((unsigned __int16)v24 < 0x52u || (unsigned __int16)v24 > 0x54u)
+                  && ((unsigned __int16)v24 < 4 || (unsigned __int16)v24 > 6)
+                  && ((unsigned __int16)v24 < 0x37u || (unsigned __int16)v24 > 0x39u)
+                  && ((unsigned __int16)v24 < 0x3Au || (unsigned __int16)v24 > 0x3Cu)
+                  && ((unsigned __int16)v24 < 0x3Du || (unsigned __int16)v24 > 0x3Fu)
+                  && ((unsigned __int16)v24 < 0xFDu || (unsigned __int16)v24 > 0xFFu)
+                  && ((unsigned __int16)v24 < 0x61u || (unsigned __int16)v24 > 0x63u)
+                  && ((unsigned __int16)v24 < 0xCDu || (unsigned __int16)v24 > 0xCFu) )
                   break;
               }
-              pParty->monster_id_for_hunting[(int)((char *)v8->ptr_1C - 102)] = rand() % 258 + 1;
+              pParty->monster_id_for_hunting[(int)((char *)window_SpeakInHouse->ptr_1C - 102)] = rand() % 258 + 1;
             }
           }
           if ( v16 == 2 )
           {
             while ( 1 )
             {
-              v22 = pParty->monster_id_for_hunting[(int)((char *)v8->ptr_1C - 102)];
-              if ( (unsigned __int16)v22 < 0x73u || (unsigned __int16)v22 > 0x84u )
+              v24 = pParty->monster_id_for_hunting[(int)((char *)window_SpeakInHouse->ptr_1C - 102)];
+              if ( (unsigned __int16)v24 < 0x73u || (unsigned __int16)v24 > 0x84u )
               {
-                if ( ((unsigned __int16)v22 < 0xE8u || (unsigned __int16)v22 > 0xF9u)
-                  && ((unsigned __int16)v22 < 0x85u || (unsigned __int16)v22 > 0x96u)
-                  && ((unsigned __int16)v22 < 0x97u || (unsigned __int16)v22 > 0xBAu)
-                  && ((unsigned __int16)v22 < 0xBEu || (unsigned __int16)v22 > 0xC0u)
-                  && ((unsigned __int16)v22 < 0xC4u || (unsigned __int16)v22 > 0xC6u)
-                  && ((unsigned __int16)v22 < 0x2Bu || (unsigned __int16)v22 > 0x2Du)
-                  && ((unsigned __int16)v22 < 0x31u || (unsigned __int16)v22 > 0x33u)
-                  && ((unsigned __int16)v22 < 0x34u || (unsigned __int16)v22 > 0x36u)
-                  && ((unsigned __int16)v22 < 0xFDu || (unsigned __int16)v22 > 0xFFu)
-                  && ((unsigned __int16)v22 < 0x61u || (unsigned __int16)v22 > 0x63u)
-                  && ((unsigned __int16)v22 < 0x1Cu || (unsigned __int16)v22 > 0x1Eu) )
+                if ( ((unsigned __int16)v24 < 0xE8u || (unsigned __int16)v24 > 0xF9u)
+                  && ((unsigned __int16)v24 < 0x85u || (unsigned __int16)v24 > 0x96u)
+                  && ((unsigned __int16)v24 < 0x97u || (unsigned __int16)v24 > 0xBAu)
+                  && ((unsigned __int16)v24 < 0xBEu || (unsigned __int16)v24 > 0xC0u)
+                  && ((unsigned __int16)v24 < 0xC4u || (unsigned __int16)v24 > 0xC6u)
+                  && ((unsigned __int16)v24 < 0x2Bu || (unsigned __int16)v24 > 0x2Du)
+                  && ((unsigned __int16)v24 < 0x31u || (unsigned __int16)v24 > 0x33u)
+                  && ((unsigned __int16)v24 < 0x34u || (unsigned __int16)v24 > 0x36u)
+                  && ((unsigned __int16)v24 < 0xFDu || (unsigned __int16)v24 > 0xFFu)
+                  && ((unsigned __int16)v24 < 0x61u || (unsigned __int16)v24 > 0x63u)
+                  && ((unsigned __int16)v24 < 0x1Cu || (unsigned __int16)v24 > 0x1Eu) )
                   break;
               }
-              pParty->monster_id_for_hunting[(int)((char *)v8->ptr_1C - 102)] = rand() % 258 + 1;
+              pParty->monster_id_for_hunting[(int)((char *)window_SpeakInHouse->ptr_1C - 102)] = rand() % 258 + 1;
             }
           }
           if ( v16 == 3 )
           {
             while ( 1 )
             {
-              v21 = pParty->monster_id_for_hunting[(int)((char *)v8->ptr_1C - 102)];
-              if ( (unsigned __int16)v21 < 0x73u || (unsigned __int16)v21 > 0x84u )
+              v24 = pParty->monster_id_for_hunting[(int)((char *)window_SpeakInHouse->ptr_1C - 102)];
+              if ( (unsigned __int16)v24 < 0x73u || (unsigned __int16)v24 > 0x84u )
               {
-                if ( ((unsigned __int16)v21 < 0xE8u || (unsigned __int16)v21 > 0xF9u)
-                  && ((unsigned __int16)v21 < 0x85u || (unsigned __int16)v21 > 0x96u)
-                  && ((unsigned __int16)v21 < 0x97u || (unsigned __int16)v21 > 0xBAu)
-                  && ((unsigned __int16)v21 < 0xBEu || (unsigned __int16)v21 > 0xC0u)
-                  && ((unsigned __int16)v21 < 0xC4u || (unsigned __int16)v21 > 0xC6u)
-                  && ((unsigned __int16)v21 < 0x2Bu || (unsigned __int16)v21 > 0x2Du)
-                  && ((unsigned __int16)v21 < 0x5Eu || (unsigned __int16)v21 > 0x60u)
-                  && ((unsigned __int16)v21 < 0x43u || (unsigned __int16)v21 > 0x45u)
-                  && ((unsigned __int16)v21 < 0x4Fu || (unsigned __int16)v21 > 0x51u)
-                  && ((unsigned __int16)v21 < 0xC1u || (unsigned __int16)v21 > 0xC3u)
-                  && ((unsigned __int16)v21 < 0x13u || (unsigned __int16)v21 > 0x15u)
-                  && ((unsigned __int16)v21 < 0xFDu || (unsigned __int16)v21 > 0xFFu)
-                  && ((unsigned __int16)v21 < 0x61u || (unsigned __int16)v21 > 0x63u)
-                  && ((unsigned __int16)v21 < 0x6Au || (unsigned __int16)v21 > 0x6Cu) )
+                if ( ((unsigned __int16)v24 < 0xE8u || (unsigned __int16)v24 > 0xF9u)
+                  && ((unsigned __int16)v24 < 0x85u || (unsigned __int16)v24 > 0x96u)
+                  && ((unsigned __int16)v24 < 0x97u || (unsigned __int16)v24 > 0xBAu)
+                  && ((unsigned __int16)v24 < 0xBEu || (unsigned __int16)v24 > 0xC0u)
+                  && ((unsigned __int16)v24 < 0xC4u || (unsigned __int16)v24 > 0xC6u)
+                  && ((unsigned __int16)v24 < 0x2Bu || (unsigned __int16)v24 > 0x2Du)
+                  && ((unsigned __int16)v24 < 0x5Eu || (unsigned __int16)v24 > 0x60u)
+                  && ((unsigned __int16)v24 < 0x43u || (unsigned __int16)v24 > 0x45u)
+                  && ((unsigned __int16)v24 < 0x4Fu || (unsigned __int16)v24 > 0x51u)
+                  && ((unsigned __int16)v24 < 0xC1u || (unsigned __int16)v24 > 0xC3u)
+                  && ((unsigned __int16)v24 < 0x13u || (unsigned __int16)v24 > 0x15u)
+                  && ((unsigned __int16)v24 < 0xFDu || (unsigned __int16)v24 > 0xFFu)
+                  && ((unsigned __int16)v24 < 0x61u || (unsigned __int16)v24 > 0x63u)
+                  && ((unsigned __int16)v24 < 0x6Au || (unsigned __int16)v24 > 0x6Cu) )
                   break;
               }
-              pParty->monster_id_for_hunting[(int)((char *)v8->ptr_1C - 102)] = rand() % 258 + 1;
+              pParty->monster_id_for_hunting[(int)((char *)window_SpeakInHouse->ptr_1C - 102)] = rand() % 258 + 1;
             }
           }
           if ( v16 == 4 )
           {
             while ( 1 )
             {
-              v20 = pParty->monster_id_for_hunting[(int)((char *)v8->ptr_1C - 102)];
-              if ( (unsigned __int16)v20 < 0x73u || (unsigned __int16)v20 > 0x84u )
+              v24 = pParty->monster_id_for_hunting[(int)((char *)window_SpeakInHouse->ptr_1C - 102)];
+              if ( (unsigned __int16)v24 < 0x73u || (unsigned __int16)v24 > 0x84u )
               {
-                if ( ((unsigned __int16)v20 < 0xE8u || (unsigned __int16)v20 > 0xF9u)
-                  && ((unsigned __int16)v20 < 0x85u || (unsigned __int16)v20 > 0x96u)
-                  && ((unsigned __int16)v20 < 0x97u || (unsigned __int16)v20 > 0xBAu)
-                  && ((unsigned __int16)v20 < 0xBEu || (unsigned __int16)v20 > 0xC0u)
-                  && ((unsigned __int16)v20 < 0xC4u || (unsigned __int16)v20 > 0xC6u)
-                  && ((unsigned __int16)v20 < 0x2Bu || (unsigned __int16)v20 > 0x2Du)
-                  && ((unsigned __int16)v20 < 0x6Du || (unsigned __int16)v20 > 0x6Fu)
-                  && ((unsigned __int16)v20 < 0x46u || (unsigned __int16)v20 > 0x48u)
-                  && ((unsigned __int16)v20 < 0x100u || (unsigned __int16)v20 > 0x102u)
-                  && ((unsigned __int16)v20 < 0xD9u || (unsigned __int16)v20 > 0xDBu)
-                  && ((unsigned __int16)v20 < 0xC7u || (unsigned __int16)v20 > 0xC9u)
-                  && ((unsigned __int16)v20 < 0xE5u || (unsigned __int16)v20 > 0xE7u)
-                  && ((unsigned __int16)v20 < 0xDFu || (unsigned __int16)v20 > 0xE1u)
-                  && ((unsigned __int16)v20 < 0x5Bu || (unsigned __int16)v20 > 0x5Du)
-                  && ((unsigned __int16)v20 < 0x49u || (unsigned __int16)v20 > 0x4Bu)
-                  && ((unsigned __int16)v20 < 0xFDu || (unsigned __int16)v20 > 0xFFu)
-                  && ((unsigned __int16)v20 < 0x61u || (unsigned __int16)v20 > 0x63u)
-                  && ((unsigned __int16)v20 < 0x10u || (unsigned __int16)v20 > 0x12u) )
+                if ( ((unsigned __int16)v24 < 0xE8u || (unsigned __int16)v24 > 0xF9u)
+                  && ((unsigned __int16)v24 < 0x85u || (unsigned __int16)v24 > 0x96u)
+                  && ((unsigned __int16)v24 < 0x97u || (unsigned __int16)v24 > 0xBAu)
+                  && ((unsigned __int16)v24 < 0xBEu || (unsigned __int16)v24 > 0xC0u)
+                  && ((unsigned __int16)v24 < 0xC4u || (unsigned __int16)v24 > 0xC6u)
+                  && ((unsigned __int16)v24 < 0x2Bu || (unsigned __int16)v24 > 0x2Du)
+                  && ((unsigned __int16)v24 < 0x6Du || (unsigned __int16)v24 > 0x6Fu)
+                  && ((unsigned __int16)v24 < 0x46u || (unsigned __int16)v24 > 0x48u)
+                  && ((unsigned __int16)v24 < 0x100u || (unsigned __int16)v24 > 0x102u)
+                  && ((unsigned __int16)v24 < 0xD9u || (unsigned __int16)v24 > 0xDBu)
+                  && ((unsigned __int16)v24 < 0xC7u || (unsigned __int16)v24 > 0xC9u)
+                  && ((unsigned __int16)v24 < 0xE5u || (unsigned __int16)v24 > 0xE7u)
+                  && ((unsigned __int16)v24 < 0xDFu || (unsigned __int16)v24 > 0xE1u)
+                  && ((unsigned __int16)v24 < 0x5Bu || (unsigned __int16)v24 > 0x5Du)
+                  && ((unsigned __int16)v24 < 0x49u || (unsigned __int16)v24 > 0x4Bu)
+                  && ((unsigned __int16)v24 < 0xFDu || (unsigned __int16)v24 > 0xFFu)
+                  && ((unsigned __int16)v24 < 0x61u || (unsigned __int16)v24 > 0x63u)
+                  && ((unsigned __int16)v24 < 0x10u || (unsigned __int16)v24 > 0x12u) )
                   break;
               }
-              pParty->monster_id_for_hunting[(int)((char *)v8->ptr_1C - 102)] = rand() % 258 + 1;
+              pParty->monster_id_for_hunting[(int)((char *)window_SpeakInHouse->ptr_1C - 102)] = rand() % 258 + 1;
             }
           }
         }
-        bountyHunting_monster_id_for_hunting = pParty->monster_id_for_hunting[(int)((char *)v8->ptr_1C - 102)];
-        if ( !pParty->monster_for_hunting_killed[(int)((char *)v8->ptr_1C - 102)] )
+        bountyHunting_monster_id_for_hunting = pParty->monster_id_for_hunting[(int)((char *)window_SpeakInHouse->ptr_1C - 102)];
+        if ( !pParty->monster_for_hunting_killed[(int)((char *)window_SpeakInHouse->ptr_1C - 102)] )
         {
           bountyHunting_text = pNPCTopics[351].pText;//"В этом месяцу назначена награда за голову %s..."
-          if ( !pParty->monster_id_for_hunting[(int)((char *)v8->ptr_1C - 102)] )
+          if ( !pParty->monster_id_for_hunting[(int)((char *)window_SpeakInHouse->ptr_1C - 102)] )
             bountyHunting_text = pNPCTopics[353].pText;//"Кое кто уже приходил в этом месяце за наградой"
         }
         else
         {
-          if ( pParty->monster_id_for_hunting[(int)((char *)v8->ptr_1C - 102)] > 0 )//get prize
+          if ( pParty->monster_id_for_hunting[(int)((char *)window_SpeakInHouse->ptr_1C - 102)] > 0 )//get prize
           {
-            party_finds_gold(100 * pMonsterStats->pInfos[(unsigned __int16)pParty->monster_id_for_hunting[(int)((char *)v8->ptr_1C - 102)]].uLevel, 0);
+            party_finds_gold(100 * pMonsterStats->pInfos[(unsigned __int16)pParty->monster_id_for_hunting[(int)((char *)window_SpeakInHouse->ptr_1C - 102)]].uLevel, 0);
             for ( uint i = 0; i < 4; ++i )
               pParty->pPlayers[i].SetVariable(VAR_Award, 86);
-            pParty->uNumBountiesCollected += 100 * pMonsterStats->pInfos[pParty->monster_id_for_hunting[(int)((char *)v8->ptr_1C - 102)]].uLevel;
-            pParty->monster_id_for_hunting[(int)((char *)v8->ptr_1C - 102)] = 0;
-            pParty->monster_for_hunting_killed[(int)((char *)v8->ptr_1C - 102)] = false;
+            pParty->uNumBountiesCollected += 100 * pMonsterStats->pInfos[pParty->monster_id_for_hunting[(int)((char *)window_SpeakInHouse->ptr_1C - 102)]].uLevel;
+            pParty->monster_id_for_hunting[(int)((char *)window_SpeakInHouse->ptr_1C - 102)] = 0;
+            pParty->monster_for_hunting_killed[(int)((char *)window_SpeakInHouse->ptr_1C - 102)] = false;
           }
           bountyHunting_text = pNPCTopics[352].pText;//"Поздравляю! Вы успешно..."
         }
       }
       else if ( uMessageParam == HOUSE_DIALOGUE_TOWNHALL_PAY_FINE )
-        pKeyActionMap->EnterText(1, 10, v8);
+        pKeyActionMap->EnterText(1, 10, window_SpeakInHouse);
       break;
     }
     case BuildingType_Bank:
     {
       if ( dialog_menu_id >= 7 && dialog_menu_id <= 8 )
-        pKeyActionMap->EnterText(1, 10, v8);
+        pKeyActionMap->EnterText(1, 10, window_SpeakInHouse);
       return;
       break;
     }
@@ -1299,272 +1261,6 @@
     }
   }
 
-  /*
-  if ( in_current_building_type > BuildingType_Tavern )
-  {
-    if ( in_current_building_type == BuildingType_Bank )
-    {
-      if ( dialog_menu_id >= 7 && dialog_menu_id <= 8 )
-        pKeyActionMap->EnterText(1, 10, v8);
-      return;
-    }
-    if ( in_current_building_type != BuildingType_Temple && in_current_building_type != BuildingType_Training )
-      return;
-  }
-  //else
-  if ( in_current_building_type < BuildingType_Tavern )
-  {
-      if (in_current_building_type <= 0)
-        return;
-      if ( in_current_building_type > BuildingType_AlchemistShop )
-      {
-        if ( in_current_building_type <= BuildingType_16 )
-        {
-          if ( (signed __int64)__PAIR__(
-                                 *(int *)&stru_AA1058[3].pSounds[8 * (unsigned int)v8->ptr_1C + 44472],
-                                 *(int *)&stru_AA1058[3].pSounds[8 * (unsigned int)v8->ptr_1C + 44468]) >= (signed __int64)pParty->uTimePlayed )
-          {
-            v32 = 0;
-            do
-            {
-              //v33 = *(&pParty->pPlayers[1].pInstalledBeacons[0].field_18 + 9 * (v32 + 12 * (unsigned int)v8->ptr_1C));
-				v33 = pParty->SpellBooksInGuilds[v8->par1C-139][v32].uItemID;
-              if ( v33 )
-              {
-                v34 = pIcons_LOD->LoadTexture(pItemsTable->pItems[v33].pIconName, TEXTURE_16BIT_PALETTE);
-                v8 = window_SpeakInHouse;
-                ItemsInShopTexture[v32] = &pIcons_LOD->pTextures[v34];
-              }
-              ++v32;
-            }
-            while ( v32 < 12 );
-          }
-          else
-          {
-            SpellBookGenerator();
-            v30 = window_SpeakInHouse->ptr_1C;
-            v31 = pParty->uTimePlayed
-                + (signed __int64)((double)(0xA8C000
-                                          //* (signed int)p2DEvents_minus1[26 * (unsigned int)ptr_507BC0->ptr_1C])
-                                          * (signed int)p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].field_1C)
-                                 * 0.033333335);
-            *(int *)&stru_AA1058[3].pSounds[8 * (int)v30 + 44468] = v31;
-            *(int *)&stru_AA1058[3].pSounds[8 * (int)v30 + 44472] = HIDWORD(v31);
-          }
-          return;
-        }
-        if ( in_current_building_type != BuildingType_TownHall )
-          return;
-		if ( in_current_building_type == BuildingType_TownHall )
-		{
-			if ( uMessageParam == 99 )
-			{
-			  v10 = (int)((char *)v8->ptr_1C - 102);
-			  v56 = v10;
-			  v11 = 8 * v10 + 11325428;
-			  if ( (signed __int64)__PAIR__(pParty->field_3C.field_0[2 * v10 + 1], pParty->field_3C.field_0[2 * v10]) >= (signed __int64)pParty->uTimePlayed )
-			  {
-				v13 = 0;
-			  }
-			  else
-			  {
-				v12 = v10;
-				v13 = 0;
-				pParty->field_75A[v12] = 0;
-				*(_QWORD *)v11 = (signed __int64)((double)(309657600 * (pParty->uCurrentMonth + 12i64 * pParty->uCurrentYear - 14015)) * 0.033333335);
-				v14 = rand() % 258;
-				v15 = window_SpeakInHouse;
-				pParty->field_750[v12] = v14 + 1;
-				v16 = (int)((char *)v15->ptr_1C - 102);
-				if ( v16 )
-				{
-				  v17 = v16 - 1;
-				  if ( v17 )
-				  {
-					v18 = v17 - 1;
-					if ( v18 )
-					{
-					  v19 = v18 - 1;
-					  if ( v19 )
-					  {
-						if ( v19 == 1 )
-						{
-						  while ( 1 )
-						  {
-							v20 = pParty->field_750[v12];
-							if ( (unsigned __int16)v20 < 0x73u || (unsigned __int16)v20 > 0x84u )
-							{
-							  if ( ((unsigned __int16)v20 < 0xE8u || (unsigned __int16)v20 > 0xF9u)
-								&& ((unsigned __int16)v20 < 0x85u || (unsigned __int16)v20 > 0x96u)
-								&& ((unsigned __int16)v20 < 0x97u || (unsigned __int16)v20 > 0xBAu)
-								&& ((unsigned __int16)v20 < 0xBEu || (unsigned __int16)v20 > 0xC0u)
-								&& ((unsigned __int16)v20 < 0xC4u || (unsigned __int16)v20 > 0xC6u)
-								&& ((unsigned __int16)v20 < 0x2Bu || (unsigned __int16)v20 > 0x2Du)
-								&& ((unsigned __int16)v20 < 0x6Du || (unsigned __int16)v20 > 0x6Fu)
-								&& ((unsigned __int16)v20 < 0x46u || (unsigned __int16)v20 > 0x48u)
-								&& ((unsigned __int16)v20 < 0x100u || (unsigned __int16)v20 > 0x102u)
-								&& ((unsigned __int16)v20 < 0xD9u || (unsigned __int16)v20 > 0xDBu)
-								&& ((unsigned __int16)v20 < 0xC7u || (unsigned __int16)v20 > 0xC9u)
-								&& ((unsigned __int16)v20 < 0xE5u || (unsigned __int16)v20 > 0xE7u)
-								&& ((unsigned __int16)v20 < 0xDFu || (unsigned __int16)v20 > 0xE1u)
-								&& ((unsigned __int16)v20 < 0x5Bu || (unsigned __int16)v20 > 0x5Du)
-								&& ((unsigned __int16)v20 < 0x49u || (unsigned __int16)v20 > 0x4Bu)
-								&& ((unsigned __int16)v20 < 0xFDu || (unsigned __int16)v20 > 0xFFu)
-								&& ((unsigned __int16)v20 < 0x61u || (unsigned __int16)v20 > 0x63u)
-								&& ((unsigned __int16)v20 < 0x10u || (unsigned __int16)v20 > 0x12u) )
-								break;
-							}
-							pParty->field_750[v12] = rand() % 258 + 1;
-						  }
-						}
-					  }
-					  else
-					  {
-						while ( 1 )
-						{
-						  v21 = pParty->field_750[v12];
-						  if ( (unsigned __int16)v21 < 0x73u || (unsigned __int16)v21 > 0x84u )
-						  {
-							if ( ((unsigned __int16)v21 < 0xE8u || (unsigned __int16)v21 > 0xF9u)
-							  && ((unsigned __int16)v21 < 0x85u || (unsigned __int16)v21 > 0x96u)
-							  && ((unsigned __int16)v21 < 0x97u || (unsigned __int16)v21 > 0xBAu)
-							  && ((unsigned __int16)v21 < 0xBEu || (unsigned __int16)v21 > 0xC0u)
-							  && ((unsigned __int16)v21 < 0xC4u || (unsigned __int16)v21 > 0xC6u)
-							  && ((unsigned __int16)v21 < 0x2Bu || (unsigned __int16)v21 > 0x2Du)
-							  && ((unsigned __int16)v21 < 0x5Eu || (unsigned __int16)v21 > 0x60u)
-							  && ((unsigned __int16)v21 < 0x43u || (unsigned __int16)v21 > 0x45u)
-							  && ((unsigned __int16)v21 < 0x4Fu || (unsigned __int16)v21 > 0x51u)
-							  && ((unsigned __int16)v21 < 0xC1u || (unsigned __int16)v21 > 0xC3u)
-							  && ((unsigned __int16)v21 < 0x13u || (unsigned __int16)v21 > 0x15u)
-							  && ((unsigned __int16)v21 < 0xFDu || (unsigned __int16)v21 > 0xFFu)
-							  && ((unsigned __int16)v21 < 0x61u || (unsigned __int16)v21 > 0x63u)
-							  && ((unsigned __int16)v21 < 0x6Au || (unsigned __int16)v21 > 0x6Cu) )
-							  break;
-						  }
-						  pParty->field_750[v12] = rand() % 258 + 1;
-						}
-					  }
-					}
-					else
-					{
-					  while ( 1 )
-					  {
-						v22 = pParty->field_750[v12];
-						if ( (unsigned __int16)v22 < 0x73u || (unsigned __int16)v22 > 0x84u )
-						{
-						  if ( ((unsigned __int16)v22 < 0xE8u || (unsigned __int16)v22 > 0xF9u)
-							&& ((unsigned __int16)v22 < 0x85u || (unsigned __int16)v22 > 0x96u)
-							&& ((unsigned __int16)v22 < 0x97u || (unsigned __int16)v22 > 0xBAu)
-							&& ((unsigned __int16)v22 < 0xBEu || (unsigned __int16)v22 > 0xC0u)
-							&& ((unsigned __int16)v22 < 0xC4u || (unsigned __int16)v22 > 0xC6u)
-							&& ((unsigned __int16)v22 < 0x2Bu || (unsigned __int16)v22 > 0x2Du)
-							&& ((unsigned __int16)v22 < 0x31u || (unsigned __int16)v22 > 0x33u)
-							&& ((unsigned __int16)v22 < 0x34u || (unsigned __int16)v22 > 0x36u)
-							&& ((unsigned __int16)v22 < 0xFDu || (unsigned __int16)v22 > 0xFFu)
-							&& ((unsigned __int16)v22 < 0x61u || (unsigned __int16)v22 > 0x63u)
-							&& ((unsigned __int16)v22 < 0x1Cu || (unsigned __int16)v22 > 0x1Eu) )
-							break;
-						}
-						pParty->field_750[v12] = rand() % 258 + 1;
-					  }
-					}
-				  }
-				  else
-				  {
-					while ( 1 )
-					{
-					  v23 = pParty->field_750[v12];
-					  if ( (unsigned __int16)v23 < 0x73u || (unsigned __int16)v23 > 0x84u )
-					  {
-						if ( ((unsigned __int16)v23 < 0xE8u || (unsigned __int16)v23 > 0xF9u)
-						  && ((unsigned __int16)v23 < 0x85u || (unsigned __int16)v23 > 0x96u)
-						  && ((unsigned __int16)v23 < 0x97u || (unsigned __int16)v23 > 0xBAu)
-						  && ((unsigned __int16)v23 < 0xBEu || (unsigned __int16)v23 > 0xC0u)
-						  && ((unsigned __int16)v23 < 0xC4u || (unsigned __int16)v23 > 0xC6u)
-						  && ((unsigned __int16)v23 < 0x2Bu || (unsigned __int16)v23 > 0x2Du)
-						  && ((unsigned __int16)v23 < 0x52u || (unsigned __int16)v23 > 0x54u)
-						  && ((unsigned __int16)v23 < 4u || (unsigned __int16)v23 > 6u)
-						  && ((unsigned __int16)v23 < 0x37u || (unsigned __int16)v23 > 0x39u)
-						  && ((unsigned __int16)v23 < 0x3Au || (unsigned __int16)v23 > 0x3Cu)
-						  && ((unsigned __int16)v23 < 0x3Du || (unsigned __int16)v23 > 0x3Fu)
-						  && ((unsigned __int16)v23 < 0xFDu || (unsigned __int16)v23 > 0xFFu)
-						  && ((unsigned __int16)v23 < 0x61u || (unsigned __int16)v23 > 0x63u)
-						  && ((unsigned __int16)v23 < 0xCDu || (unsigned __int16)v23 > 0xCFu) )
-						  break;
-					  }
-					  pParty->field_750[v12] = rand() % 258 + 1;
-					}
-				  }
-				}
-				else
-				{
-				  while ( 1 )
-				  {
-					v24 = pParty->field_750[v12];
-					if ( (unsigned __int16)v24 < 0x73u || (unsigned __int16)v24 > 0x84u )
-					{
-					  if ( ((unsigned __int16)v24 < 0xEBu || (unsigned __int16)v24 > 0xFCu)
-						&& ((unsigned __int16)v24 < 0x85u || (unsigned __int16)v24 > 0x96u)
-						&& ((unsigned __int16)v24 < 0x97u || (unsigned __int16)v24 > 0xBAu)
-						&& ((unsigned __int16)v24 < 0xBEu || (unsigned __int16)v24 > 0xC0u)
-						&& ((unsigned __int16)v24 < 0xC4u || (unsigned __int16)v24 > 0xC6u)
-						&& ((unsigned __int16)v24 < 0x2Bu || (unsigned __int16)v24 > 0x2Du)
-						&& ((unsigned __int16)v24 < 0xCDu || (unsigned __int16)v24 > 0xCFu)
-						&& ((unsigned __int16)v24 < 0x5Eu || (unsigned __int16)v24 > 0x60u)
-						&& ((unsigned __int16)v24 < 0xFDu || (unsigned __int16)v24 > 0xFFu)
-						&& ((unsigned __int16)v24 < 0x6Du || (unsigned __int16)v24 > 0x6Fu)
-						&& ((unsigned __int16)v24 < 0x61u || (unsigned __int16)v24 > 0x63u) )
-						break;
-					}
-					pParty->field_750[v12] = rand() % 258 + 1;
-				  }
-				}
-				v10 = v56;
-			  }
-			  v25 = v10;
-			  v26 = pParty->field_750[v25];
-			  v27 = pParty->field_75A[v25] == v13;
-			  bountyHunting_monster_id_for_hunting = pParty->field_750[v25];
-			  if ( v27 )
-			  {
-				//v1 = 0;
-				v27 = v26 == v13;
-				v29 = (int)pNPCTopics[351].pText;
-				if ( v27 )
-				  v29 = (int)pNPCTopics[353].pText;
-				bountyHunting_text = (char *)v29;
-			  }
-			  else
-			  {
-				if ( v26 != v13 )
-				{
-				  party_finds_gold(100 * pMonsterStats->pInfos[(unsigned __int16)v26].uLevel, 0);
-				  v28 = pParty->pPlayers;
-				  do
-				  {
-					v28->SetVariable(VAR_Award, 86);
-					++v28;
-				  }
-				  while ( (signed int)v28 < (signed int)pParty->pHirelings );
-				  pParty->uNumBountiesCollected += 100 * pMonsterStats->pInfos[pParty->field_750[v25]].uLevel;
-				  pParty->field_750[v25] = v13;
-				  pParty->field_75A[v25] = v13;
-				}
-				//v1 = 0;
-				bountyHunting_text = pNPCTopics[352].pText;
-			  }
-			}
-			else if ( uMessageParam == 100 )
-			{
-			  pKeyActionMap->EnterText(1, 10, v8);
-			}
-		}
-	  }
-  }
-  */
-  
-
-//LABEL_196:
   switch ( uMessageParam )
   {
     case HOUSE_DIALOGUE_LEARN_SKILLS:
@@ -1589,13 +1285,6 @@
     }
     case HOUSE_DIALOGUE_TAVERN_ARCOMAGE_RESULT:
     {
-      /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 )
-      {
-        pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = UIMSG_PlayArcomage;
-        pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = v1;
-        *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = v1;
-        ++pMessageQueue_50CBD0->uNumMessages;
-      }*/
       pMessageQueue_50CBD0->AddMessage(UIMSG_PlayArcomage, 0, 0);
       dialog_menu_id = HOUSE_DIALOGUE_TAVERN_ARCOMAGE_RESULT;
       break;
@@ -1603,7 +1292,7 @@
     case HOUSE_DIALOGUE_SHOP_BUY_STANDARD:
     case HOUSE_DIALOGUE_SHOP_BUY_SPECIAL:
     {
-      if ( pParty->PartyTimes.Shops_next_generation_time[(unsigned int)v8->ptr_1C] < (signed __int64)pParty->uTimePlayed )
+      if ( pParty->PartyTimes.Shops_next_generation_time[(unsigned int)window_SpeakInHouse->ptr_1C] < (signed __int64)pParty->uTimePlayed )
       {
         GenerateStandartShopItems();
         GenerateSpecialShopItems();
@@ -1613,59 +1302,47 @@
       {
         if ( uItemsAmountPerShopType[p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].uType] )
         {
-          for ( v43 = 0; v43 < (unsigned __int8)uItemsAmountPerShopType[p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].uType]; ++v43 )
+          for ( uint i = 0; i < (unsigned __int8)uItemsAmountPerShopType[p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].uType]; ++i )
           {
-            if ( pParty->StandartItemsInShops[(int)window_SpeakInHouse->ptr_1C][v43].uItemID )
-            {
-              v46 = pIcons_LOD->LoadTexture(pParty->StandartItemsInShops[(int)window_SpeakInHouse->ptr_1C][v43].GetIconName(), TEXTURE_16BIT_PALETTE);
-              ItemsInShopTexture[v43] = &pIcons_LOD->pTextures[v46];
-            }
+            if ( pParty->StandartItemsInShops[(int)window_SpeakInHouse->ptr_1C][i].uItemID )
+              ItemsInShopTexture[i] = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture(pParty->StandartItemsInShops[(int)window_SpeakInHouse->ptr_1C][i].GetIconName(), TEXTURE_16BIT_PALETTE)];
           }
         }
         if ( in_current_building_type == BuildingType_WeaponShop )
         {
-          v48 = 0;
           if ( uItemsAmountPerShopType[p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].uType] )
           {
-            do
+            for ( uint i = 0; i < (unsigned __int8)uItemsAmountPerShopType[p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].uType]; ++i )
             {
-              if ( pParty->StandartItemsInShops[(int)window_SpeakInHouse->ptr_1C][v48].uItemID)
-                word_F8B158[v48] = rand() % (300 - ItemsInShopTexture[v48]->uTextureHeight);
-              ++v48;
-              }
-              while ( v48 < (unsigned __int8)uItemsAmountPerShopType[p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].uType] );
+              if ( pParty->StandartItemsInShops[(int)window_SpeakInHouse->ptr_1C][i].uItemID)
+                weapons_Ypos[i] = rand() % (300 - ItemsInShopTexture[i]->uTextureHeight);
             }
           }
         }
-        if ( uMessageParam == HOUSE_DIALOGUE_SHOP_BUY_SPECIAL )
+      }
+      if ( uMessageParam == HOUSE_DIALOGUE_SHOP_BUY_SPECIAL )
+      {
+        if ( uItemsAmountPerShopType[p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].uType] )
+        {
+          for ( uint i = 0; i < (unsigned __int8)uItemsAmountPerShopType[p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].uType]; ++i )
+          {
+            if ( pParty->SpecialItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][i].uItemID )
+              ItemsInShopTexture[i] = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture(pParty->SpecialItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][i].GetIconName(), TEXTURE_16BIT_PALETTE)];
+          }
+        }
+        if ( in_current_building_type == BuildingType_WeaponShop )
         {
           if ( uItemsAmountPerShopType[p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].uType] )
           {
-            for ( v43 = 0; v43 < (unsigned __int8)uItemsAmountPerShopType[p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].uType]; ++v43 )
+            for ( uint i = 0; i < (unsigned __int8)uItemsAmountPerShopType[p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].uType]; ++i )
             {
-              if ( pParty->SpecialItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][(signed int)v43].uItemID )
-              {
-                v51 = pIcons_LOD->LoadTexture(pParty->SpecialItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][(signed int)v43].GetIconName(), TEXTURE_16BIT_PALETTE);
-                ItemsInShopTexture[v43] = &pIcons_LOD->pTextures[v51];
-              }
-            }
-          }
-          if ( in_current_building_type == BuildingType_WeaponShop )
-          {
-            v53 = 0;
-            if ( uItemsAmountPerShopType[p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].uType] )
-            {
-              do
-              {
-                if (pParty->SpecialItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][v53].uItemID)
-                  word_F8B158[v53] = rand() % (300 - ItemsInShopTexture[v53]->uTextureHeight);
-                ++v53;
-              }
-              while ( v53 < (unsigned __int8)uItemsAmountPerShopType[p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].uType ] );
+              if (pParty->SpecialItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][i].uItemID)
+                weapons_Ypos[i] = rand() % (300 - ItemsInShopTexture[i]->uTextureHeight);
             }
           }
         }
-        break;
+      }
+      break;
     }
     case HOUSE_DIALOGUE_SHOP_SELL:
     case HOUSE_DIALOGUE_SHOP_IDENTIFY:
@@ -1686,29 +1363,25 @@
     {
       if( uMessageParam >= HOUSE_DIALOGUE_36 && uMessageParam <= HOUSE_DIALOGUE_GUILD_LEARN_SKILL )
       {
-        v36 = (signed __int64)(p2DEvents[(unsigned int)v8->ptr_1C - 1].flt_24 * 500.0);
-        v37 = v36 * (100 - pPlayers[uActiveCharacter]->GetMerchant()) / 100;
-        if ( v37 < v36 / 3 )
-        v37 = v36 / 3;
-        //if (false)
-        if(byte_4ED970_skill_learn_ability_by_class_table[pPlayers[uActiveCharacter]->classType][uMessageParam-36])
-        //if ( *(&byte_4ED94C[37 * v35->uClass] + v55) )
+        v36 = (signed __int64)(p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].flt_24 * 500.0);
+        pPrice = v36 * (100 - pPlayers[uActiveCharacter]->GetMerchant()) / 100;
+        if ( pPrice < v36 / 3 )
+        pPrice = v36 / 3;
+        if(byte_4ED970_skill_learn_ability_by_class_table[pPlayers[uActiveCharacter]->classType][uMessageParam - 36])
         {
-          //v38 = (int)(&pPlayers[uActiveCharacter]->uIntelligence + uMessageParam);
           if ( !pPlayers[uActiveCharacter]->pActiveSkills[uMessageParam - 36] )
           {
-            if ( pParty->uNumGold < v37 )
+            if ( pParty->uNumGold < pPrice )
             {
               ShowStatusBarString(pGlobalTXT_LocalizationStrings[155], 2);
               if ( in_current_building_type == BuildingType_Training || in_current_building_type == BuildingType_Tavern )
-                v39 = 4;
+                PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_Goodbye);
               else
-                v39 = 2;
-              PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, (HouseSoundID)v39);
+                PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_NotEnoughMoney_TrainingSuccessful);
             }
             else
             {
-              Party::TakeGold(v37);
+              Party::TakeGold(pPrice);
               dword_F8B1E4 = 1;
               pPlayers[uActiveCharacter]->pActiveSkills[uMessageParam - 36] = 1;
               pPlayers[uActiveCharacter]->PlaySound(SPEECH_78, 0);
@@ -1719,192 +1392,6 @@
       break;
     }
   }
-  /*
-  if ( uMessageParam != 95 && uMessageParam != 2 )
-  {
-    if ( uMessageParam == 3 )
-    {
-      dialog_menu_id = 3;
-    }
-    else
-    {
-      if ( uMessageParam == 4 )
-      {
-        dialog_menu_id = 4;
-      }
-      else
-      {
-        if ( uMessageParam != 5 )
-        {
-          if ( uMessageParam > 35 )
-          {
-            if ( uMessageParam <= 72 )
-            {
-              v35 = pPlayers[uActiveCharacter];
-              //v36 = (signed __int64)(*(float *)&p2DEvents_minus1__24[13 * (unsigned int)v8->ptr_1C] * 500.0);
-              v36 = (signed __int64)(p2DEvents[(unsigned int)v8->ptr_1C - 1].flt_24 * 500.0);
-              v37 = v36 * (100 - pPlayers[uActiveCharacter]->GetMerchant()) / 100;
-              if ( v37 < v36 / 3 )
-                v37 = v36 / 3;
-              
-              __debugbreak();
-              //pSkillAvailabilityPerClass[8 + v58->uClass][4 + v23]
-              // or
-              //byte_4ED970_skill_learn_ability_by_class_table[v58->uClass][v23 - 36]
-              // or
-              //byte_4ED970_skill_learn_ability_by_class_table[v58->uClass - 1][v23 + 1]
-
-              if (false)
-              //if ( *(&byte_4ED94C[37 * v35->uClass] + v55) )
-              {
-                v38 = (int)(&v35->uIntelligence + uMessageParam);
-                if ( !*(short *)v38 )
-                {
-                  if ( pParty->uNumGold < v37 )
-                  {
-                    ShowStatusBarString(pGlobalTXT_LocalizationStrings[155], 2u);
-                    if ( in_current_building_type == BuildingType_Training || in_current_building_type == BuildingType_Tavern )
-                      v39 = 4;
-                    else
-                      v39 = 2;
-                    PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, v39);
-                  }
-                  else
-                  {
-                    Party::TakeGold(v37);
-                    dword_F8B1E4 = 1;
-                    *(short *)v38 = 1;
-                    v35->PlaySound(SPEECH_78, 0);
-                  }
-                }
-              }
-            }
-            else
-            {
-              if ( uMessageParam == 94 )
-              {
-                pDialogueWindow->eWindowType = WINDOW_MainMenu;
-                UI_CreateEndConversationButton();
-                InitializaDialogueOptions_Shops(in_current_building_type);
-              }
-            }
-          }
-          return;
-        }
-        dialog_menu_id = 5;
-      }
-    }
-    sub_421B2C_PlaceInInventory_or_DropPickedItem();
-    return;
-  }
-  if ( pParty->field_3C.Shops_next_generation_time[(unsigned int)v8->ptr_1C] < (signed __int64)pParty->uTimePlayed )
-  {
-    GenerateStandartShopItems();
-    GenerateSpecialShopItems();
-    v8 = window_SpeakInHouse;
-    v40 = window_SpeakInHouse->par1C;
-    //v3 = dword_F8B198;
-    v41 = pParty->uTimePlayed
-        //+ (signed __int64)((double)(11059200 * (signed int)p2DEvents_minus1[26 * (unsigned int)ptr_507BC0->ptr_1C])
-        + (signed __int64)((double)(11059200 * (signed int)p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].field_1C)
-                         * 0.033333335);
-    pParty->field_3C.Shops_next_generation_time[v40] = v41;
-   
-  }
-  v42 = v8->ptr_1C;
-  v43 = 0;
-  //v44 = p2DEvents_minus1___00[26 * (unsigned int)v8->ptr_1C];
-  v44 = p2DEvents[(unsigned int)v8->ptr_1C - 1].uType;
-  if ( uMessageParam == 2 )
-  {
-    if ( uItemsAmountPerShopType[v44] )
-    {
-      do
-      {
-        v45 = pParty->StandartItemsInShops[(int)v42][v43].uItemID;
-        if ( v45 )
-        {
-          v46 = pIcons_LOD->LoadTexture(pItemsTable->pItems[v45].pIconName, TEXTURE_16BIT_PALETTE);
-          //v3 = dword_F8B198;
-          v8 = window_SpeakInHouse;
-          ItemsInShopTexture[v43] = &pIcons_LOD->pTextures[v46];
-        }
-        v42 = v8->ptr_1C;
-        ++v43;
-      }
-      //while ( v43 < (unsigned __int8)_4F063C_smthn_by_2da_uType[p2DEvents_minus1___00[26 * (unsigned int)v8->ptr_1C]] );
-      while ( v43 < (unsigned __int8)uItemsAmountPerShopType[p2DEvents[(unsigned int)v8->ptr_1C - 1].uType] );
-    }
-    if ( in_current_building_type == BuildingType_WeaponShop )
-    {
-      v47 = v8->ptr_1C;
-      v48 = 0;
-      //if ( _4F063C_smthn_by_2da_uType[p2DEvents_minus1___00[26 * (unsigned int)v8->ptr_1C]] )
-      if ( uItemsAmountPerShopType[p2DEvents[(unsigned int)v8->ptr_1C - 1].uType] )
-      {
-        do
-        {
-         // if ( pParty->field_777C[9 * (v48 + 12 * (int)v47)] )
-		 if ( pParty->StandartItemsInShops[(int)v47][v48].uItemID);
-          {
-            v49 = rand();
-            v8 = window_SpeakInHouse;
-            word_F8B158[v48] = v49 % (300 - ItemsInShopTexture[v48]->uTextureHeight);
-          }
-          v47 = v8->ptr_1C;
-          ++v48;
-        }
-        //while ( v48 < (unsigned __int8)_4F063C_smthn_by_2da_uType[p2DEvents_minus1___00[26 * (unsigned int)v8->ptr_1C]] );
-        while ( v48 < (unsigned __int8)uItemsAmountPerShopType[p2DEvents[(unsigned int)v8->ptr_1C - 1].uType] );
-      }
-    }
-  }
-  if ( uMessageParam == 95 )
-  {
-    if ( uItemsAmountPerShopType[v44] )
-    {
-      do
-      {
-        //v50 = pParty->field_C59C[9 * (v43 + 12 * (int)v42) + 724];
-	  v50=pParty->SpecialItemsInShops[(unsigned int)v42][(signed int)v43].uItemID;
-        if ( v50 )
-        {
-          v51 = pIcons_LOD->LoadTexture(pItemsTable->pItems[v50].pIconName, TEXTURE_16BIT_PALETTE);
-          //v3 = dword_F8B198;
-          v8 = window_SpeakInHouse;
-          ItemsInShopTexture[v43] = &pIcons_LOD->pTextures[v51];
-        }
-        v42 = v8->ptr_1C;
-        ++v43;
-      }
-      //while ( v43 < (unsigned __int8)_4F063C_smthn_by_2da_uType[p2DEvents_minus1___00[26 * (unsigned int)v8->ptr_1C]] );
-      while ( v43 < (unsigned __int8)uItemsAmountPerShopType[p2DEvents[(unsigned int)v8->ptr_1C - 1].uType] );
-    }
-    if ( in_current_building_type == BuildingType_WeaponShop )
-    {
-      v52 = v8->ptr_1C;
-      v53 = 0;
-      //if ( _4F063C_smthn_by_2da_uType[p2DEvents_minus1___00[26 * (unsigned int)v8->ptr_1C]] )
-      if ( uItemsAmountPerShopType[p2DEvents[(unsigned int)v8->ptr_1C - 1].uType] )
-      {
-        do
-        {
-         // if ( pParty->field_C59C[9 * (v53 + 12 * (int)v52) + 724] )
-		if (pParty->SpecialItemsInShops[(unsigned int)v52][v53].uItemID)
-          {
-            v54 = rand();
-            v8 = window_SpeakInHouse;
-            word_F8B158[v53] = v54 % (300 - ItemsInShopTexture[v53]->uTextureHeight);
-          }
-          v52 = v8->ptr_1C;
-          ++v53;
-        }
-        //while ( v53 < (unsigned __int8)_4F063C_smthn_by_2da_uType[p2DEvents_minus1___00[26 * (unsigned int)v8->ptr_1C]] );
-        while ( v53 < (unsigned __int8)uItemsAmountPerShopType[p2DEvents[(unsigned int)v8->ptr_1C - 1].uType ] );
-      }
-    }
-  }
-*/
 }
 //----- (004B6943) --------------------------------------------------------
 void  TravelByTransport()
--- a/UI/UISaveLoad.cpp	Mon Sep 30 05:48:32 2013 +0200
+++ b/UI/UISaveLoad.cpp	Mon Sep 30 05:59:06 2013 +0200
@@ -148,219 +148,178 @@
   UI_DrawSaveLoad(true);
 }
 
-
 //----- (0045E361) --------------------------------------------------------
 void LoadUI_Load(unsigned int uDialogueType)
 {
-    unsigned int v1; // ebp@5
-    unsigned int v2; // eax@5
-    //signed int v3; // ebp@11
-    FILE *v4; // eax@14
-    FILE *v5; // eax@18
-    unsigned int v6; // eax@25
-    GUIButton *v7; // eax@27
-    const char *v8; // [sp-8h] [bp-26Ch]@25
-    //char *v9; // [sp-4h] [bp-268h]@19
-    enum TEXTURE_TYPE v10; // [sp-4h] [bp-268h]@25
-    unsigned int uDialogueType_; // [sp+10h] [bp-254h]@1
-    //RGBTexture *pTex; // [sp+10h] [bp-254h]@12
-    //SavegameHeader *Dest; // [sp+14h] [bp-250h]@12
-    //const char *Str1; // [sp+18h] [bp-24Ch]@12
-    LODWriteableFile pLODFile; // [sp+1Ch] [bp-248h]@1
-    int v16; // [sp+260h] [bp-4h]@1
+  LODWriteableFile pLODFile; // [sp+1Ch] [bp-248h]@1
 
-    uDialogueType_ = uDialogueType;
-    dword_6BE138 = -1;
-    pIcons_LOD->_inlined_sub2();
+  dword_6BE138 = -1;
+  pIcons_LOD->_inlined_sub2();
 
-    memset(pSavegameUsedSlots.data(), 0, sizeof(pSavegameUsedSlots));
-    memset(pSavegameThumbnails.data(), 0, 45 * sizeof(RGBTexture));
-    uTextureID_loadsave = pIcons_LOD->LoadTexture("loadsave", TEXTURE_16BIT_PALETTE);
-    uTextureID_load_up = pIcons_LOD->LoadTexture("load_up", TEXTURE_16BIT_PALETTE);
-    uTextureID_save_up = pIcons_LOD->LoadTexture("save_up", TEXTURE_16BIT_PALETTE);
-    uTextureID_LS_loadU = pIcons_LOD->LoadTexture("LS_loadU", TEXTURE_16BIT_PALETTE);
-    uTextureID_LS_saveU = pIcons_LOD->LoadTexture("LS_saveU", TEXTURE_16BIT_PALETTE);
-    uTextureID_x_u = pIcons_LOD->LoadTexture("x_u", TEXTURE_16BIT_PALETTE);
-    if ( uDialogueType_ )
-        {
-        pRenderer->DrawTextureIndexed(8, 8, pIcons_LOD->GetTexture(uTextureID_loadsave));
-        if ( pCurrentScreen == SCREEN_SAVEGAME )
-            {
-            v1 = uTextureID_save_up;
-            v2 = uTextureID_LS_saveU;
-            }
-        else
-            {
-            v1 = uTextureID_load_up;
-            v2 = uTextureID_LS_loadU;
-            }
-        pRenderer->DrawTextureIndexed(241, 302, pIcons_LOD->GetTexture(v2));
-        pRenderer->DrawTextureIndexed( 18, 141, pIcons_LOD->GetTexture(v1));
-        pRenderer->DrawTextureIndexed(351, 302, pIcons_LOD->GetTexture(uTextureID_x_u));
-        }
+  memset(pSavegameUsedSlots.data(), 0, sizeof(pSavegameUsedSlots));
+  memset(pSavegameThumbnails.data(), 0, 45 * sizeof(RGBTexture));
+  uTextureID_loadsave = pIcons_LOD->LoadTexture("loadsave", TEXTURE_16BIT_PALETTE);
+  uTextureID_load_up = pIcons_LOD->LoadTexture("load_up", TEXTURE_16BIT_PALETTE);
+  uTextureID_save_up = pIcons_LOD->LoadTexture("save_up", TEXTURE_16BIT_PALETTE);
+  uTextureID_LS_loadU = pIcons_LOD->LoadTexture("LS_loadU", TEXTURE_16BIT_PALETTE);
+  uTextureID_LS_saveU = pIcons_LOD->LoadTexture("LS_saveU", TEXTURE_16BIT_PALETTE);
+  uTextureID_x_u = pIcons_LOD->LoadTexture("x_u", TEXTURE_16BIT_PALETTE);
+  if ( uDialogueType )
+  {
+    pRenderer->DrawTextureIndexed(8, 8, pIcons_LOD->GetTexture(uTextureID_loadsave));
+    if ( pCurrentScreen == SCREEN_SAVEGAME )
+    {
+      pRenderer->DrawTextureIndexed(241, 302, pIcons_LOD->GetTexture(uTextureID_LS_saveU));
+      pRenderer->DrawTextureIndexed( 18, 141, pIcons_LOD->GetTexture(uTextureID_save_up));
+    }
     else
-        {
-        pRenderer->DrawTextureRGB(0, 0, &pTexture_PCX);
-        }
-    pGUIWindow_CurrentMenu = GUIWindow::Create(saveload_dlg_xs[uDialogueType_], saveload_dlg_ys[uDialogueType_], saveload_dlg_zs[uDialogueType_],
-        saveload_dlg_ws[uDialogueType_], WINDOW_MainMenu_Load, 0, 0);
-    pGUIWindow_CurrentMenu->DrawText(pFontSmallnum, 25, 199, 0, pGlobalTXT_LocalizationStrings[505], 0, 0, 0);// "Reading..."
-    pRenderer->Present();
-    pSavegameList->Initialize(0);
-    if ( pSaveListPosition > (signed int)uNumSavegameFiles )
-        {
-        pSaveListPosition = 0;
-        uLoadGameUI_SelectedSlot = 0;
-        }
-    pLODFile.AllocSubIndicesAndIO(0x12C, 0);
-    Assert(sizeof(SavegameHeader) == 0x64);
-    //v3 = 0;
-    for (uint i = 0; i < uNumSavegameFiles; ++i)
-        {
+    {
+      pRenderer->DrawTextureIndexed(241, 302, pIcons_LOD->GetTexture(uTextureID_LS_loadU));
+      pRenderer->DrawTextureIndexed( 18, 141, pIcons_LOD->GetTexture(uTextureID_load_up));
+    }
+    pRenderer->DrawTextureIndexed(351, 302, pIcons_LOD->GetTexture(uTextureID_x_u));
+  }
+  else
+    pRenderer->DrawTextureRGB(0, 0, &pTexture_PCX);
+  pGUIWindow_CurrentMenu = GUIWindow::Create(saveload_dlg_xs[uDialogueType], saveload_dlg_ys[uDialogueType], saveload_dlg_zs[uDialogueType],
+      saveload_dlg_ws[uDialogueType], WINDOW_MainMenu_Load, 0, 0);
+  pGUIWindow_CurrentMenu->DrawText(pFontSmallnum, 25, 199, 0, pGlobalTXT_LocalizationStrings[505], 0, 0, 0);// "Reading..."
+  pRenderer->Present();
+  pSavegameList->Initialize(0);
+  if ( pSaveListPosition > (signed int)uNumSavegameFiles )
+  {
+    pSaveListPosition = 0;
+    uLoadGameUI_SelectedSlot = 0;
+  }
+  pLODFile.AllocSubIndicesAndIO(300, 0);
+  Assert(sizeof(SavegameHeader) == 100);
+  for (uint i = 0; i < uNumSavegameFiles; ++i)
+  {
+    sprintf(pTmpBuf.data(), "saves\\%s", pSavegameList->pFileList[i].pSaveFileName);
+    if (_access(pTmpBuf.data(), 6))
+    {
+      pSavegameUsedSlots[i] = 0;
+      strcpy(pSavegameHeader[i].pName, pGlobalTXT_LocalizationStrings[72]); // "Empty"
+      continue;
+    }
+    pLODFile.LoadFile(pTmpBuf.data(), 1);
+    if ( pLODFile.FindContainer("header.bin", true) )
+      fread(&pSavegameHeader[i], 100, 1, pLODFile.FindContainer("header.bin", true));
+    if ( !_stricmp(pSavegameList->pFileList[i].pSaveFileName, pGlobalTXT_LocalizationStrings[613]) )// "AutoSave.MM7"
+      strcpy(pSavegameHeader[i].pName, pGlobalTXT_LocalizationStrings[16]);// "Autosave"
+    if ( !pLODFile.FindContainer("image.pcx", true) )
+    {
+      pSavegameUsedSlots[i] = 0;
+      strcpy(pSavegameList->pFileList[i].pSaveFileName, "");
+    }
+    else
+    {
+      pSavegameThumbnails[i].LoadFromFILE(pLODFile.FindContainer("image.pcx", true), 0, true);
+      pLODFile.CloseWriteFile();
+      pSavegameUsedSlots[i] = 1;
+    }
+  }
 
-        sprintf(pTmpBuf.data(), "saves\\%s", pSavegameList->pFileList[i].pSaveFileName);
-        if (_access(pTmpBuf.data(), 6))
-            {
-            pSavegameUsedSlots[i] = 0;
-            strcpy(pSavegameHeader[i].pName, pGlobalTXT_LocalizationStrings[72]); // "Empty"
-            continue;
-            }
-        pLODFile.LoadFile(pTmpBuf.data(), 1);
-        v4 = pLODFile.FindContainer("header.bin", true);
-        if ( v4 )
-            fread(&pSavegameHeader[i], 0x64, 1, v4);
-        if ( !_stricmp(pSavegameList->pFileList[i].pSaveFileName, pGlobalTXT_LocalizationStrings[613]) )// "AutoSave.MM7"
-            strcpy(pSavegameHeader[i].pName, pGlobalTXT_LocalizationStrings[16]);// "Autosave"
-        v5 = pLODFile.FindContainer("image.pcx", true);
-        if ( !v5 )
-            {
-            pSavegameUsedSlots[i] = 0;
-            strcpy(pSavegameList->pFileList[i].pSaveFileName, "");
-            }
-        else
-            {
-            pSavegameThumbnails[i].LoadFromFILE(v5, 0, true);
-            pLODFile.CloseWriteFile();
-            pSavegameUsedSlots[i] = 1;
-            }
-        }
-
-    //LABEL_24:
-    pLODFile.FreeSubIndexAndIO();
-    if ( pCurrentScreen == SCREEN_SAVEGAME )
-        {
-        uTextureID_x_d = pIcons_LOD->LoadTexture("x_d", TEXTURE_16BIT_PALETTE);
-        uTextureID_LS_ = pIcons_LOD->LoadTexture("LS_saveD",TEXTURE_16BIT_PALETTE);
-        }
-    else
-        {
-        uTextureID_x_d = pIcons_LOD->LoadTexture("x_d", TEXTURE_16BIT_PALETTE);
-        uTextureID_LS_ = pIcons_LOD->LoadTexture("LS_loadD",TEXTURE_16BIT_PALETTE);
-        }
-    uTextureID_AR_UP_DN = pIcons_LOD->LoadTexture("AR_UP_DN", TEXTURE_16BIT_PALETTE);
-    uTextureID_AR_DN_DN = pIcons_LOD->LoadTexture("AR_DN_DN", TEXTURE_16BIT_PALETTE);
-    pGUIWindow_CurrentMenu->CreateButton(21, 198, 191, 18, 1, 0, UIMSG_SelectLoadSlot, 0, 0, "", 0);
-    pGUIWindow_CurrentMenu->CreateButton(21, 219, 191, 18, 1, 0, UIMSG_SelectLoadSlot, 1, 0, "", 0);
-    pGUIWindow_CurrentMenu->CreateButton(21, 240, 191, 18, 1, 0, UIMSG_SelectLoadSlot, 2, 0, "", 0);
-    pGUIWindow_CurrentMenu->CreateButton(21, 261, 191, 18, 1, 0, UIMSG_SelectLoadSlot, 3, 0, "", 0);
-    pGUIWindow_CurrentMenu->CreateButton(21, 282, 191, 18, 1, 0, UIMSG_SelectLoadSlot, 4, 0, "", 0);
-    pGUIWindow_CurrentMenu->CreateButton(21, 303, 191, 18, 1, 0, UIMSG_SelectLoadSlot, 5, 0, "", 0);
-    pGUIWindow_CurrentMenu->CreateButton(21, 324, 191, 18, 1, 0, UIMSG_SelectLoadSlot, 6, 0, "", 0);
-    pBtnLoadSlot  = pGUIWindow_CurrentMenu->CreateButton(241, 302, 105, 40, 1, 0, UIMSG_SaveLoadBtn, 0, 0, "", pIcons_LOD->GetTexture(uTextureID_LS_), 0);
-    pBtnCancel    = pGUIWindow_CurrentMenu->CreateButton(350, 302, 105, 40, 1, 0, UIMSG_Cancel, 0, 0, "", pIcons_LOD->GetTexture(uTextureID_x_d), 0);
-    pBtnArrowUp   = pGUIWindow_CurrentMenu->CreateButton(215, 199,  17, 17, 1, 0, UIMSG_ArrowUp, 0, 0, "", pIcons_LOD->GetTexture(uTextureID_AR_UP_DN), 0);
-    pBtnDownArrow = pGUIWindow_CurrentMenu->CreateButton(215, 323,  17, 17, 1, 0, UIMSG_DownArrow, uNumSavegameFiles, 0, "", pIcons_LOD->GetTexture(uTextureID_AR_DN_DN), 0);
+  pLODFile.FreeSubIndexAndIO();
+  if ( pCurrentScreen == SCREEN_SAVEGAME )
+  {
+    uTextureID_x_d = pIcons_LOD->LoadTexture("x_d", TEXTURE_16BIT_PALETTE);
+    uTextureID_LS_ = pIcons_LOD->LoadTexture("LS_saveD",TEXTURE_16BIT_PALETTE);
+  }
+  else
+  {
+    uTextureID_x_d = pIcons_LOD->LoadTexture("x_d", TEXTURE_16BIT_PALETTE);
+    uTextureID_LS_ = pIcons_LOD->LoadTexture("LS_loadD",TEXTURE_16BIT_PALETTE);
+  }
+  uTextureID_AR_UP_DN = pIcons_LOD->LoadTexture("AR_UP_DN", TEXTURE_16BIT_PALETTE);
+  uTextureID_AR_DN_DN = pIcons_LOD->LoadTexture("AR_DN_DN", TEXTURE_16BIT_PALETTE);
+  pGUIWindow_CurrentMenu->CreateButton(21, 198, 191, 18, 1, 0, UIMSG_SelectLoadSlot, 0, 0, "", 0);
+  pGUIWindow_CurrentMenu->CreateButton(21, 219, 191, 18, 1, 0, UIMSG_SelectLoadSlot, 1, 0, "", 0);
+  pGUIWindow_CurrentMenu->CreateButton(21, 240, 191, 18, 1, 0, UIMSG_SelectLoadSlot, 2, 0, "", 0);
+  pGUIWindow_CurrentMenu->CreateButton(21, 261, 191, 18, 1, 0, UIMSG_SelectLoadSlot, 3, 0, "", 0);
+  pGUIWindow_CurrentMenu->CreateButton(21, 282, 191, 18, 1, 0, UIMSG_SelectLoadSlot, 4, 0, "", 0);
+  pGUIWindow_CurrentMenu->CreateButton(21, 303, 191, 18, 1, 0, UIMSG_SelectLoadSlot, 5, 0, "", 0);
+  pGUIWindow_CurrentMenu->CreateButton(21, 324, 191, 18, 1, 0, UIMSG_SelectLoadSlot, 6, 0, "", 0);
+  pBtnLoadSlot  = pGUIWindow_CurrentMenu->CreateButton(241, 302, 105, 40, 1, 0, UIMSG_SaveLoadBtn, 0, 0, "", pIcons_LOD->GetTexture(uTextureID_LS_), 0);
+  pBtnCancel    = pGUIWindow_CurrentMenu->CreateButton(350, 302, 105, 40, 1, 0, UIMSG_Cancel, 0, 0, "", pIcons_LOD->GetTexture(uTextureID_x_d), 0);
+  pBtnArrowUp   = pGUIWindow_CurrentMenu->CreateButton(215, 199,  17, 17, 1, 0, UIMSG_ArrowUp, 0, 0, "", pIcons_LOD->GetTexture(uTextureID_AR_UP_DN), 0);
+  pBtnDownArrow = pGUIWindow_CurrentMenu->CreateButton(215, 323,  17, 17, 1, 0, UIMSG_DownArrow, uNumSavegameFiles, 0, "", pIcons_LOD->GetTexture(uTextureID_AR_DN_DN), 0);
 }
 
 //----- (0045E93E) --------------------------------------------------------
 void SaveUI_Load()
 {
-    unsigned int v0; // ebp@4
-    unsigned int v1; // eax@4
-    char *v3; // eax@7
-    FILE *v4; // eax@11
-    FILE *v5; // eax@11
-    LODWriteableFile v11; // [sp+1Ch] [bp-248h]@1
+  char *v3; // eax@7
+  LODWriteableFile pLODFile; // [sp+1Ch] [bp-248h]@1
 
-    ++pIcons_LOD->uTexturePacksCount;
-    if ( !pIcons_LOD->uNumPrevLoadedFiles )
-        pIcons_LOD->uNumPrevLoadedFiles = pIcons_LOD->uNumLoadedFiles;
-    memset(pSavegameUsedSlots.data(), 0, 0xB4u);
-    memset(&pSavegameThumbnails, 0, 0x708u);
-    uTextureID_loadsave = pIcons_LOD->LoadTexture("loadsave", TEXTURE_16BIT_PALETTE);
-    uTextureID_load_up = pIcons_LOD->LoadTexture("load_up", TEXTURE_16BIT_PALETTE);
-    uTextureID_save_up = pIcons_LOD->LoadTexture("save_up", TEXTURE_16BIT_PALETTE);
-    uTextureID_LS_loadU = pIcons_LOD->LoadTexture("LS_loadU", TEXTURE_16BIT_PALETTE);
-    uTextureID_LS_saveU = pIcons_LOD->LoadTexture("LS_saveU", TEXTURE_16BIT_PALETTE);
-    uTextureID_x_u = pIcons_LOD->LoadTexture("x_u", TEXTURE_16BIT_PALETTE);
-    pRenderer->DrawTextureIndexed(8, 8, pIcons_LOD->GetTexture(uTextureID_loadsave));
-    if ( pCurrentScreen == SCREEN_SAVEGAME )
+  ++pIcons_LOD->uTexturePacksCount;
+  if ( !pIcons_LOD->uNumPrevLoadedFiles )
+    pIcons_LOD->uNumPrevLoadedFiles = pIcons_LOD->uNumLoadedFiles;
+  memset(pSavegameUsedSlots.data(), 0, 0xB4u);
+  memset(&pSavegameThumbnails, 0, 0x708u);
+  uTextureID_loadsave = pIcons_LOD->LoadTexture("loadsave", TEXTURE_16BIT_PALETTE);
+  uTextureID_load_up = pIcons_LOD->LoadTexture("load_up", TEXTURE_16BIT_PALETTE);
+  uTextureID_save_up = pIcons_LOD->LoadTexture("save_up", TEXTURE_16BIT_PALETTE);
+  uTextureID_LS_loadU = pIcons_LOD->LoadTexture("LS_loadU", TEXTURE_16BIT_PALETTE);
+  uTextureID_LS_saveU = pIcons_LOD->LoadTexture("LS_saveU", TEXTURE_16BIT_PALETTE);
+  uTextureID_x_u = pIcons_LOD->LoadTexture("x_u", TEXTURE_16BIT_PALETTE);
+  pRenderer->DrawTextureIndexed(8, 8, pIcons_LOD->GetTexture(uTextureID_loadsave));
+  if ( pCurrentScreen == SCREEN_SAVEGAME )
+  {
+    pRenderer->DrawTextureIndexed(241, 302, pIcons_LOD->GetTexture(uTextureID_LS_saveU));
+    pRenderer->DrawTextureIndexed(351, 302, pIcons_LOD->GetTexture(uTextureID_x_u));
+    pRenderer->DrawTextureIndexed(18, 141, pIcons_LOD->GetTexture(uTextureID_save_up));
+  }
+  else
+  {
+    pRenderer->DrawTextureIndexed(241, 302, pIcons_LOD->GetTexture(uTextureID_LS_loadU));
+    pRenderer->DrawTextureIndexed(351, 302, pIcons_LOD->GetTexture(uTextureID_x_u));
+    pRenderer->DrawTextureIndexed(18, 141, pIcons_LOD->GetTexture(uTextureID_load_up));
+  }
+  pGUIWindow_CurrentMenu->DrawText(pFontSmallnum, 25, 199, 0, pGlobalTXT_LocalizationStrings[505], 0, 0, 0);//Read...(Чтение...)
+  pRenderer->Present();
+  pSavegameList->Initialize(1);
+  pLODFile.AllocSubIndicesAndIO(300, 0);
+  for (uint i = 0; i < 40; ++i)
+  {
+    v3 = pSavegameList->pFileList[i].pSaveFileName;
+    if ( !*pSavegameList->pFileList[i].pSaveFileName )
+      v3 = "1.mm7";
+    sprintf(pTmpBuf.data(), "saves\\%s", v3);
+    if ( _access(pTmpBuf.data(), 0) || _access(pTmpBuf.data(), 6) )
     {
-        v0 = uTextureID_save_up;
-        v1 = uTextureID_LS_saveU;
-        }
+      pSavegameUsedSlots[i] = 0;
+      strcpy(pSavegameHeader[i].pName, pGlobalTXT_LocalizationStrings[LOCSTR_EMPTY]);
+    }
     else
     {
-        v0 = uTextureID_load_up;
-        v1 = uTextureID_LS_loadU;
-        }
-    pRenderer->DrawTextureIndexed(0xF1u, 0x12Eu, pIcons_LOD->GetTexture(v1));
-    pRenderer->DrawTextureIndexed(0x15Fu, 0x12Eu, pIcons_LOD->GetTexture(uTextureID_x_u));
-    pRenderer->DrawTextureIndexed(0x12u, 0x8Du, pIcons_LOD->GetTexture(v0));
-    pGUIWindow_CurrentMenu->DrawText(pFontSmallnum, 25, 199, 0, pGlobalTXT_LocalizationStrings[505], 0, 0, 0);
-    pRenderer->Present();
-    pSavegameList->Initialize(1u);
-    v11.AllocSubIndicesAndIO(0x12Cu, 0);
-    //v2 = pSavegameUsedSlots;
-    // Dest = pSavegameHeader;
-    // this_ = pSavegameThumbnails;
-    // v8 = (char *)pSavegameList->pSavesNames;
-    for (uint i = 0; i < 40; ++i)
-        {
-        v3 = pSavegameList->pFileList[i].pSaveFileName;
-        if ( !*pSavegameList->pFileList[i].pSaveFileName )
-            v3 = "1.mm7";
-        sprintf(pTmpBuf.data(), "saves\\%s", v3);
-        if ( _access(pTmpBuf.data(), 0) || _access(pTmpBuf.data(), 6) )
-            {
-            pSavegameUsedSlots[i] = 0;
-            strcpy(pSavegameHeader[i].pName, pGlobalTXT_LocalizationStrings[LOCSTR_EMPTY]);
-            }
-        else
-            {
-            v11.LoadFile(pTmpBuf.data(), 1);
-            v4 = v11.FindContainer("header.bin", 1);
-            fread(&pSavegameHeader[i], 100, 1u, v4);
-            v5 = v11.FindContainer("image.pcx", 1);
-            if ( v5 )
-                {
-                pSavegameThumbnails[i].LoadFromFILE(v5, 0, 1u);
-                v11.CloseWriteFile();
-                pSavegameUsedSlots[i] = 1;
-                }
-            else
-                {
-                pSavegameUsedSlots[i] = 0;
-                }
-            }
-
-        }
-
-    v11.FreeSubIndexAndIO();
-    uTextureID_x_d = pIcons_LOD->LoadTexture("x_d", TEXTURE_16BIT_PALETTE);
-    uTextureID_LS_ = pIcons_LOD->LoadTexture("LS_saveD", TEXTURE_16BIT_PALETTE);
-    uTextureID_AR_UP_DN = pIcons_LOD->LoadTexture("AR_UP_DN", TEXTURE_16BIT_PALETTE);
-    uTextureID_AR_DN_DN = pIcons_LOD->LoadTexture("AR_DN_DN", TEXTURE_16BIT_PALETTE);
-    pGUIWindow_CurrentMenu = GUIWindow::Create(0, 0, 640, 480, WINDOW_SaveLoadButtons, 0, 0);
-    pGUIWindow_CurrentMenu->CreateButton(21, 198, 191, 18, 1, 0, UIMSG_SelectLoadSlot, 0, 0, "", 0);
-    pGUIWindow_CurrentMenu->CreateButton(21, 218, 191, 18, 1, 0, UIMSG_SelectLoadSlot, 1, 0, "", 0);
-    pGUIWindow_CurrentMenu->CreateButton(21, 238, 191, 18, 1, 0, UIMSG_SelectLoadSlot, 2, 0, "", 0);
-    pGUIWindow_CurrentMenu->CreateButton(21, 258, 191, 18, 1, 0, UIMSG_SelectLoadSlot, 3, 0, "", 0);
-    pGUIWindow_CurrentMenu->CreateButton(21, 278, 191, 18, 1, 0, UIMSG_SelectLoadSlot, 4, 0, "", 0);
-    pGUIWindow_CurrentMenu->CreateButton(21, 298, 191, 18, 1, 0, UIMSG_SelectLoadSlot, 5, 0, "", 0);
-    pGUIWindow_CurrentMenu->CreateButton(21, 318, 191, 18, 1, 0, UIMSG_SelectLoadSlot, 6, 0, "", 0);
-    pBtnLoadSlot  = pGUIWindow_CurrentMenu->CreateButton(241, 302, 105, 40, 1, 0, UIMSG_SaveLoadBtn, 0, 0, "", pIcons_LOD->GetTexture(uTextureID_LS_), 0);
-    pBtnCancel    = pGUIWindow_CurrentMenu->CreateButton(350, 302, 105, 40, 1, 0, UIMSG_Cancel, 0, 0, "", pIcons_LOD->GetTexture(uTextureID_x_d), 0);
-    pBtnArrowUp   = pGUIWindow_CurrentMenu->CreateButton(215, 199,  17, 17, 1, 0, UIMSG_ArrowUp, 0, 0, "", pIcons_LOD->GetTexture(uTextureID_AR_UP_DN), 0);
-    pBtnDownArrow = pGUIWindow_CurrentMenu->CreateButton(215, 323,  17, 17, 1, 0, UIMSG_DownArrow, 34, 0, "", pIcons_LOD->GetTexture(uTextureID_AR_DN_DN), 0);
-}
+      pLODFile.LoadFile(pTmpBuf.data(), 1);
+      fread(&pSavegameHeader[i], 100, 1, pLODFile.FindContainer("header.bin", 1));
+      if ( pLODFile.FindContainer("image.pcx", 1) )
+      {
+        pSavegameThumbnails[i].LoadFromFILE(pLODFile.FindContainer("image.pcx", 1), 0, 1);
+        pLODFile.CloseWriteFile();
+        pSavegameUsedSlots[i] = 1;
+      }
+      else
+        pSavegameUsedSlots[i] = 0;
+    }
+  }
+  pLODFile.FreeSubIndexAndIO();
+  uTextureID_x_d = pIcons_LOD->LoadTexture("x_d", TEXTURE_16BIT_PALETTE);
+  uTextureID_LS_ = pIcons_LOD->LoadTexture("LS_saveD", TEXTURE_16BIT_PALETTE);
+  uTextureID_AR_UP_DN = pIcons_LOD->LoadTexture("AR_UP_DN", TEXTURE_16BIT_PALETTE);
+  uTextureID_AR_DN_DN = pIcons_LOD->LoadTexture("AR_DN_DN", TEXTURE_16BIT_PALETTE);
+  pGUIWindow_CurrentMenu = GUIWindow::Create(0, 0, 640, 480, WINDOW_SaveLoadButtons, 0, 0);
+  pGUIWindow_CurrentMenu->CreateButton(21, 198, 191, 18, 1, 0, UIMSG_SelectLoadSlot, 0, 0, "", 0);
+  pGUIWindow_CurrentMenu->CreateButton(21, 218, 191, 18, 1, 0, UIMSG_SelectLoadSlot, 1, 0, "", 0);
+  pGUIWindow_CurrentMenu->CreateButton(21, 238, 191, 18, 1, 0, UIMSG_SelectLoadSlot, 2, 0, "", 0);
+  pGUIWindow_CurrentMenu->CreateButton(21, 258, 191, 18, 1, 0, UIMSG_SelectLoadSlot, 3, 0, "", 0);
+  pGUIWindow_CurrentMenu->CreateButton(21, 278, 191, 18, 1, 0, UIMSG_SelectLoadSlot, 4, 0, "", 0);
+  pGUIWindow_CurrentMenu->CreateButton(21, 298, 191, 18, 1, 0, UIMSG_SelectLoadSlot, 5, 0, "", 0);
+  pGUIWindow_CurrentMenu->CreateButton(21, 318, 191, 18, 1, 0, UIMSG_SelectLoadSlot, 6, 0, "", 0);
+  pBtnLoadSlot  = pGUIWindow_CurrentMenu->CreateButton(241, 302, 105, 40, 1, 0, UIMSG_SaveLoadBtn, 0, 0, "", pIcons_LOD->GetTexture(uTextureID_LS_), 0);
+  pBtnCancel    = pGUIWindow_CurrentMenu->CreateButton(350, 302, 105, 40, 1, 0, UIMSG_Cancel, 0, 0, "", pIcons_LOD->GetTexture(uTextureID_x_d), 0);
+  pBtnArrowUp   = pGUIWindow_CurrentMenu->CreateButton(215, 199,  17, 17, 1, 0, UIMSG_ArrowUp, 0, 0, "", pIcons_LOD->GetTexture(uTextureID_AR_UP_DN), 0);
+  pBtnDownArrow = pGUIWindow_CurrentMenu->CreateButton(215, 323,  17, 17, 1, 0, UIMSG_DownArrow, 34, 0, "", pIcons_LOD->GetTexture(uTextureID_AR_DN_DN), 0);
+}
\ No newline at end of file
--- a/UI/UIShops.cpp	Mon Sep 30 05:48:32 2013 +0200
+++ b/UI/UIShops.cpp	Mon Sep 30 05:59:06 2013 +0200
@@ -16,241 +16,158 @@
 //----- (004B910F) --------------------------------------------------------
 void  WeaponShopDialog()
 {
-  int v0; // ebx@1
-  int pNumActiveItem; // eax@6
-  signed int v2; // esi@8
-  ItemGen *v4; // eax@11
-  char *v5; // ecx@12
-  unsigned __int8 v6; // dl@13
-  char *v7; // edx@14
-  int v9; // ST08_4@16
-  int v10; // eax@16
-  signed int v11; // esi@18
-  int v12; // ST08_4@21
-  int v13; // eax@21
-  int v14; // edi@23
-  char **v15; // esi@23
-  int v16; // eax@24
-  //int v18; // edx@25
+  int phrases_id; // eax@16
   int v19; // edi@25
-  unsigned __int8 v20; // sf@25
   GUIButton *pButton; // esi@27
-  int pNewItem; // eax@27
-  unsigned int v24; // ecx@27
-  int v25; // edx@27
   unsigned int pColorText; // ax@27
-  signed int v27; // esi@32
-  int v28; // ST08_4@36
-  int v29; // eax@36
   signed int v32; // esi@41
-  unsigned int v33; // esi@43
-  int v34; // eax@43
-  unsigned int v35; // eax@44
-  int v36; // eax@46
-  __int32 v37; // ecx@51
-  int v40; // eax@53
-  char *v41; // eax@55
-  unsigned int v43; // ecx@55
-  const char **v44; // edx@55
-  int v45; // eax@55
-  int v47; // eax@59
-  const char **v48; // eax@63
-  unsigned int v49; // esi@65
-  Texture *v50; // eax@65
-  int v51; // edi@65
-  int v52; // esi@70
-  Texture *v53; // ST1C_4@70
-  int v54; // edi@70
-  signed int v55; // ecx@73
-  SHORT v56; // di@82
-  bool v57; // eax@82
-  const char *v58; // ecx@84
-  POINT *v59; // esi@89
-  LONG v60; // ecx@90
-  int v61; // eax@90
-  int v62; // ecx@90
-  ItemGen *pItemInShop; // esi@90
-  //int v64; // eax@95
+  const char *pText; // ecx@84
   int all_text_height; // esi@96
-  char **v66; // edi@96
-  int v67; // eax@97
-  int v69; // edx@98
-  int v70; // edi@98
-  int v71;
-  const char **v72; // eax@100
-  int pTextHeight; // eax@100
-  unsigned int v74; // ecx@100
-  int v78; // [sp-14h] [bp-10Ch]@14
-  ItemGen *v79; // [sp-10h] [bp-108h]@12
-  int v80; // [sp-10h] [bp-108h]@14
-  void *v81; // [sp-Ch] [bp-104h]@12
-  unsigned __int16 v82; // [sp-Ch] [bp-104h]@14
-  int v83; // [sp-8h] [bp-100h]@11
-  char *v84; // [sp-8h] [bp-100h]@14
-  __int64 *v85; // [sp-4h] [bp-FCh]@11
-  unsigned int v86; // [sp-4h] [bp-FCh]@14
-  POINT v87; // [sp+Ch] [bp-ECh]@8
-  POINT v88; // [sp+14h] [bp-E4h]@18
-  POINT v89; // [sp+1Ch] [bp-DCh]@89
-  POINT v90; // [sp+24h] [bp-D4h]@19
-  POINT v91; // [sp+2Ch] [bp-CCh]@89
-  POINT v92; // [sp+34h] [bp-C4h]@9
-  POINT v93; // [sp+3Ch] [bp-BCh]@33
-  POINT v94; // [sp+44h] [bp-B4h]@18
-  POINT v95; // [sp+4Ch] [bp-ACh]@32
-  POINT v96; // [sp+54h] [bp-A4h]@18
-  POINT v97; // [sp+5Ch] [bp-9Ch]@32
-  POINT a2; // [sp+64h] [bp-94h]@8
-  POINT v99; // [sp+6Ch] [bp-8Ch]@32
-  POINT v100; // [sp+74h] [bp-84h]@8
+  ItemGen *item; 
+  int pItemID;
+  POINT mouse; // [sp+64h] [bp-94h]@8
   GUIWindow dialog_window; // [sp+7Ch] [bp-7Ch]@1
-  char *Str; // [sp+D0h] [bp-28h]@55
   __int32 v103; // [sp+D4h] [bp-24h]@25
-  int pColorYellow; // [sp+D8h] [bp-20h]@1
-  int pColorWhite; // [sp+DCh] [bp-1Ch]@1
-  POINT v106; // [sp+E0h] [bp-18h]@8
-  Player *pPlayer; // [sp+E8h] [bp-10h]@1
-  int pItemNum; // [sp+ECh] [bp-Ch]@26
-  const char **v109; // [sp+F0h] [bp-8h]@26
-  unsigned __int8 v110; // [sp+F7h] [bp-1h]@16
+  int pPrice; // [sp+ECh] [bp-Ch]@26
+  unsigned int v109;
   int pNumString;
+  int item_X;
 
-  pPlayer = pPlayers[uActiveCharacter];
   memcpy(&dialog_window, window_SpeakInHouse, sizeof(dialog_window));
   dialog_window.uFrameX = 483;
   dialog_window.uFrameWidth = 148;
   dialog_window.uFrameZ = 334;
-  pColorWhite = TargetColor(0xFFu, 0xFFu, 0xFFu);
-  pColorYellow = TargetColor(0xE1u, 0xCDu, 0x23u);
 
   switch(dialog_menu_id)
   {
     case HOUSE_DIALOGUE_MAIN:
     {
-      pNumActiveItem = HouseUI_CheckIfPlayerCanInteract();
-      if ( pNumActiveItem )
+      if ( HouseUI_CheckIfPlayerCanInteract() )
       {
         pShopOptions[0] = pGlobalTXT_LocalizationStrings[134];
         pShopOptions[1] = pGlobalTXT_LocalizationStrings[152];
         pShopOptions[2] = pGlobalTXT_LocalizationStrings[159];
         pShopOptions[3] = pGlobalTXT_LocalizationStrings[160];
         all_text_height = 0;
-        for (int i = 0; i < 4; ++i)//while ( (signed int)v15 < (signed int)&unk_F8B1C8 );
+        for ( int i = 0; i < 4; ++i )
           all_text_height += pFontArrus->CalcTextHeight(pShopOptions[i], &dialog_window, 0, 0);
         v103 = (174 - all_text_height) / 4;
-        pNumActiveItem = pDialogueWindow->pStartingPosActiveItem;
         v19 = (174 - 4 * (174 - all_text_height) / 4 - all_text_height) / 2 - (174 - all_text_height) / 4 / 2 + 138;
-        v20 = -pDialogueWindow->pNumPresenceButton < 0;
-        if ( v20 ^ (pNumActiveItem > pNumActiveItem + pDialogueWindow->pNumPresenceButton ))
+        pNumString = 0;
+        for ( int i = pDialogueWindow->pStartingPosActiveItem; i < pDialogueWindow->pNumPresenceButton + pDialogueWindow->pStartingPosActiveItem; ++i )
         {
-          pItemNum = 2;
-          pNumString = 0;
-          do
+          pButton = pDialogueWindow->GetControl(i);
+          pButton->uY = v103 + v19;
+          pButton->uHeight = pFontArrus->CalcTextHeight((const char *)pShopOptions[pNumString], &dialog_window, 0, 0);
+          v19 = pButton->uY + pFontArrus->CalcTextHeight((const char *)pShopOptions[pNumString], &dialog_window, 0, 0) - 1;
+          pButton->uW = v19;
+          pColorText = TargetColor(0xE1u, 0xCDu, 0x23u);
+          if ( pDialogueWindow->pCurrentPosActiveItem != i )
+            pColorText = TargetColor(0xFFu, 0xFFu, 0xFFu);
+          dialog_window.DrawTitleText(pFontArrus, 0, pButton->uY, pColorText, (const char *)pShopOptions[pNumString], 3);
+          ++pNumString;
+        }
+      }
+      break;
+    }
+    case HOUSE_DIALOGUE_SHOP_BUY_STANDARD:
+    {
+      pRenderer->DrawTextureIndexed(8, 8, ShopTexture);
+      item_X = 0;
+      for ( uint i = 0; i < 6; ++i )
+      {
+        if ( pParty->StandartItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][i].uItemID)
+        {
+          pRenderer->DrawTextureTransparent((60 - ((signed int)ItemsInShopTexture[i]->uTextureWidth / 2)) + item_X, weapons_Ypos[i] + 30, ItemsInShopTexture[i]);
+          ZBuffer_DoFill2(&pRenderer->pActiveZBuffer[(60 - ((signed int)ItemsInShopTexture[i]->uTextureWidth / 2)) + item_X + 640 * (weapons_Ypos[i] + 30)], ItemsInShopTexture[i], i + 1);
+        }
+        item_X += 70;
+      }
+      if ( HouseUI_CheckIfPlayerCanInteract() )
+      {
+        uint item_num = 0;
+        for ( uint i = 0; i < 6; ++i )
+        {
+          if ( pParty->StandartItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][i].uItemID)
+            ++item_num;
+        }
+        if ( GetAsyncKeyState(17) && pPlayers[uActiveCharacter]->CanSteal() )
+          pText = pGlobalTXT_LocalizationStrings[185];//Украсть предмет
+        else
+          pText = pGlobalTXT_LocalizationStrings[195];//Выберите предмет для покупки
+        DrawTextAtStatusBar(pText, 0);
+        if ( item_num )
+        {
+          pMouse->GetCursorPos(&mouse);
+          if ( pRenderer->pActiveZBuffer[mouse.x + pSRZBufferLineOffsets[mouse.y]] & 0xFFFF )
           {
-            pButton = pDialogueWindow->GetControl(pItemNum);
-            pButton->uY = v103 + v19;
-            pTextHeight = pFontArrus->CalcTextHeight((const char *)pShopOptions[pNumString], &dialog_window, 0, 0);
-            pButton->uHeight = pTextHeight;
-            v19 = pButton->uY + pTextHeight - 1;
-            pButton->uW = v19;
-            pColorText = pColorYellow;
-            if ( pDialogueWindow->pCurrentPosActiveItem != pItemNum )
-              pColorText = pColorWhite;
-            dialog_window.DrawTitleText(pFontArrus, 0, pButton->uY, pColorText, (const char *)pShopOptions[pNumString], 3);
-            ++pItemNum;
-            ++pNumString;
-            pNumActiveItem = pDialogueWindow->pNumPresenceButton + pDialogueWindow->pStartingPosActiveItem;
+            item = &pParty->StandartItemsInShops[(int)window_SpeakInHouse->ptr_1C][(pRenderer->pActiveZBuffer[mouse.x + pSRZBufferLineOffsets[mouse.y]] & 0xFFFF) - 1];
+            if ( !GetAsyncKeyState(17) || !pPlayers[uActiveCharacter]->CanSteal() )
+            {
+              pText = BuildDialogueString((char *)pMerchantsBuyPhrases[pPlayers[uActiveCharacter]->SelectPhrasesTransaction(item, BuildingType_WeaponShop, (int)window_SpeakInHouse->ptr_1C, 2)],
+                                       uActiveCharacter - 1, item, (char *)window_SpeakInHouse->ptr_1C, 2, 0);
+              dialog_window.DrawTitleText(pFontArrus, 0, (174 - pFontArrus->CalcTextHeight(pText, &dialog_window, 0, 0)) / 2 + 138, TargetColor(0xFFu, 0xFFu, 0xFFu), pText, 3);
+            }
+            else
+            {
+              pText = BuildDialogueString(pGlobalTXT_LocalizationStrings[181], uActiveCharacter - 1, item, (char *)window_SpeakInHouse->ptr_1C, 2, 0);
+              dialog_window.DrawTitleText(pFontArrus, 0, (174 - pFontArrus->CalcTextHeight(pText, &dialog_window, 0, 0)) / 2 + 138, TargetColor(0xFFu, 0xFFu, 0xFFu), pText, 3);
+            }
           }
-          while ( pItemNum < pNumActiveItem );
         }
+        else
+          dialog_window.DrawCurrentTime( pParty->field_3C.Shops_next_generation_time[(unsigned int)window_SpeakInHouse->ptr_1C] - pParty->uTimePlayed);//Приходите через 7 дней
       }
       break;
     }
 
-    case HOUSE_DIALOGUE_SHOP_BUY_STANDARD:
+    case HOUSE_DIALOGUE_SHOP_BUY_SPECIAL:
     {
       pRenderer->DrawTextureIndexed(8, 8, ShopTexture);
-      v48 = 0;
-      pItemNum = 0;
-      v109 = 0;
-      do
+      item_X = 0;
+      for ( uint i = 0; i < 6; ++i )
       {
-        //  if ( pParty->field_777C[9 * (int)&v48[3 * (unsigned int)window_SpeakInHouse->ptr_1C]] )
-        if ( pParty->StandartItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][(int)v48].uItemID)
+        if (pParty->SpecialItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][i].uItemID)
         {
-          v49 = word_F8B158[(signed int)v48];
-          v50 = ItemsInShopTexture[(signed int)v48];
-          v49 += 30;
-          v51 = 60 - ((signed int)v50->uTextureWidth >> 1);
-          pRenderer->DrawTextureTransparent(v51 + pItemNum, v49, v50);
-          ZBuffer_DoFill2(&pRenderer->pActiveZBuffer[v51 + pItemNum + 640 * v49], ItemsInShopTexture[(signed int)v109], (int)((char *)v109 + 1));
-          v48 = v109;
-        }
-        pItemNum += 70;
-        v48 = (const char **)((char *)v48 + 1);
-        v109 = v48;
-      }
-      while ( (signed int)v48 < 6 );
-      pNumActiveItem = HouseUI_CheckIfPlayerCanInteract();
-      if ( pNumActiveItem )
-      {
-        v55 = 0;
-        v106.x = 0;
-        v106.x = 0;
-        do
-        {
-          if ( pParty->StandartItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][v55].uItemID)//9 * (v55 + 12 * (unsigned int)window_SpeakInHouse->ptr_1C)] )
-            ++v106.x;
-          ++v55;
+          pRenderer->DrawTextureTransparent((60 - ((signed int)ItemsInShopTexture[i]->uTextureWidth / 2)) + item_X, weapons_Ypos[i] + 30, ItemsInShopTexture[i]);
+          ZBuffer_DoFill2(&pRenderer->pActiveZBuffer[(60 - ((signed int)ItemsInShopTexture[i]->uTextureWidth / 2)) + item_X + 640 * (weapons_Ypos[i] + 30)], ItemsInShopTexture[i], i + 1);
         }
-        while ( v55 < 6 );
-        v56 = GetAsyncKeyState(17);
-        v57 = pPlayer->CanSteal();
-        Str = (char *)v57;
-        if ( v56 && v57 )
-        {
-          v58 = pGlobalTXT_LocalizationStrings[185];
-        }
-        else
-        {
-          v58 = pGlobalTXT_LocalizationStrings[195];
-          if ( dialog_menu_id != HOUSE_DIALOGUE_SHOP_BUY_STANDARD)
-            v58 = pGlobalTXT_LocalizationStrings[196];
-        }
-        DrawTextAtStatusBar(v58, 0);
-        if ( v106.x )
+        item_X += 70;
+      }
+      if ( HouseUI_CheckIfPlayerCanInteract() )
+      {
+        uint item_num = 0;
+        for ( uint i = 0; i < 6; ++i )
         {
-          v59 = pMouse->GetCursorPos(&v91);
-          pNumActiveItem = v59->x + pSRZBufferLineOffsets[pMouse->GetCursorPos(&v89)->y];
-          if ( pRenderer->pActiveZBuffer[pNumActiveItem] & 0xFFFF )
+          if ( pParty->SpecialItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][i].uItemID )
+            ++item_num;
+        }
+        if ( GetAsyncKeyState(17) && pPlayers[uActiveCharacter]->CanSteal() )
+          pText = pGlobalTXT_LocalizationStrings[185];
+        else
+            pText = pGlobalTXT_LocalizationStrings[196];
+        DrawTextAtStatusBar(pText, 0);
+        if ( item_num )
+        {
+          pMouse->GetCursorPos(&mouse);
+          if ( pRenderer->pActiveZBuffer[mouse.x + pSRZBufferLineOffsets[mouse.y]] & 0xFFFF )
           {
-            v60 = (pRenderer->pActiveZBuffer[pNumActiveItem] & 0xFFFF) - 1;
-            v106.x = v60;
-            v61 = (int)window_SpeakInHouse->ptr_1C;//maybe ptr_1C - BuildID_2Events
-            //  v62 = 9 * (v60 + 12 * v61);
-            pItemInShop = (ItemGen *)&pParty->StandartItemsInShops[(int)v61][v60];
-            if ( dialog_menu_id != HOUSE_DIALOGUE_SHOP_BUY_STANDARD)
-              pItemInShop = &pParty->SpecialItemsInShops[(int)v61][v60];
-            if ( !v56 || !Str )
+            item = &pParty->SpecialItemsInShops[(int)window_SpeakInHouse->ptr_1C][(pRenderer->pActiveZBuffer[mouse.x + pSRZBufferLineOffsets[mouse.y]] & 0xFFFF) - 1];
+            if ( !GetAsyncKeyState(17) || !pPlayers[uActiveCharacter]->CanSteal() )
             {
-              v7 = BuildDialogueString((char *)pMerchantsBuyPhrases[pPlayer->SelectPhrasesTransaction(pItemInShop, BuildingType_WeaponShop, v61, 2)],
-                                       uActiveCharacter - 1, pItemInShop, (char *)window_SpeakInHouse->ptr_1C, 2, 0);
-              pTextHeight = pFontArrus->CalcTextHeight(v7, &dialog_window, 0, 0);
-              dialog_window.DrawTitleText(pFontArrus, 0, (174 - pTextHeight) / 2 + 138, pColorWhite, v7, 3);
+              pText = BuildDialogueString((char *)pMerchantsBuyPhrases[pPlayers[uActiveCharacter]->SelectPhrasesTransaction(item, BuildingType_WeaponShop, (int)window_SpeakInHouse->ptr_1C, 2)],
+                                       uActiveCharacter - 1, item, (char *)window_SpeakInHouse->ptr_1C, 2, 0);
+              dialog_window.DrawTitleText(pFontArrus, 0, (174 - pFontArrus->CalcTextHeight(pText, &dialog_window, 0, 0)) / 2 + 138, TargetColor(0xFFu, 0xFFu, 0xFFu), pText, 3);
             }
             else
             {
-              v7 = BuildDialogueString(pGlobalTXT_LocalizationStrings[181], uActiveCharacter - 1, pItemInShop, (char *)window_SpeakInHouse->ptr_1C, 2, 0);
-              pTextHeight = pFontArrus->CalcTextHeight(v7, &dialog_window, 0, 0);
-              dialog_window.DrawTitleText(pFontArrus, 0, (174 - pTextHeight) / 2 + 138, pColorWhite, v7, 3);
+              pText = BuildDialogueString(pGlobalTXT_LocalizationStrings[181], uActiveCharacter - 1, item, (char *)window_SpeakInHouse->ptr_1C, 2, 0);
+              dialog_window.DrawTitleText(pFontArrus, 0, (174 - pFontArrus->CalcTextHeight(pText, &dialog_window, 0, 0)) / 2 + 138, TargetColor(0xFFu, 0xFFu, 0xFFu), pText, 3);
             }
           }
         }
         else
-        {
-          dialog_window.DrawCurrentTime( pParty->PartyTimes.Shops_next_generation_time[(unsigned int)window_SpeakInHouse->ptr_1C] - pParty->uTimePlayed);//Приходите через 7 дней
-          pNumActiveItem = 0; //added
-        }
+          dialog_window.DrawCurrentTime( pParty->field_3C.Shops_next_generation_time[(unsigned int)window_SpeakInHouse->ptr_1C]  - pParty->uTimePlayed);
       }
       break;
     }
@@ -262,18 +179,19 @@
       DrawTextAtStatusBar(pGlobalTXT_LocalizationStrings[199], 0);
       if ( !HouseUI_CheckIfPlayerCanInteract() )
         return;
-      if((v11 = pMouse->GetCursorPos(&v96)->x - 14, v106.x = (v11 >> 5) + 14 * ((pMouse->GetCursorPos(&v88)->y - 17) >> 5),
-        pMouse->GetCursorPos(&v94)->x <= 13) || pMouse->GetCursorPos(&v90)->x >= 462 
-        || (pNumActiveItem = pPlayer->GetItemIDAtInventoryIndex((int *)&v106.x), !pNumActiveItem) )
+      pMouse->GetCursorPos(&mouse);
+      v109 = ((mouse.x + 14) >> 5) + 14 * ((mouse.y - 17) >> 5);
+      if( mouse.x <= 13 || mouse.x >= 462 )
         return;
-      v79 = (ItemGen *)&pPlayer->pInventoryItemList[pNumActiveItem - 1];
-      v13 = pPlayer->SelectPhrasesTransaction(v79, BuildingType_WeaponShop, (int)window_SpeakInHouse->ptr_1C, 3);
-      v7 = BuildDialogueString((char *)pMerchantsSellPhrases[v13], uActiveCharacter - 1, v79, (char *)window_SpeakInHouse->ptr_1C, 3, 0);
-      pTextHeight = pFontArrus->CalcTextHeight(v7, &dialog_window, 0, 0);
-      dialog_window.DrawTitleText(pFontArrus, 0, (174 - pTextHeight) / 2 + 138, pColorWhite, v7, 3);
+      pItemID = pPlayers[uActiveCharacter]->GetItemIDAtInventoryIndex((int *)&v109);
+      if ( !pItemID )
+        return;
+      item = &pPlayers[uActiveCharacter]->pInventoryItemList[pItemID - 1];
+      phrases_id = pPlayers[uActiveCharacter]->SelectPhrasesTransaction(item, BuildingType_WeaponShop, (int)window_SpeakInHouse->ptr_1C, 3);
+      pText = BuildDialogueString((char *)pMerchantsSellPhrases[phrases_id], uActiveCharacter - 1, item, (char *)window_SpeakInHouse->ptr_1C, 3, 0);
+      dialog_window.DrawTitleText(pFontArrus, 0, (174 - pFontArrus->CalcTextHeight(pText, &dialog_window, 0, 0)) / 2 + 138, TargetColor(0xFFu, 0xFFu, 0xFFu), pText, 3);
       break;
     }
-
     case HOUSE_DIALOGUE_SHOP_IDENTIFY:
     {
       draw_leather();
@@ -281,23 +199,24 @@
       DrawTextAtStatusBar(pGlobalTXT_LocalizationStrings[197], 0);
       if ( !HouseUI_CheckIfPlayerCanInteract() )
         return;
-      if((v2 = pMouse->GetCursorPos(&a2)->x - 14, v106.x = (v2 >> 5) + 14 * ((pMouse->GetCursorPos(&v87)->y - 17) >> 5),
-        pMouse->GetCursorPos(&v100)->x <= 13) || pMouse->GetCursorPos(&v92)->x >= 462 
-        || (pNumActiveItem = pPlayer->GetItemIDAtInventoryIndex((int *)&v106.x), !pNumActiveItem) )
+      pMouse->GetCursorPos(&mouse);
+      v109 = ((mouse.x - 14) >> 5) + 14 * ((mouse.y - 17) >> 5);
+      if( mouse.x <= 13 || mouse.x >= 462 )
+        return;
+      pItemID = pPlayers[uActiveCharacter]->GetItemIDAtInventoryIndex((int *)&v109);
+      if ( !pItemID )
         return;
-      v4 = (ItemGen *)&pPlayer->pInventoryItemList[pNumActiveItem - 1];
-      if (!v4->IsIdentified())
+      item = &pPlayers[uActiveCharacter]->pInventoryItemList[pItemID - 1];
+      if (!item->IsIdentified())
       {
-        v10 = pPlayer->SelectPhrasesTransaction(v4, BuildingType_WeaponShop, (int)window_SpeakInHouse->ptr_1C, 4);
-        v7 = BuildDialogueString((char *)pMerchantsIdentifyPhrases[v10], uActiveCharacter - 1, v4, (char *)window_SpeakInHouse->ptr_1C, 4, 0);
-        pTextHeight = pFontArrus->CalcTextHeight(v7, &dialog_window, 0, 0);
-        dialog_window.DrawTitleText(pFontArrus, 0, (174 - pTextHeight) / 2 + 138, pColorWhite, v7, 3);
+        phrases_id = pPlayers[uActiveCharacter]->SelectPhrasesTransaction(item, BuildingType_WeaponShop, (int)window_SpeakInHouse->ptr_1C, 4);
+        pText = BuildDialogueString((char *)pMerchantsIdentifyPhrases[phrases_id], uActiveCharacter - 1, item, (char *)window_SpeakInHouse->ptr_1C, 4, 0);
+        dialog_window.DrawTitleText(pFontArrus, 0, (174 - pFontArrus->CalcTextHeight(pText, &dialog_window, 0, 0)) / 2 + 138, TargetColor(0xFFu, 0xFFu, 0xFFu), pText, 3);
       }
       else
       {
-        v7 = BuildDialogueString("%24", uActiveCharacter - 1, v4, (char *)window_SpeakInHouse->ptr_1C, 4, 0);
-        pTextHeight = pFontArrus->CalcTextHeight(v7, &dialog_window, 0, 0);
-        dialog_window.DrawTitleText(pFontArrus, 0, (174 - pTextHeight) / 2 + 138, pColorWhite, v7, 3);
+        pText = BuildDialogueString("%24", uActiveCharacter - 1, item, (char *)window_SpeakInHouse->ptr_1C, 4, 0);
+        dialog_window.DrawTitleText(pFontArrus, 0, (174 - pFontArrus->CalcTextHeight(pText, &dialog_window, 0, 0)) / 2 + 138, TargetColor(0xFFu, 0xFFu, 0xFFu), pText, 3);
       }
       break;
     }
@@ -308,17 +227,18 @@
       CharacterUI_InventoryTab_Draw(pPlayers[uActiveCharacter], true);
       DrawTextAtStatusBar(pGlobalTXT_LocalizationStrings[198], 0);
       if ( !HouseUI_CheckIfPlayerCanInteract())
-            return;
-      if( (v2 = pMouse->GetCursorPos(&a2)->x - 14, v106.x = (v2 >> 5) + 14 * ((pMouse->GetCursorPos(&v87)->y - 17) >> 5),
-          pMouse->GetCursorPos(&v100)->x <= 13) || pMouse->GetCursorPos(&v92)->x >= 462
-            || (pNumActiveItem = pPlayer->GetItemIDAtInventoryIndex((int *)&v106.x), !pNumActiveItem)
-            || (!(pPlayer->pOwnItems[pNumActiveItem-1].uAttributes& 2)) )
-            return;
-      v4 = (ItemGen *)&pPlayer->pInventoryItemList[pNumActiveItem - 1];
-      v10 = pPlayer->SelectPhrasesTransaction(v4, BuildingType_ArmorShop, (int)window_SpeakInHouse->ptr_1C, 5);
-      v7 = BuildDialogueString((char *)pMerchantsRepairPhrases[v10], uActiveCharacter - 1, v4, (char *)window_SpeakInHouse->ptr_1C, 5, 0);
-      pTextHeight = (174 - pFontArrus->CalcTextHeight(v7, &dialog_window, 0, 0)) / 2 + 138;
-      dialog_window.DrawTitleText(pFontArrus, 0, pTextHeight, pColorWhite, v7, 3);
+        return;
+      pMouse->GetCursorPos(&mouse);
+      v109 = ((mouse.x - 14) >> 5) + 14 * (mouse.y - 17) >> 5;
+      if( ( mouse.x <= 13) || mouse.x >= 462 )
+        return;
+      pItemID = pPlayers[uActiveCharacter]->GetItemIDAtInventoryIndex((int *)&v109);
+      if ( !pItemID || (!(pPlayers[uActiveCharacter]->pOwnItems[pItemID - 1].uAttributes & 2)) )
+        return;
+      item = &pPlayers[uActiveCharacter]->pInventoryItemList[pItemID - 1];
+      phrases_id = pPlayers[uActiveCharacter]->SelectPhrasesTransaction(item, BuildingType_ArmorShop, (int)window_SpeakInHouse->ptr_1C, 5);
+      pText = BuildDialogueString((char *)pMerchantsRepairPhrases[phrases_id], uActiveCharacter - 1, item, (char *)window_SpeakInHouse->ptr_1C, 5, 0);
+      dialog_window.DrawTitleText(pFontArrus, 0, (174 - pFontArrus->CalcTextHeight(pText, &dialog_window, 0, 0)) / 2 + 138, TargetColor(0xFFu, 0xFFu, 0xFFu), pText, 3);
       return;
     }
     break;
@@ -334,113 +254,21 @@
       for ( int i = 0; i < 3; ++i )
         all_text_height += pFontArrus->CalcTextHeight(pShopOptions[i], &dialog_window, 0, 0);
       v103 = (174 - all_text_height) / 3;
-      pNumActiveItem = pDialogueWindow->pStartingPosActiveItem;
-      v70 = (3 * (58 - (signed int)v103) - all_text_height) / 2 - ((174 - all_text_height) / 3) / 2 + 138;
-      v20 = -pDialogueWindow->pNumPresenceButton < 0;
-      if ( v20 ^ (pNumActiveItem > pNumActiveItem + pDialogueWindow->pNumPresenceButton ))
-      {
-        pItemNum = 2;
-        pNumString = 0;
-        do
-        {
-          pButton = pDialogueWindow->GetControl(pItemNum);
-          pButton->uY = v103 + v70;
-          pTextHeight = pFontArrus->CalcTextHeight((const char *)pShopOptions[pNumString], &dialog_window, 0, 0);
-          pButton->uHeight = pTextHeight;
-          v70 = pButton->uY + pTextHeight - 1;
-          pButton->uW = v70;
-          pColorText = pColorYellow;
-          if ( pDialogueWindow->pCurrentPosActiveItem != pItemNum )
-            pColorText = pColorWhite;
-          dialog_window.DrawTitleText(pFontArrus, 0, pButton->uY, pColorText, (const char *)pShopOptions[pNumString], 3);
-          ++pItemNum;
-          ++pNumString;
-          pNumActiveItem = pDialogueWindow->pNumPresenceButton + pDialogueWindow->pStartingPosActiveItem;
-        }
-        while ( pItemNum < pNumActiveItem );
-      }
-      break;
-    }
-
-    case HOUSE_DIALOGUE_SHOP_BUY_SPECIAL:
-    {
-      pRenderer->DrawTextureIndexed(8, 8, ShopTexture);
-      v109 = 0;
-      pItemNum = 0;
-      do
-      {
-        //   if ( pParty->field_C59C[9 * (int)&v109[3 * (unsigned int)window_SpeakInHouse->ptr_1C] + 724] )
-        if (pParty->SpecialItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][(signed int)v109].uItemID)
-        {
-          v52 = word_F8B158[(signed int)v109] + 30;
-          v53 = ItemsInShopTexture[(signed int)v109];
-          v54 = 60 - ((signed int)v53->uTextureWidth >> 1);
-          pRenderer->DrawTextureTransparent(v54 + pItemNum, word_F8B158[(signed int)v109] + 30, v53);
-          ZBuffer_DoFill2(&pRenderer->pActiveZBuffer[v54 + pItemNum + 640 * v52], ItemsInShopTexture[(signed int)v109], (int)((char *)v109 + 1));
-        }
-        v109 = (const char **)((char *)v109 + 1);
-        pItemNum += 70;
-      }
-      while ( (signed int)v109 < 6 );
-      pNumActiveItem = HouseUI_CheckIfPlayerCanInteract();
-      if ( pNumActiveItem )
+      v19 = (3 * (58 - (signed int)v103) - all_text_height) / 2 - ((174 - all_text_height) / 3) / 2 + 138;
+      pNumString = 0;
+      for ( int i = pDialogueWindow->pStartingPosActiveItem; i < pDialogueWindow->pNumPresenceButton + pDialogueWindow->pStartingPosActiveItem; ++i )
       {
-        v55 = 0;
-        v106.x = 0;
-        do
-        {
-          // if ( pParty->field_C59C[9 * (v55 + 12 * (unsigned int)window_SpeakInHouse->ptr_1C) + 724] )
-          if (pParty->SpecialItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][v55].uItemID)
-            ++v106.x;
-          ++v55;
-        }
-        while ( v55 < 6 );
-        v56 = GetAsyncKeyState(17);
-        v57 = pPlayer->CanSteal();
-        Str = (char *)v57;
-        if ( v56 && v57 )
-        {
-          v58 = pGlobalTXT_LocalizationStrings[185];
-        }
-        else
-        {
-          v58 = pGlobalTXT_LocalizationStrings[195];
-          if ( dialog_menu_id != HOUSE_DIALOGUE_SHOP_BUY_STANDARD)
-            v58 = pGlobalTXT_LocalizationStrings[196];
+        pButton = pDialogueWindow->GetControl(i);
+        pButton->uY = v103 + v19;
+        pButton->uHeight = pFontArrus->CalcTextHeight((const char *)pShopOptions[pNumString], &dialog_window, 0, 0);
+        v19 = pButton->uY + pFontArrus->CalcTextHeight((const char *)pShopOptions[pNumString], &dialog_window, 0, 0) - 1;
+        pButton->uW = v19;
+        pColorText = TargetColor(0xE1u, 0xCDu, 0x23u);
+        if ( pDialogueWindow->pCurrentPosActiveItem != i )
+          pColorText = TargetColor(0xFFu, 0xFFu, 0xFFu);
+        dialog_window.DrawTitleText(pFontArrus, 0, pButton->uY, pColorText, (const char *)pShopOptions[pNumString], 3);
+        ++pNumString;
         }
-        DrawTextAtStatusBar(v58, 0);
-        if ( v106.x )
-        {
-          v59 = pMouse->GetCursorPos(&v91);
-          pNumActiveItem = v59->x + pSRZBufferLineOffsets[pMouse->GetCursorPos(&v89)->y];
-          if ( pRenderer->pActiveZBuffer[pNumActiveItem] & 0xFFFF )
-          {
-            v60 = (pRenderer->pActiveZBuffer[pNumActiveItem] & 0xFFFF) - 1;
-            v106.x = v60;
-            v61 = (int)window_SpeakInHouse->ptr_1C;
-            //  v62 = 9 * (v60 + 12 * v61);
-            pItemInShop = (ItemGen *)&pParty->StandartItemsInShops[(int)v61][v60];
-            if ( dialog_menu_id != HOUSE_DIALOGUE_SHOP_BUY_STANDARD)
-              pItemInShop = &pParty->SpecialItemsInShops[(int)v61][v60];//v63 = (ItemGen *)&pParty->field_C59C[v62 + 724];
-            if ( !v56 || !Str )
-            {
-              v7 = BuildDialogueString((char *)pMerchantsBuyPhrases[pPlayer->SelectPhrasesTransaction(pItemInShop, BuildingType_WeaponShop, v61, 2)],
-                                       uActiveCharacter - 1, pItemInShop, (char *)window_SpeakInHouse->ptr_1C, 2, 0);
-              dialog_window.DrawTitleText(pFontArrus, 0, (174 - pFontArrus->CalcTextHeight(v7, &dialog_window, 0, 0)) / 2 + 138, pColorWhite, v7, 3);
-            }
-            else
-            {
-              v7 = BuildDialogueString(pGlobalTXT_LocalizationStrings[181], uActiveCharacter - 1, pItemInShop, (char *)window_SpeakInHouse->ptr_1C, 2, 0);
-              dialog_window.DrawTitleText(pFontArrus, 0, (174 - pFontArrus->CalcTextHeight(v7, &dialog_window, 0, 0)) / 2 + 138, pColorWhite, v7, 3);
-            }
-          }
-        }
-        else
-        {
-          dialog_window.DrawCurrentTime( pParty->PartyTimes.Shops_next_generation_time[(unsigned int)window_SpeakInHouse->ptr_1C]  - pParty->uTimePlayed);
-          pNumActiveItem = 0; //added
-        }
-      }
       break;
     }
 
@@ -448,58 +276,35 @@
     {
       if (!HouseUI_CheckIfPlayerCanInteract())
         return;
-      v0 = 0;
+      uint item_num = 0;
       all_text_height = 0;
-      //v32 = (signed __int64)(*(float *)&p2DEvents_minus1__24[13 * (signed int)v31] * 500.0);
       v32 = (signed __int64)(p2DEvents[(signed int)window_SpeakInHouse->ptr_1C - 1].flt_24 * 500.0);
-      pItemNum = v32 * (100 - pPlayer->GetMerchant()) / 100;
-      if ( pItemNum < v32 / 3 )
-        pItemNum = v32 / 3;
-      pNumActiveItem = pDialogueWindow->pStartingPosActiveItem;
-      if ( pNumActiveItem >= pNumActiveItem + pDialogueWindow->pNumPresenceButton )
+      pPrice = v32 * (100 - pPlayers[uActiveCharacter]->GetMerchant()) / 100;
+      if ( pPrice < v32 / 3 )
+        pPrice = v32 / 3;
+      for ( int i = pDialogueWindow->pStartingPosActiveItem;
+            i < pDialogueWindow->pNumPresenceButton + pDialogueWindow->pStartingPosActiveItem; ++i )
       {
-        sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[544], pPlayer->pName, pClassNames[pPlayer->classType]);
-        strcat(pTmpBuf.data(), "\n \n");
-        strcat(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[528]);
-        pTextHeight = pFontArrus->CalcTextHeight(pTmpBuf.data(), &dialog_window, 0, 0);
-        dialog_window.DrawTitleText(pFontArrus, 0, (174 - pTextHeight) / 2 + 138, pColorYellow, pTmpBuf.data(), 3);
-        return;
-      }
-      do
-      {
-        v35 = pDialogueWindow->GetControl(pNumActiveItem)->msg_param - 36;
-        if ( byte_4ED970_skill_learn_ability_by_class_table[pPlayer->classType][v35] && !pPlayer->pActiveSkills[v35] )
+        if ( byte_4ED970_skill_learn_ability_by_class_table[pPlayers[uActiveCharacter]->classType][pDialogueWindow->GetControl(i)->msg_param - 36]
+          && !pPlayers[uActiveCharacter]->pActiveSkills[pDialogueWindow->GetControl(i)->msg_param - 36] )
         {
-          all_text_height += pFontArrus->CalcTextHeight(pSkillNames[v35], &dialog_window, 0, 0);
-          v0++;
+          all_text_height += pFontArrus->CalcTextHeight(pSkillNames[pDialogueWindow->GetControl(i)->msg_param - 36], &dialog_window, 0, 0);
+          item_num++;
         }
-        ++pNumActiveItem;
       }
-      while ( pNumActiveItem < pDialogueWindow->pNumPresenceButton + pDialogueWindow->pStartingPosActiveItem );
-      if ( !v0 )
+      if ( item_num )
       {
-        sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[544], pPlayer->pName, pClassNames[pPlayer->classType]);
-        strcat(pTmpBuf.data(), "\n \n");
-        strcat(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[528]);
-        pTextHeight = pFontArrus->CalcTextHeight(pTmpBuf.data(), &dialog_window, 0, 0);
-        dialog_window.DrawTitleText(pFontArrus, 0, (174 - pTextHeight) / 2 + 138, pColorYellow, pTmpBuf.data(), 3);
-        return;
-      }
-      sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[401], pItemNum);
-      dialog_window.DrawTitleText(pFontArrus, 0, 0x92u, 0, pTmpBuf.data(), 3);
-      v103 = (149 - all_text_height) / v0;
-      if ( (149 - all_text_height) / v0 > 32 )
-        v103 = 32;
-      pNumActiveItem = pDialogueWindow->pStartingPosActiveItem;
-      v37 = (149 - v0 * v103 - all_text_height) / 2 - v103 / 2 + 162;
-      if ( pNumActiveItem < pNumActiveItem + pDialogueWindow->pNumPresenceButton )
-      {
-        pItemNum = 2;
-        do
+        sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[401], pPrice);//Стоимость навыка: %lu
+        dialog_window.DrawTitleText(pFontArrus, 0, 0x92u, 0, pTmpBuf.data(), 3);
+        v103 = (149 - all_text_height) / item_num;
+        if ( (149 - all_text_height) / item_num > 32 )
+          v103 = 32;
+        v19 = (149 - item_num * v103 - all_text_height) / 2 - v103 / 2 + 162;
+        for ( uint i = pDialogueWindow->pStartingPosActiveItem;
+                   i < pDialogueWindow->pNumPresenceButton + pDialogueWindow->pStartingPosActiveItem; ++i )
         {
-          pButton = pDialogueWindow->GetControl(pItemNum);
-          v40 = pButton->msg_param - 36;
-          if ( !byte_4ED970_skill_learn_ability_by_class_table[pPlayer->classType][v40] || pPlayer->pActiveSkills[v40] )
+          pButton = pDialogueWindow->GetControl(i);
+          if ( !byte_4ED970_skill_learn_ability_by_class_table[pPlayers[uActiveCharacter]->classType][pButton->msg_param - 36] || pPlayers[uActiveCharacter]->pActiveSkills[pButton->msg_param - 36] )
           {
             pButton->uW = 0;
             pButton->uHeight = 0;
@@ -507,29 +312,27 @@
           }
           else
           {
-            pButton->uY = v103 + v37;
-            pTextHeight = pFontArrus->CalcTextHeight(pSkillNames[v40], &dialog_window, 0, 0);
-            pButton->uHeight = pTextHeight;
-            v37 = pButton->uY + pTextHeight - 1;
-            pButton->uW = v37;
-            pColorText = pColorYellow;
-            if ( pDialogueWindow->pCurrentPosActiveItem != pItemNum )
-              pColorText = pColorWhite;
-            dialog_window.DrawTitleText(pFontArrus, 0, pButton->uY, pColorText, pSkillNames[v40], 3);
+            pButton->uY = v103 + v19;
+            pButton->uHeight = pFontArrus->CalcTextHeight(pSkillNames[pButton->msg_param - 36], &dialog_window, 0, 0);
+            v19 = pButton->uY + pFontArrus->CalcTextHeight(pSkillNames[pButton->msg_param - 36], &dialog_window, 0, 0) - 1;
+            pButton->uW = v19;
+            pColorText = TargetColor(0xE1u, 0xCDu, 0x23u);
+            if ( pDialogueWindow->pCurrentPosActiveItem != i )
+              pColorText = TargetColor(0xFFu, 0xFFu, 0xFFu);
+            dialog_window.DrawTitleText(pFontArrus, 0, pButton->uY, pColorText, pSkillNames[pButton->msg_param - 36], 3);
           }
-          pNumActiveItem = pDialogueWindow->pNumPresenceButton + pDialogueWindow->pStartingPosActiveItem;
-          pItemNum++;
         }
-        while ( pItemNum < pNumActiveItem );
+        break;
       }
-      break;
+      sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[544], pPlayers[uActiveCharacter]->pName, pClassNames[pPlayers[uActiveCharacter]->classType]);
+      strcat(pTmpBuf.data(), "\n \n");
+      strcat(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[528]);//Больше ничего не могу предложить.
+      dialog_window.DrawTitleText(pFontArrus, 0, (174 - pFontArrus->CalcTextHeight(pTmpBuf.data(), &dialog_window, 0, 0)) / 2 + 138, TargetColor(0xE1u, 0xCDu, 0x23u), pTmpBuf.data(), 3);
+      return;
     }
     default:
     {
-      if( dialog_menu_id > HOUSE_DIALOGUE_SHOP_REPAIR)
-        pNumActiveItem = dialog_menu_id - 96;
-      else
-        pNumActiveItem = dialog_menu_id - 4;
+      __debugbreak();
       break;
     }
   }
@@ -538,142 +341,28 @@
 //----- (004BA928) --------------------------------------------------------
 void  ArmorShopDialog()
 {
-  signed int v1; // esi@8
-  unsigned int v2; // eax@10
-  ItemGen *v3; // eax@11
-  char *v5; // ecx@12
-  char *v6; // eax@13
-  int v8; // eax@15
-  signed int v9; // esi@17
-  unsigned int v10; // eax@19
-  char *v11; // edi@19
-  int v12; // ST08_4@20
-  int v13; // eax@20
-  char *v15; // ecx@20
-  char **v16; // edi@22
+  int phrases_id; // eax@20
   int all_text_height; // ebx@22
-  char **v18; // esi@22
-  int v19; // eax@23
-  GUIWindow *v20; // ecx@24
-  int v21; // eax@24
-  int v22; // edx@24
+  int v146; // [sp+E4h] [bp-20h]@24
   int v23; // ebx@24
-  unsigned __int8 v24; // sf@24
   GUIButton *pButton; // eax@26
-  unsigned int v28; // ecx@26
-  int v29; // edx@26
-  signed int v31; // esi@31
-  unsigned int v32; // eax@33
-  //int v33; // eax@34
-  int v35; // eax@35
-  char *v36; // edx@36
   signed int v38; // esi@42
-  unsigned int v39; // esi@44
-  int v40; // eax@44
-  unsigned int v41; // eax@45
-  int v42; // eax@47
-  int v43; // ecx@52
-  int v46; // eax@54
-  unsigned int v49; // ecx@56
-  int v51; // eax@56
-  int v53; // eax@60
-  int textureH; // eax@60
-  signed int textureW; // ebx@65
-  Texture *v56; // eax@67
-  unsigned int pY_item; // edi@68
-  Texture *v58; // ST1C_4@68
   int v59; // eax@68
-  int v60; // edi@69
-  signed int v61; // ebx@73
-  Texture *v62; // eax@75
-  int v63; // edi@76
-  Texture *v64; // ST1C_4@76
-  unsigned int v65; // ST18_4@76
-  int v66; // eax@76
-  int v67; // edi@77
-  signed int v68; // ecx@81
-  const char *pStatusText; // ecx@91
-  void *v72; // eax@95
-  POINT *v73; // esi@97
-  int v74; // ecx@97
-  int v75; // eax@98
-  int v76; // ecx@98
+  const char *pText; // ecx@91
   ItemGen *selected_item; // ecx@99
-  unsigned __int8 v78; // bl@104
-  int v80; // ebx@105
-  char **v81; // esi@105
-  int v82; // eax@106
-  int v86; // ebx@107
-  int pTextHeight; // eax@109
-  unsigned int v90; // ecx@109
   int pNumString; // edx@109
   unsigned __int16 pTextColor; // ax@109
-  signed int v93; // edx@114
-  POINT *v94; // edi@120
-  __int32 v95; // ecx@120
-  void *v96; // ST14_4@122
-  unsigned __int8 v97; // bl@122
-  //ItemGen *v98; // ST10_4@122
-  int v99; // eax@122
-  char *v100; // eax@122
-  const char *v101; // ST18_4@122
-  unsigned __int16 v102; // ST14_2@122
-  int v103; // eax@122
-  signed int v104; // edi@123
-  Texture *v105; // eax@125
-  int v106; // ebx@126
-  unsigned int v108; // ST18_4@126
-  int v109; // eax@126
-  int v110; // ebx@127
-  GUIWindow *v111; // [sp-18h] [bp-11Ch]@36
-  unsigned int v112; // [sp-14h] [bp-118h]@13
-  int v113; // [sp-14h] [bp-118h]@36
-  unsigned int v115; // [sp-10h] [bp-114h]@13
-  ItemGen *v116; // [sp-10h] [bp-114h]@20
-  int v117; // [sp-10h] [bp-114h]@36
-  unsigned __int16 v119; // [sp-Ch] [bp-110h]@13
-  char *v121; // [sp-8h] [bp-10Ch]@13
-  int v122; // [sp-8h] [bp-10Ch]@20
-  unsigned int v123; // [sp-4h] [bp-108h]@13
-  __int64 *v124; // [sp-4h] [bp-108h]@20
-  int v125; // [sp-4h] [bp-108h]@68
-  int v126; // [sp-4h] [bp-108h]@76
-  int v127; // [sp-4h] [bp-108h]@126
-  POINT v128; // [sp+Ch] [bp-F8h]@8
-  POINT v129; // [sp+14h] [bp-F0h]@18
-  char v130; // [sp+1Ch] [bp-E8h]@120
-  POINT a2; // [sp+24h] [bp-E0h]@8
-  POINT v132; // [sp+2Ch] [bp-D8h]@120
-  POINT v133; // [sp+34h] [bp-D0h]@17
-  POINT v134; // [sp+3Ch] [bp-C8h]@97
-  POINT v135; // [sp+44h] [bp-C0h]@31
-  POINT v136; // [sp+4Ch] [bp-B8h]@97
-  POINT v137; // [sp+54h] [bp-B0h]@17
-  POINT v138; // [sp+5Ch] [bp-A8h]@32
-  POINT v139; // [sp+64h] [bp-A0h]@17
-  POINT v140; // [sp+6Ch] [bp-98h]@31
-  POINT v141; // [sp+74h] [bp-90h]@8
-  POINT v142; // [sp+7Ch] [bp-88h]@31
-  POINT v143; // [sp+84h] [bp-80h]@9
+  POINT mouse; // [sp+4Ch] [bp-B8h]@97
   GUIWindow dialog_window; // [sp+8Ch] [bp-78h]@1
-  int v146; // [sp+E4h] [bp-20h]@24
-  int pYellowColor; // [sp+E8h] [bp-1Ch]@1
-  int pWhiteColor; // [sp+ECh] [bp-18h]@1
   __int32 pItemCount; // [sp+F0h] [bp-14h]@8
-  int v152; // [sp+FCh] [bp-8h]@24
-  int v153; // [sp+100h] [bp-4h]@44
-  int th;
-  short text_color;
-  int pActiveButton;
+  int item_x; // [sp+100h] [bp-4h]@44
+  int pPrice;
+  unsigned int v153;
 
-  //__debugbreak(); // uishops.cpp(952): warning C4700: uninitialized local variable 'v33' used
-  //__debugbreak(); // uishops.cpp(981): warning C4700: uninitialized local variable 'v98' used
   memcpy(&dialog_window, window_SpeakInHouse, sizeof(dialog_window));
   dialog_window.uFrameX = 483;
   dialog_window.uFrameWidth = 148;
   dialog_window.uFrameZ = 334;
-  pWhiteColor = TargetColor(0xFFu, 0xFFu, 0xFFu);
-  pYellowColor = TargetColor(0xE1u, 0xCDu, 0x23u);
   switch (dialog_menu_id)
   {
     case HOUSE_DIALOGUE_MAIN:
@@ -690,52 +379,44 @@
       v146 = ( 174 - all_text_height ) / 4;
       v23 = ( 174 - 4 * ( 174 - all_text_height ) / 4 - all_text_height ) / 2 - ( 174 - all_text_height ) / 4 / 2 + 138;
       pNumString = 0;
-      if ( pDialogueWindow->pNumPresenceButton>=0 )
+      for (int i = pDialogueWindow->pStartingPosActiveItem;
+               i < pDialogueWindow->pNumPresenceButton + pDialogueWindow->pStartingPosActiveItem; ++i)
       {
-        for (pActiveButton = pDialogueWindow->pStartingPosActiveItem; pActiveButton < pDialogueWindow->pNumPresenceButton + pDialogueWindow->pStartingPosActiveItem;  ++pActiveButton)
-        {
-          pButton = pDialogueWindow->GetControl(pActiveButton);
-          pButton->uY = v146 + v23;
-          pTextHeight = pFontArrus->CalcTextHeight(pShopOptions[pNumString], &dialog_window, 0, 0);
-          pButton->uHeight = pTextHeight;
-          v23 = pButton->uY + pButton->uHeight - 1;
-          pButton->uW = v23;
-          pTextColor = pYellowColor;
-          if ( pDialogueWindow->pCurrentPosActiveItem != pActiveButton )
-            pTextColor = pWhiteColor;
-          dialog_window.DrawTitleText(pFontArrus, 0, pButton->uY, pTextColor, pShopOptions[pNumString], 3);
-          ++pNumString;
-        }
+        pButton = pDialogueWindow->GetControl(i);
+        pButton->uY = v146 + v23;
+        pButton->uHeight = pFontArrus->CalcTextHeight(pShopOptions[pNumString], &dialog_window, 0, 0);
+        v23 = pButton->uY + pFontArrus->CalcTextHeight(pShopOptions[pNumString], &dialog_window, 0, 0) - 1;
+        pButton->uW = v23;
+        pTextColor = TargetColor(0xE1u, 0xCDu, 0x23u);
+        if ( pDialogueWindow->pCurrentPosActiveItem != i )
+          pTextColor = TargetColor(0xFFu, 0xFFu, 0xFFu);
+        dialog_window.DrawTitleText(pFontArrus, 0, pButton->uY, pTextColor, pShopOptions[pNumString], 3);
+        ++pNumString;
       }
     }
     break;
+
     case HOUSE_DIALOGUE_SHOP_BUY_STANDARD:
     {
       pRenderer->DrawTextureIndexed(8, 8, ShopTexture);// подложка
-      textureW = 0;
-      v153 = 0;
+      item_x = 0;
       for ( int i = 0; i < 8; ++i )// разместить вещи
       {
         if ( pParty->StandartItemsInShops[window_SpeakInHouse->par1C][i].uItemID)
         {
-          textureW = ItemsInShopTexture[i]->uTextureWidth;
-          textureH = ItemsInShopTexture[i]->uTextureHeight;
           if ( i >= 4 )  //low row
           {
-            v60 = 90 - (textureW/2);
-            pRenderer->DrawTextureTransparent(v60 + v153 - 420, 126, ItemsInShopTexture[i]);
-            v59 = v60 + v153 + 80220;
+            pRenderer->DrawTextureTransparent((90 - (ItemsInShopTexture[i]->uTextureWidth / 2)) + item_x - 420, 126, ItemsInShopTexture[i]);
+            v59 = (90 - (ItemsInShopTexture[i]->uTextureWidth / 2)) + item_x + 80220;
           }
           else
           {
-            pY_item = 98 -  textureH;
-            v152 = 86 - (textureW/2);
-            pRenderer->DrawTextureTransparent(v152 + v153, pY_item, ItemsInShopTexture[i]);
-            v59 = v153 + v152 + 640 * pY_item;
+            pRenderer->DrawTextureTransparent(( 86 - (ItemsInShopTexture[i]->uTextureWidth / 2)) + item_x, 98 -  ItemsInShopTexture[i]->uTextureHeight, ItemsInShopTexture[i]);
+            v59 = item_x + (86 - (ItemsInShopTexture[i]->uTextureWidth / 2)) + 640 * (98 -  ItemsInShopTexture[i]->uTextureHeight);
           }
           ZBuffer_DoFill(&pRenderer->pActiveZBuffer[v59], ItemsInShopTexture[i], i + 1);
         }
-        v153 += 105;
+        item_x += 105;
       }
       if ( !HouseUI_CheckIfPlayerCanInteract() )
         return;
@@ -746,103 +427,97 @@
           ++pItemCount;
       }
       if ( GetAsyncKeyState(17) == 0 || pPlayers[uActiveCharacter]->CanSteal() == 0 )
-        pStatusText = pGlobalTXT_LocalizationStrings[195]; //"Select the Item to Buy"
+        pText = pGlobalTXT_LocalizationStrings[195]; //"Select the Item to Buy"
       else
-        pStatusText = pGlobalTXT_LocalizationStrings[185];//"Steal item"
-      DrawTextAtStatusBar(pStatusText, 0);
-      if ( pItemCount != 0 )
+        pText = pGlobalTXT_LocalizationStrings[185];//"Steal item"
+      DrawTextAtStatusBar(pText, 0);
+      if ( pItemCount )
       {
-        v73 = pMouse->GetCursorPos(&v136);
-        v74 = pRenderer->pActiveZBuffer[v73->x + pSRZBufferLineOffsets[pMouse->GetCursorPos(&v134)->y]] & 0xFFFF;
-        if ( !v74 )
+        pMouse->GetCursorPos(&mouse);
+        if ( !(pRenderer->pActiveZBuffer[mouse.x + pSRZBufferLineOffsets[mouse.y]] & 0xFFFF) )
           return;
-        pItemCount = v74 - 1;
-        selected_item = &pParty->StandartItemsInShops[window_SpeakInHouse->par1C][v74-1];
-        if ( GetAsyncKeyState(17) == 0 || pPlayers[uActiveCharacter]->CanSteal() == 0)
-          v15 = (char *)pMerchantsBuyPhrases[pPlayers[uActiveCharacter]->SelectPhrasesTransaction(selected_item, BuildingType_ArmorShop, window_SpeakInHouse->par1C, 2)];
+        selected_item = &pParty->StandartItemsInShops[window_SpeakInHouse->par1C][(pRenderer->pActiveZBuffer[mouse.x + pSRZBufferLineOffsets[mouse.y]] & 0xFFFF) - 1];
+        if ( !GetAsyncKeyState(17) || !pPlayers[uActiveCharacter]->CanSteal())
+        {
+          pText = BuildDialogueString((char *)pMerchantsBuyPhrases[pPlayers[uActiveCharacter]->SelectPhrasesTransaction(selected_item, BuildingType_ArmorShop, window_SpeakInHouse->par1C, 2)],
+                                 uActiveCharacter - 1, selected_item, (char *)window_SpeakInHouse->ptr_1C, 2, 0);
+          dialog_window.DrawTitleText(pFontArrus, 0, (174 - pFontArrus->CalcTextHeight(pText, &dialog_window, 0, 0)) / 2 + 138, TargetColor(0xFFu, 0xFFu, 0xFFu), pText, 3);
+        }
         else
-          v15 = pGlobalTXT_LocalizationStrings[181]; //"Steal %24"
-        v36 = BuildDialogueString(v15, uActiveCharacter - 1, selected_item, (char *)window_SpeakInHouse->ptr_1C, 2, 0);
-        v115 = (174 - pFontArrus->CalcTextHeight(v36, &dialog_window, 0, 0)) / 2 + 138;
-        dialog_window.DrawTitleText(pFontArrus, 0, v115, pWhiteColor, v36, 3);
+        {
+          pText = BuildDialogueString(pGlobalTXT_LocalizationStrings[181], uActiveCharacter - 1, selected_item, (char *)window_SpeakInHouse->ptr_1C, 2, 0); //"Steal %24"
+          dialog_window.DrawTitleText(pFontArrus, 0, (174 - pFontArrus->CalcTextHeight(pText, &dialog_window, 0, 0)) / 2 + 138, TargetColor(0xFFu, 0xFFu, 0xFFu), pText, 3);
+        }
         return;
       }
-      dialog_window.DrawCurrentTime( pParty->PartyTimes.Shops_next_generation_time[window_SpeakInHouse->par1C]- pParty->uTimePlayed);
+      dialog_window.DrawCurrentTime( pParty->field_3C.Shops_next_generation_time[window_SpeakInHouse->par1C]- pParty->uTimePlayed);
       return;
     }
     break;
+
     case HOUSE_DIALOGUE_SHOP_BUY_SPECIAL:
     {
       pRenderer->DrawTextureIndexed(8, 8, ShopTexture);
-      v11 = 0;
-      v61 = 0;
-      v153 = 0;
-      do
+      item_x = 0;
+      for ( int i = 0; i < 8; ++i )
       {
-        if (pParty->SpecialItemsInShops[window_SpeakInHouse->par1C][v61].uItemID)
+        if ( pParty->SpecialItemsInShops[window_SpeakInHouse->par1C][i].uItemID )
         {
-          v62 = ItemsInShopTexture[v61];
-          if ( v61 >= 4 )
+          if ( i >= 4 )
           {
-            v67 = 90 - ((signed int)v62->uTextureWidth >> 1);
-            pRenderer->DrawTextureTransparent(v153 + v67 - 420, 0x7Eu, ItemsInShopTexture[v61]);
-            v66 = v153 + v67 + 80220;
+            pRenderer->DrawTextureTransparent(item_x + (90 - ((signed int)ItemsInShopTexture[i]->uTextureWidth / 2)) - 420, 126, ItemsInShopTexture[i]);
+            v59 = item_x + (90 - ((signed int)ItemsInShopTexture[i]->uTextureWidth / 2)) + 80220;
           }
           else
           {
-            v63 = 98 - v62->uTextureHeight;
-            v64 = ItemsInShopTexture[v61];
-            v65 = 98 - v62->uTextureHeight;
-            v152 = 86 - ((signed int)v62->uTextureWidth >> 1);
-            pRenderer->DrawTextureTransparent(v152 + v153, v65, v64);
-            v66 = v152 + v153 + 640 * v63;
+            pRenderer->DrawTextureTransparent(86 - ((signed int)ItemsInShopTexture[i]->uTextureWidth / 2) + item_x, 98 - ItemsInShopTexture[i]->uTextureHeight, ItemsInShopTexture[i]);
+            v59 = (86 - ((signed int)ItemsInShopTexture[i]->uTextureWidth / 2)) + item_x + 640 * (98 - ItemsInShopTexture[i]->uTextureHeight);
           }
-          ZBuffer_DoFill(&pRenderer->pActiveZBuffer[v66], ItemsInShopTexture[v61], v61 + 1);
+          ZBuffer_DoFill(&pRenderer->pActiveZBuffer[v59], ItemsInShopTexture[i], i + 1);
         }
-        v153 += 105;
-        ++v61;
+        item_x += 105;
       }
-      while ( v61 < 8 );
       if ( !HouseUI_CheckIfPlayerCanInteract() )
         return;
-      v68 = 0;
       pItemCount = 0;
-      do
+      for ( uint i = 0; i < 6; ++i )
       {
-        if (pParty->SpecialItemsInShops[window_SpeakInHouse->par1C][(signed int)v68].uItemID)
-        ++pItemCount;
-        ++v68;
+        if (pParty->SpecialItemsInShops[window_SpeakInHouse->par1C][i].uItemID)
+          ++pItemCount;
       }
-      while ( v68 < 6 );
-      if ( GetAsyncKeyState(17) == 0 || pPlayers[uActiveCharacter]->CanSteal() == 0 )
-        pStatusText = pGlobalTXT_LocalizationStrings[196]; //Select the Special Item to Buy"
+      if ( !GetAsyncKeyState(17) || !pPlayers[uActiveCharacter]->CanSteal() )
+        pText = pGlobalTXT_LocalizationStrings[196]; //Select the Special Item to Buy"
       else
-        pStatusText = pGlobalTXT_LocalizationStrings[185];
-      DrawTextAtStatusBar(pStatusText, 0);
-      if ( (char *)pItemCount != 0 )
+        pText = pGlobalTXT_LocalizationStrings[185];
+      DrawTextAtStatusBar(pText, 0);
+      if ( pItemCount )
       {
-        v73 = pMouse->GetCursorPos(&v136);
-        v74 = pRenderer->pActiveZBuffer[v73->x + pSRZBufferLineOffsets[pMouse->GetCursorPos((POINT *)&v134)->y]] & 0xFFFF;
-        if ( !v74 )
+        pMouse->GetCursorPos(&mouse);
+        if ( !(pRenderer->pActiveZBuffer[mouse.x + pSRZBufferLineOffsets[mouse.y]] & 0xFFFF) )
           return;
-        pItemCount = v74 - 1;
+        pItemCount = (pRenderer->pActiveZBuffer[mouse.x + pSRZBufferLineOffsets[mouse.y]] & 0xFFFF) - 1;
         if ( dialog_menu_id == 2 )
-          selected_item = &pParty->StandartItemsInShops[window_SpeakInHouse->par1C][v74 - 1];
+          selected_item = &pParty->StandartItemsInShops[window_SpeakInHouse->par1C][(pRenderer->pActiveZBuffer[mouse.x + pSRZBufferLineOffsets[mouse.y]] & 0xFFFF) - 1];
         else
-          selected_item = &pParty->SpecialItemsInShops[window_SpeakInHouse->par1C][v74 - 1];
-        if ( GetAsyncKeyState(17) == 0 || pPlayers[uActiveCharacter]->CanSteal() == 0 )
-          v15 = (char *)pMerchantsBuyPhrases[pPlayers[uActiveCharacter]->SelectPhrasesTransaction(selected_item, BuildingType_ArmorShop, window_SpeakInHouse->par1C, 2)];
+          selected_item = &pParty->SpecialItemsInShops[window_SpeakInHouse->par1C][(pRenderer->pActiveZBuffer[mouse.x + pSRZBufferLineOffsets[mouse.y]] & 0xFFFF) - 1];
+        if ( !GetAsyncKeyState(17) || !pPlayers[uActiveCharacter]->CanSteal() )
+        {
+          pText = BuildDialogueString((char *)pMerchantsBuyPhrases[pPlayers[uActiveCharacter]->SelectPhrasesTransaction(selected_item, BuildingType_ArmorShop, window_SpeakInHouse->par1C, 2)],
+                 uActiveCharacter - 1, selected_item, (char *)window_SpeakInHouse->ptr_1C, 2, 0);
+          dialog_window.DrawTitleText(pFontArrus, 0, (174 - pFontArrus->CalcTextHeight(pText, &dialog_window, 0, 0)) / 2 + 138, TargetColor(0xFFu, 0xFFu, 0xFFu), pText, 3);
+        }
         else
-          v15 = pGlobalTXT_LocalizationStrings[181]; //"Steal %24"
-        v36 = BuildDialogueString(v15, uActiveCharacter - 1, selected_item, (char *)window_SpeakInHouse->ptr_1C, 2, 0);
-        v115 = (174 - pFontArrus->CalcTextHeight(v36, &dialog_window, 0, 0)) / 2 + 138;
-        dialog_window.DrawTitleText(pFontArrus, 0, v115, pWhiteColor, v36, 3);
+        {
+          pText = BuildDialogueString(pGlobalTXT_LocalizationStrings[181], uActiveCharacter - 1, selected_item, (char *)window_SpeakInHouse->ptr_1C, 2, 0);//"Steal %24"
+          dialog_window.DrawTitleText(pFontArrus, 0, (174 - pFontArrus->CalcTextHeight(pText, &dialog_window, 0, 0)) / 2 + 138, TargetColor(0xFFu, 0xFFu, 0xFFu), pText, 3);
+        }
         return;
       }
-      dialog_window.DrawCurrentTime( pParty->PartyTimes.Shops_next_generation_time[window_SpeakInHouse->par1C]- pParty->uTimePlayed);
+      dialog_window.DrawCurrentTime( pParty->field_3C.Shops_next_generation_time[window_SpeakInHouse->par1C]- pParty->uTimePlayed);
       return;
     }
     break;
+
     case HOUSE_DIALOGUE_SHOP_DISPLAY_EQUIPMENT:
     {
       draw_leather();
@@ -853,34 +528,27 @@
       all_text_height = 0;
       for ( int i = 0; i < 3; ++i )
         all_text_height += pFontArrus->CalcTextHeight(pShopOptions[i], &dialog_window, 0, 0);
-      v152 = (174 - all_text_height) / 3;
-      v86 = (3 * (58 - v152) - all_text_height) / 2 - v152 / 2 + 138;
-      v24 = -pDialogueWindow->pNumPresenceButton < 0;
-      pActiveButton = pDialogueWindow->pStartingPosActiveItem;
-      if ( v24 ^ (pDialogueWindow->pStartingPosActiveItem > pDialogueWindow->pStartingPosActiveItem + pDialogueWindow->pNumPresenceButton) )
+      v146 = (174 - all_text_height) / 3;
+      v23 = (3 * (58 - v146) - all_text_height) / 2 - v146 / 2 + 138;
+      pNumString = 0;
+      for ( int i = pDialogueWindow->pStartingPosActiveItem;
+                i  < pDialogueWindow->pNumPresenceButton + pDialogueWindow->pStartingPosActiveItem; ++i )
       {
-        pNumString = 0;
-        do
-        {
-          pButton = pDialogueWindow->GetControl((unsigned int)pActiveButton);
-          pButton->uY = v152 + v86;
-          pTextHeight = pFontArrus->CalcTextHeight(pShopOptions[pNumString], &dialog_window, 0, 0);
-          v90 = pButton->uY;
-          pButton->uHeight = pTextHeight;
-          v86 = v90 + pTextHeight - 1;
-          pButton->uW = v86;
-          pTextColor = pYellowColor;
-          if ( pDialogueWindow->pCurrentPosActiveItem != pActiveButton )
-            pTextColor = pWhiteColor;
-          dialog_window.DrawTitleText(pFontArrus, 0, v90, pTextColor, pShopOptions[pNumString], 3);
-          ++pNumString;
-          ++pActiveButton;
-        }
-        while ( (signed int)pActiveButton < pDialogueWindow->pNumPresenceButton + pDialogueWindow->pStartingPosActiveItem );
+        pButton = pDialogueWindow->GetControl(i);
+        pButton->uY = v146 + v23;
+        pButton->uHeight = pFontArrus->CalcTextHeight(pShopOptions[pNumString], &dialog_window, 0, 0);
+        v23 = pButton->uY + pFontArrus->CalcTextHeight(pShopOptions[pNumString], &dialog_window, 0, 0) - 1;
+        pButton->uW = v23;
+        pTextColor = TargetColor(0xE1u, 0xCDu, 0x23u);
+        if ( pDialogueWindow->pCurrentPosActiveItem != i )
+          pTextColor = TargetColor(0xFFu, 0xFFu, 0xFFu);
+        dialog_window.DrawTitleText(pFontArrus, 0, pButton->uY, pTextColor, pShopOptions[pNumString], 3);
+        ++pNumString;
       }
       return;
     }
     break;
+
     case HOUSE_DIALOGUE_SHOP_SELL:
     {
       draw_leather();
@@ -888,16 +556,16 @@
       DrawTextAtStatusBar(pGlobalTXT_LocalizationStrings[199], 0);//"Select the Item to Sell"
       if ( !HouseUI_CheckIfPlayerCanInteract())
         return;
-      if((v9 = pMouse->GetCursorPos(&v139)->x - 14, pItemCount = (v9 >> 5) + 14 * ((pMouse->GetCursorPos(&v133)->y - 17) >> 5),
-         pMouse->GetCursorPos(&v137)->x <= 13) || pMouse->GetCursorPos(&v129)->x >= 462 
-         || (v10 = pPlayers[uActiveCharacter]->GetItemIDAtInventoryIndex((int *)&pItemCount), v11 = 0, !v10) )
+      pMouse->GetCursorPos(&mouse);
+      v153 = ((mouse.x - 14) >> 5) + 14 * ((mouse.y - 17) >> 5);
+      if ( mouse.x <= 13 || mouse.x >= 462 )
+        return;
+      if ( !pPlayers[uActiveCharacter]->GetItemIDAtInventoryIndex((int *)&v153) )
            return;
-      v116 = (ItemGen *)&pPlayers[uActiveCharacter]->pInventoryItemList[v10 - 1];
-      v13 = pPlayers[uActiveCharacter]->SelectPhrasesTransaction(v116, BuildingType_ArmorShop, window_SpeakInHouse->par1C, 3);
-      v15 = (char *)pMerchantsSellPhrases[pPlayers[uActiveCharacter]->SelectPhrasesTransaction(v116, BuildingType_ArmorShop, window_SpeakInHouse->par1C, 3)];
-      v36 = BuildDialogueString(v15, uActiveCharacter - 1, v116, (char *) window_SpeakInHouse->par1C, 3, 0);
-      v115 = (174 - pFontArrus->CalcTextHeight(v36, &dialog_window, 0, 0)) / 2 + 138;
-      dialog_window.DrawTitleText(pFontArrus, 0, v115, pWhiteColor, v36, 3);
+      selected_item = &pPlayers[uActiveCharacter]->pInventoryItemList[pPlayers[uActiveCharacter]->GetItemIDAtInventoryIndex((int *)&v153) - 1];
+      pText = BuildDialogueString((char *)pMerchantsSellPhrases[pPlayers[uActiveCharacter]->SelectPhrasesTransaction(selected_item, BuildingType_ArmorShop, window_SpeakInHouse->par1C, 3)],
+              uActiveCharacter - 1, selected_item, (char *) window_SpeakInHouse->par1C, 3, 0);
+      dialog_window.DrawTitleText(pFontArrus, 0, (174 - pFontArrus->CalcTextHeight(pText, &dialog_window, 0, 0)) / 2 + 138, TargetColor(0xFFu, 0xFFu, 0xFFu), pText, 3);
       return;
     }
     break;
@@ -908,28 +576,20 @@
       DrawTextAtStatusBar(pGlobalTXT_LocalizationStrings[197], 0); //"Select the Item to Identify"	
       if ( HouseUI_CheckIfPlayerCanInteract() )
       {
-        v1 = pMouse->GetCursorPos(&a2)->x - 14;
-        pItemCount = (v1 >> 5) + 14 * ((pMouse->GetCursorPos(&v128)->y - 17) >> 5);
-        if ( pMouse->GetCursorPos(&v141)->x > 13 )
+        pMouse->GetCursorPos(&mouse);
+        v153 = ((mouse.x - 14) >> 5) + 14 * ((mouse.y - 17) >> 5);
+        if ( mouse.x > 13 && mouse.x < 462 )
         {
-          if ( pMouse->GetCursorPos(&v143)->x < 462 )
+          if ( pPlayers[uActiveCharacter]->GetItemIDAtInventoryIndex((int *)&v153) )
           {
-            v2 = pPlayers[uActiveCharacter]->GetItemIDAtInventoryIndex((int *)&pItemCount);
-            if ( v2 )
-            {
-              v3 = (ItemGen *)&pPlayers[uActiveCharacter]->pInventoryItemList[v2-1];
-              if (v3->IsIdentified())
-                v5 = "%24";
-              else
-              {
-                v8 = pPlayers[uActiveCharacter]->SelectPhrasesTransaction(v3, BuildingType_ArmorShop, (int)window_SpeakInHouse->ptr_1C, 4);
-                v5 = (char *)pMerchantsIdentifyPhrases[v8];
-              }
-              v6 = BuildDialogueString(v5, uActiveCharacter - 1, v3, (char *)window_SpeakInHouse->ptr_1C, 4, 0);
-              v115 = (174 - pFontArrus->CalcTextHeight(v6, &dialog_window, 0, 0)) / 2 + 138;
-              dialog_window.DrawTitleText(pFontArrus, 0, v115, pWhiteColor, v6, 3);
-              return;
-            }
+            selected_item = &pPlayers[uActiveCharacter]->pInventoryItemList[pPlayers[uActiveCharacter]->GetItemIDAtInventoryIndex((int *)&v153)-1];
+            if (selected_item->IsIdentified())
+              pText = BuildDialogueString("%24", uActiveCharacter - 1, selected_item, (char *)window_SpeakInHouse->ptr_1C, 4, 0);
+            else
+              pText = BuildDialogueString((char *)pMerchantsIdentifyPhrases[pPlayers[uActiveCharacter]->SelectPhrasesTransaction(selected_item, BuildingType_ArmorShop,
+                    (int)window_SpeakInHouse->ptr_1C, 4)], uActiveCharacter - 1, selected_item, (char *)window_SpeakInHouse->ptr_1C, 4, 0);
+            dialog_window.DrawTitleText(pFontArrus, 0, (174 - pFontArrus->CalcTextHeight(pText, &dialog_window, 0, 0)) / 2 + 138, TargetColor(0xFFu, 0xFFu, 0xFFu), pText, 3);
+            return;
           }
         }
       }
@@ -942,281 +602,113 @@
       DrawTextAtStatusBar(pGlobalTXT_LocalizationStrings[198], 0);
       if ( !HouseUI_CheckIfPlayerCanInteract())
         return;
-      if( (v31 = pMouse->GetCursorPos(&v135)->x - 14,
-          pItemCount = (v31 >> 5) + 14 * ((pMouse->GetCursorPos(&v142)->y - 17) >> 5),
-            pMouse->GetCursorPos(&v140)->x <= 13)
-            || pMouse->GetCursorPos(&v138)->x >= 462
-            || (v32 = pPlayers[uActiveCharacter]->GetItemIDAtInventoryIndex((int *)&pItemCount), v11 = 0, !v32)
-            || (!(pPlayers[uActiveCharacter]->pOwnItems[v32-1].uAttributes& 2)) )
+      pMouse->GetCursorPos(&mouse);
+      v153 = ((mouse.x -14) >> 5) + 14 * ((mouse.y - 17) >> 5);
+      if( mouse.x <= 13 || mouse.x >= 462 )
         return;
-      //__debugbreak(); // warning C4700: uninitialized local variable 'v33' used
-      v116 = &pPlayers[uActiveCharacter]->pInventoryItemList[v32 - 1];
-      v35 = pPlayers[uActiveCharacter]->SelectPhrasesTransaction(&pPlayers[uActiveCharacter]->pInventoryItemList[v32 - 1], BuildingType_ArmorShop, window_SpeakInHouse->par1C, 5);
-      v15 = (char *)pMerchantsRepairPhrases[v35];
-      v36 = BuildDialogueString(v15, uActiveCharacter - 1, v116, (char *)window_SpeakInHouse->ptr_1C, 5, 0);
-      v115 = (174 - pFontArrus->CalcTextHeight(v36, &dialog_window, 0, 0)) / 2 + 138;
-      dialog_window.DrawTitleText(pFontArrus, 0, v115, pWhiteColor, v36, 3);
+      if ( !pPlayers[uActiveCharacter]->GetItemIDAtInventoryIndex((int *)&v153)
+       || (!(pPlayers[uActiveCharacter]->pOwnItems[pPlayers[uActiveCharacter]->GetItemIDAtInventoryIndex((int *)&v153) - 1].uAttributes& 2)) )
+        return;
+      selected_item = &pPlayers[uActiveCharacter]->pInventoryItemList[pPlayers[uActiveCharacter]->GetItemIDAtInventoryIndex((int *)&v153) - 1];
+      phrases_id = pPlayers[uActiveCharacter]->SelectPhrasesTransaction(&pPlayers[uActiveCharacter]->pInventoryItemList[pPlayers[uActiveCharacter]->GetItemIDAtInventoryIndex((int *)&v153) - 1],
+             BuildingType_ArmorShop, window_SpeakInHouse->par1C, 5);
+      pText = BuildDialogueString((char *)pMerchantsRepairPhrases[phrases_id], uActiveCharacter - 1, selected_item, (char *)window_SpeakInHouse->ptr_1C, 5, 0);
+      dialog_window.DrawTitleText(pFontArrus, 0, (174 - pFontArrus->CalcTextHeight(pText, &dialog_window, 0, 0)) / 2 + 138, TargetColor(0xFFu, 0xFFu, 0xFFu), pText, 3);
       return;
     }
     break;
-    case HOUSE_DIALOGUE_SHOP_6: //buy standart ???
-    {
-      pRenderer->DrawTextureIndexed(8u, 8u, ShopTexture);
-      DrawTextAtStatusBar(pGlobalTXT_LocalizationStrings[195], 0); //"Select the Item to Buy"
-      if ( !HouseUI_CheckIfPlayerCanInteract() )
-        return;
-      pItemCount = 0;
-      for( int i = 0; i < 6 ; ++i )
-        if (pParty->SpecialItemsInShops[window_SpeakInHouse->par1C][i].uItemID)
-          ++pItemCount;
-      if ( pItemCount )
-      {
-        v94 = pMouse->GetCursorPos(&v132);
-        pItemCount = pRenderer->pActiveZBuffer[v94->x + pSRZBufferLineOffsets[pMouse->GetCursorPos((POINT *)&v130)->y]];
-        v95 = pItemCount;
-        if ( pItemCount && pItemCount != -65536 )
-        {
-          --pItemCount;
-          v97 = uActiveCharacter - 1;
-      //__debugbreak(); // warning C4700: uninitialized local variable 'v98' used
-          v99 = pPlayers[uActiveCharacter]->SelectPhrasesTransaction(&pParty->SpecialItemsInShops[window_SpeakInHouse->par1C][v95-1], BuildingType_ArmorShop,	window_SpeakInHouse->par1C,	2);
-          v100 = BuildDialogueString((char *)pMerchantsBuyPhrases[v99], uActiveCharacter - 1, &pParty->SpecialItemsInShops[window_SpeakInHouse->par1C][v95-1], (char *)window_SpeakInHouse->par1C, 2, 0);
-          v103 = pFontArrus->CalcTextHeight(v100, &dialog_window, 0, 0);
-          dialog_window.DrawTitleText(pFontArrus, 0, (174 - v103) / 2 + 138, pWhiteColor, v100, 3);
-        }
-        v104 = 0;
-        v153 = 0;
-        do
-        {
-          //if ( pParty->field_C59C[9 * (v104 + 12 * (unsigned int)window_SpeakInHouse->ptr_1C) + 724] )
-          if (pParty->SpecialItemsInShops[window_SpeakInHouse->par1C][v104].uItemID)
-          {
-            v105 = ItemsInShopTexture[v104];
-            if ( v104 >= 4 )
-            {
-              v110 = 90 - ((signed int)v105->uTextureWidth >> 1);
-              pRenderer->DrawTextureTransparent(v153 + v110 - 420, 0x7Eu, ItemsInShopTexture[v104]);
-              v127 = v104 + 1;
-              v109 = v153 + v110 + 80220;
-            }
-            else
-            {
-              v106 = 98 - v105->uTextureHeight;
-              v108 = 98 - v105->uTextureHeight;
-              v152 = 86 - ((signed int)v105->uTextureWidth >> 1);
-              pRenderer->DrawTextureTransparent(v152 + v153, v108, ItemsInShopTexture[v104]);
-              v127 = v104 + 1;
-              v109 = v152 + v153 + 640 * v106;
-            }
-            ZBuffer_DoFill(&pRenderer->pActiveZBuffer[v109], ItemsInShopTexture[v104], v127);
-          }
-          v153 += 105;
-          ++v104;
-        }
-        while ( v104 < 8 );
-        return;
-      }
-      dialog_window.DrawCurrentTime(pParty->PartyTimes.Shops_next_generation_time[window_SpeakInHouse->par1C]-  pParty->uTimePlayed);
-      return;
-    }
-    break;
+
     case HOUSE_DIALOGUE_LEARN_SKILLS:
     {
       if (!HouseUI_CheckIfPlayerCanInteract() )
         return;
-      v152 = 0;
+      uint item_num = 0;
       v38 = (signed __int64)(p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].flt_24 * 500.0);
-      pActiveButton = v38 * (100 - pPlayers[uActiveCharacter]->GetMerchant()) / 100;
-      if ( (signed int)pActiveButton < v38 / 3 )
-        pActiveButton = v38 / 3;
-      v39 = pDialogueWindow->pStartingPosActiveItem;
-      v40 = pDialogueWindow->pNumPresenceButton;
-      v153 = 0;
-      if ( (signed int)v39 < (signed int)(v39 + v40) )
+      pPrice = v38 * (100 - pPlayers[uActiveCharacter]->GetMerchant()) / 100;
+      if ( (signed int)pPrice < v38 / 3 )
+        pPrice = v38 / 3;
+      all_text_height = 0;
+      for ( int i = pDialogueWindow->pStartingPosActiveItem;
+                  i < pDialogueWindow->pNumPresenceButton + pDialogueWindow->pStartingPosActiveItem; ++i )
       {
-        do
+        if ( byte_4ED970_skill_learn_ability_by_class_table[pPlayers[uActiveCharacter]->classType][pDialogueWindow->GetControl(i)->msg_param - 36]
+             && !pPlayers[uActiveCharacter]->pActiveSkills[pDialogueWindow->GetControl(i)->msg_param - 36] )
         {
-          v41 = pDialogueWindow->GetControl(v39)->msg_param - 36;
-          if ( byte_4ED970_skill_learn_ability_by_class_table[pPlayers[uActiveCharacter]->classType][v41] && !pPlayers[uActiveCharacter]->pActiveSkills[v41] )
-          {
-            v42 = pFontArrus->CalcTextHeight(pSkillNames[v41], &dialog_window, 0, 0);
-            v152 += v42;
-            ++v153;
-          }
-          ++v39;
+          all_text_height += pFontArrus->CalcTextHeight(pSkillNames[pDialogueWindow->GetControl(i)->msg_param - 36], &dialog_window, 0, 0);
+          item_num ++;
         }
-        while ( (signed int)v39 < pDialogueWindow->pNumPresenceButton + pDialogueWindow->pStartingPosActiveItem );
-        if ( v153 )
+      }
+      if ( item_num )
+      {
+        sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[401], pPrice);
+        dialog_window.DrawTitleText(pFontArrus, 0, 0x92u, 0, pTmpBuf.data(), 3);
+        v146 = (149 - all_text_height) / item_num;
+        if ( (149 - all_text_height) / item_num > 32 )
+          v146 = 32;
+        v23 = (149 - v146 * item_num - all_text_height) / 2 - v146 / 2 + 162;
+        for ( int i = pDialogueWindow->pStartingPosActiveItem;
+                  i < pDialogueWindow->pNumPresenceButton + pDialogueWindow->pStartingPosActiveItem; ++i )
         {
-          sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[401], pActiveButton);
-          dialog_window.DrawTitleText(pFontArrus, 0, 0x92u, 0, pTmpBuf.data(), 3);
-          pActiveButton = (149 - v152) / v153;
-          if ( (149 - v152) / v153 > 32 )
-            pActiveButton = 32;
-          v43 = (149 - v153 * (signed int)pActiveButton - v152) / 2 - (signed int)pActiveButton / 2 + 162;
-          v152 = pDialogueWindow->pStartingPosActiveItem;
-          v146 = v43;
-          if ( v152 < v152 + pDialogueWindow->pNumPresenceButton )
+          pButton = pDialogueWindow->GetControl(i);
+          if ( !byte_4ED970_skill_learn_ability_by_class_table[pPlayers[uActiveCharacter]->classType][pButton->msg_param - 36]
+            || pPlayers[uActiveCharacter]->pActiveSkills[pButton->msg_param - 36] )
           {
-            v153 = 2;
-            do
-            {
-              pButton = pDialogueWindow->GetControl(v152);
-              v46 = pButton->msg_param - 36;
-              if ( !byte_4ED970_skill_learn_ability_by_class_table[pPlayers[uActiveCharacter]->classType][v46] || pPlayers[uActiveCharacter]->pActiveSkills[v46] )
-              {
-                pButton->uW = 0;
-                pButton->uHeight = 0;
-                pButton->uY = 0;
-              }
-              else
-              {
-                pButton->uY = (unsigned int)((char *)pActiveButton + v146);
-                pTextHeight = pFontArrus->CalcTextHeight(pSkillNames[v46], &dialog_window, 0, 0);
-                v49 = pButton->uY;
-                pButton->uHeight = pTextHeight;
-                v51 = v49 + pTextHeight - 1;
-                pButton->uW = v51;
-                v146 = v51;
-                pTextColor = pYellowColor;
-                if ( pDialogueWindow->pCurrentPosActiveItem != v153 )
-                  pTextColor = pWhiteColor;
-                dialog_window.DrawTitleText(pFontArrus, 0, v49, pTextColor, pSkillNames[v46], 3);
-              }
-              v53 = pDialogueWindow->pStartingPosActiveItem;
-              ++v152;
-              textureH = pDialogueWindow->pNumPresenceButton + v53;
-              ++v153;
-            }
-            while ( v152 < textureH );
+            pButton->uW = 0;
+            pButton->uHeight = 0;
+            pButton->uY = 0;
           }
-          return;
+          else
+          {
+            pButton->uY = v146 + v23;
+            pButton->uHeight = pFontArrus->CalcTextHeight(pSkillNames[pButton->msg_param - 36], &dialog_window, 0, 0);
+            v23 = pButton->uY + pFontArrus->CalcTextHeight(pSkillNames[pButton->msg_param - 36], &dialog_window, 0, 0) - 1;
+            pButton->uW = v23;
+            pTextColor = TargetColor(0xE1u, 0xCDu, 0x23u);
+            if ( pDialogueWindow->pCurrentPosActiveItem != i )
+              pTextColor = TargetColor(0xFFu, 0xFFu, 0xFFu);
+            dialog_window.DrawTitleText(pFontArrus, 0, pButton->uY, pTextColor, pSkillNames[pButton->msg_param - 36], 3);
+          }
         }
+        return;
       }
       sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[544], pPlayers[uActiveCharacter]->pName, pClassNames[pPlayers[uActiveCharacter]->classType]); //"Seek knowledge elsewhere %s the %s"
       strcat(pTmpBuf.data(), "\n \n");
       strcat(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[528]); //"I can offer you nothing further."
-      v115 = (174 - pFontArrus->CalcTextHeight(pTmpBuf.data(), &dialog_window, 0, 0)) / 2 + 138;
-      dialog_window.DrawTitleText(pFontArrus, 0, v115, pYellowColor, pTmpBuf.data(), 3);
+      dialog_window.DrawTitleText(pFontArrus, 0, (174 - pFontArrus->CalcTextHeight(pTmpBuf.data(), &dialog_window, 0, 0)) / 2 + 138, TargetColor(0xE1u, 0xCDu, 0x23u), pTmpBuf.data(), 3);
       return;
     }
     break;
+    default:
+      __debugbreak();
   }
 }
 //----- (004B9CC6) --------------------------------------------------------
 void  AlchemistDialog()
 {
-  int v0;
-  int pNumActiveItem; // eax@7
+  int index; // eax@7
   signed int v5; // esi@9
-  unsigned int v6; // esi@11
-  int v7; // eax@11
-  unsigned int v8; // eax@12
-  int v9; // eax@14
-  int v10; // ecx@19
-  int v13; // eax@21
-  char *v14; // eax@23
-  int v15; // eax@23
-  unsigned int v16; // ecx@23
-  int v17; // edx@23
   int v18; // eax@23
-  int v20; // eax@27
-  char *v21; // edx@29
-  int v22; // esi@30
-  char **v23; // edi@30
-  int v24; // eax@31
-  int v26; // edx@32
-  int v27; // edi@32
-  unsigned __int8 v28; // sf@32
-  const char **v30; // eax@34
-  int v31; // eax@34
-  unsigned int v32; // ecx@34
-  int v34; // eax@34
-  signed int v36; // esi@39
-  ItemGen *v37; // eax@42
-  char *v38; // ecx@43
-  unsigned __int8 v39; // dl@44
-  int v40; // eax@46
-  int v41; // ST08_4@47
-  int v42; // eax@47
-  signed int v43; // esi@49
-  int v44; // ST08_4@52
-  int v45; // eax@52
-  Texture *v46; // ecx@55
+  char *pText; // edx@29
   unsigned int v47; // edi@55
   unsigned int v48; // esi@57
-  int v49; // edx@61
-  Texture *v50; // ecx@67
   unsigned int v51; // edi@67
   unsigned int v52; // esi@69
-  int v53; // edx@73
-  Texture *v54; // ecx@79
-  unsigned int v55; // edi@79
-  unsigned int v56; // esi@81
-  int v57; // edx@85
-  Texture *v58; // ecx@91
-  unsigned int v59; // edi@91
-  unsigned int v60; // esi@93
-  int v61; // edx@97
-  signed int v62; // ecx@102
-  SHORT v63; // di@110
-  bool v64; // eax@110
-  const char *v65; // ecx@112
-  POINT *v66; // esi@117
-  int v67; // ecx@118
-  int v68; // eax@118
-  int v69; // ecx@118
-  ItemGen *v70; // esi@118
+  ItemGen *item; // esi@118
   int v71; // eax@123
   int all_text_height; // edi@125
-  char **v73; // esi@125
-  int v74; // eax@126
-  int pItemNum;
-  int v76; // edx@127
-  int v77; // edi@127
   GUIButton *pButton; // esi@129
-  const char **v79; // eax@129
-  int pTextHeight; // eax@129
-  unsigned int v81; // ecx@129
   unsigned int pColorText; // ax@129
-  int v85; // [sp-14h] [bp-ECh]@29
-  int v86; // [sp-10h] [bp-E8h]@29
-  ItemGen *v87; // [sp-10h] [bp-E8h]@43
-  unsigned __int16 v88; // [sp-Ch] [bp-E4h]@29
-  void *v89; // [sp-Ch] [bp-E4h]@43
-  char *v90; // [sp-8h] [bp-E0h]@29
-  int v91; // [sp-8h] [bp-E0h]@42
-  unsigned int v92; // [sp-4h] [bp-DCh]@29
-  __int64 *v93; // [sp-4h] [bp-DCh]@42
-  POINT v94; // [sp+Ch] [bp-CCh]@39
-  POINT v95; // [sp+14h] [bp-C4h]@49
-  POINT v96; // [sp+1Ch] [bp-BCh]@117
-  POINT v97; // [sp+24h] [bp-B4h]@40
-  POINT v98; // [sp+2Ch] [bp-ACh]@117
-  POINT v99; // [sp+34h] [bp-A4h]@49
-  POINT v100; // [sp+3Ch] [bp-9Ch]@50
-  POINT v101; // [sp+44h] [bp-94h]@39
-  POINT v102; // [sp+4Ch] [bp-8Ch]@49
-  POINT a2; // [sp+54h] [bp-84h]@39
+  POINT mouse; // [sp+2Ch] [bp-ACh]@117
   GUIWindow dialog_window; // [sp+5Ch] [bp-7Ch]@1
   int v105; // [sp+B0h] [bp-28h]@19
-  int pColorYellow; // [sp+B4h] [bp-24h]@1
-  int Str; // [sp+B8h] [bp-20h]@23
-  int pColorWhite; // [sp+BCh] [bp-1Ch]@1
-  __int32 v109; // [sp+C0h] [bp-18h]@39
-  Player *pPlayer; // [sp+C4h] [bp-14h]@1
   int pNumString; // [sp+C8h] [bp-10h]@9
-  unsigned int v112; // [sp+CCh] [bp-Ch]@9
-  unsigned __int8 v113; // [sp+D3h] [bp-5h]@47
-  int v114; // [sp+D4h] [bp-4h]@11
+  int item_num; // [sp+D4h] [bp-4h]@11
+  int pPrice;
 
-  pPlayer = pPlayers[uActiveCharacter];
   memcpy(&dialog_window, window_SpeakInHouse, sizeof(dialog_window));
   dialog_window.uFrameX = 483;
   dialog_window.uFrameWidth = 148;
   dialog_window.uFrameZ = 334;
-  pColorWhite = TargetColor(0xFFu, 0xFFu, 0xFFu);
-  pColorYellow = TargetColor(0xE1u, 0xCDu, 0x23u);
   switch(dialog_menu_id)
   {
     case HOUSE_DIALOGUE_MAIN:
@@ -1228,85 +720,68 @@
         pShopOptions[2] = pGlobalTXT_LocalizationStrings[159];
         pShopOptions[3] = pGlobalTXT_LocalizationStrings[160];
         all_text_height = 0;
-        for (int i = 0; i < 4; ++i)//while ( (signed int)v15 < (signed int)&unk_F8B1C8 );
+        for ( int i = 0; i < 4; ++i )
           all_text_height += pFontArrus->CalcTextHeight(pShopOptions[i], &dialog_window, 0, 0);
-        Str = (174 - all_text_height) / 4;
-        pNumActiveItem = pDialogueWindow->pStartingPosActiveItem;
-        v76 = pNumActiveItem + pDialogueWindow->pNumPresenceButton;
-        v77 = (174 - 4 * (174 - all_text_height) / 4 - all_text_height) / 2 - (174 - all_text_height) / 4 / 2 + 138;
-        v28 = -pDialogueWindow->pNumPresenceButton < 0;
-        if ( v28 ^ (pNumActiveItem > v76) )
+        v18 = (174 - all_text_height) / 4;
+        v105 = (174 - 4 * (174 - all_text_height) / 4 - all_text_height) / 2 - (174 - all_text_height) / 4 / 2 + 138;
+        pNumString = 0;
+        for ( int i = pDialogueWindow->pStartingPosActiveItem;
+                  i < pDialogueWindow->pNumPresenceButton + pDialogueWindow->pStartingPosActiveItem; ++i )
         {
-          pItemNum = 2;
-          pNumString = 0;
-          do
-          {
-            pButton = pDialogueWindow->GetControl(pItemNum);
-            pButton->uY = Str + v77;
-            pTextHeight = pFontArrus->CalcTextHeight((const char *)pShopOptions[pNumString], &dialog_window, 0, 0);
-            pButton->uHeight = pTextHeight;
-            v77 = pButton->uY + pTextHeight - 1;
-            pButton->uW = v77;
-            pColorText = pColorYellow;
-            if ( pDialogueWindow->pCurrentPosActiveItem != pItemNum )
-              pColorText = pColorWhite;
-            dialog_window.DrawTitleText(pFontArrus, 0, pButton->uY, pColorText, (const char *)pShopOptions[pNumString], 3);
-            ++pItemNum;
-            ++pNumString;
-            pNumActiveItem = pDialogueWindow->pNumPresenceButton + pDialogueWindow->pStartingPosActiveItem;
-          }
-          while ( pItemNum < pNumActiveItem );
+          pButton = pDialogueWindow->GetControl(i);
+          pButton->uY = v18 + v105;
+          pButton->uHeight = pFontArrus->CalcTextHeight((const char *)pShopOptions[pNumString], &dialog_window, 0, 0);
+          v105 = pButton->uY + pFontArrus->CalcTextHeight((const char *)pShopOptions[pNumString], &dialog_window, 0, 0) - 1;
+          pButton->uW = v105;
+          pColorText = TargetColor(0xE1u, 0xCDu, 0x23u);
+          if ( pDialogueWindow->pCurrentPosActiveItem != i )
+            pColorText = TargetColor(0xFFu, 0xFFu, 0xFFu);
+          dialog_window.DrawTitleText(pFontArrus, 0, pButton->uY, pColorText, (const char *)pShopOptions[pNumString], 3);
+          ++pNumString;
         }
       }
       return;
     }
+
     case HOUSE_DIALOGUE_SHOP_BUY_STANDARD:
     {
       pRenderer->DrawTextureIndexed(8, 8, ShopTexture);
-      v114 = 0;
-      do
+      for ( uint i = 0; i < 6; ++i )
       {
-        if ( pParty->StandartItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][v114].uItemID)
+        if ( pParty->StandartItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][i].uItemID )
         {
-          v46 = ItemsInShopTexture[v114];
-          v47 = 152 - v46->uTextureHeight;
+          v47 = 152 - ItemsInShopTexture[i]->uTextureHeight;
           if ( (signed int)v47 < 1 )
             v47 = 0;
-          v48 = 75 * v114 - v46->uTextureWidth / 2 + 40;
-          if ( v114 )
+          v48 = 75 * i - ItemsInShopTexture[i]->uTextureWidth / 2 + 40;
+          if ( i )
           {
-            if ( v114 == 5 )
+            if ( i == 5 )
             {
-              v49 = ItemsInShopTexture[5]->uTextureWidth;
-              if ( (signed int)v48 > 457 - v49 )
-                v48 = 457 - v49;
+              if ( (signed int)v48 > 457 - ItemsInShopTexture[5]->uTextureWidth )
+                v48 = 457 - ItemsInShopTexture[5]->uTextureWidth;
             }
           }
           else if ( (signed int)v48 < 18 )
             v48 = 18;
-          pRenderer->DrawTextureTransparent(v48, v47, v46);
-          ZBuffer_DoFill2(&pRenderer->pActiveZBuffer[v48 + 640 * v47], ItemsInShopTexture[v114], v114 + 1);
+          pRenderer->DrawTextureTransparent(v48, v47, ItemsInShopTexture[i]);
+          ZBuffer_DoFill2(&pRenderer->pActiveZBuffer[v48 + 640 * v47], ItemsInShopTexture[i], i + 1);
         }
-        ++v114;
       }
-      while ( v114 < 6 );
-      v114 = 0;
-      do
+      for ( uint i = 0; i < 6; ++i )
       {
-        if ( pParty->StandartItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][v114 + 6].uItemID)
+        if ( pParty->StandartItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][i + 6].uItemID )
         {
-          v50 = ItemsInShopTexture[v114 + 6];
-          v51 = 308 - v50->uTextureHeight;
+          v51 = 308 - ItemsInShopTexture[i + 6]->uTextureHeight;
           if ( (signed int)v51 < 1 )
             v51 = 0;
-          v52 = 75 * v114 - v50->uTextureWidth / 2 + 40;
-          if ( v114 )
+          v52 = 75 * i - ItemsInShopTexture[i + 6]->uTextureWidth / 2 + 40;
+          if ( i )
           {
-            if ( v114 == 5 )
+            if ( i == 5 )
             {
-              v53 = ItemsInShopTexture[11]->uTextureWidth;
-              if ( (signed int)v52 > 457 - v53 )
-                v52 = 457 - v53;
+              if ( (signed int)v52 > 457 - ItemsInShopTexture[11]->uTextureWidth )
+                v52 = 457 - ItemsInShopTexture[11]->uTextureWidth;
             }
           }
           else
@@ -1314,69 +789,133 @@
             if ( (signed int)v52 < 18 )
               v52 = 18;
           }
-          pRenderer->DrawTextureTransparent(v52, v51, v50);
-          ZBuffer_DoFill2(&pRenderer->pActiveZBuffer[v52 + 640 * v51], ItemsInShopTexture[v114 + 6], v114 + 7);
+          pRenderer->DrawTextureTransparent(v52, v51, ItemsInShopTexture[i + 6]);
+          ZBuffer_DoFill2(&pRenderer->pActiveZBuffer[v52 + 640 * v51], ItemsInShopTexture[i + 6], i + 7);
         }
-        ++v114;
       }
-      while ( v114 < 6 );
       if ( HouseUI_CheckIfPlayerCanInteract() )
       {
-        v62 = 0;
-        v109 = 0;
-        do
-        {
-          if ( pParty->StandartItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][v62].uItemID)
-            ++v109;
-          ++v62;
-        }
-        while ( v62 < 12 );
-        v63 = GetAsyncKeyState(17);
-        v64 = pPlayer->CanSteal();
-        Str = v64;
-        if ( v63 && v64 )
+        item_num = 0;
+        for ( uint i = 0; i < 12; ++i )
         {
-          v65 = pGlobalTXT_LocalizationStrings[185];
+          if ( pParty->StandartItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][i].uItemID)
+            ++item_num;
         }
-        else if ( dialog_menu_id == HOUSE_DIALOGUE_SHOP_BUY_STANDARD)
-        {
-          v65 = pGlobalTXT_LocalizationStrings[195];
-        }
+        if ( GetAsyncKeyState(17) && pPlayers[uActiveCharacter]->CanSteal() )
+          DrawTextAtStatusBar(pGlobalTXT_LocalizationStrings[185], 0);
         else
+          DrawTextAtStatusBar(pGlobalTXT_LocalizationStrings[195], 0);
+        if ( !item_num )
         {
-          v65 = pGlobalTXT_LocalizationStrings[196];
-        }
-        DrawTextAtStatusBar(v65, 0);
-        if ( !v109 )
-        {
-          dialog_window.DrawCurrentTime( pParty->PartyTimes.Shops_next_generation_time[ (unsigned int)window_SpeakInHouse->ptr_1C] - pParty->uTimePlayed);
+          dialog_window.DrawCurrentTime( pParty->field_3C.Shops_next_generation_time[ (unsigned int)window_SpeakInHouse->ptr_1C] - pParty->uTimePlayed);
           return;
         }
-        pMouse->GetCursorPos(&v98);
-        pNumActiveItem = v98.x + pSRZBufferLineOffsets[v98.y];
-        if ( pRenderer->pActiveZBuffer[pNumActiveItem] & 0xFFFF )
+        pMouse->GetCursorPos(&mouse);
+        if ( pRenderer->pActiveZBuffer[mouse.x + pSRZBufferLineOffsets[mouse.y]] & 0xFFFF )
         {
-          v67 = (pRenderer->pActiveZBuffer[pNumActiveItem] & 0xFFFF) - 1;
-          v70 = (ItemGen *)&pParty->StandartItemsInShops[(int)window_SpeakInHouse->ptr_1C][v67];
-          if ( dialog_menu_id != HOUSE_DIALOGUE_SHOP_BUY_STANDARD)
-            v70 = &pParty->SpecialItemsInShops[(int)window_SpeakInHouse->ptr_1C][v67];//v70 = (ItemGen *)&pParty->field_C59C[v69 + 724];
-          if ( !v63 || !Str )
+          item = &pParty->StandartItemsInShops[(int)window_SpeakInHouse->ptr_1C][(pRenderer->pActiveZBuffer[mouse.x + pSRZBufferLineOffsets[mouse.y]] & 0xFFFF) - 1];
+          if ( !GetAsyncKeyState(17) || !pPlayers[uActiveCharacter]->CanSteal() )
           {
-            v71 = pPlayer->SelectPhrasesTransaction(v70, BuildingType_AlchemistShop, (int)window_SpeakInHouse->ptr_1C, 2);
-            v38 = (char *)pMerchantsBuyPhrases[v71];
+            v71 = pPlayers[uActiveCharacter]->SelectPhrasesTransaction(item, BuildingType_AlchemistShop, (int)window_SpeakInHouse->ptr_1C, 2);
+            pText = BuildDialogueString((char *)pMerchantsBuyPhrases[v71], uActiveCharacter - 1, item, (char *)window_SpeakInHouse->ptr_1C, 2, 0);
           }
           else
-          {
-            v38 = pGlobalTXT_LocalizationStrings[181];
-          }
-          v21 = BuildDialogueString(v38, uActiveCharacter - 1, v70, (char *)window_SpeakInHouse->ptr_1C, 2, 0);
-          v40 = pFontArrus->CalcTextHeight(v21, &dialog_window, 0, 0);
-          dialog_window.DrawTitleText(pFontArrus, 0, (174 - v40) / 2 + 138, pColorWhite, v21, 3);
+            pText = BuildDialogueString(pGlobalTXT_LocalizationStrings[181], uActiveCharacter - 1, item, (char *)window_SpeakInHouse->ptr_1C, 2, 0);
+          dialog_window.DrawTitleText(pFontArrus, 0, (174 - pFontArrus->CalcTextHeight(pText, &dialog_window, 0, 0)) / 2 + 138, TargetColor(0xFFu, 0xFFu, 0xFFu), pText, 3);
           return ;
         }
       }
       return;
     }
+
+    case HOUSE_DIALOGUE_SHOP_BUY_SPECIAL:
+    {
+      pRenderer->DrawTextureIndexed(8, 8, ShopTexture);
+      for ( uint i = 0; i < 6; ++i )
+      {
+        if (pParty->SpecialItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][i].uItemID)
+        {
+          v47 = 152 - ItemsInShopTexture[i]->uTextureHeight;
+          if ( (signed int)v47 < 1 )
+            v47 = 0;
+          v48 = 75 * i - ItemsInShopTexture[i]->uTextureWidth / 2 + 40;
+          if ( i )
+          {
+            if ( i == 5 )
+            {
+              if ( (signed int)v48 > 457 - ItemsInShopTexture[5]->uTextureWidth )
+                v48 = 457 - ItemsInShopTexture[5]->uTextureWidth;
+            }
+          }
+          else
+          {
+            if ( (signed int)v48 < 18 )
+              v48 = 18;
+          }
+          pRenderer->DrawTextureTransparent(v48, v47, ItemsInShopTexture[i]);
+          ZBuffer_DoFill2(&pRenderer->pActiveZBuffer[v48 + 640 * v47], ItemsInShopTexture[i], i + 1);
+        }
+      }
+      for ( uint i = 0; i < 6; ++i )
+      {
+        if (pParty->SpecialItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][(signed int)i + 6].uItemID) //not itemid
+        {
+          v51 = 308 - ItemsInShopTexture[i + 6]->uTextureHeight;
+          if ( (signed int)v51 < 1 )
+            v51 = 0;
+          v52 = 75 * i - ItemsInShopTexture[i + 6]->uTextureWidth / 2 + 40;
+          if ( i )
+          {
+            if ( i == 5 )
+            {
+              if ( (signed int)v52 > 457 - ItemsInShopTexture[11]->uTextureWidth )
+                v52 = 457 - ItemsInShopTexture[11]->uTextureWidth;
+            }
+          }
+          else
+          {
+            if ( (signed int)v52 < 18 )
+              v52 = 18;
+          }
+          pRenderer->DrawTextureTransparent(v52, v51, ItemsInShopTexture[i + 6]);
+          ZBuffer_DoFill2(&pRenderer->pActiveZBuffer[v52 + 640 * v51], ItemsInShopTexture[i + 6], i + 7);
+        }
+      }
+      if ( HouseUI_CheckIfPlayerCanInteract() )
+      {
+        item_num = 0;
+        for ( uint i = 0; i < 12; ++i )
+        {
+          if (pParty->SpecialItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][i].uItemID)
+            ++item_num;
+        }
+        if ( GetAsyncKeyState(17) && pPlayers[uActiveCharacter]->CanSteal() )
+          DrawTextAtStatusBar(pGlobalTXT_LocalizationStrings[185], 0);
+        else
+          DrawTextAtStatusBar(pGlobalTXT_LocalizationStrings[196], 0);
+        if ( !item_num )
+        {
+          dialog_window.DrawCurrentTime( pParty->field_3C.Shops_next_generation_time[ (unsigned int)window_SpeakInHouse->ptr_1C] - pParty->uTimePlayed);
+          return;
+        }
+        pMouse->GetCursorPos(&mouse);
+        if ( pRenderer->pActiveZBuffer[mouse.x + pSRZBufferLineOffsets[mouse.y]] & 0xFFFF )
+        {
+          item = &pParty->SpecialItemsInShops[(int)window_SpeakInHouse->ptr_1C][(pRenderer->pActiveZBuffer[mouse.x + pSRZBufferLineOffsets[mouse.y]] & 0xFFFF) - 1];
+          if ( !GetAsyncKeyState(17) || !pPlayers[uActiveCharacter]->CanSteal() )
+          {
+            v71 = pPlayers[uActiveCharacter]->SelectPhrasesTransaction(item, BuildingType_AlchemistShop, (int)window_SpeakInHouse->ptr_1C, 2);
+            pText = BuildDialogueString((char *)pMerchantsBuyPhrases[v71], uActiveCharacter - 1, item, (char *)window_SpeakInHouse->ptr_1C, 2, 0);
+          }
+          else
+            pText = BuildDialogueString(pGlobalTXT_LocalizationStrings[181], uActiveCharacter - 1, item, (char *)window_SpeakInHouse->ptr_1C, 2, 0);
+          dialog_window.DrawTitleText(pFontArrus, 0, (174 - pFontArrus->CalcTextHeight(pText, &dialog_window, 0, 0)) / 2 + 138, TargetColor(0xFFu, 0xFFu, 0xFFu), pText, 3);
+          return;
+        }
+      }
+      return;
+    }
+
     case HOUSE_DIALOGUE_SHOP_SELL:
     {
       draw_leather();
@@ -1384,17 +923,20 @@
       DrawTextAtStatusBar(pGlobalTXT_LocalizationStrings[199], 0);
       if ( !HouseUI_CheckIfPlayerCanInteract() )
         return;
-      if ((v43 = pMouse->GetCursorPos(&v99)->x - 14, v109 = (v43 >> 5) + 14 * ((pMouse->GetCursorPos(&v95)->y - 17) >> 5),
-           pMouse->GetCursorPos(&v102)->x <= 13) || pMouse->GetCursorPos(&v100)->x >= 462 
-          || (pNumActiveItem = pPlayer->GetItemIDAtInventoryIndex((int *)&v109), !pNumActiveItem) )
+      pMouse->GetCursorPos(&mouse);
+      index = ((mouse.x - 14) >> 5) + 14 * ((mouse.y - 17) >> 5);
+      if ( mouse.x <= 13 || mouse.x >= 462 )
+        return;
+      if ( !pPlayers[uActiveCharacter]->GetItemIDAtInventoryIndex((int *)&index) )
           return;
-      v87 = (ItemGen *)&pPlayer->pInventoryItemList[pNumActiveItem - 1];
-      v45 = pPlayer->SelectPhrasesTransaction(v87, BuildingType_AlchemistShop, (int)window_SpeakInHouse->ptr_1C, 3);
-      v21 = BuildDialogueString((char *)pMerchantsSellPhrases[v45], uActiveCharacter - 1, v87, (char *)window_SpeakInHouse->ptr_1C, 3, 0);
-      pTextHeight = pFontArrus->CalcTextHeight(v21, &dialog_window, 0, 0);
-      dialog_window.DrawTitleText(pFontArrus, 0, (174 - pTextHeight) / 2 + 138, pColorWhite, v21, 3);
+      v71 = pPlayers[uActiveCharacter]->SelectPhrasesTransaction(&pPlayers[uActiveCharacter]->pInventoryItemList[pPlayers[uActiveCharacter]->GetItemIDAtInventoryIndex((int *)&index) - 1],
+             BuildingType_AlchemistShop, (int)window_SpeakInHouse->ptr_1C, 3);
+      pText = BuildDialogueString((char *)pMerchantsSellPhrases[v71], uActiveCharacter - 1, &pPlayers[uActiveCharacter]->pInventoryItemList[pPlayers[uActiveCharacter]->GetItemIDAtInventoryIndex((int *)&index) - 1],
+             (char *)window_SpeakInHouse->ptr_1C, 3, 0);
+      dialog_window.DrawTitleText(pFontArrus, 0, (174 - pFontArrus->CalcTextHeight(pText, &dialog_window, 0, 0)) / 2 + 138, TargetColor(0xFFu, 0xFFu, 0xFFu), pText, 3);
       return; 
     }
+
     case HOUSE_DIALOGUE_SHOP_IDENTIFY:
     {
       draw_leather();
@@ -1402,25 +944,24 @@
       DrawTextAtStatusBar(pGlobalTXT_LocalizationStrings[197], 0);
       if ( HouseUI_CheckIfPlayerCanInteract() )
         return;
-      if ((v36 = pMouse->GetCursorPos(&a2)->x - 14, v109 = (v36 >> 5) + 14 * ((pMouse->GetCursorPos(&v94)->y - 17) >> 5),
-          pMouse->GetCursorPos(&v101)->x <= 13) || pMouse->GetCursorPos(&v97)->x >= 462
-         || (pNumActiveItem = pPlayer->GetItemIDAtInventoryIndex((int *)&v109), !pNumActiveItem) )
+      pMouse->GetCursorPos(&mouse);
+      index = ((mouse.x - 14) >> 5) + 14 * ((mouse.y - 17) >> 5);
+      if ( mouse.x <= 13 || mouse.x >= 462 )
+        return;
+      if ( !pPlayers[uActiveCharacter]->GetItemIDAtInventoryIndex((int *)&index) )
         return;
-      v37 = (ItemGen *)&pPlayer->pInventoryItemList[pNumActiveItem - 1];
-      if (!v37->IsIdentified())
+      item = &pPlayers[uActiveCharacter]->pInventoryItemList[pPlayers[uActiveCharacter]->GetItemIDAtInventoryIndex((int *)&index) - 1];
+      if (!item->IsIdentified())
       {
-        v42 = pPlayer->SelectPhrasesTransaction(v37, BuildingType_AlchemistShop, (int)window_SpeakInHouse->ptr_1C, 4);
-        v38 = (char *)pMerchantsIdentifyPhrases[v42];
+        v71 = pPlayers[uActiveCharacter]->SelectPhrasesTransaction(item, BuildingType_AlchemistShop, (int)window_SpeakInHouse->ptr_1C, 4);
+        pText = BuildDialogueString(pMerchantsIdentifyPhrases[v71], uActiveCharacter - 1, item, (char *)window_SpeakInHouse->ptr_1C, 4, 0);
       }
       else
-      {
-        v38 = "%24";
-      }
-      v21 = BuildDialogueString(v38, uActiveCharacter - 1, v37, (char *)window_SpeakInHouse->ptr_1C, 4, 0);
-      v40 = pFontArrus->CalcTextHeight(v21, &dialog_window, 0, 0);
-      dialog_window.DrawTitleText(pFontArrus, 0, (174 - v40) / 2 + 138, pColorWhite, v21, 3);
+        pText = BuildDialogueString("%24", uActiveCharacter - 1, item, (char *)window_SpeakInHouse->ptr_1C, 4, 0);
+      dialog_window.DrawTitleText(pFontArrus, 0, (174 - pFontArrus->CalcTextHeight(pText, &dialog_window, 0, 0)) / 2 + 138, TargetColor(0xFFu, 0xFFu, 0xFFu), pText, 3);
       return;
     }
+
     case HOUSE_DIALOGUE_SHOP_DISPLAY_EQUIPMENT:
     {
       draw_leather();
@@ -1430,244 +971,94 @@
       all_text_height = 0;
       for ( int i = 0; i < 2; ++i )
         all_text_height += pFontArrus->CalcTextHeight(pShopOptions[i], &dialog_window, 0, 0);
-      Str = (174 - all_text_height) / 2;
-      pNumActiveItem = pDialogueWindow->pStartingPosActiveItem;
-      v26 = pNumActiveItem + pDialogueWindow->pNumPresenceButton;
-      v27 = (2 * (87 - (174 - all_text_height) / 2) - all_text_height) / 2 - (174 - all_text_height) / 2 / 2 + 138;
-      v28 = -pDialogueWindow->pNumPresenceButton < 0;
-      if ( v28 ^ (pNumActiveItem > v26) )
+      v18 = (174 - all_text_height) / 2;
+      v105 = (2 * (87 - (174 - all_text_height) / 2) - all_text_height) / 2 - (174 - all_text_height) / 2 / 2 + 138;
+      pNumString = 0;
+      for ( int i = pDialogueWindow->pStartingPosActiveItem;
+                i < pDialogueWindow->pNumPresenceButton + pDialogueWindow->pStartingPosActiveItem; ++i )
       {
-        pItemNum = 2;
-        pNumString = 0;
-        do
-        {
-          pButton = pDialogueWindow->GetControl(pItemNum);
-          pButton->uY = Str + v27;
-          pTextHeight = pFontArrus->CalcTextHeight((const char *)pShopOptions[pNumString], &dialog_window, 0, 0);
-          pButton->uHeight = pTextHeight;
-          v27 = pButton->uY + pTextHeight - 1;
-          pButton->uW = v27;
-          pColorText = pColorYellow;
-          if ( pDialogueWindow->pCurrentPosActiveItem != pItemNum )
-            pColorText = pColorWhite;
-          dialog_window.DrawTitleText(pFontArrus, 0, pButton->uY, pColorText, (const char *)pShopOptions[pNumString], 3);
-          ++pItemNum;
-          ++pNumString;
-          pNumActiveItem = pDialogueWindow->pNumPresenceButton + pDialogueWindow->pStartingPosActiveItem;
-        }
-        while ( pItemNum < pNumActiveItem );
+        pButton = pDialogueWindow->GetControl(i);
+        pButton->uY = v18 + v105;
+        pButton->uHeight = pFontArrus->CalcTextHeight((const char *)pShopOptions[pNumString], &dialog_window, 0, 0);
+        v105 = pButton->uY + pFontArrus->CalcTextHeight((const char *)pShopOptions[pNumString], &dialog_window, 0, 0) - 1;
+        pButton->uW = v105;
+        pColorText = TargetColor(0xE1u, 0xCDu, 0x23u);
+        if ( pDialogueWindow->pCurrentPosActiveItem != i )
+          pColorText = TargetColor(0xFFu, 0xFFu, 0xFFu);
+        dialog_window.DrawTitleText(pFontArrus, 0, pButton->uY, pColorText, (const char *)pShopOptions[pNumString], 3);
+        ++pNumString;
       }
       return;
     }
-    case HOUSE_DIALOGUE_SHOP_BUY_SPECIAL:
-    {
-      pRenderer->DrawTextureIndexed(8, 8, ShopTexture);
-      v114 = 0;
-      do
-      {
-        if (pParty->SpecialItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][v114].uItemID)
-        {
-          v54 = ItemsInShopTexture[v114];
-          v55 = 152 - v54->uTextureHeight;
-          if ( (signed int)v55 < 1 )
-            v55 = 0;
-          v56 = 75 * v114 - v54->uTextureWidth / 2 + 40;
-          if ( v114 )
-          {
-            if ( v114 == 5 )
-            {
-              v57 = ItemsInShopTexture[5]->uTextureWidth;
-              if ( (signed int)v56 > 457 - v57 )
-                v56 = 457 - v57;
-            }
-          }
-          else
-          {
-            if ( (signed int)v56 < 18 )
-              v56 = 18;
-          }
-          pRenderer->DrawTextureTransparent(v56, v55, v54);
-          ZBuffer_DoFill2(&pRenderer->pActiveZBuffer[v56 + 640 * v55], ItemsInShopTexture[v114], v114 + 1);
-        }
-        ++v114;
-      }
-      while ( v114 < 6 );
-      v114 = 0;
-      do
-      {
-        if (pParty->SpecialItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][(signed int)v114 + 6].uItemID) //not itemid
-        {
-          v58 = ItemsInShopTexture[v114 + 6];
-          v59 = 308 - v58->uTextureHeight;
-          if ( (signed int)v59 < 1 )
-            v59 = 0;
-          v60 = 75 * v114 - v58->uTextureWidth / 2 + 40;
-          if ( v114 )
-          {
-            if ( v114 == 5 )
-            {
-              v61 = ItemsInShopTexture[11]->uTextureWidth;
-              if ( (signed int)v60 > 457 - v61 )
-                v60 = 457 - v61;
-            }
-          }
-          else
-          {
-            if ( (signed int)v60 < 18 )
-              v60 = 18;
-          }
-          pRenderer->DrawTextureTransparent(v60, v59, v58);
-          ZBuffer_DoFill2(&pRenderer->pActiveZBuffer[v60 + 640 * v59], ItemsInShopTexture[v114 + 6], v114 + 7);
-        }
-        ++v114;
-      }
-      while ( v114 < 6 );
-      if ( HouseUI_CheckIfPlayerCanInteract() )
-      {
-        v62 = 0;
-        v109 = 0;
-        do
-        {
-          if (pParty->SpecialItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][v62].uItemID)
-            ++v109;
-          ++v62;
-        }
-        while ( v62 < 12 );
-        v63 = GetAsyncKeyState(17);
-        v64 = pPlayer->CanSteal();
-        Str = v64;
-        if ( v63 && v64 )
-        {
-          v65 = pGlobalTXT_LocalizationStrings[185];
-        }
-        else
-        {
-          v65 = pGlobalTXT_LocalizationStrings[195];
-          if ( dialog_menu_id != HOUSE_DIALOGUE_SHOP_BUY_STANDARD)
-            v65 = pGlobalTXT_LocalizationStrings[196];
-        }
-        DrawTextAtStatusBar(v65, 0);
-        if ( !v109 )
-        {
-          dialog_window.DrawCurrentTime( pParty->PartyTimes.Shops_next_generation_time[ (unsigned int)window_SpeakInHouse->ptr_1C] - pParty->uTimePlayed);
-          return;
-        }
-        v66 = pMouse->GetCursorPos(&v98);
-        pNumActiveItem = v66->x + pSRZBufferLineOffsets[pMouse->GetCursorPos(&v96)->y];
-        if ( pRenderer->pActiveZBuffer[pNumActiveItem] & 0xFFFF )
-        {
-          v67 = (pRenderer->pActiveZBuffer[pNumActiveItem] & 0xFFFF) - 1;
-          v109 = v67;
-          v68 = (int)window_SpeakInHouse->ptr_1C;
-          //  v69 = 9 * (v67 + 12 * v68);
-          v70 = (ItemGen *)&pParty->StandartItemsInShops[v68][v67];
-          if ( dialog_menu_id != HOUSE_DIALOGUE_SHOP_BUY_STANDARD)
-            v70 = &pParty->SpecialItemsInShops[(int)v68][v67];//v70 = (ItemGen *)&pParty->field_C59C[v69 + 724];
-          if ( !v63 || !Str )
-          {
-            v71 = pPlayer->SelectPhrasesTransaction(v70, BuildingType_AlchemistShop, v68, 2);
-            v38 = (char *)pMerchantsBuyPhrases[v71];
-          }
-          else
-          {
-            v38 = pGlobalTXT_LocalizationStrings[181];
-          }
-          v21 = BuildDialogueString(v38, uActiveCharacter - 1, v70, (char *)window_SpeakInHouse->ptr_1C, 2, 0);
-          v40 = pFontArrus->CalcTextHeight(v21, &dialog_window, 0, 0);
-          dialog_window.DrawTitleText(pFontArrus, 0, (174 - v40) / 2 + 138, pColorWhite, v21, 3);
-          return;
-        }
-      }
-      return;
-    }
+
     case HOUSE_DIALOGUE_LEARN_SKILLS:
     {
       if (!HouseUI_CheckIfPlayerCanInteract())
         return;
       all_text_height = 0;
       v5 = (signed __int64)(p2DEvents[(signed int)window_SpeakInHouse->ptr_1C - 1].flt_24 * 500.0);
-      pItemNum = v5 * (100 - pPlayer->GetMerchant()) / 100;
-      if ( pItemNum < v5 / 3 )
-        pItemNum = v5 / 3;
-      pNumActiveItem = pDialogueWindow->pStartingPosActiveItem;
-      v114 = 0;
-      if ( pNumActiveItem >= pNumActiveItem + pDialogueWindow->pNumPresenceButton )
+      pPrice = v5 * (100 - pPlayers[uActiveCharacter]->GetMerchant()) / 100;
+      if ( pPrice < v5 / 3 )
+        pPrice = v5 / 3;
+      item_num = 0;
+      for ( int i = pDialogueWindow->pStartingPosActiveItem;
+                i < pDialogueWindow->pNumPresenceButton + pDialogueWindow->pStartingPosActiveItem; ++i )
       {
-        sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[544], pPlayer->pName, pClassNames[pPlayer->classType]);
+        pButton = pDialogueWindow->GetControl(i);
+        if ( byte_4ED970_skill_learn_ability_by_class_table[pPlayers[uActiveCharacter]->classType][pButton->msg_param - 36]
+         && !pPlayers[uActiveCharacter]->pActiveSkills[pButton->msg_param - 36] )
+        {
+          all_text_height = pFontArrus->CalcTextHeight(pSkillNames[pButton->msg_param - 36], &dialog_window, 0, 0);
+          ++item_num;
+        }
+      }
+      if ( !item_num )
+      {
+        sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[544], pPlayers[uActiveCharacter]->pName, pClassNames[pPlayers[uActiveCharacter]->classType]);
         strcat(pTmpBuf.data(), "\n \n");
         strcat(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[528]);
-        v40 = pFontArrus->CalcTextHeight(pTmpBuf.data(), &dialog_window, 0, 0);
-        dialog_window.DrawTitleText(pFontArrus, 0, (174 - v40) / 2 + 138, pColorYellow, pTmpBuf.data(), 3);
-        return;
-      }
-      do
-      {
-        v8 = pDialogueWindow->GetControl(pNumActiveItem)->msg_param - 36;
-        if ( byte_4ED970_skill_learn_ability_by_class_table[pPlayer->classType][v8] && !pPlayer->pActiveSkills[v8] )
-        {
-          all_text_height = pFontArrus->CalcTextHeight(pSkillNames[v8], &dialog_window, 0, 0);
-          ++v114;
-        }
-        ++pNumActiveItem;
-      }
-      while ( pNumActiveItem < pDialogueWindow->pNumPresenceButton + pDialogueWindow->pStartingPosActiveItem );
-      if ( !v114 )
-      {
-        sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[544], pPlayer->pName, pClassNames[pPlayer->classType]);
-        strcat(pTmpBuf.data(), "\n \n");
-        strcat(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[528]);
-        v40 = pFontArrus->CalcTextHeight(pTmpBuf.data(), &dialog_window, 0, 0);
-        dialog_window.DrawTitleText(pFontArrus, 0, (174 - v40) / 2 + 138, pColorYellow, pTmpBuf.data(), 3);
+        dialog_window.DrawTitleText(pFontArrus, 0, (174 - pFontArrus->CalcTextHeight(pTmpBuf.data(), &dialog_window, 0, 0)) / 2 + 138, TargetColor(0xE1u, 0xCDu, 0x23u), pTmpBuf.data(), 3);
         return;
       }
-      if ( v114 )
+      if ( item_num )
       {
-        sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[401], pItemNum);
+        sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[401], pPrice);
         dialog_window.DrawTitleText(pFontArrus, 0, 0x92u, 0, pTmpBuf.data(), 3);
-        v18 = (149 - all_text_height) / v114;
-        if ( (149 - all_text_height) / v114 > 32 )
+        v18 = (149 - all_text_height) / item_num;
+        if ( (149 - all_text_height) / item_num > 32 )
           v18 = 32;
-        pNumActiveItem = pDialogueWindow->pStartingPosActiveItem;
-        v105 = (149 - v114 * v18 - all_text_height) / 2 - v18 / 2 + 162;
-        if ( pNumActiveItem < pNumActiveItem + pDialogueWindow->pNumPresenceButton )
+        v105 = (149 - item_num * v18 - all_text_height) / 2 - v18 / 2 + 162;
+        for ( int i = pDialogueWindow->pStartingPosActiveItem;
+                  i < pDialogueWindow->pNumPresenceButton + pDialogueWindow->pStartingPosActiveItem; i++ )
         {
-          pItemNum = 2;
-          do
+          pButton = pDialogueWindow->GetControl(i);
+          if ( !byte_4ED970_skill_learn_ability_by_class_table[pPlayers[uActiveCharacter]->classType][pButton->msg_param - 36]
+             || pPlayers[uActiveCharacter]->pActiveSkills[pButton->msg_param - 36] )
           {
-            pButton = pDialogueWindow->GetControl(pItemNum);
-            v13 = pButton->msg_param - 36;
-            if ( !byte_4ED970_skill_learn_ability_by_class_table[pPlayer->classType][v13] || pPlayer->pActiveSkills[v13] )
-            {
-              pButton->uW = 0;
-              pButton->uHeight = 0;
-              pButton->uY = 0;
-            }
-            else
-            {
-              pButton->uY = v18 + v105;
-              pTextHeight = pFontArrus->CalcTextHeight(pSkillNames[v13], &dialog_window, 0, 0);
-              pButton->uHeight = pTextHeight;
-              v105 = pButton->uY + pTextHeight - 1;
-              pButton->uW = v105;
-              pColorText = pColorYellow;
-              if ( pDialogueWindow->pCurrentPosActiveItem != pItemNum )
-                pColorText = pColorWhite;
-              dialog_window.DrawTitleText(pFontArrus, 0, pButton->uY, pColorText, pSkillNames[v13], 3);
-            }
-            pNumActiveItem = pDialogueWindow->pNumPresenceButton + pDialogueWindow->pStartingPosActiveItem;
-            pItemNum++;
+            pButton->uW = 0;
+            pButton->uHeight = 0;
+            pButton->uY = 0;
           }
-          while ( pItemNum < pNumActiveItem );
+          else
+          {
+            pButton->uY = v18 + v105;
+            pButton->uHeight = pFontArrus->CalcTextHeight(pSkillNames[pButton->msg_param - 36], &dialog_window, 0, 0);
+            v105 = pButton->uY + pFontArrus->CalcTextHeight(pSkillNames[pButton->msg_param - 36], &dialog_window, 0, 0) - 1;
+            pButton->uW = v105;
+            pColorText = TargetColor(0xE1u, 0xCDu, 0x23u);
+            if ( pDialogueWindow->pCurrentPosActiveItem != i )
+              pColorText = TargetColor(0xFFu, 0xFFu, 0xFFu);
+            dialog_window.DrawTitleText(pFontArrus, 0, pButton->uY, pColorText, pSkillNames[pButton->msg_param - 36], 3);
+          }
         }
         return;
       }
     }
     default:
-    {
-      return;// (POINT *)dialog_menu_id - 96;
-    }
+      __debugbreak();
   }
 }
+
 //----- (004B4FCF) --------------------------------------------------------
 void MagicShopDialog()
 {
@@ -1930,7 +1321,7 @@
       DrawTextAtStatusBar(v69, 0);
       if ( !v117 )
       {
-        dialog_window.DrawCurrentTime( pParty->PartyTimes.Shops_next_generation_time[(unsigned int)window_SpeakInHouse->ptr_1C] - pParty->uTimePlayed);
+        dialog_window.DrawCurrentTime( pParty->field_3C.Shops_next_generation_time[(unsigned int)window_SpeakInHouse->ptr_1C] - pParty->uTimePlayed);
         return;
       }
       v70 = pMouse->GetCursorPos(&v102);
@@ -2061,7 +1452,7 @@
       DrawTextAtStatusBar(v69, 0);
       if ( !v117 )
       {
-        dialog_window.DrawCurrentTime( pParty->PartyTimes.Shops_next_generation_time[(unsigned int)window_SpeakInHouse->ptr_1C] - pParty->uTimePlayed);
+        dialog_window.DrawCurrentTime( pParty->field_3C.Shops_next_generation_time[(unsigned int)window_SpeakInHouse->ptr_1C] - pParty->uTimePlayed);
         return;
       }
       v70 = pMouse->GetCursorPos(&v102);
@@ -2667,7 +2058,7 @@
       PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_Greeting_2);
       return;
     }
-    if ( (signed __int64)pParty->PartyTimes._shop_ban_times[(unsigned int)window_SpeakInHouse->ptr_1C]<= (signed __int64)pParty->uTimePlayed )
+    if ( (signed __int64)pParty->field_3C._shop_ban_times[(unsigned int)window_SpeakInHouse->ptr_1C]<= (signed __int64)pParty->uTimePlayed )
     {
       if ( pParty->uNumGold <= 10000 )
       {
--- a/UI/UITransition.cpp	Mon Sep 30 05:48:32 2013 +0200
+++ b/UI/UITransition.cpp	Mon Sep 30 05:59:06 2013 +0200
@@ -23,28 +23,20 @@
 
 
 
-
 //----- (00444839) --------------------------------------------------------
 void TransitionUI_Load(uint anim_id, uint exit_pic_id, int x, int y, int z, int directiony, int directionx, int a8, const char *pLocationName)
 {
-  //unsigned int v9; // ebx@1
-  //int v10; // edi@1
-  //signed int v11; // eax@1
   unsigned int v12; // eax@6
   const char *v13; // ST0C_4@6
   unsigned int v14; // eax@8
   const char *v15; // eax@14
   unsigned int v16; // eax@16
-  //unsigned int result; // eax@26
   const char *v18; // [sp-8h] [bp-40h]@9
-  //const char *v19; // [sp-4h] [bp-3Ch]@2
   char *v20; // [sp-4h] [bp-3Ch]@9
   const char *v21; // [sp-4h] [bp-3Ch]@11
   char pContainer[40]; // [sp+Ch] [bp-2Ch]@1
   unsigned int v23; // [sp+34h] [bp-4h]@1
 
-  //v9 = a1;
-  //v10 = a2;
   v23 = IndoorLocation::GetLocationIndex(pLocationName);
   dword_59117C_teleportx = x;
   dword_591178_teleporty = y;
--- a/mm7_data.cpp	Mon Sep 30 05:48:32 2013 +0200
+++ b/mm7_data.cpp	Mon Sep 30 05:59:06 2013 +0200
@@ -1326,7 +1326,7 @@
 std::array<int, 32> dword_F1B430; // weak
 //int dword_F8B144; // nexindex [-1] to the following
 std::array<int, 4> player_levels = {{1, 1, 1, 1}};
-std::array<__int16, 777> word_F8B158; // weak
+std::array<__int16, 6> weapons_Ypos; // word_F8B158
 struct Texture *ShopTexture; // idb
 std::array<struct Texture *, 12> ItemsInShopTexture;
 __int16 bountyHunting_monster_id_for_hunting; // word_F8B1A0
--- a/mm7_data.h	Mon Sep 30 05:48:32 2013 +0200
+++ b/mm7_data.h	Mon Sep 30 05:59:06 2013 +0200
@@ -984,7 +984,7 @@
 extern char byte_AE5B91; // weak
 extern std::array<int, 32> dword_F1B430; // weak
 extern std::array<int, 4> player_levels;
-extern std::array<__int16, 777> word_F8B158; // weak
+extern std::array<__int16, 6> weapons_Ypos; // word_F8B158
 extern struct Texture *ShopTexture; // idb
 extern std::array<struct Texture *, 12> ItemsInShopTexture;
 extern __int16 bountyHunting_monster_id_for_hunting; // weak