Mercurial > mm7
comparison 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 |
comparison
equal
deleted
inserted
replaced
1428:50d1412cd2c0 | 1429:c7489dd19f88 |
---|---|
564 GUIButton *pButton; // eax@26 | 564 GUIButton *pButton; // eax@26 |
565 unsigned int v28; // ecx@26 | 565 unsigned int v28; // ecx@26 |
566 int v29; // edx@26 | 566 int v29; // edx@26 |
567 signed int v31; // esi@31 | 567 signed int v31; // esi@31 |
568 unsigned int v32; // eax@33 | 568 unsigned int v32; // eax@33 |
569 int v33; // eax@34 | 569 //int v33; // eax@34 |
570 int v35; // eax@35 | 570 int v35; // eax@35 |
571 char *v36; // edx@36 | 571 char *v36; // edx@36 |
572 signed int v38; // esi@42 | 572 signed int v38; // esi@42 |
573 unsigned int v39; // esi@44 | 573 unsigned int v39; // esi@44 |
574 int v40; // eax@44 | 574 int v40; // eax@44 |
613 signed int v93; // edx@114 | 613 signed int v93; // edx@114 |
614 POINT *v94; // edi@120 | 614 POINT *v94; // edi@120 |
615 __int32 v95; // ecx@120 | 615 __int32 v95; // ecx@120 |
616 void *v96; // ST14_4@122 | 616 void *v96; // ST14_4@122 |
617 unsigned __int8 v97; // bl@122 | 617 unsigned __int8 v97; // bl@122 |
618 ItemGen *v98; // ST10_4@122 | 618 //ItemGen *v98; // ST10_4@122 |
619 int v99; // eax@122 | 619 int v99; // eax@122 |
620 char *v100; // eax@122 | 620 char *v100; // eax@122 |
621 const char *v101; // ST18_4@122 | 621 const char *v101; // ST18_4@122 |
622 unsigned __int16 v102; // ST14_2@122 | 622 unsigned __int16 v102; // ST14_2@122 |
623 int v103; // eax@122 | 623 int v103; // eax@122 |
666 int v153; // [sp+100h] [bp-4h]@44 | 666 int v153; // [sp+100h] [bp-4h]@44 |
667 int th; | 667 int th; |
668 short text_color; | 668 short text_color; |
669 int pActiveButton; | 669 int pActiveButton; |
670 | 670 |
671 __debugbreak(); // uishops.cpp(952): warning C4700: uninitialized local variable 'v33' used | 671 //__debugbreak(); // uishops.cpp(952): warning C4700: uninitialized local variable 'v33' used |
672 __debugbreak(); // uishops.cpp(981): warning C4700: uninitialized local variable 'v98' used | 672 //__debugbreak(); // uishops.cpp(981): warning C4700: uninitialized local variable 'v98' used |
673 memcpy(&dialog_window, window_SpeakInHouse, sizeof(dialog_window)); | 673 memcpy(&dialog_window, window_SpeakInHouse, sizeof(dialog_window)); |
674 dialog_window.uFrameX = 483; | 674 dialog_window.uFrameX = 483; |
675 dialog_window.uFrameWidth = 148; | 675 dialog_window.uFrameWidth = 148; |
676 dialog_window.uFrameZ = 334; | 676 dialog_window.uFrameZ = 334; |
677 pWhiteColor = TargetColor(0xFFu, 0xFFu, 0xFFu); | 677 pWhiteColor = TargetColor(0xFFu, 0xFFu, 0xFFu); |
949 pMouse->GetCursorPos(&v140)->x <= 13) | 949 pMouse->GetCursorPos(&v140)->x <= 13) |
950 || pMouse->GetCursorPos(&v138)->x >= 462 | 950 || pMouse->GetCursorPos(&v138)->x >= 462 |
951 || (v32 = pPlayers[uActiveCharacter]->GetItemIDAtInventoryIndex((int *)&pItemCount), v11 = 0, !v32) | 951 || (v32 = pPlayers[uActiveCharacter]->GetItemIDAtInventoryIndex((int *)&pItemCount), v11 = 0, !v32) |
952 || (!(pPlayers[uActiveCharacter]->pOwnItems[v32-1].uAttributes& 2)) ) | 952 || (!(pPlayers[uActiveCharacter]->pOwnItems[v32-1].uAttributes& 2)) ) |
953 return; | 953 return; |
954 __debugbreak(); // warning C4700: uninitialized local variable 'v33' used | 954 //__debugbreak(); // warning C4700: uninitialized local variable 'v33' used |
955 v116 = &pPlayers[uActiveCharacter]->pInventoryItemList[v33 - 1]; | 955 v116 = &pPlayers[uActiveCharacter]->pInventoryItemList[v32 - 1]; |
956 v35 = pPlayers[uActiveCharacter]->SelectPhrasesTransaction(&pPlayers[uActiveCharacter]->pInventoryItemList[v32 - 1], BuildingType_ArmorShop, window_SpeakInHouse->par1C, 5); | 956 v35 = pPlayers[uActiveCharacter]->SelectPhrasesTransaction(&pPlayers[uActiveCharacter]->pInventoryItemList[v32 - 1], BuildingType_ArmorShop, window_SpeakInHouse->par1C, 5); |
957 v15 = (char *)pMerchantsRepairPhrases[v35]; | 957 v15 = (char *)pMerchantsRepairPhrases[v35]; |
958 v36 = BuildDialogueString(v15, uActiveCharacter - 1, v116, (char *)window_SpeakInHouse->ptr_1C, 5, 0); | 958 v36 = BuildDialogueString(v15, uActiveCharacter - 1, v116, (char *)window_SpeakInHouse->ptr_1C, 5, 0); |
959 v115 = (174 - pFontArrus->CalcTextHeight(v36, &dialog_window, 0, 0)) / 2 + 138; | 959 v115 = (174 - pFontArrus->CalcTextHeight(v36, &dialog_window, 0, 0)) / 2 + 138; |
960 dialog_window.DrawTitleText(pFontArrus, 0, v115, pWhiteColor, v36, 3); | 960 dialog_window.DrawTitleText(pFontArrus, 0, v115, pWhiteColor, v36, 3); |
978 v95 = pItemCount; | 978 v95 = pItemCount; |
979 if ( pItemCount && pItemCount != -65536 ) | 979 if ( pItemCount && pItemCount != -65536 ) |
980 { | 980 { |
981 --pItemCount; | 981 --pItemCount; |
982 v97 = uActiveCharacter - 1; | 982 v97 = uActiveCharacter - 1; |
983 __debugbreak(); // warning C4700: uninitialized local variable 'v98' used | 983 //__debugbreak(); // warning C4700: uninitialized local variable 'v98' used |
984 v99 = pPlayers[uActiveCharacter]->SelectPhrasesTransaction(&pParty->SpecialItemsInShops[window_SpeakInHouse->par1C][v95-1], BuildingType_ArmorShop, window_SpeakInHouse->par1C, 2); | 984 v99 = pPlayers[uActiveCharacter]->SelectPhrasesTransaction(&pParty->SpecialItemsInShops[window_SpeakInHouse->par1C][v95-1], BuildingType_ArmorShop, window_SpeakInHouse->par1C, 2); |
985 v100 = BuildDialogueString((char *)pMerchantsBuyPhrases[v99], uActiveCharacter - 1, v98, (char *)window_SpeakInHouse->par1C, 2, 0); | 985 v100 = BuildDialogueString((char *)pMerchantsBuyPhrases[v99], uActiveCharacter - 1, &pParty->SpecialItemsInShops[window_SpeakInHouse->par1C][v95-1], (char *)window_SpeakInHouse->par1C, 2, 0); |
986 v103 = pFontArrus->CalcTextHeight(v100, &dialog_window, 0, 0); | 986 v103 = pFontArrus->CalcTextHeight(v100, &dialog_window, 0, 0); |
987 dialog_window.DrawTitleText(pFontArrus, 0, (174 - v103) / 2 + 138, pWhiteColor, v100, 3); | 987 dialog_window.DrawTitleText(pFontArrus, 0, (174 - v103) / 2 + 138, pWhiteColor, v100, 3); |
988 } | 988 } |
989 v104 = 0; | 989 v104 = 0; |
990 v153 = 0; | 990 v153 = 0; |