Mercurial > mm7

changeset 483:98f0d3c19de2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Tue, 26 Feb 2013 20:30:26 +0200
parents 9898e6b413d8 (current diff) 5b6e2021c6fe (diff)
children b6bdfaa3ae0f
files
diffstat 7 files changed, 17 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/Events.cpp	Tue Feb 26 20:29:54 2013 +0200
+++ b/Events.cpp	Tue Feb 26 20:30:26 2013 +0200
@@ -26,6 +26,7 @@
 #include "Events2D.h"
 #include "Weather.h"
 #include "Party.h"
+#include "MM7.h"
 
 
 
@@ -607,7 +608,7 @@
 						sub_4BD8B5();
 						window_SpeakInHouse->Release();
 						pParty->uFlags &= 0xFFFFFFFDu;
-						if ( EnterHouse((enum HOUSE_ID)170) )
+						if ( EnterHouse(HOUSE_DARK_GUILD_PIT) )
 							{
 							pAudioPlayer->StopChannels(-1, -1);
 							window_SpeakInHouse = GUIWindow::Create(0, 0, 640, 480, WINDOW_HouseInterior, 170, 0);
@@ -722,7 +723,7 @@
 						window_SpeakInHouse->Release();
 						pParty->uFlags &= 0xFFFFFFFDu;
 						GlobalEventInfo = 1;
-						if ( EnterHouse((enum HOUSE_ID)165) )
+						if ( EnterHouse(HOUSE_BODY_GUILD_ERATHIA) )
 							{
 							pAudioPlayer->PlaySound((SoundID)0, 0, 0, -1, 0, 0, 0, 0);
 							v47 = GUIWindow::Create(0, 0, 640, 480, WINDOW_HouseInterior, 165, 0);
--- a/GUIWindow.cpp	Tue Feb 26 20:29:54 2013 +0200
+++ b/GUIWindow.cpp	Tue Feb 26 20:30:26 2013 +0200
@@ -1192,7 +1192,7 @@
         case BildingType_Bank:
           BankDialog();
           break;
-        case BildingType_Tample:
+        case BildingType_Temple:
           TampleDialog();
           break;
         case BildingType_Stables:
--- a/GUIWindow.h	Tue Feb 26 20:29:54 2013 +0200
+++ b/GUIWindow.h	Tue Feb 26 20:30:26 2013 +0200
@@ -181,7 +181,7 @@
   BildingType_20 = 0x14,
   BildingType_Tavern = 0x15,
   BildingType_Bank = 0x16,
-  BildingType_Tample = 0x17,
+  BildingType_Temple = 0x17,
   BildingType_1A = 0x1A,
   BildingType_Stables = 0x1B,
   BildingType_Boats = 0x1C,
--- a/MM7.h	Tue Feb 26 20:29:54 2013 +0200
+++ b/MM7.h	Tue Feb 26 20:30:26 2013 +0200
@@ -167,10 +167,12 @@
 {
   HOUSE_SMITH_EMERALD_ISLE = 1,
   HOUSE_BODY_GUILD_NOVICE_EMERALD_ISLE = 163,
-  HOUSE_186 = 186,
+  HOUSE_BODY_GUILD_ERATHIA = 165,
+  HOUSE_DARK_GUILD_PIT = 170,
+  HOUSE_LORD_AND_JUDGE = 186,
   HOUSE_JAIL = 187,
-  HOUSE_600 = 600,
-  HOUSE_601 = 601
+  HOUSE_600 = 600,//???
+  HOUSE_601 = 601//???
 };
 
 
--- a/VideoPlayer.cpp	Tue Feb 26 20:29:54 2013 +0200
+++ b/VideoPlayer.cpp	Tue Feb 26 20:30:26 2013 +0200
@@ -13,6 +13,7 @@
 #include "Time.h"
 #include "Log.h"
 
+#include "MM7.h"
 #include "mm7_data.h"
 
 
@@ -1123,7 +1124,7 @@
     sub_4BD8B5();
     window_SpeakInHouse->Release();
     pParty->uFlags &= 0xFFFFFFFDu;
-    if ( EnterHouse((enum HOUSE_ID)165) )
+    if ( EnterHouse(HOUSE_BODY_GUILD_ERATHIA) )
     {
       pAudioPlayer->PlaySound(SOUND_Invalid, 0, 0, -1, 0, 0, 0, 0);
       window_SpeakInHouse = GUIWindow::Create(0, 0, 640, 480, WINDOW_HouseInterior, 165, 0);
--- a/mm7_2.cpp	Tue Feb 26 20:29:54 2013 +0200
+++ b/mm7_2.cpp	Tue Feb 26 20:30:26 2013 +0200
@@ -3780,7 +3780,7 @@
   v8 = window_SpeakInHouse;
   if ( (in_current_bilding_type == BildingType_Stables || in_current_bilding_type == BildingType_Boats)
     && (v1 = 0, *(&byte_4F09B1[32 * (unsigned __int8)*(&byte_4F0CCF[4 * (unsigned int)window_SpeakInHouse->ptr_1C] + uMessageParam)] + pParty->uDaysPlayed % 7))
-    || in_current_bilding_type != BildingType_Tample || uMessageParam != BildingType_MindGuild )
+    || in_current_bilding_type != BildingType_Temple || uMessageParam != BildingType_MindGuild )
   {
 LABEL_9:
     pDialogueWindow->Release();
@@ -3817,7 +3817,7 @@
         pKeyActionMap->EnterText(1, 10, v8);
       return;
     }
-    if ( in_current_bilding_type != BildingType_Tample && in_current_bilding_type != BildingType_Training )
+    if ( in_current_bilding_type != BildingType_Temple && in_current_bilding_type != BildingType_Training )
       return;
   }
   else
--- a/mm7_4.cpp	Tue Feb 26 20:29:54 2013 +0200
+++ b/mm7_4.cpp	Tue Feb 26 20:30:26 2013 +0200
@@ -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;