Mercurial > mm7

comparison mm7_2.cpp @ 739:e0a8cc28caeb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Fri, 22 Mar 2013 09:14:45 +0600
parents 9f596a163257
children de482c901171
comparison
equal deleted inserted replaced
738:7378398c34e4 739:e0a8cc28caeb
810 return; 810 return;
811 } 811 }
812 812
813 813
814 //----- (004BCA33) -------------------------------------------------------- 814 //----- (004BCA33) --------------------------------------------------------
815 GUIButton *__cdecl UI_CreateEndConversationButton() 815 void UI_CreateEndConversationButton()
816 { 816 {
817 pDialogueWindow->Release(); 817 pDialogueWindow->Release();
818 pDialogueWindow = GUIWindow::Create(0, 0, 640, 345, WINDOW_MainMenu, 0, 0); 818 pDialogueWindow = GUIWindow::Create(0, 0, 640, 345, WINDOW_MainMenu, 0, 0);
819 pBtn_ExitCancel = pDialogueWindow->CreateButton( 471, 445, 169, 35, 1, 0, 0x71u, 0, 0, 819 pBtn_ExitCancel = pDialogueWindow->CreateButton( 471, 445, 169, 35, 1, 0, 0x71u, 0, 0,
820 pGlobalTXT_LocalizationStrings[74], //"End Conversation" 820 pGlobalTXT_LocalizationStrings[74], //"End Conversation"
821 (Texture *)(uExitCancelTextureId != -1 ? &pIcons_LOD->pTextures[uExitCancelTextureId] : NULL), 821 pIcons_LOD->GetTexture(uExitCancelTextureId), 0);
822 0); 822 pDialogueWindow->CreateButton(8, 8, 450, 320, 1, 0, 0x51u, 0, 0, "", 0);
823 return pDialogueWindow->CreateButton(8, 8, 450, 320, 1, 0, 0x51u, 0, 0, "", 0);
824 } 823 }
825 824
826 //----- (004BCACC) -------------------------------------------------------- 825 //----- (004BCACC) --------------------------------------------------------
827 void __fastcall OnSelectShopDialogueOption(signed int uMessageParam) 826 void __fastcall OnSelectShopDialogueOption(signed int uMessageParam)
828 { 827 {
926 } 925 }
927 //else 926 //else
928 if ( in_current_building_type != BildingType_Training ) 927 if ( in_current_building_type != BildingType_Training )
929 { 928 {
930 v8 = window_SpeakInHouse; 929 v8 = window_SpeakInHouse;
931 if ( (in_current_building_type == BildingType_Stables || in_current_building_type == BildingType_Boats) 930 if ((in_current_building_type == BildingType_Stables || in_current_building_type == BildingType_Boats) &&
932 && (*(&byte_4F09B1[32 * (unsigned __int8)*(&byte_4F0CCF[4 * (unsigned int)window_SpeakInHouse->ptr_1C] + uMessageParam)] + pParty->uDaysPlayed % 7)) 931 array_4F09B0[byte_4F0CD0[(unsigned int)window_SpeakInHouse->ptr_1C - 1][uMessageParam - 1]].pSchedule[pParty->uDaysPlayed % 7]
933 || in_current_building_type != BildingType_Temple || uMessageParam != BildingType_MindGuild ) 932 || in_current_building_type != BildingType_Temple || uMessageParam != BildingType_MindGuild )
934 { 933 {
935 //LABEL_9: 934 //LABEL_9:
936 pDialogueWindow->Release(); 935 pDialogueWindow->Release();
937 pDialogueWindow = GUIWindow::Create(0, 0, 640, 0x159u, WINDOW_MainMenu, 0, 0); 936 pDialogueWindow = GUIWindow::Create(0, 0, 640, 0x159u, WINDOW_MainMenu, 0, 0);