diff UI/UIHouses.cpp @ 1465:090ff42290c4

Слияние
author Ritor1
date Mon, 26 Aug 2013 10:39:24 +0600
parents 845907a747d3
children 7ef4b64f6329
line wrap: on
line diff
--- a/UI/UIHouses.cpp	Mon Aug 26 10:39:10 2013 +0600
+++ b/UI/UIHouses.cpp	Mon Aug 26 10:39:24 2013 +0600
@@ -762,7 +762,7 @@
 
 
 //----- (004B1784) --------------------------------------------------------
-bool __cdecl HouseUI_CheckIfPlayerCanInteract()
+bool  HouseUI_CheckIfPlayerCanInteract()
 {
   Player *pPlayer; // ebx@1
   bool result; // eax@2
@@ -829,7 +829,7 @@
 		pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
 	viewparams->bRedrawGameUI = 1;
 	uDialogueType = 0;
-	pKeyActionMap->SetWindowInputStatus(3);
+	pKeyActionMap->SetWindowInputStatus(WINDOW_INPUT_CANCELLED);
 	pKeyActionMap->ResetKeys();
 	if (uHouseID == HOUSE_600 || uHouseID == HOUSE_601)
 		{
@@ -937,7 +937,7 @@
 			v19 = guild_mambership_flags[uHouseID - HOUSE_FIRE_GUILD_INITIATE_EMERALD_ISLE]; //guilds flags 
 			//v20 = uHouseID;
 			//if ( !((unsigned __int8)(0x80u >> v19 % 8) & pPlayers[uActiveCharacter]->_guilds_member_bits[v19 /8]) )
-			if(_449B57_test_bit(pPlayers[uActiveCharacter]->_guilds_member_bits,v19))
+			if(_449B57_test_bit(pPlayers[uActiveCharacter]->_achieved_awards_bits,v19))
             {
 				PlayHouseSound(uHouseID, HouseSound_Greeting_2);
 				return 1;
@@ -2061,7 +2061,7 @@
 */
 }
 //----- (004B6943) --------------------------------------------------------
-void __cdecl TravelByTransport()
+void  TravelByTransport()
 {
   GUIWindow *v0; // ebx@1
   Player *v1; // esi@1
@@ -2391,7 +2391,7 @@
 
 
 //----- (004B7911) --------------------------------------------------------
-void __cdecl TownHallDialog()
+void  TownHallDialog()
 {
   GUIWindow *v0; // eax@4
   int v1; // eax@10
@@ -2569,7 +2569,7 @@
 }
 
 //----- (004B7D7E) --------------------------------------------------------
-void __cdecl BankDialog()
+void  BankDialog()
 {
   GUIWindow *v0; // eax@4
   //int v1; // ecx@5
@@ -2711,7 +2711,7 @@
 // F8B19C: using guessed type int dword_F8B19C;
 
 //----- (004B8285) --------------------------------------------------------
-void __cdecl TavernDialog()
+void  TavernDialog()
 {
   int v0;
   int pItemNum;
@@ -4017,7 +4017,7 @@
     pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, v5);
     return; // void func
   }
-  if ( !(unsigned __int16)_449B57_test_bit((unsigned __int8 *)v1->_guilds_member_bits, word_4F0754[2 * (unsigned int)window_SpeakInHouse->ptr_1C]) )
+  if ( !(unsigned __int16)_449B57_test_bit((unsigned __int8 *)v1->_achieved_awards_bits, word_4F0754[2 * (unsigned int)window_SpeakInHouse->ptr_1C]) )
   {
     v24 = pNPCTopics[171].pText;
     v25 = v31;