diff UI/UIHouses.cpp @ 1461:845907a747d3

Merge
author Gloval
date Wed, 21 Aug 2013 20:59:16 +0400
parents ff2118028c71 2ca62c9e7b3c
children 7ef4b64f6329
line wrap: on
line diff
--- a/UI/UIHouses.cpp	Wed Aug 21 20:58:36 2013 +0400
+++ b/UI/UIHouses.cpp	Wed Aug 21 20:59:16 2013 +0400
@@ -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)
 		{
@@ -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;