Mercurial > mm7
diff mm7_2.cpp @ 727:da130dd3092a
Big time Travel ouverhaul
| author | Nomad |
|---|---|
| date | Fri, 22 Mar 2013 00:02:31 +0200 |
| parents | 735dab8d3c9a |
| children | 9f596a163257 |
line wrap: on
line diff
--- a/mm7_2.cpp Thu Mar 21 20:30:17 2013 +0200 +++ b/mm7_2.cpp Fri Mar 22 00:02:31 2013 +0200 @@ -812,15 +812,14 @@ //----- (004BCA33) -------------------------------------------------------- -GUIButton *__cdecl UI_CreateEndConversationButton() +void UI_CreateEndConversationButton() { pDialogueWindow->Release(); pDialogueWindow = GUIWindow::Create(0, 0, 640, 345, WINDOW_MainMenu, 0, 0); pBtn_ExitCancel = pDialogueWindow->CreateButton( 471, 445, 169, 35, 1, 0, 0x71u, 0, 0, pGlobalTXT_LocalizationStrings[74], //"End Conversation" - (Texture *)(uExitCancelTextureId != -1 ? &pIcons_LOD->pTextures[uExitCancelTextureId] : NULL), - 0); - return pDialogueWindow->CreateButton(8, 8, 450, 320, 1, 0, 0x51u, 0, 0, "", 0); + pIcons_LOD->GetTexture(uExitCancelTextureId), 0); + pDialogueWindow->CreateButton(8, 8, 450, 320, 1, 0, 0x51u, 0, 0, "", 0); } //----- (004BCACC) -------------------------------------------------------- @@ -928,8 +927,8 @@ if ( in_current_building_type != BildingType_Training ) { v8 = window_SpeakInHouse; - if ( (in_current_building_type == BildingType_Stables || in_current_building_type == BildingType_Boats) - && (*(&byte_4F09B1[32 * (unsigned __int8)*(&byte_4F0CCF[4 * (unsigned int)window_SpeakInHouse->ptr_1C] + uMessageParam)] + pParty->uDaysPlayed % 7)) + if ((in_current_building_type == BildingType_Stables || in_current_building_type == BildingType_Boats) && + array_4F09B0[byte_4F0CD0[(unsigned int)window_SpeakInHouse->ptr_1C - 1][uMessageParam - 1]].pSchedule[pParty->uDaysPlayed % 7] || in_current_building_type != BildingType_Temple || uMessageParam != BildingType_MindGuild ) { //LABEL_9: