Mercurial > mm7

comparison GUIWindow.cpp @ 502:dd5124185551

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Fri, 01 Mar 2013 17:38:04 +0600
parents 89e360b3a0fd 0e20e886365d
children 663c4f618f56
comparison
equal deleted inserted replaced
501:6fa3ff8ef729 502:dd5124185551
401 } 401 }
402 v1->pControlsHead = 0; 402 v1->pControlsHead = 0;
403 v1->pControlsTail = 0; 403 v1->pControlsTail = 0;
404 v1->uNumControls = 0; 404 v1->uNumControls = 0;
405 v1->eWindowType = WINDOW_null; 405 v1->eWindowType = WINDOW_null;
406 v10 = v1->field_3C; 406 v10 = v1->numVisibleWindows;
407 v11 = uNumVisibleWindows; 407 v11 = uNumVisibleWindows;
408 while ( v10 < v11 ) 408 while ( v10 < v11 )
409 { 409 {
410 v12 = pVisibleWindowsIdxs[v10 + 1]; 410 v12 = pVisibleWindowsIdxs[v10 + 1];
411 pVisibleWindowsIdxs[v10] = v12; 411 pVisibleWindowsIdxs[v10] = v12;
1144 SimpleHouseAndBoatsDialog(); 1144 SimpleHouseAndBoatsDialog();
1145 } 1145 }
1146 else 1146 else
1147 { 1147 {
1148 sprintfex( pTmpBuf, pGlobalTXT_LocalizationStrings[429], 1148 sprintfex( pTmpBuf, pGlobalTXT_LocalizationStrings[429],
1149 //p2DEvents_minus1_::08[13 * (unsigned int)ptr_507BC0->ptr_1C],
1150 p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].pProprieterName, 1149 p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].pProprieterName,
1151 //p2DEvents_minus1__10[13 * (unsigned int)ptr_507BC0->ptr_1C]);
1152 p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].pProprieterTitle); 1150 p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].pProprieterTitle);
1153 v18.DrawTitleText(pFontCreate, 0x1E3u, 0x71u, v19, pTmpBuf, 3u); 1151 v18.DrawTitleText(pFontCreate, 0x1E3u, 0x71u, v19, pTmpBuf, 3u);
1154 switch ( in_current_building_type ) 1152 switch ( in_current_building_type )
1155 { 1153 {
1156 case BildingType_WeaponShop: 1154 case BildingType_WeaponShop:
1171 case BildingType_EarthGuild: 1169 case BildingType_EarthGuild:
1172 case BildingType_SpiritGuild: 1170 case BildingType_SpiritGuild:
1173 case BildingType_MindGuild: 1171 case BildingType_MindGuild:
1174 case BildingType_BodyGuild: 1172 case BildingType_BodyGuild:
1175 case BildingType_LightGuild: 1173 case BildingType_LightGuild:
1176 case BildingType_Dark: 1174 case BildingType_DarkGuild:
1177 //case BildingType_14:
1178 //case BildingType_15:
1179 //case BildingType_16:
1180 GuildDialog(); 1175 GuildDialog();
1181 break; 1176 break;
1182 case BildingType_18: 1177 case BildingType_18:
1183 __debugbreak; //What over the dialog? 1178 __debugbreak; //What over the dialog?
1184 sub_4B6478(); 1179 sub_4B6478();
1191 break; 1186 break;
1192 case BildingType_Bank: 1187 case BildingType_Bank:
1193 BankDialog(); 1188 BankDialog();
1194 break; 1189 break;
1195 case BildingType_Temple: 1190 case BildingType_Temple:
1196 TampleDialog(); 1191 TempleDialog();
1197 break; 1192 break;
1198 case BildingType_Stables: 1193 case BildingType_Stables:
1199 TravelByTransport(); 1194 TravelByTransport();
1200 break; 1195 break;
1201 case BildingType_Training: 1196 case BildingType_Training:
1782 ++v10; 1777 ++v10;
1783 pWindow->uFrameY = uY; 1778 pWindow->uFrameY = uY;
1784 pWindow->uFrameHeight = uHeight; 1779 pWindow->uFrameHeight = uHeight;
1785 pWindow->eWindowType = eWindowType; 1780 pWindow->eWindowType = eWindowType;
1786 pWindow->field_44 = 0; 1781 pWindow->field_44 = 0;
1787 uNumVisibleWindows = v10; 1782 ++uNumVisibleWindows;
1788 pWindow->field_3C = v10; 1783 pWindow->numVisibleWindows = uNumVisibleWindows;
1789 pVisibleWindowsIdxs[v10] = uNextFreeWindowID + 1; 1784 pVisibleWindowsIdxs[uNumVisibleWindows] = uNextFreeWindowID + 1;
1790 if ( (signed int)eWindowType <= 20 ) 1785 if ( (signed int)eWindowType <= 20 )
1791 { 1786 {
1792 if (eWindowType != WINDOW_Chest) 1787 if (eWindowType != WINDOW_Chest)
1793 { 1788 {
1794 switch (eWindowType) 1789 switch (eWindowType)
1799 case WINDOW_Dialogue: 1794 case WINDOW_Dialogue:
1800 pMainScreenNum = pCurrentScreen; 1795 pMainScreenNum = pCurrentScreen;
1801 pCurrentScreen = SCREEN_NPC_DIALOGUE; 1796 pCurrentScreen = SCREEN_NPC_DIALOGUE;
1802 pBtn_ExitCancel = pWindow->CreateButton(0x1D7u, 0x1BDu, 0xA9u, 0x23u, 1, 0, 0x71u, 0, 0, pGlobalTXT_LocalizationStrings[79], //"Exit" 1797 pBtn_ExitCancel = pWindow->CreateButton(0x1D7u, 0x1BDu, 0xA9u, 0x23u, 1, 0, 0x71u, 0, 0, pGlobalTXT_LocalizationStrings[79], //"Exit"
1803 (Texture *)(uTextureID_506438 != -1 ? &pIcons_LOD->pTextures[uTextureID_506438] : 0), 0); 1798 (Texture *)(uTextureID_506438 != -1 ? &pIcons_LOD->pTextures[uTextureID_506438] : 0), 0);
1804 if ( pWindow->ptr_1C != (void *)1 ) 1799 if ( pWindow->par1C != 1 )
1805 { 1800 {
1806 num_menu_buttons = 0; 1801 num_menu_buttons = 0;
1807 v11 = LOBYTE(pFontArrus->uFontHeight) - 3; 1802 v11 = LOBYTE(pFontArrus->uFontHeight) - 3;
1808 speakingNPC = GetNPCData(uDialogue_SpeakingActorNPC_ID); 1803 speakingNPC = GetNPCData(uDialogue_SpeakingActorNPC_ID);
1809 if ( sub_445C8B(uDialogue_SpeakingActorNPC_ID) == 1 ) 1804 if ( sub_445C8B(uDialogue_SpeakingActorNPC_ID) == 1 )