diff UI/UIShops.cpp @ 1429:c7489dd19f88

BuildingType_Tavern and CastSpellInfo_PushCastSpellInfo fix
author Ritor1
date Thu, 01 Aug 2013 17:51:16 +0600
parents 2423bc2af692
children 934074e7fcc1
line wrap: on
line diff
--- a/UI/UIShops.cpp	Thu Aug 01 09:26:13 2013 +0600
+++ b/UI/UIShops.cpp	Thu Aug 01 17:51:16 2013 +0600
@@ -566,7 +566,7 @@
   int v29; // edx@26
   signed int v31; // esi@31
   unsigned int v32; // eax@33
-  int v33; // eax@34
+  //int v33; // eax@34
   int v35; // eax@35
   char *v36; // edx@36
   signed int v38; // esi@42
@@ -615,7 +615,7 @@
   __int32 v95; // ecx@120
   void *v96; // ST14_4@122
   unsigned __int8 v97; // bl@122
-  ItemGen *v98; // ST10_4@122
+  //ItemGen *v98; // ST10_4@122
   int v99; // eax@122
   char *v100; // eax@122
   const char *v101; // ST18_4@122
@@ -668,8 +668,8 @@
   short text_color;
   int pActiveButton;
 
-  __debugbreak(); // uishops.cpp(952): warning C4700: uninitialized local variable 'v33' used
-  __debugbreak(); // uishops.cpp(981): warning C4700: uninitialized local variable 'v98' used
+  //__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;
@@ -951,8 +951,8 @@
             || (v32 = pPlayers[uActiveCharacter]->GetItemIDAtInventoryIndex((int *)&pItemCount), v11 = 0, !v32)
             || (!(pPlayers[uActiveCharacter]->pOwnItems[v32-1].uAttributes& 2)) )
         return;
-      __debugbreak(); // warning C4700: uninitialized local variable 'v33' used
-      v116 = &pPlayers[uActiveCharacter]->pInventoryItemList[v33 - 1];
+      //__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);
@@ -980,9 +980,9 @@
         {
           --pItemCount;
           v97 = uActiveCharacter - 1;
-      __debugbreak(); // warning C4700: uninitialized local variable 'v98' used
+      //__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, v98, (char *)window_SpeakInHouse->par1C, 2, 0);
+          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);
         }