Mercurial > mm7

comparison mm7_2.cpp @ 481:5b6e2021c6fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
HOUSE_ID
author Ritor1
date Tue, 26 Feb 2013 17:24:53 +0600
parents d4ea191229ff
children 4bd56919f075
comparison
equal deleted inserted replaced
480:d4ea191229ff 481:5b6e2021c6fe
3778 goto LABEL_9; 3778 goto LABEL_9;
3779 } 3779 }
3780 v8 = window_SpeakInHouse; 3780 v8 = window_SpeakInHouse;
3781 if ( (in_current_bilding_type == BildingType_Stables || in_current_bilding_type == BildingType_Boats) 3781 if ( (in_current_bilding_type == BildingType_Stables || in_current_bilding_type == BildingType_Boats)
3782 && (v1 = 0, *(&byte_4F09B1[32 * (unsigned __int8)*(&byte_4F0CCF[4 * (unsigned int)window_SpeakInHouse->ptr_1C] + uMessageParam)] + pParty->uDaysPlayed % 7)) 3782 && (v1 = 0, *(&byte_4F09B1[32 * (unsigned __int8)*(&byte_4F0CCF[4 * (unsigned int)window_SpeakInHouse->ptr_1C] + uMessageParam)] + pParty->uDaysPlayed % 7))
3783 || in_current_bilding_type != BildingType_Tample || uMessageParam != BildingType_MindGuild ) 3783 || in_current_bilding_type != BildingType_Temple || uMessageParam != BildingType_MindGuild )
3784 { 3784 {
3785 LABEL_9: 3785 LABEL_9:
3786 pDialogueWindow->Release(); 3786 pDialogueWindow->Release();
3787 pDialogueWindow = GUIWindow::Create(0, 0, 640, 0x159u, WINDOW_MainMenu, v1, v1); 3787 pDialogueWindow = GUIWindow::Create(0, 0, 640, 0x159u, WINDOW_MainMenu, v1, v1);
3788 pBtn_ExitCancel = pDialogueWindow->CreateButton(526, 445, 75, 33, 1, v1, 0x71u, v1, v1, pGlobalTXT_LocalizationStrings[74],// "End Conversation" 3788 pBtn_ExitCancel = pDialogueWindow->CreateButton(526, 445, 75, 33, 1, v1, 0x71u, v1, v1, pGlobalTXT_LocalizationStrings[74],// "End Conversation"
3815 { 3815 {
3816 if ( dword_F8B19C >= 7 && dword_F8B19C <= 8 ) 3816 if ( dword_F8B19C >= 7 && dword_F8B19C <= 8 )
3817 pKeyActionMap->EnterText(1, 10, v8); 3817 pKeyActionMap->EnterText(1, 10, v8);
3818 return; 3818 return;
3819 } 3819 }
3820 if ( in_current_bilding_type != BildingType_Tample && in_current_bilding_type != BildingType_Training ) 3820 if ( in_current_bilding_type != BildingType_Temple && in_current_bilding_type != BildingType_Training )
3821 return; 3821 return;
3822 } 3822 }
3823 else 3823 else
3824 { 3824 {
3825 if ( in_current_bilding_type != BildingType_Tavern ) 3825 if ( in_current_bilding_type != BildingType_Tavern )