Mercurial > mm7

comparison mm7_2.cpp @ 785:a821bbace194

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
m
author Ritor1
date Sun, 24 Mar 2013 09:18:51 +0600
parents 45615cacad31
children da80bd2922df
comparison
equal deleted inserted replaced
774:c319601893af 785:a821bbace194
926 //else 926 //else
927 if ( in_current_building_type != BildingType_Training ) 927 if ( in_current_building_type != BildingType_Training )
928 { 928 {
929 v8 = window_SpeakInHouse; 929 v8 = window_SpeakInHouse;
930 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) &&
931 array_4F09B0[byte_4F0CD0[(unsigned int)window_SpeakInHouse->ptr_1C - 1][uMessageParam - 1]].pSchedule[pParty->uDaysPlayed % 7] 931 travel_schedule[byte_4F0CD0[(unsigned int)window_SpeakInHouse->ptr_1C - 1][uMessageParam - 1]].pSchedule[pParty->uDaysPlayed % 7]
932 || in_current_building_type != BildingType_Temple || uMessageParam != BildingType_MindGuild ) 932 || in_current_building_type != BildingType_Temple || uMessageParam != BildingType_MindGuild )
933 { 933 {
934 //LABEL_9: 934 //LABEL_9:
935 pDialogueWindow->Release(); 935 pDialogueWindow->Release();
936 pDialogueWindow = GUIWindow::Create(0, 0, 640, 0x159u, WINDOW_MainMenu, 0, 0); 936 pDialogueWindow = GUIWindow::Create(0, 0, 640, 0x159u, WINDOW_MainMenu, 0, 0);