Mercurial > mm7
diff mm7_4.cpp @ 747:585490c29945
House dialogue ids appended
author | Nomad |
---|---|
date | Fri, 22 Mar 2013 21:50:41 +0200 |
parents | 852ec78d9548 |
children | f39fbeb65b28 |
line wrap: on
line diff
--- a/mm7_4.cpp Fri Mar 22 23:46:32 2013 +0600 +++ b/mm7_4.cpp Fri Mar 22 21:50:41 2013 +0200 @@ -7786,7 +7786,7 @@ pParty->field_709 = 0; Party__CountHirelings(); PrepareHouse((HOUSE_ID)(int)window_SpeakInHouse->ptr_1C); - dialog_menu_id = 1; + dialog_menu_id = HOUSE_DIALOGUE_MAIN; pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 ) @@ -8772,7 +8772,7 @@ //----- (004B3EF0) -------------------------------------------------------- void DrawJoinGuildWindow( int pEventCode ) - { +{ uDialogueType = 81;//enum JoinGuildDialog ptr_F8B1E8 = (char *)pNPCTopics[pEventCode + 99].pText; ContractSelectText(pEventCode); @@ -8783,7 +8783,7 @@ pDialogueWindow->CreateButton(0, 0, 0, 0, 1, 0, 0x51u, 0, 0, "", 0); pDialogueWindow->CreateButton(0x1E0u, 0xA0u, 0x8Cu, 0x1Eu, 1, 0, 0xAFu, 0x52u, 0, pGlobalTXT_LocalizationStrings[122], 0); pDialogueWindow->_41D08F(1, 1, 0, 2); - dialog_menu_id = -1; + dialog_menu_id = HOUSE_DIALOGUE_OTHER; } // F8B19C: using guessed type int dword_F8B19C; @@ -8809,7 +8809,7 @@ v2 = pGlobalTXT_LocalizationStrings[535]; pDialogueWindow->CreateButton(0x1E0u, 0xA0u, 0x8Cu, 0x1Eu, 1, 0, 0xAFu, 0x4Fu, 0, v2, 0); pDialogueWindow->_41D08F(1, 1, 0, 2); - dialog_menu_id = -1; + dialog_menu_id = HOUSE_DIALOGUE_OTHER; } // F8B19C: using guessed type int dword_F8B19C; // F8B1A8: using guessed type int dword_F8B1A8; @@ -8838,7 +8838,7 @@ pDialogueWindow->CreateButton( 0x1E0u, 30 * v0 + 160, 0x8Cu, 0x1Eu, 1, 0, 0xAFu, 0x4Cu, 0, pGlobalTXT_LocalizationStrings[406], 0); //"Hire" pDialogueWindow->_41D08F(v0 + 1, 1, 0, 2); - dialog_menu_id = -1; + dialog_menu_id = HOUSE_DIALOGUE_OTHER; } @@ -8958,7 +8958,7 @@ pDialogueWindow->_41D08F(num_menu_buttons, 1, 0, 2); dword_F8B1E0 = pDialogueWindow->pNumPresenceButton; } - dialog_menu_id = 1; + dialog_menu_id = HOUSE_DIALOGUE_MAIN; } } @@ -9843,7 +9843,7 @@ } else { - dialog_menu_id = 1; + dialog_menu_id = HOUSE_DIALOGUE_MAIN; pAudioPlayer->PlaySound(SOUND_27, 0, 0, -1, 0, 0, 0, 0); } }