comparison UI/UIHouses.cpp @ 1465:090ff42290c4

Слияние
author Ritor1
date Mon, 26 Aug 2013 10:39:24 +0600
parents 845907a747d3
children 7ef4b64f6329
comparison
equal deleted inserted replaced
1464:b870630761df 1465:090ff42290c4
760 } 760 }
761 // F8B1E0: using guessed type int dword_F8B1E0; 761 // F8B1E0: using guessed type int dword_F8B1E0;
762 762
763 763
764 //----- (004B1784) -------------------------------------------------------- 764 //----- (004B1784) --------------------------------------------------------
765 bool __cdecl HouseUI_CheckIfPlayerCanInteract() 765 bool HouseUI_CheckIfPlayerCanInteract()
766 { 766 {
767 Player *pPlayer; // ebx@1 767 Player *pPlayer; // ebx@1
768 bool result; // eax@2 768 bool result; // eax@2
769 int v3; // eax@3 769 int v3; // eax@3
770 GUIWindow v4; // [sp+4h] [bp-54h]@3 770 GUIWindow v4; // [sp+4h] [bp-54h]@3
827 ShowStatusBarString("", 2u); 827 ShowStatusBarString("", 2u);
828 if ( pMessageQueue_50CBD0->uNumMessages ) 828 if ( pMessageQueue_50CBD0->uNumMessages )
829 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; 829 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
830 viewparams->bRedrawGameUI = 1; 830 viewparams->bRedrawGameUI = 1;
831 uDialogueType = 0; 831 uDialogueType = 0;
832 pKeyActionMap->SetWindowInputStatus(3); 832 pKeyActionMap->SetWindowInputStatus(WINDOW_INPUT_CANCELLED);
833 pKeyActionMap->ResetKeys(); 833 pKeyActionMap->ResetKeys();
834 if (uHouseID == HOUSE_600 || uHouseID == HOUSE_601) 834 if (uHouseID == HOUSE_600 || uHouseID == HOUSE_601)
835 { 835 {
836 GameOverMenu(0); 836 GameOverMenu(0);
837 return 0; 837 return 0;
935 else 935 else
936 { //guilds 936 { //guilds
937 v19 = guild_mambership_flags[uHouseID - HOUSE_FIRE_GUILD_INITIATE_EMERALD_ISLE]; //guilds flags 937 v19 = guild_mambership_flags[uHouseID - HOUSE_FIRE_GUILD_INITIATE_EMERALD_ISLE]; //guilds flags
938 //v20 = uHouseID; 938 //v20 = uHouseID;
939 //if ( !((unsigned __int8)(0x80u >> v19 % 8) & pPlayers[uActiveCharacter]->_guilds_member_bits[v19 /8]) ) 939 //if ( !((unsigned __int8)(0x80u >> v19 % 8) & pPlayers[uActiveCharacter]->_guilds_member_bits[v19 /8]) )
940 if(_449B57_test_bit(pPlayers[uActiveCharacter]->_guilds_member_bits,v19)) 940 if(_449B57_test_bit(pPlayers[uActiveCharacter]->_achieved_awards_bits,v19))
941 { 941 {
942 PlayHouseSound(uHouseID, HouseSound_Greeting_2); 942 PlayHouseSound(uHouseID, HouseSound_Greeting_2);
943 return 1; 943 return 1;
944 } 944 }
945 } 945 }
2059 } 2059 }
2060 } 2060 }
2061 */ 2061 */
2062 } 2062 }
2063 //----- (004B6943) -------------------------------------------------------- 2063 //----- (004B6943) --------------------------------------------------------
2064 void __cdecl TravelByTransport() 2064 void TravelByTransport()
2065 { 2065 {
2066 GUIWindow *v0; // ebx@1 2066 GUIWindow *v0; // ebx@1
2067 Player *v1; // esi@1 2067 Player *v1; // esi@1
2068 signed int v2; // edi@1 2068 signed int v2; // edi@1
2069 unsigned int v3; // eax@1 2069 unsigned int v3; // eax@1
2389 } 2389 }
2390 2390
2391 2391
2392 2392
2393 //----- (004B7911) -------------------------------------------------------- 2393 //----- (004B7911) --------------------------------------------------------
2394 void __cdecl TownHallDialog() 2394 void TownHallDialog()
2395 { 2395 {
2396 GUIWindow *v0; // eax@4 2396 GUIWindow *v0; // eax@4
2397 int v1; // eax@10 2397 int v1; // eax@10
2398 int v2; // esi@10 2398 int v2; // esi@10
2399 GUIFont *v3; // ST20_4@20 2399 GUIFont *v3; // ST20_4@20
2567 } 2567 }
2568 return; 2568 return;
2569 } 2569 }
2570 2570
2571 //----- (004B7D7E) -------------------------------------------------------- 2571 //----- (004B7D7E) --------------------------------------------------------
2572 void __cdecl BankDialog() 2572 void BankDialog()
2573 { 2573 {
2574 GUIWindow *v0; // eax@4 2574 GUIWindow *v0; // eax@4
2575 //int v1; // ecx@5 2575 //int v1; // ecx@5
2576 int v2; // eax@6 2576 int v2; // eax@6
2577 unsigned int v3; // esi@6 2577 unsigned int v3; // esi@6
2709 } 2709 }
2710 } 2710 }
2711 // F8B19C: using guessed type int dword_F8B19C; 2711 // F8B19C: using guessed type int dword_F8B19C;
2712 2712
2713 //----- (004B8285) -------------------------------------------------------- 2713 //----- (004B8285) --------------------------------------------------------
2714 void __cdecl TavernDialog() 2714 void TavernDialog()
2715 { 2715 {
2716 int v0; 2716 int v0;
2717 int pItemNum; 2717 int pItemNum;
2718 double v2; // st7@1 2718 double v2; // st7@1
2719 signed int v3; // ebx@1 2719 signed int v3; // ebx@1
4015 ++pMessageQueue_50CBD0->uNumMessages; 4015 ++pMessageQueue_50CBD0->uNumMessages;
4016 }*/ 4016 }*/
4017 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, v5); 4017 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, v5);
4018 return; // void func 4018 return; // void func
4019 } 4019 }
4020 if ( !(unsigned __int16)_449B57_test_bit((unsigned __int8 *)v1->_guilds_member_bits, word_4F0754[2 * (unsigned int)window_SpeakInHouse->ptr_1C]) ) 4020 if ( !(unsigned __int16)_449B57_test_bit((unsigned __int8 *)v1->_achieved_awards_bits, word_4F0754[2 * (unsigned int)window_SpeakInHouse->ptr_1C]) )
4021 { 4021 {
4022 v24 = pNPCTopics[171].pText; 4022 v24 = pNPCTopics[171].pText;
4023 v25 = v31; 4023 v25 = v31;
4024 v26 = pFontArrus->CalcTextHeight(pNPCTopics[171].pText, &v28, 0, 0); 4024 v26 = pFontArrus->CalcTextHeight(pNPCTopics[171].pText, &v28, 0, 0);
4025 v28.DrawTitleText(pFontArrus, 0, (212 - v26) / 2 + 101, v25, v24, 3u); 4025 v28.DrawTitleText(pFontArrus, 0, (212 - v26) / 2 + 101, v25, v24, 3u);