Mercurial > mm7

comparison mm7_4.cpp @ 747:585490c29945

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
House dialogue ids appended
author Nomad
date Fri, 22 Mar 2013 21:50:41 +0200
parents 852ec78d9548
children f39fbeb65b28
comparison
equal deleted inserted replaced
746:852ec78d9548 747:585490c29945
7784 } 7784 }
7785 strcpy(v22, v24); 7785 strcpy(v22, v24);
7786 pParty->field_709 = 0; 7786 pParty->field_709 = 0;
7787 Party__CountHirelings(); 7787 Party__CountHirelings();
7788 PrepareHouse((HOUSE_ID)(int)window_SpeakInHouse->ptr_1C); 7788 PrepareHouse((HOUSE_ID)(int)window_SpeakInHouse->ptr_1C);
7789 dialog_menu_id = 1; 7789 dialog_menu_id = HOUSE_DIALOGUE_MAIN;
7790 7790
7791 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); 7791 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
7792 /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 ) 7792 /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 )
7793 { 7793 {
7794 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)113; 7794 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)113;
8770 pDialogueWindow->_41D08F(v1 + 1, 1, 0, 1); 8770 pDialogueWindow->_41D08F(v1 + 1, 1, 0, 1);
8771 } 8771 }
8772 8772
8773 //----- (004B3EF0) -------------------------------------------------------- 8773 //----- (004B3EF0) --------------------------------------------------------
8774 void DrawJoinGuildWindow( int pEventCode ) 8774 void DrawJoinGuildWindow( int pEventCode )
8775 { 8775 {
8776 uDialogueType = 81;//enum JoinGuildDialog 8776 uDialogueType = 81;//enum JoinGuildDialog
8777 ptr_F8B1E8 = (char *)pNPCTopics[pEventCode + 99].pText; 8777 ptr_F8B1E8 = (char *)pNPCTopics[pEventCode + 99].pText;
8778 ContractSelectText(pEventCode); 8778 ContractSelectText(pEventCode);
8779 pDialogueWindow->Release(); 8779 pDialogueWindow->Release();
8780 pDialogueWindow = GUIWindow::Create(0, 0, 640, 0x15E, WINDOW_MainMenu, pEventCode, 0); 8780 pDialogueWindow = GUIWindow::Create(0, 0, 640, 0x15E, WINDOW_MainMenu, pEventCode, 0);
8781 pBtn_ExitCancel = pDialogueWindow->CreateButton(0x1D7, 0x1BD, 0xA9, 0x23, 1, 0, 0x71, 0, 0, pGlobalTXT_LocalizationStrings[34], 8781 pBtn_ExitCancel = pDialogueWindow->CreateButton(0x1D7, 0x1BD, 0xA9, 0x23, 1, 0, 0x71, 0, 0, pGlobalTXT_LocalizationStrings[34],
8782 (Texture *)(uExitCancelTextureId != -1 ? &pIcons_LOD->pTextures[uExitCancelTextureId] : 0), 0); 8782 (Texture *)(uExitCancelTextureId != -1 ? &pIcons_LOD->pTextures[uExitCancelTextureId] : 0), 0);
8783 pDialogueWindow->CreateButton(0, 0, 0, 0, 1, 0, 0x51u, 0, 0, "", 0); 8783 pDialogueWindow->CreateButton(0, 0, 0, 0, 1, 0, 0x51u, 0, 0, "", 0);
8784 pDialogueWindow->CreateButton(0x1E0u, 0xA0u, 0x8Cu, 0x1Eu, 1, 0, 0xAFu, 0x52u, 0, pGlobalTXT_LocalizationStrings[122], 0); 8784 pDialogueWindow->CreateButton(0x1E0u, 0xA0u, 0x8Cu, 0x1Eu, 1, 0, 0xAFu, 0x52u, 0, pGlobalTXT_LocalizationStrings[122], 0);
8785 pDialogueWindow->_41D08F(1, 1, 0, 2); 8785 pDialogueWindow->_41D08F(1, 1, 0, 2);
8786 dialog_menu_id = -1; 8786 dialog_menu_id = HOUSE_DIALOGUE_OTHER;
8787 } 8787 }
8788 // F8B19C: using guessed type int dword_F8B19C; 8788 // F8B19C: using guessed type int dword_F8B19C;
8789 8789
8790 //----- (004B3FE5) -------------------------------------------------------- 8790 //----- (004B3FE5) --------------------------------------------------------
8791 void __fastcall sub_4B3FE5(int a4) 8791 void __fastcall sub_4B3FE5(int a4)
8807 pDialogueWindow->CreateButton(0, 0, 0, 0, 1, 0, 0x51u, 0, 0, "", 0); 8807 pDialogueWindow->CreateButton(0, 0, 0, 0, 1, 0, 0x51u, 0, 0, "", 0);
8808 if ( contract_approved ) 8808 if ( contract_approved )
8809 v2 = pGlobalTXT_LocalizationStrings[535]; 8809 v2 = pGlobalTXT_LocalizationStrings[535];
8810 pDialogueWindow->CreateButton(0x1E0u, 0xA0u, 0x8Cu, 0x1Eu, 1, 0, 0xAFu, 0x4Fu, 0, v2, 0); 8810 pDialogueWindow->CreateButton(0x1E0u, 0xA0u, 0x8Cu, 0x1Eu, 1, 0, 0xAFu, 0x4Fu, 0, v2, 0);
8811 pDialogueWindow->_41D08F(1, 1, 0, 2); 8811 pDialogueWindow->_41D08F(1, 1, 0, 2);
8812 dialog_menu_id = -1; 8812 dialog_menu_id = HOUSE_DIALOGUE_OTHER;
8813 } 8813 }
8814 // F8B19C: using guessed type int dword_F8B19C; 8814 // F8B19C: using guessed type int dword_F8B19C;
8815 // F8B1A8: using guessed type int dword_F8B1A8; 8815 // F8B1A8: using guessed type int dword_F8B1A8;
8816 8816
8817 //----- (004B40E6) -------------------------------------------------------- 8817 //----- (004B40E6) --------------------------------------------------------
8836 v0 = 1; 8836 v0 = 1;
8837 } 8837 }
8838 pDialogueWindow->CreateButton( 0x1E0u, 30 * v0 + 160, 0x8Cu, 0x1Eu, 1, 0, 0xAFu, 0x4Cu, 0, 8838 pDialogueWindow->CreateButton( 0x1E0u, 30 * v0 + 160, 0x8Cu, 0x1Eu, 1, 0, 0xAFu, 0x4Cu, 0,
8839 pGlobalTXT_LocalizationStrings[406], 0); //"Hire" 8839 pGlobalTXT_LocalizationStrings[406], 0); //"Hire"
8840 pDialogueWindow->_41D08F(v0 + 1, 1, 0, 2); 8840 pDialogueWindow->_41D08F(v0 + 1, 1, 0, 2);
8841 dialog_menu_id = -1; 8841 dialog_menu_id = HOUSE_DIALOGUE_OTHER;
8842 } 8842 }
8843 8843
8844 8844
8845 //----- (004B4224) -------------------------------------------------------- 8845 //----- (004B4224) --------------------------------------------------------
8846 void _4B4224_UpdateNPCTopics( int _this ) 8846 void _4B4224_UpdateNPCTopics( int _this )
8956 } 8956 }
8957 } 8957 }
8958 pDialogueWindow->_41D08F(num_menu_buttons, 1, 0, 2); 8958 pDialogueWindow->_41D08F(num_menu_buttons, 1, 0, 2);
8959 dword_F8B1E0 = pDialogueWindow->pNumPresenceButton; 8959 dword_F8B1E0 = pDialogueWindow->pNumPresenceButton;
8960 } 8960 }
8961 dialog_menu_id = 1; 8961 dialog_menu_id = HOUSE_DIALOGUE_MAIN;
8962 } 8962 }
8963 8963
8964 } 8964 }
8965 8965
8966 8966
9841 return; 9841 return;
9842 }*/ 9842 }*/
9843 } 9843 }
9844 else 9844 else
9845 { 9845 {
9846 dialog_menu_id = 1; 9846 dialog_menu_id = HOUSE_DIALOGUE_MAIN;
9847 pAudioPlayer->PlaySound(SOUND_27, 0, 0, -1, 0, 0, 0, 0); 9847 pAudioPlayer->PlaySound(SOUND_27, 0, 0, -1, 0, 0, 0, 0);
9848 } 9848 }
9849 } 9849 }
9850 } 9850 }
9851 } 9851 }