Mercurial > mm7

diff mm7_4.cpp @ 481:5b6e2021c6fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
HOUSE_ID
author Ritor1
date Tue, 26 Feb 2013 17:24:53 +0600
parents d4ea191229ff
children 4bd56919f075 9b4bdf6089af
line wrap: on
line diff
--- a/mm7_4.cpp	Tue Feb 26 15:23:15 2013 +0600
+++ b/mm7_4.cpp	Tue Feb 26 17:24:53 2013 +0600
@@ -9192,7 +9192,7 @@
       }
       else
       {
-        if ( in_current_bilding_type != BildingType_Tample )
+        if ( in_current_bilding_type != BildingType_Temple )
           return;
       }
       v1 = (unsigned int)window_SpeakInHouse->ptr_1C;
@@ -14331,7 +14331,7 @@
 
 
 //----- (0044622E) --------------------------------------------------------
-bool __fastcall EnterHouse(HOUSE_ID uHouseID)
+bool __fastcall EnterHouse(enum HOUSE_ID uHouseID)
 {
   //enum HOUSE_ID v1; // edi@1
   //int v2; // edi@5
@@ -14443,7 +14443,7 @@
       uHouseID = HOUSE_JAIL;
       v12 = LODWORD(pParty->uTimePlayed);
       LODWORD(pParty->uTimePlayed) += 0x7620000u;
-      v14 = LOBYTE(pAnimatedRooms[(signed __int16)p2DEvents[HOUSE_186].uAnimationID].field_C);
+      v14 = LOBYTE(pAnimatedRooms[(signed __int16)p2DEvents[HOUSE_LORD_AND_JUDGE].uAnimationID].field_C);
       pParty->uTimePlayed = __PAIR__(HIDWORD(pParty->uTimePlayed), v12) + 0x7620000;
       in_current_bilding_type = v14;
       //v13 = pParty->pPlayers;//[0].uNumDivineInterventionCastsThisDay;