Mercurial > mm7

comparison mm7_4.cpp @ 972:c8a0f6d89c70

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Some inqury on selecting Knight bug.
author Nomad
date Wed, 08 May 2013 19:54:19 +0200
parents d7f0572335ec
children ec7568e13b24
comparison
equal deleted inserted replaced
971:35f2e900618e 972:c8a0f6d89c70
7588 { 7588 {
7589 num_buttons = 3; 7589 num_buttons = 3;
7590 CreateButtonInColumn(2, 0x68u); 7590 CreateButtonInColumn(2, 0x68u);
7591 } 7591 }
7592 } 7592 }
7593 pDialogueWindow->_41D08F(num_buttons, 1, 0, 2); 7593 pDialogueWindow->_41D08F_set_keyboard_control_group(num_buttons, 1, 0, 2);
7594 dword_F8B1E0 = pDialogueWindow->pNumPresenceButton; 7594 dword_F8B1E0 = pDialogueWindow->pNumPresenceButton;
7595 } 7595 }
7596 // F8B1E0: using guessed type int dword_F8B1E0; 7596 // F8B1E0: using guessed type int dword_F8B1E0;
7597 7597
7598 //----- (004B3AD4) -------------------------------------------------------- 7598 //----- (004B3AD4) --------------------------------------------------------
7603 if ( a1 <= 3 ) 7603 if ( a1 <= 3 )
7604 { 7604 {
7605 CreateButtonInColumn(0, 3u); 7605 CreateButtonInColumn(0, 3u);
7606 CreateButtonInColumn(1, 4u); 7606 CreateButtonInColumn(1, 4u);
7607 CreateButtonInColumn(2, 5u); 7607 CreateButtonInColumn(2, 5u);
7608 pDialogueWindow->_41D08F(3, 1, 0, 2); 7608 pDialogueWindow->_41D08F_set_keyboard_control_group(3, 1, 0, 2);
7609 } 7609 }
7610 if ( a1 == 4 ) 7610 if ( a1 == 4 )
7611 { 7611 {
7612 CreateButtonInColumn(0, 3u); 7612 CreateButtonInColumn(0, 3u);
7613 CreateButtonInColumn(1, 4u); 7613 CreateButtonInColumn(1, 4u);
7614 pDialogueWindow->_41D08F(2, 1, 0, 2); 7614 pDialogueWindow->_41D08F_set_keyboard_control_group(2, 1, 0, 2);
7615 } 7615 }
7616 } 7616 }
7617 dword_F8B1E0 = pDialogueWindow->pNumPresenceButton; 7617 dword_F8B1E0 = pDialogueWindow->pNumPresenceButton;
7618 } 7618 }
7619 // F8B1E0: using guessed type int dword_F8B1E0; 7619 // F8B1E0: using guessed type int dword_F8B1E0;
7722 v17 = 2; 7722 v17 = 2;
7723 v11 = 0; 7723 v11 = 0;
7724 v10 = 1; 7724 v10 = 1;
7725 v9 = v4; 7725 v9 = v4;
7726 LABEL_42: 7726 LABEL_42:
7727 pDialogueWindow->_41D08F(v9, v10, v11, v17); 7727 pDialogueWindow->_41D08F_set_keyboard_control_group(v9, v10, v11, v17);
7728 goto LABEL_43; 7728 goto LABEL_43;
7729 } 7729 }
7730 v4 = 2; 7730 v4 = 2;
7731 v7 = 1; 7731 v7 = 1;
7732 v6 = 100; 7732 v6 = 100;
7833 { 7833 {
7834 pDialogueWindow->CreateButton(480, 160, 140, 28, 1, 0, UIMSG_SelectNPCDialogueOption, 77, 0, pGlobalTXT_LocalizationStrings[407], 0); 7834 pDialogueWindow->CreateButton(480, 160, 140, 28, 1, 0, UIMSG_SelectNPCDialogueOption, 77, 0, pGlobalTXT_LocalizationStrings[407], 0);
7835 v1 = 1; 7835 v1 = 1;
7836 } 7836 }
7837 pDialogueWindow->CreateButton(480, 30 * v1 + 160, 140, 30, 1, 0, UIMSG_SelectNPCDialogueOption, 76, 0, pGlobalTXT_LocalizationStrings[406], 0);//Нанять 7837 pDialogueWindow->CreateButton(480, 30 * v1 + 160, 140, 30, 1, 0, UIMSG_SelectNPCDialogueOption, 76, 0, pGlobalTXT_LocalizationStrings[406], 0);//Нанять
7838 pDialogueWindow->_41D08F(v1 + 1, 1, 0, 1); 7838 pDialogueWindow->_41D08F_set_keyboard_control_group(v1 + 1, 1, 0, 1);
7839 } 7839 }
7840 7840
7841 //----- (004B3EF0) -------------------------------------------------------- 7841 //----- (004B3EF0) --------------------------------------------------------
7842 void DrawJoinGuildWindow( int pEventCode ) 7842 void DrawJoinGuildWindow( int pEventCode )
7843 { 7843 {
7847 pDialogueWindow->Release(); 7847 pDialogueWindow->Release();
7848 pDialogueWindow = GUIWindow::Create(0, 0, 640, 0x15E, WINDOW_MainMenu, pEventCode, 0); 7848 pDialogueWindow = GUIWindow::Create(0, 0, 640, 0x15E, WINDOW_MainMenu, pEventCode, 0);
7849 pBtn_ExitCancel = pDialogueWindow->CreateButton(471, 445, 169, 35, 1, 0, UIMSG_Escape, 0, 0, pGlobalTXT_LocalizationStrings[34], pIcons_LOD->GetTexture(uExitCancelTextureId), 0); // Cancel 7849 pBtn_ExitCancel = pDialogueWindow->CreateButton(471, 445, 169, 35, 1, 0, UIMSG_Escape, 0, 0, pGlobalTXT_LocalizationStrings[34], pIcons_LOD->GetTexture(uExitCancelTextureId), 0); // Cancel
7850 pDialogueWindow->CreateButton( 0, 0, 0, 0, 1, 0, UIMSG_BuyInShop_Identify_Repair, 0, 0, "", 0); 7850 pDialogueWindow->CreateButton( 0, 0, 0, 0, 1, 0, UIMSG_BuyInShop_Identify_Repair, 0, 0, "", 0);
7851 pDialogueWindow->CreateButton(480, 160, 140, 30, 1, 0, UIMSG_ClickNPCTopic, 0x52u, 0, pGlobalTXT_LocalizationStrings[122], 0); 7851 pDialogueWindow->CreateButton(480, 160, 140, 30, 1, 0, UIMSG_ClickNPCTopic, 0x52u, 0, pGlobalTXT_LocalizationStrings[122], 0);
7852 pDialogueWindow->_41D08F(1, 1, 0, 2); 7852 pDialogueWindow->_41D08F_set_keyboard_control_group(1, 1, 0, 2);
7853 dialog_menu_id = HOUSE_DIALOGUE_OTHER; 7853 dialog_menu_id = HOUSE_DIALOGUE_OTHER;
7854 } 7854 }
7855 // F8B19C: using guessed type int dword_F8B19C; 7855 // F8B19C: using guessed type int dword_F8B19C;
7856 7856
7857 //----- (004B3FE5) -------------------------------------------------------- 7857 //----- (004B3FE5) --------------------------------------------------------
7871 pGlobalTXT_LocalizationStrings[34], pIcons_LOD->GetTexture(uExitCancelTextureId), 0); 7871 pGlobalTXT_LocalizationStrings[34], pIcons_LOD->GetTexture(uExitCancelTextureId), 0);
7872 pDialogueWindow->CreateButton(0, 0, 0, 0, 1, 0, UIMSG_BuyInShop_Identify_Repair, 0, 0, "", 0); 7872 pDialogueWindow->CreateButton(0, 0, 0, 0, 1, 0, UIMSG_BuyInShop_Identify_Repair, 0, 0, "", 0);
7873 if ( contract_approved ) 7873 if ( contract_approved )
7874 v2 = pGlobalTXT_LocalizationStrings[535]; 7874 v2 = pGlobalTXT_LocalizationStrings[535];
7875 pDialogueWindow->CreateButton(0x1E0u, 0xA0u, 0x8Cu, 0x1Eu, 1, 0, UIMSG_ClickNPCTopic, 0x4Fu, 0, v2, 0); 7875 pDialogueWindow->CreateButton(0x1E0u, 0xA0u, 0x8Cu, 0x1Eu, 1, 0, UIMSG_ClickNPCTopic, 0x4Fu, 0, v2, 0);
7876 pDialogueWindow->_41D08F(1, 1, 0, 2); 7876 pDialogueWindow->_41D08F_set_keyboard_control_group(1, 1, 0, 2);
7877 dialog_menu_id = HOUSE_DIALOGUE_OTHER; 7877 dialog_menu_id = HOUSE_DIALOGUE_OTHER;
7878 } 7878 }
7879 // F8B19C: using guessed type int dword_F8B19C; 7879 // F8B19C: using guessed type int dword_F8B19C;
7880 // F8B1A8: using guessed type int dword_F8B1A8; 7880 // F8B1A8: using guessed type int dword_F8B1A8;
7881 7881
7900 pGlobalTXT_LocalizationStrings[407], 0);//"More Information" 7900 pGlobalTXT_LocalizationStrings[407], 0);//"More Information"
7901 v0 = 1; 7901 v0 = 1;
7902 } 7902 }
7903 pDialogueWindow->CreateButton( 0x1E0u, 30 * v0 + 160, 0x8Cu, 0x1Eu, 1, 0, UIMSG_ClickNPCTopic, 0x4Cu, 0, 7903 pDialogueWindow->CreateButton( 0x1E0u, 30 * v0 + 160, 0x8Cu, 0x1Eu, 1, 0, UIMSG_ClickNPCTopic, 0x4Cu, 0,
7904 pGlobalTXT_LocalizationStrings[406], 0); //"Hire" 7904 pGlobalTXT_LocalizationStrings[406], 0); //"Hire"
7905 pDialogueWindow->_41D08F(v0 + 1, 1, 0, 2); 7905 pDialogueWindow->_41D08F_set_keyboard_control_group(v0 + 1, 1, 0, 2);
7906 dialog_menu_id = HOUSE_DIALOGUE_OTHER; 7906 dialog_menu_id = HOUSE_DIALOGUE_OTHER;
7907 } 7907 }
7908 7908
7909 //----- (004B4224) -------------------------------------------------------- 7909 //----- (004B4224) --------------------------------------------------------
7910 void _4B4224_UpdateNPCTopics( int _this ) 7910 void _4B4224_UpdateNPCTopics( int _this )
8013 v16 = NPC_EventProcessor(v17->evt_F); 8013 v16 = NPC_EventProcessor(v17->evt_F);
8014 if ( v16 == 1 || v16 == 2 ) 8014 if ( v16 == 1 || v16 == 2 )
8015 pDialogueWindow->CreateButton( 0x1E0u, 30 * num_menu_buttons++ + 160, 0x8Cu, 0x1Eu, 1, 0, UIMSG_ClickNPCTopic, 0x18u, 0, "", 0); 8015 pDialogueWindow->CreateButton( 0x1E0u, 30 * num_menu_buttons++ + 160, 0x8Cu, 0x1Eu, 1, 0, UIMSG_ClickNPCTopic, 0x18u, 0, "", 0);
8016 } 8016 }
8017 } 8017 }
8018 pDialogueWindow->_41D08F(num_menu_buttons, 1, 0, 2); 8018 pDialogueWindow->_41D08F_set_keyboard_control_group(num_menu_buttons, 1, 0, 2);
8019 dword_F8B1E0 = pDialogueWindow->pNumPresenceButton; 8019 dword_F8B1E0 = pDialogueWindow->pNumPresenceButton;
8020 } 8020 }
8021 dialog_menu_id = HOUSE_DIALOGUE_MAIN; 8021 dialog_menu_id = HOUSE_DIALOGUE_MAIN;
8022 } 8022 }
8023 8023