From fa8e4523bdc4f7c8c2483b7fa45eaa8b99b98594 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Thu, 22 Jun 2023 00:18:37 +0200
Subject: [PATCH 01/10] isle: match Isle::Tick and FindExistingInstance (#32)

* match Isle::Tick and FindExistingInstance

* add offset comments

* inline Isle::Tick

* move inline MxDSObject, remove mx.cpp
---
 ISLE/define.cpp      |   3 -
 ISLE/define.h        |   4 +-
 ISLE/isle.cpp        |  68 +-------------
 ISLE/isle.h          |  70 ++++++++++++++
 ISLE/mx.cpp          |   7 --
 LEGO1/mxdsobject.cpp |   5 +-
 LEGO1/mxdsobject.h   |  10 +-
 isle.mak             | 215 ++++++++++++++++---------------------------
 isle.mdp             | Bin 50688 -> 50688 bytes
 9 files changed, 157 insertions(+), 225 deletions(-)
 delete mode 100644 ISLE/mx.cpp

diff --git a/ISLE/define.cpp b/ISLE/define.cpp
index a5122188..b5501b08 100644
--- a/ISLE/define.cpp
+++ b/ISLE/define.cpp
@@ -38,6 +38,3 @@ int g_startupDelay = 200;
 
 // 0x4101c0
 long g_lastFrameTime = 0;
-
-// 0x4101dc
-const char *WINDOW_TITLE = "LEGO\xAE";
diff --git a/ISLE/define.h b/ISLE/define.h
index 36f69993..7adc751e 100644
--- a/ISLE/define.h
+++ b/ISLE/define.h
@@ -7,8 +7,10 @@ class Isle;
 
 extern Isle *g_isle;
 extern int g_closed;
+// 0x4101c4
 #define WNDCLASS_NAME "Lego Island MainNoM App"
-extern const char *WINDOW_TITLE;
+// 0x4101dc
+#define WINDOW_TITLE "LEGO\xAE"
 extern unsigned char g_mousedown;
 extern unsigned char g_mousemoved;
 extern RECT g_windowRect;
diff --git a/ISLE/isle.cpp b/ISLE/isle.cpp
index a58ad707..9f3c50c4 100644
--- a/ISLE/isle.cpp
+++ b/ISLE/isle.cpp
@@ -1,10 +1,8 @@
 #include "isle.h"
 
-#include "define.h"
 #include "legoanimationmanager.h"
 #include "legobuildingmanager.h"
 #include "legomodelpresenter.h"
-#include "legoomni.h"
 #include "legopartpresenter.h"
 #include "legoworldpresenter.h"
 #include "mxdirectdraw.h"
@@ -78,7 +76,7 @@ Isle::~Isle()
 void Isle::Close()
 {
   MxDSAction ds;
-  ds.SetUnknown24(0xFFFE);
+  ds.SetUnknown24(-2);
 
   if (Lego()) {
     GameState()->Save(0);
@@ -574,67 +572,3 @@ MxResult Isle::SetupWindow(HINSTANCE hInstance)
 
   return SUCCESS;
 }
-
-// OFFSET: ISLE 0x402c20
-void Isle::Tick(BOOL sleepIfNotNextFrame)
-{
-  if (this->m_windowActive) {
-    if (!Lego()) return;
-    if (!TickleManager()) return;
-    if (!Timer()) return;
-
-    long currentTime = Timer()->GetRealTime();
-    if (currentTime < g_lastFrameTime) {
-      g_lastFrameTime = -this->m_frameDelta;
-    }
-    if (this->m_frameDelta + g_lastFrameTime < currentTime) {
-      if (!Lego()->vtable40()) {
-        TickleManager()->Tickle();
-      }
-      g_lastFrameTime = currentTime;
-
-      if (g_startupDelay == 0) {
-        return;
-      }
-
-      g_startupDelay--;
-      if (g_startupDelay != 0) {
-        return;
-      }
-
-      LegoOmni::GetInstance()->CreateBackgroundAudio();
-      BackgroundAudioManager()->Enable(this->m_useMusic);
-
-      MxStreamController *stream = Streamer()->Open("\\lego\\scripts\\isle\\isle", 0);
-      MxDSAction ds;
-
-      if (!stream) {
-        stream = Streamer()->Open("\\lego\\scripts\\nocd", 0);
-        if (!stream) {
-          return;
-        }
-
-        ds.SetAtomId(stream->atom);
-        ds.SetUnknown24(0xFFFF);
-        ds.SetUnknown1c(0);
-        VideoManager()->EnableFullScreenMovie(TRUE, TRUE);
-
-        if (Start(&ds) != SUCCESS) {
-          return;
-        }
-      } else {
-        ds.SetAtomId(stream->atom);
-        ds.SetUnknown24(0xFFFF);
-        ds.SetUnknown1c(0);
-        if (Start(&ds) != SUCCESS) {
-          return;
-        }
-        this->m_gameStarted = 1;
-      }
-      return;
-    }
-    if (sleepIfNotNextFrame == 0) return;
-  }
-
-  Sleep(0);
-}
diff --git a/ISLE/isle.h b/ISLE/isle.h
index 4d6b73c4..b11f4c09 100644
--- a/ISLE/isle.h
+++ b/ISLE/isle.h
@@ -3,6 +3,9 @@
 
 #include <windows.h>
 
+#include "define.h"
+
+#include "legoomni.h"
 #include "mxresult.h"
 #include "mxvideoparam.h"
 
@@ -77,4 +80,71 @@ class Isle
 
 };
 
+// OFFSET: ISLE 0x401c40
+inline void MxDSObject::SetAtomId(MxAtomId p_atomId) { this->m_atomId = p_atomId; }
+
+// OFFSET: ISLE 0x402c20
+inline void Isle::Tick(BOOL sleepIfNotNextFrame)
+{
+  if (this->m_windowActive) {
+    if (!Lego()) return;
+    if (!TickleManager()) return;
+    if (!Timer()) return;
+
+    long currentTime = Timer()->GetRealTime();
+    if (currentTime < g_lastFrameTime) {
+      g_lastFrameTime = -this->m_frameDelta;
+    }
+    if (this->m_frameDelta + g_lastFrameTime < currentTime) {
+      if (!Lego()->vtable40()) {
+        TickleManager()->Tickle();
+      }
+      g_lastFrameTime = currentTime;
+
+      if (g_startupDelay == 0) {
+        return;
+      }
+
+      g_startupDelay--;
+      if (g_startupDelay != 0) {
+        return;
+      }
+
+      LegoOmni::GetInstance()->CreateBackgroundAudio();
+      BackgroundAudioManager()->Enable(this->m_useMusic);
+
+      MxStreamController *stream = Streamer()->Open("\\lego\\scripts\\isle\\isle", 0);
+      MxDSAction ds;
+
+      if (!stream) {
+        stream = Streamer()->Open("\\lego\\scripts\\nocd", 0);
+        if (!stream) {
+          return;
+        }
+
+        ds.SetAtomId(stream->atom);
+        ds.SetUnknown24(-1);
+        ds.SetUnknown1c(0);
+        VideoManager()->EnableFullScreenMovie(TRUE, TRUE);
+
+        if (Start(&ds) != SUCCESS) {
+          return;
+        }
+      } else {
+        ds.SetAtomId(stream->atom);
+        ds.SetUnknown24(-1);
+        ds.SetUnknown1c(0);
+        if (Start(&ds) != SUCCESS) {
+          return;
+        }
+        this->m_gameStarted = 1;
+      }
+      return;
+    }
+    if (sleepIfNotNextFrame == 0) return;
+  }
+
+  Sleep(0);
+}
+
 #endif // ISLE_H
diff --git a/ISLE/mx.cpp b/ISLE/mx.cpp
deleted file mode 100644
index c0417e5a..00000000
--- a/ISLE/mx.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "mxdsobject.h"
-
-// OFFSET: ISLE 0x00401c40
-void MxDSObject::SetAtomId(MxAtomId p_atomId)
-{
-  this->m_atomId = p_atomId;
-}
\ No newline at end of file
diff --git a/LEGO1/mxdsobject.cpp b/LEGO1/mxdsobject.cpp
index 5e7d7103..8142ba9d 100644
--- a/LEGO1/mxdsobject.cpp
+++ b/LEGO1/mxdsobject.cpp
@@ -6,14 +6,11 @@
 // OFFSET: LEGO1 0x100bf6a0
 MxDSObject::MxDSObject()
 {
-  // The following code yields 100% matching assembly if m_unk24 is declared as (signed) short.
-  // However, in other areas m_unk24 (notably, ISLE.EXE) is treated as unsigned short.
-  // Since we don't have a proper solution yet, we are using a union to work around this discrepancy.
   this->m_unk0c = 0;
   this->m_unk10 = 0;
   this->m_unk14 = 0;
   this->m_name = NULL;
-  this->m_unk24signed = -1;
+  this->m_unk24 = -1;
   this->m_unk1c = -1;
   this->m_unk28 = 0;
 }
diff --git a/LEGO1/mxdsobject.h b/LEGO1/mxdsobject.h
index 99c62dd2..4f59d4bb 100644
--- a/LEGO1/mxdsobject.h
+++ b/LEGO1/mxdsobject.h
@@ -15,7 +15,7 @@ class MxDSObject : public MxCore
   inline int GetUnknown1c() { return this->m_unk1c; }
 
   inline void SetUnknown1c(int p_unk1c) { this->m_unk1c = p_unk1c; }
-  inline void SetUnknown24(unsigned short p_unk24) { this->m_unk24 = p_unk24; }
+  inline void SetUnknown24(short p_unk24) { this->m_unk24 = p_unk24; }
 
   void SetAtomId(MxAtomId p_atomId);
 
@@ -27,13 +27,7 @@ class MxDSObject : public MxCore
   char *m_name;
   int m_unk1c;
   MxAtomId m_atomId;
-  // So far, implementing MxDSObject::MxDSObject correctly required that m_unk24 is declared a (signed) short. 
-  // Most of the other game's code appears to treat it as unsigned short, however.
-  // This union is a workaround until we have figured this out.
-  union {
-    unsigned short m_unk24;
-    short m_unk24signed;
-  };
+  short m_unk24;
   unsigned short m_unk26;
   int m_unk28;
 };
diff --git a/isle.mak b/isle.mak
index f0f905ff..acbf2236 100644
--- a/isle.mak
+++ b/isle.mak
@@ -288,7 +288,6 @@ CLEAN :
 	-@erase "$(INTDIR)\isle.obj"
 	-@erase "$(INTDIR)\isle.res"
 	-@erase "$(INTDIR)\main.obj"
-	-@erase "$(INTDIR)\mx.obj"
 	-@erase "$(INTDIR)\vc40.pdb"
 	-@erase ".\Release\ISLE.EXE"
 	-@erase ".\Release\ISLE.PDB"
@@ -350,7 +349,6 @@ LINK32_OBJS= \
 	"$(INTDIR)\isle.obj" \
 	"$(INTDIR)\isle.res" \
 	"$(INTDIR)\main.obj" \
-	"$(INTDIR)\mx.obj" \
 	".\Release\LEGO1.LIB"
 
 ".\Release\ISLE.EXE" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -380,7 +378,6 @@ CLEAN :
 	-@erase "$(INTDIR)\isle.obj"
 	-@erase "$(INTDIR)\isle.res"
 	-@erase "$(INTDIR)\main.obj"
-	-@erase "$(INTDIR)\mx.obj"
 	-@erase "$(INTDIR)\vc40.idb"
 	-@erase "$(INTDIR)\vc40.pdb"
 	-@erase ".\Debug\ISLE.EXE"
@@ -444,7 +441,6 @@ LINK32_OBJS= \
 	"$(INTDIR)\isle.obj" \
 	"$(INTDIR)\isle.res" \
 	"$(INTDIR)\main.obj" \
-	"$(INTDIR)\mx.obj" \
 	".\LEGO1\Debug\LEGO1.lib"
 
 ".\Debug\ISLE.EXE" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -497,6 +493,9 @@ DEP_CPP_DLLMA=\
 # Begin Source File
 
 SOURCE=.\LEGO1\legoomni.cpp
+
+!IF  "$(CFG)" == "LEGO1 - Win32 Release"
+
 DEP_CPP_LEGOO=\
 	".\LEGO1\lego3dmanager.h"\
 	".\LEGO1\lego3dview.h"\
@@ -545,6 +544,39 @@ DEP_CPP_LEGOO=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ELSEIF  "$(CFG)" == "LEGO1 - Win32 Debug"
+
+DEP_CPP_LEGOO=\
+	".\LEGO1\lego3dmanager.h"\
+	".\LEGO1\lego3dview.h"\
+	".\LEGO1\legoentity.h"\
+	".\LEGO1\legogamestate.h"\
+	".\LEGO1\legoinc.h"\
+	".\LEGO1\legoinputmanager.h"\
+	".\LEGO1\legonavcontroller.h"\
+	".\LEGO1\legoomni.h"\
+	".\LEGO1\legoroi.h"\
+	".\LEGO1\legovideomanager.h"\
+	".\LEGO1\mxatomid.h"\
+	".\LEGO1\mxbackgroundaudiomanager.h"\
+	".\LEGO1\mxbool.h"\
+	".\LEGO1\mxcore.h"\
+	".\LEGO1\mxcriticalsection.h"\
+	".\LEGO1\mxdsaction.h"\
+	".\LEGO1\mxdsfile.h"\
+	".\LEGO1\mxdsobject.h"\
+	".\LEGO1\mxeventmanager.h"\
+	".\LEGO1\mxomni.h"\
+	".\LEGO1\mxtimer.h"\
+	".\LEGO1\viewmanager.h"\
+	
+
+"$(INTDIR)\legoomni.obj" : $(SOURCE) $(DEP_CPP_LEGOO) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
@@ -741,6 +773,9 @@ DEP_CPP_MXOMNICR=\
 # Begin Source File
 
 SOURCE=.\LEGO1\legonavcontroller.cpp
+
+!IF  "$(CFG)" == "LEGO1 - Win32 Release"
+
 DEP_CPP_LEGON=\
 	".\LEGO1\lego3dmanager.h"\
 	".\LEGO1\lego3dview.h"\
@@ -790,6 +825,40 @@ DEP_CPP_LEGON=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ELSEIF  "$(CFG)" == "LEGO1 - Win32 Debug"
+
+DEP_CPP_LEGON=\
+	".\LEGO1\lego3dmanager.h"\
+	".\LEGO1\lego3dview.h"\
+	".\LEGO1\legoentity.h"\
+	".\LEGO1\legogamestate.h"\
+	".\LEGO1\legoinc.h"\
+	".\LEGO1\legoinputmanager.h"\
+	".\LEGO1\legonavcontroller.h"\
+	".\LEGO1\legoomni.h"\
+	".\LEGO1\legoroi.h"\
+	".\LEGO1\legoutil.h"\
+	".\LEGO1\legovideomanager.h"\
+	".\LEGO1\mxatomid.h"\
+	".\LEGO1\mxbackgroundaudiomanager.h"\
+	".\LEGO1\mxbool.h"\
+	".\LEGO1\mxcore.h"\
+	".\LEGO1\mxcriticalsection.h"\
+	".\LEGO1\mxdsaction.h"\
+	".\LEGO1\mxdsfile.h"\
+	".\LEGO1\mxdsobject.h"\
+	".\LEGO1\mxeventmanager.h"\
+	".\LEGO1\mxomni.h"\
+	".\LEGO1\mxtimer.h"\
+	".\LEGO1\viewmanager.h"\
+	
+
+"$(INTDIR)\legonavcontroller.obj" : $(SOURCE) $(DEP_CPP_LEGON) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
@@ -850,9 +919,6 @@ DEP_CPP_DEFIN=\
 # Begin Source File
 
 SOURCE=.\ISLE\isle.cpp
-
-!IF  "$(CFG)" == "ISLE - Win32 Release"
-
 DEP_CPP_ISLE_=\
 	".\ISLE\define.h"\
 	".\ISLE\isle.h"\
@@ -910,90 +976,36 @@ DEP_CPP_ISLE_=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
-
-DEP_CPP_ISLE_=\
-	".\ISLE\define.h"\
-	".\ISLE\isle.h"\
-	".\ISLE\res\resource.h"\
-	".\LEGO1\lego3dmanager.h"\
-	".\LEGO1\lego3dview.h"\
-	".\LEGO1\legoanimationmanager.h"\
-	".\LEGO1\legobuildingmanager.h"\
-	".\LEGO1\legoentity.h"\
-	".\LEGO1\legogamestate.h"\
-	".\LEGO1\legoinc.h"\
-	".\LEGO1\legoinputmanager.h"\
-	".\LEGO1\legomodelpresenter.h"\
-	".\LEGO1\legonavcontroller.h"\
-	".\LEGO1\legoomni.h"\
-	".\LEGO1\legopartpresenter.h"\
-	".\LEGO1\legoroi.h"\
-	".\LEGO1\legovideomanager.h"\
-	".\LEGO1\legoworldpresenter.h"\
-	".\LEGO1\mxatomid.h"\
-	".\LEGO1\mxbackgroundaudiomanager.h"\
-	".\LEGO1\mxbool.h"\
-	".\LEGO1\mxcore.h"\
-	".\LEGO1\mxcriticalsection.h"\
-	".\LEGO1\mxdirectdraw.h"\
-	".\LEGO1\mxdsaction.h"\
-	".\LEGO1\mxdsfile.h"\
-	".\LEGO1\mxdsobject.h"\
-	".\LEGO1\mxeventmanager.h"\
-	".\LEGO1\mxmusicmanager.h"\
-	".\LEGO1\mxnotificationmanager.h"\
-	".\LEGO1\mxobjectfactory.h"\
-	".\LEGO1\mxomni.h"\
-	".\LEGO1\mxomnicreateflags.h"\
-	".\LEGO1\mxomnicreateparam.h"\
-	".\LEGO1\mxomnicreateparambase.h"\
-	".\LEGO1\mxresult.h"\
-	".\LEGO1\mxsoundmanager.h"\
-	".\LEGO1\mxstreamcontroller.h"\
-	".\LEGO1\mxstreamer.h"\
-	".\LEGO1\mxstring.h"\
-	".\LEGO1\mxticklemanager.h"\
-	".\LEGO1\mxtimer.h"\
-	".\LEGO1\mxtransitionmanager.h"\
-	".\LEGO1\mxvariabletable.h"\
-	".\LEGO1\mxvideomanager.h"\
-	".\LEGO1\mxvideoparam.h"\
-	".\LEGO1\viewmanager.h"\
-	
-
-"$(INTDIR)\isle.obj" : $(SOURCE) $(DEP_CPP_ISLE_) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\ISLE\main.cpp
-
-!IF  "$(CFG)" == "ISLE - Win32 Release"
-
 DEP_CPP_MAIN_=\
 	".\ISLE\define.h"\
 	".\ISLE\isle.h"\
+	".\ISLE\res\resource.h"\
 	".\LEGO1\lego3dmanager.h"\
 	".\LEGO1\lego3dview.h"\
+	".\LEGO1\legoanimationmanager.h"\
+	".\LEGO1\legobuildingmanager.h"\
 	".\LEGO1\legoentity.h"\
 	".\LEGO1\legogamestate.h"\
 	".\LEGO1\legoinc.h"\
 	".\LEGO1\legoinputmanager.h"\
+	".\LEGO1\legomodelpresenter.h"\
 	".\LEGO1\legonavcontroller.h"\
 	".\LEGO1\legoomni.h"\
+	".\LEGO1\legopartpresenter.h"\
 	".\LEGO1\legoroi.h"\
 	".\LEGO1\legovideomanager.h"\
+	".\LEGO1\legoworldpresenter.h"\
 	".\LEGO1\mxatomid.h"\
 	".\LEGO1\mxbackgroundaudiomanager.h"\
 	".\LEGO1\mxbool.h"\
 	".\LEGO1\mxcore.h"\
 	".\LEGO1\mxcriticalsection.h"\
+	".\LEGO1\mxdirectdraw.h"\
 	".\LEGO1\mxdsaction.h"\
 	".\LEGO1\mxdsfile.h"\
 	".\LEGO1\mxdsobject.h"\
@@ -1026,57 +1038,6 @@ DEP_CPP_MAIN_=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
-
-DEP_CPP_MAIN_=\
-	".\ISLE\define.h"\
-	".\ISLE\isle.h"\
-	".\LEGO1\lego3dmanager.h"\
-	".\LEGO1\lego3dview.h"\
-	".\LEGO1\legoentity.h"\
-	".\LEGO1\legogamestate.h"\
-	".\LEGO1\legoinc.h"\
-	".\LEGO1\legoinputmanager.h"\
-	".\LEGO1\legonavcontroller.h"\
-	".\LEGO1\legoomni.h"\
-	".\LEGO1\legoroi.h"\
-	".\LEGO1\legovideomanager.h"\
-	".\LEGO1\mxatomid.h"\
-	".\LEGO1\mxbackgroundaudiomanager.h"\
-	".\LEGO1\mxbool.h"\
-	".\LEGO1\mxcore.h"\
-	".\LEGO1\mxcriticalsection.h"\
-	".\LEGO1\mxdsaction.h"\
-	".\LEGO1\mxdsfile.h"\
-	".\LEGO1\mxdsobject.h"\
-	".\LEGO1\mxeventmanager.h"\
-	".\LEGO1\mxmusicmanager.h"\
-	".\LEGO1\mxnotificationmanager.h"\
-	".\LEGO1\mxobjectfactory.h"\
-	".\LEGO1\mxomni.h"\
-	".\LEGO1\mxomnicreateflags.h"\
-	".\LEGO1\mxomnicreateparam.h"\
-	".\LEGO1\mxomnicreateparambase.h"\
-	".\LEGO1\mxresult.h"\
-	".\LEGO1\mxsoundmanager.h"\
-	".\LEGO1\mxstreamcontroller.h"\
-	".\LEGO1\mxstreamer.h"\
-	".\LEGO1\mxstring.h"\
-	".\LEGO1\mxticklemanager.h"\
-	".\LEGO1\mxtimer.h"\
-	".\LEGO1\mxtransitionmanager.h"\
-	".\LEGO1\mxvariabletable.h"\
-	".\LEGO1\mxvideomanager.h"\
-	".\LEGO1\mxvideoparam.h"\
-	".\LEGO1\viewmanager.h"\
-	
-
-"$(INTDIR)\main.obj" : $(SOURCE) $(DEP_CPP_MAIN_) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
 # End Source File
 ################################################################################
 # Begin Source File
@@ -1517,22 +1478,6 @@ SOURCE=.\LEGO1\mxvideoparamflags.h
 !ENDIF 
 
 # End Project Dependency
-################################################################################
-# Begin Source File
-
-SOURCE=.\ISLE\mx.cpp
-DEP_CPP_MX_CP=\
-	".\LEGO1\mxatomid.h"\
-	".\LEGO1\mxbool.h"\
-	".\LEGO1\mxcore.h"\
-	".\LEGO1\mxdsobject.h"\
-	
-
-"$(INTDIR)\mx.obj" : $(SOURCE) $(DEP_CPP_MX_CP) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-# End Source File
 # End Target
 # End Project
 ################################################################################
diff --git a/isle.mdp b/isle.mdp
index e164ac1ec45b5477842f4919ab402efe54cf7ffe..a35b41d166591b9a4cb0900d43013fff86967b52 100644
GIT binary patch
delta 457
zcmZqZVQ%PQ-oPQnTAW{+mok}gn#$zdiOVMQ)vTM`FqL((QA^n-84e*lvIcl%UGU0A
zsB%r-SR}eRE9n~d=7PL;f|C^{C{Ny1tup!TERD%eYBVR?Rd#NERe6CC=Ag|+E%VqW
zOO&Z>PM^G+b#p~k4%24a$xk7y$)dA`CqF6{+MKz6I?Ln_-2$5>D%?1*nK}7Y<wwy+
z91O3v&Shsfz%Y?v#{o8WTp^IRX$=b#I~xN7TLLrd<oz3yC+DqeXJi4g;wLIdOwL_j
zIr;0lipg;s$|gTspTNt?z`(!=#9(@|<Hp*_S2iT@3IIi%fEY{zMU5xNZBm-NZ@t9i
z8JmPAAJ`Zr;|7$C24Y<#8ps5L$qsoMlNY41PTsUmdUM031zeLI6IC|HWIbU92HOY5
HMMszb=EARs

delta 350
zcmZqZVQ%PQ-oPOx@QQ)qmC!s^hKNIjOd1DDnKlZ(VB93bA%tDR0GEUdE{O<LuE`3U
zH8^rB^pXn-7#SxA7Kv`QO1j34BDz^1@15Z0dlkQ!CvT7r*euba!N$d_7vmZ1;~JA&
zF<G%#V)BksmCaix>2gfIQ3GP^X5GAd#%adMF*O>K@5~b3EW~w#PavIvAzg498w1EA
zJBss}HVblnVBEBZg^8V&fq^Z7nPu|+jq#JS)^$&Qw!UI=?)u8fS2iR}RFIe)x1ntE
zzKsdIKxGUPKn$iQJ8rC<ykb+#L<JUJQJ|n75QAx;gz@CKO-h?HHZS0ssPJO)!UWaH
Qvr4%)KPWuGy66ZK089aUlmGw#


From c4b4555b8035ee1bec7f241de20d847805e3ff33 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Wed, 21 Jun 2023 17:01:48 -0700
Subject: [PATCH 02/10] reccmp: revert using debug offsets

---
 tools/reccmp/reccmp.py | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/tools/reccmp/reccmp.py b/tools/reccmp/reccmp.py
index 02189dfe..36f917fa 100755
--- a/tools/reccmp/reccmp.py
+++ b/tools/reccmp/reccmp.py
@@ -118,14 +118,23 @@ def __init__(self, pdb, file):
       if current_section == 'SYMBOLS' and 'S_GPROC32' in line:
         addr = int(line[26:34], 16)
 
-        debug_offs = line_dump[i + 2]
-        debug_start = int(debug_offs[22:30], 16)
-        debug_end = int(debug_offs[43:], 16)
+
 
         info = RecompiledInfo()
         info.addr = addr + recompfile.imagebase + recompfile.textvirt
-        info.start = debug_start
-        info.size = debug_end - debug_start
+
+        use_dbg_offs = False
+        if use_dbg_offs:
+          debug_offs = line_dump[i + 2]
+          debug_start = int(debug_offs[22:30], 16)
+          debug_end = int(debug_offs[43:], 16)
+
+          info.start = debug_start
+          info.size = debug_end - debug_start
+        else:
+          info.start = 0
+          info.size = int(line[41:49], 16)
+
         info.name = line[77:]
 
         self.funcs[addr] = info

From 30ef923bf4477cd3ad6b4e889c19d244bc94b1f1 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Thu, 22 Jun 2023 08:13:15 +0200
Subject: [PATCH 03/10] hotfix: messed up structure due to windows.h (#37)

---
 ISLE/define.h | 2 +-
 ISLE/isle.h   | 3 +--
 ISLE/main.cpp | 5 +++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ISLE/define.h b/ISLE/define.h
index 7adc751e..27a347b7 100644
--- a/ISLE/define.h
+++ b/ISLE/define.h
@@ -1,7 +1,7 @@
 #ifndef DEFINE_H
 #define DEFINE_H
 
-#include <Windows.h>
+#include "legoinc.h"
 
 class Isle;
 
diff --git a/ISLE/isle.h b/ISLE/isle.h
index b11f4c09..8eb37fa7 100644
--- a/ISLE/isle.h
+++ b/ISLE/isle.h
@@ -1,8 +1,7 @@
 #ifndef ISLE_H
 #define ISLE_H
 
-#include <windows.h>
-
+#include "legoinc.h"
 #include "define.h"
 
 #include "legoomni.h"
diff --git a/ISLE/main.cpp b/ISLE/main.cpp
index 6e4c6621..632ed43d 100644
--- a/ISLE/main.cpp
+++ b/ISLE/main.cpp
@@ -1,9 +1,10 @@
 #include <dsound.h>
-#include <windows.h>
 
+#include "legoinc.h"
 #include "define.h"
-#include "isle.h"
+
 #include "legoomni.h"
+#include "isle.h"
 
 // OFFSET: ISLE 0x401ca0
 BOOL FindExistingInstance(void)

From 598ca01df52d0187b86813e2fa7be41dea1ce620 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Thu, 22 Jun 2023 00:43:37 -0700
Subject: [PATCH 04/10] gitignore ISLE.EXE/LEGO1.DLL

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index b1838781..ef562599 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 Debug/
 Release/
 *.ncb
+ISLE.EXE
+LEGO1.DLL

From 12395ac41aaf278fb980c0f81c8ba4301de2a00c Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Thu, 22 Jun 2023 00:44:28 -0700
Subject: [PATCH 05/10] reccmp: further improve accuracy

---
 tools/reccmp/reccmp.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tools/reccmp/reccmp.py b/tools/reccmp/reccmp.py
index 36f917fa..993c51f2 100755
--- a/tools/reccmp/reccmp.py
+++ b/tools/reccmp/reccmp.py
@@ -198,7 +198,14 @@ def get_recompiled_address(self, filename, line):
 def sanitize(file, mnemonic, op_str):
   offsetplaceholder = '<OFFSET>'
 
-  if mnemonic == 'call' or mnemonic == 'jmp':
+  op_str_is_number = False
+  try:
+    int(op_str, 16)
+    op_str_is_number = True
+  except ValueError:
+    pass
+
+  if (mnemonic == 'call' or mnemonic == 'jmp') and op_str_is_number:
     # Filter out "calls" because the offsets we're not currently trying to
     # match offsets. As long as there's a call in the right place, it's
     # probably accurate.

From 66a010a19fa9c2b635afb2897be88ec18364e72b Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Thu, 22 Jun 2023 00:45:56 -0700
Subject: [PATCH 06/10] move inlined MxDSObject::SetAtomId to main header

We've confirmed that, despite a function being declared inline, msvc will still make a conventional call in some circumstances. As such, I feel like this is warranted because it's most likely what a developer would have actually written.
---
 ISLE/isle.h          |   3 --
 LEGO1/mxdsobject.cpp |   6 ----
 LEGO1/mxdsobject.h   |   4 ++-
 isle.mak             |  82 ++-----------------------------------------
 isle.mdp             | Bin 50688 -> 48128 bytes
 5 files changed, 5 insertions(+), 90 deletions(-)

diff --git a/ISLE/isle.h b/ISLE/isle.h
index 8eb37fa7..e556a5c4 100644
--- a/ISLE/isle.h
+++ b/ISLE/isle.h
@@ -79,9 +79,6 @@ class Isle
 
 };
 
-// OFFSET: ISLE 0x401c40
-inline void MxDSObject::SetAtomId(MxAtomId p_atomId) { this->m_atomId = p_atomId; }
-
 // OFFSET: ISLE 0x402c20
 inline void Isle::Tick(BOOL sleepIfNotNextFrame)
 {
diff --git a/LEGO1/mxdsobject.cpp b/LEGO1/mxdsobject.cpp
index 8142ba9d..7323f446 100644
--- a/LEGO1/mxdsobject.cpp
+++ b/LEGO1/mxdsobject.cpp
@@ -34,9 +34,3 @@ void MxDSObject::SetObjectName(const char *p_name)
     }
   }
 }
-
-// OFFSET: LEGO1 0x10005530
-void MxDSObject::SetAtomId(MxAtomId p_atomId)
-{
-  this->m_atomId = p_atomId;
-}
diff --git a/LEGO1/mxdsobject.h b/LEGO1/mxdsobject.h
index 4f59d4bb..468076f7 100644
--- a/LEGO1/mxdsobject.h
+++ b/LEGO1/mxdsobject.h
@@ -17,7 +17,9 @@ class MxDSObject : public MxCore
   inline void SetUnknown1c(int p_unk1c) { this->m_unk1c = p_unk1c; }
   inline void SetUnknown24(short p_unk24) { this->m_unk24 = p_unk24; }
 
-  void SetAtomId(MxAtomId p_atomId);
+  // OFFSET: ISLE 0x401c40
+  // OFFSET: LEGO1 0x10005530
+  inline void SetAtomId(MxAtomId p_atomId) { this->m_atomId = p_atomId; }
 
 private:
   int m_unk08;
diff --git a/isle.mak b/isle.mak
index acbf2236..53c8f2bd 100644
--- a/isle.mak
+++ b/isle.mak
@@ -493,9 +493,6 @@ DEP_CPP_DLLMA=\
 # Begin Source File
 
 SOURCE=.\LEGO1\legoomni.cpp
-
-!IF  "$(CFG)" == "LEGO1 - Win32 Release"
-
 DEP_CPP_LEGOO=\
 	".\LEGO1\lego3dmanager.h"\
 	".\LEGO1\lego3dview.h"\
@@ -544,45 +541,13 @@ DEP_CPP_LEGOO=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "LEGO1 - Win32 Debug"
-
-DEP_CPP_LEGOO=\
-	".\LEGO1\lego3dmanager.h"\
-	".\LEGO1\lego3dview.h"\
-	".\LEGO1\legoentity.h"\
-	".\LEGO1\legogamestate.h"\
-	".\LEGO1\legoinc.h"\
-	".\LEGO1\legoinputmanager.h"\
-	".\LEGO1\legonavcontroller.h"\
-	".\LEGO1\legoomni.h"\
-	".\LEGO1\legoroi.h"\
-	".\LEGO1\legovideomanager.h"\
-	".\LEGO1\mxatomid.h"\
-	".\LEGO1\mxbackgroundaudiomanager.h"\
-	".\LEGO1\mxbool.h"\
-	".\LEGO1\mxcore.h"\
-	".\LEGO1\mxcriticalsection.h"\
-	".\LEGO1\mxdsaction.h"\
-	".\LEGO1\mxdsfile.h"\
-	".\LEGO1\mxdsobject.h"\
-	".\LEGO1\mxeventmanager.h"\
-	".\LEGO1\mxomni.h"\
-	".\LEGO1\mxtimer.h"\
-	".\LEGO1\viewmanager.h"\
-	
-
-"$(INTDIR)\legoomni.obj" : $(SOURCE) $(DEP_CPP_LEGOO) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\LEGO1\mxcriticalsection.cpp
 DEP_CPP_MXCRI=\
+	".\LEGO1\legoinc.h"\
 	".\LEGO1\mxcriticalsection.h"\
 	
 
@@ -596,6 +561,7 @@ DEP_CPP_MXCRI=\
 
 SOURCE=.\LEGO1\mxautolocker.cpp
 DEP_CPP_MXAUT=\
+	".\LEGO1\legoinc.h"\
 	".\LEGO1\mxautolocker.h"\
 	".\LEGO1\mxcriticalsection.h"\
 	
@@ -773,9 +739,6 @@ DEP_CPP_MXOMNICR=\
 # Begin Source File
 
 SOURCE=.\LEGO1\legonavcontroller.cpp
-
-!IF  "$(CFG)" == "LEGO1 - Win32 Release"
-
 DEP_CPP_LEGON=\
 	".\LEGO1\lego3dmanager.h"\
 	".\LEGO1\lego3dview.h"\
@@ -825,40 +788,6 @@ DEP_CPP_LEGON=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!ELSEIF  "$(CFG)" == "LEGO1 - Win32 Debug"
-
-DEP_CPP_LEGON=\
-	".\LEGO1\lego3dmanager.h"\
-	".\LEGO1\lego3dview.h"\
-	".\LEGO1\legoentity.h"\
-	".\LEGO1\legogamestate.h"\
-	".\LEGO1\legoinc.h"\
-	".\LEGO1\legoinputmanager.h"\
-	".\LEGO1\legonavcontroller.h"\
-	".\LEGO1\legoomni.h"\
-	".\LEGO1\legoroi.h"\
-	".\LEGO1\legoutil.h"\
-	".\LEGO1\legovideomanager.h"\
-	".\LEGO1\mxatomid.h"\
-	".\LEGO1\mxbackgroundaudiomanager.h"\
-	".\LEGO1\mxbool.h"\
-	".\LEGO1\mxcore.h"\
-	".\LEGO1\mxcriticalsection.h"\
-	".\LEGO1\mxdsaction.h"\
-	".\LEGO1\mxdsfile.h"\
-	".\LEGO1\mxdsobject.h"\
-	".\LEGO1\mxeventmanager.h"\
-	".\LEGO1\mxomni.h"\
-	".\LEGO1\mxtimer.h"\
-	".\LEGO1\viewmanager.h"\
-	
-
-"$(INTDIR)\legonavcontroller.obj" : $(SOURCE) $(DEP_CPP_LEGON) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
 # End Source File
 ################################################################################
 # Begin Source File
@@ -984,28 +913,21 @@ SOURCE=.\ISLE\main.cpp
 DEP_CPP_MAIN_=\
 	".\ISLE\define.h"\
 	".\ISLE\isle.h"\
-	".\ISLE\res\resource.h"\
 	".\LEGO1\lego3dmanager.h"\
 	".\LEGO1\lego3dview.h"\
-	".\LEGO1\legoanimationmanager.h"\
-	".\LEGO1\legobuildingmanager.h"\
 	".\LEGO1\legoentity.h"\
 	".\LEGO1\legogamestate.h"\
 	".\LEGO1\legoinc.h"\
 	".\LEGO1\legoinputmanager.h"\
-	".\LEGO1\legomodelpresenter.h"\
 	".\LEGO1\legonavcontroller.h"\
 	".\LEGO1\legoomni.h"\
-	".\LEGO1\legopartpresenter.h"\
 	".\LEGO1\legoroi.h"\
 	".\LEGO1\legovideomanager.h"\
-	".\LEGO1\legoworldpresenter.h"\
 	".\LEGO1\mxatomid.h"\
 	".\LEGO1\mxbackgroundaudiomanager.h"\
 	".\LEGO1\mxbool.h"\
 	".\LEGO1\mxcore.h"\
 	".\LEGO1\mxcriticalsection.h"\
-	".\LEGO1\mxdirectdraw.h"\
 	".\LEGO1\mxdsaction.h"\
 	".\LEGO1\mxdsfile.h"\
 	".\LEGO1\mxdsobject.h"\
diff --git a/isle.mdp b/isle.mdp
index a35b41d166591b9a4cb0900d43013fff86967b52..0a0a443d90e0d5a067e5d1e0ed2b0de17456ba1b 100644
GIT binary patch
literal 48128
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

literal 50688
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
S8NL8(oC6Kz{Rkm&6#fTi?1E7M


From 749a1f419b34c9b11e5504abd93e32aebe750d60 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Thu, 22 Jun 2023 01:05:00 -0700
Subject: [PATCH 07/10] reccmp: support inlined functions that may have been
 compiled into both files

---
 .github/workflows/build.yml |  4 ++--
 tools/reccmp/reccmp.py      | 13 +++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 91a218f5..07fe411d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -60,8 +60,8 @@ jobs:
         C:\msys64\usr\bin\wget.exe https://legoisland.org/download/ISLE.EXE
         C:\msys64\usr\bin\wget.exe https://legoisland.org/download/LEGO1.DLL
         pip install capstone
-        python3 tools/reccmp/reccmp.py -H ISLEPROGRESS.HTML ISLE.EXE Release/ISLE.EXE Release/ISLE.PDB ISLE
-        python3 tools/reccmp/reccmp.py -H LEGO1PROGRESS.HTML LEGO1.DLL Release/LEGO1.DLL Release/LEGO1.PDB LEGO1
+        python3 tools/reccmp/reccmp.py -H ISLEPROGRESS.HTML ISLE.EXE Release/ISLE.EXE Release/ISLE.PDB .
+        python3 tools/reccmp/reccmp.py -H LEGO1PROGRESS.HTML LEGO1.DLL Release/LEGO1.DLL Release/LEGO1.PDB .
       
     - name: Upload Artifact
       uses: actions/upload-artifact@master
diff --git a/tools/reccmp/reccmp.py b/tools/reccmp/reccmp.py
index 993c51f2..6e9826ce 100755
--- a/tools/reccmp/reccmp.py
+++ b/tools/reccmp/reccmp.py
@@ -259,6 +259,10 @@ def parse_asm(file, addr, size):
 total_accuracy = 0
 htmlinsert = []
 
+# Generate basename of original file, used in locating OFFSET lines
+basename = os.path.basename(os.path.splitext(original)[0])
+pattern = '// OFFSET:'
+
 for subdir, dirs, files in os.walk(source):
   for file in files:
     srcfilename = os.path.join(os.path.abspath(subdir), file)
@@ -273,9 +277,14 @@ def parse_asm(file, addr, size):
         if not line:
           break
 
-        if line.startswith('// OFFSET:'):
-          par = line[10:].strip().split()
+        line = line.strip()
+
+        if line.startswith(pattern):
+          par = line[len(pattern):].strip().split()
           module = par[0]
+          if module != basename:
+            continue
+
           addr = int(par[1], 16)
 
           find_open_bracket = line

From a0fac56d4cfd93ed0e01d335109eb54199893792 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Thu, 22 Jun 2023 18:19:48 +0200
Subject: [PATCH 08/10] lego: implement/match MxVideoParam exported functions
 (#36)

Co-authored-by: itsmattkc <itsmattkc@gmail.com>
---
 LEGO1/mxrect32.h       |  1 +
 LEGO1/mxvideoparam.cpp | 62 ++++++++++++++++++++++++++++++------------
 LEGO1/mxvideoparam.h   |  8 ++----
 3 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/LEGO1/mxrect32.h b/LEGO1/mxrect32.h
index 092396f5..8ba5f6d6 100644
--- a/LEGO1/mxrect32.h
+++ b/LEGO1/mxrect32.h
@@ -4,6 +4,7 @@
 class MxRect32
 {
 public:
+  MxRect32() { }
   MxRect32(int p_left, int p_top, int p_right, int p_bottom)
   {
     this->m_left = p_left;
diff --git a/LEGO1/mxvideoparam.cpp b/LEGO1/mxvideoparam.cpp
index 2a33736a..063d97f7 100644
--- a/LEGO1/mxvideoparam.cpp
+++ b/LEGO1/mxvideoparam.cpp
@@ -6,31 +6,57 @@
 // OFFSET: LEGO1 0x100bec70
 MxVideoParam::MxVideoParam()
 {
-  this->m_flags = MxVideoParamFlags();
-  this->m_right = 640;
-  this->m_bottom = 480;
-  this->m_left = 0;
-  this->m_top = 0;
+  this->m_rect.m_right = 640;
+  this->m_rect.m_bottom = 480;
+  this->m_rect.m_left = 0;
+  this->m_rect.m_top = 0;
   this->m_palette = 0;
   this->m_backBuffers = 0;
   this->m_unk1c = 0;
   this->m_deviceId = 0;
 }
 
-// OFFSET: LEGO1 0x100becf0
-MxVideoParam &MxVideoParam::operator=(const MxVideoParam &other)
+// OFFSET: LEGO1 0x100beca0
+MxVideoParam::MxVideoParam(MxRect32 &p_rect, MxPalette *p_pal, unsigned long p_backBuffers, MxVideoParamFlags &p_flags)
 {
-  m_flags = MxVideoParamFlags();
-  m_left = other.m_left;
-  m_top = other.m_top;
-  m_right = other.m_right;
-  m_bottom = other.m_bottom;
-  m_palette = other.m_palette;
-  m_backBuffers = other.m_backBuffers;
-  m_flags = other.m_flags;
-  m_unk1c = other.m_unk1c;
-  m_deviceId = other.m_deviceId;
-  SetDeviceName(other.m_deviceId);
+  this->m_rect.m_left = p_rect.m_left;
+  this->m_rect.m_top = p_rect.m_top;
+  this->m_rect.m_right = p_rect.m_right;
+  this->m_rect.m_bottom = p_rect.m_bottom;
+  this->m_palette = p_pal;
+  this->m_backBuffers = p_backBuffers;
+  this->m_flags = p_flags;
+  this->m_unk1c = 0;
+  this->m_deviceId = NULL;
+}
+
+// OFFSET: LEGO1 0x100becf0
+MxVideoParam::MxVideoParam(MxVideoParam &p_videoParam)
+{
+  this->m_rect.m_left = p_videoParam.m_rect.m_left;
+  this->m_rect.m_top = p_videoParam.m_rect.m_top;
+  this->m_rect.m_right = p_videoParam.m_rect.m_right;
+  this->m_rect.m_bottom = p_videoParam.m_rect.m_bottom;
+  this->m_palette = p_videoParam.m_palette;
+  this->m_backBuffers = p_videoParam.m_backBuffers;
+  this->m_flags = p_videoParam.m_flags;
+  this->m_unk1c = p_videoParam.m_unk1c;
+  this->m_deviceId = NULL;
+  SetDeviceName(p_videoParam.m_deviceId);
+}
+
+// OFFSET: LEGO1 0x100bede0
+MxVideoParam &MxVideoParam::operator=(const MxVideoParam &p_videoParam)
+{
+  this->m_rect.m_left = p_videoParam.m_rect.m_left;
+  this->m_rect.m_top = p_videoParam.m_rect.m_top;
+  this->m_rect.m_right = p_videoParam.m_rect.m_right;
+  this->m_rect.m_bottom = p_videoParam.m_rect.m_bottom;
+  this->m_palette = p_videoParam.m_palette;
+  this->m_backBuffers = p_videoParam.m_backBuffers;
+  this->m_flags = p_videoParam.m_flags;
+  this->m_unk1c = p_videoParam.m_unk1c;
+  SetDeviceName(p_videoParam.m_deviceId);
 
   return *this;
 }
diff --git a/LEGO1/mxvideoparam.h b/LEGO1/mxvideoparam.h
index eedf3167..aeb50554 100644
--- a/LEGO1/mxvideoparam.h
+++ b/LEGO1/mxvideoparam.h
@@ -20,16 +20,12 @@ class MxVideoParam
   inline MxVideoParamFlags &flags() { return m_flags; }
 
 private:
-  int m_left;
-  int m_top;
-  int m_right;
-  int m_bottom;
+  MxRect32 m_rect;
   MxPalette *m_palette;
-  int m_backBuffers;
+  unsigned int m_backBuffers;
   MxVideoParamFlags m_flags;
   int m_unk1c;
   char *m_deviceId;
-
 };
 
 #endif // MXVIDEOPARAM_H

From bd245dc6d860882aa49a5af0d7fbfdcd98466f4a Mon Sep 17 00:00:00 2001
From: MishaProductions <106913236+MishaProductions@users.noreply.github.com>
Date: Thu, 22 Jun 2023 19:23:54 +0300
Subject: [PATCH 09/10] lego1: implement Get* functions (#39)

---
 LEGO1/legoomni.cpp |  31 +++++++++++++++++++++++++++++++
 LEGO1/legoomni.h   |   4 ++++
 isle.mdp           | Bin 48128 -> 51200 bytes
 3 files changed, 35 insertions(+)

diff --git a/LEGO1/legoomni.cpp b/LEGO1/legoomni.cpp
index 062764f7..ff209e38 100644
--- a/LEGO1/legoomni.cpp
+++ b/LEGO1/legoomni.cpp
@@ -24,12 +24,43 @@ LegoOmni *Lego()
   return (LegoOmni *) MxOmni::GetInstance();
 }
 
+// OFFSET: LEGO1 0x10015710
+LegoSoundManager *SoundManager()
+{
+  return LegoOmni::GetInstance()->GetSoundManager();
+}
+
+
 // OFFSET: LEGO1 0x10015720
 LegoVideoManager *VideoManager()
 {
   return LegoOmni::GetInstance()->GetVideoManager();
 }
 
+// OFFSET: LEGO1 0x10015730
+MxBackgroundAudioManager *BackgroundAudioManager()
+{
+  return LegoOmni::GetInstance()->GetBackgroundAudioManager();
+}
+
+// OFFSET: LEGO1 0x10015740
+LegoInputManager *InputManager()
+{
+  return LegoOmni::GetInstance()->GetInputManager();
+}
+
+// OFFSET: LEGO1 0x10015760
+LegoGameState *GameState()
+{
+  return LegoOmni::GetInstance()->GetGameState();
+}
+
+// OFFSET: LEGO1 0x10015780
+LegoNavController *NavController()
+{
+  return LegoOmni::GetInstance()->GetNavController();
+}
+
 // OFFSET: LEGO1 0x1005b5f0
 long LegoOmni::Notify(MxParam &p)
 {
diff --git a/LEGO1/legoomni.h b/LEGO1/legoomni.h
index 10f05665..6234dd7b 100644
--- a/LEGO1/legoomni.h
+++ b/LEGO1/legoomni.h
@@ -46,7 +46,11 @@ class LegoOmni : public MxOmni
   virtual unsigned char vtable40();
 
   LegoVideoManager *GetVideoManager() { return (LegoVideoManager *) m_videoManager; }
+  LegoSoundManager *GetSoundManager() { return (LegoSoundManager *)m_soundManager;}
+  MxBackgroundAudioManager *GetBackgroundAudioManager() { return m_bkgAudioManager; }
   LegoInputManager *GetInputManager() { return m_inputMgr; }
+  LegoGameState *GetGameState() { return m_gameState; }
+  LegoNavController *GetNavController() { return m_navController; }
 
 private:
   int m_unk68;
diff --git a/isle.mdp b/isle.mdp
index 0a0a443d90e0d5a067e5d1e0ed2b0de17456ba1b..375126de1fb0e167099a3ea158190f92cebdac37 100644
GIT binary patch
literal 51200
zcmeHQS#ul55pIa0LQ1lAkdkcqlAZWSVk4I5_&!BaGHJ@9MLWs?$6D?#iH-I^?Jj7z
zT;*3k<S*zkul^0rW2*co@|>sqgQREnm;rWX2@D|7A{teqP(V-b^fx`z(_han*0-*|
zIs-?+0XPEmnmPpjN3W?y;NMeiJsJNeco}SX4ju!B#iRT$p)x%P$N}%a(_=PSnj>%&
zej&R6y(a_+0YZQfAOr{jLVyq;1PB2_fDj-A2!TV4z!9we{BUOm{t4eh=lgq93p&JO
zEt@tA$B+S<gLya(C*UMJB7aHm4><z!FawRk#_~<^0sT)15CVh%AwUQa0)zk|KnM^5
zga9Ex2oM5?3jyN)4%c`NYt1P*4QJpiEWje1gY$4<*oGu`2oRV@?sq1)<EJkrgE$w+
zivav<c36;odldg2yKSX*`*QK-O7Ui?c=KAJ=f=kRM)98hCj<xqLVyq;1PB2_fDj-A
z2mwNX5Fi8yfrCeY_`ic6gM;Y7<8Tq4fG6Q8cp9F8OYrPLbb_vVKnTpknSUJ6rRlPS
z03kpK5CVh%AwUQa0)zk|KnM^5ga9G%z!4z+?}0=9v$)_d;aBiHyZ|r4OYm#>4gB_J
z(JSi2gFztU|JY%_#kH-C)l08jy6uHaS1#Rheb-9dS!k5650>9<eUZ3v(z@X#ZL4)N
zbXQ_;&ux8mYqhn!x!KxqccZn$w?e1oCBEBY3R{l5<ArY1?sOWB_lz_!UE{P5EHBL3
ze`s|5*iE=S&Dd@<Hbzykv3mXH<(7}oSfLkKsTYNT6<WJ)+-!ehu57#O`HmOvmbzBW
zb?sV#o1|9iHrpSYYw^NPH!ZufZmuYZ9M|t4>TZ}altvyk0eKXJUbDSs-j|LQr&3o&
zo&usPafCe?1KvH)aidAV`*jrij%1S|yg|=Oqrh{T?M*XygWk4f-`$O)Zs=HD#}mdG
z_h{Qg2kbQ4?;H0hiu^H}+fj^jXvOsEju*Rj>crO9&GuDeC5dITMaFpE1U)C&@o>pC
zhjFZF7xY+jJ9cqF+VQR3#CQVBns6dpL9_jlDXbmKcT=`P8apQ&+odaGDM-40+H4yx
ztwAqI5!Aqr!ZeP2pDnG%UY4mEV|C`e!T8l|UpF0+)U)sUZn-2HuFXL&^@1^iF}9Db
zF!A~VyRl7sR_s~Z=xXfG7)uF{7P-$GhQFXEl;rae7I-`>H;F6mc6V3aA{tK)zH;(C
zqTvj6d|&MI4BeV-()iNFJ7Tyw3wm~p&R|=9f)k!C#9Z4oQ!lr=Y2-)tU3AfL@G0D!
z>o6WBfsU~~!l^QQjA0gvGVdI3&_vA1W)0VN({#`Vv~6Q1m04@(ndNFZDI>>+j7^r%
z+LNLQ@0<DNCyBQIhBIbNobpX6?+cvmOKB^s)yNTp5?ajaMM^^nZ5{g|aH51(a6$qV
zzJ8axH^WUWTZJg0tx|6p%$Q<RLffK*RwiW&&!B{sbJPVKl+YHDeX0`LbA0^EgjP}Y
zFwT`IrQN{btXg^~rPTmKDecg;#bVtSnf7#~v{<NBuUT`vOd42s8~7~m<;^%^$+TKj
z{V99a%YSD1V_)!{is{3T)m38lg(BBxA0L}r+}gT&3!gE40+v6w;$1ggOWh#<_-r#z
zCy_N{wG)=M<AcbTuVMW`5?d(5WR_1Mw^+#aF?kBXrwTzeTc>F8m}oJud?|#>{>rSI
zLQXQjWY!d7(zV43p~FftO$dv*p-?Zi5VJ|JV2T#c3NQv*luVbRRXI9+Y?eY$*`eV~
zP_t5sYn&G*I5P935S98Zu}ccU8OKHUU4-Qox8sJ68`|G2W3dH~AGmSu@N-2<)__y8
z9CLUflGPFQBJ<2lFSMI&z04^lv*eTswqEjNCb{RiSa;k<3`_D}`c0h}zpiwmK(Fv@
zW`%reKrg(&g!}o%n!X-q(tJwQ2yqm7Szdox-p78XLN9z=)Wr2d7xi^-eWQiyI#pxX
zNtW>zRbahR>~2x%)eCW5IWt>x$<sm4-9zUX!rf3b=q8>$gy@B!7e=YKgVmJ2@|wQ8
zXRzkWY2+QWKZ<KT73bo9E`qp=1uk2GYC!0d&WmsQuA*^5H<#v%XN~?7L9fi(^?Gqw
zi&FDGLRmRkFN7nNu+tesjMO4u(+8@{dd=unBH`AHp(!ZFtHgRC9P)umuwHh)2*@=k
zpHn8ldYyRvfvT-u77-nGF?m$3zt%0d=yijEzQ(#o*fKxFfa2w)eNK%+zSMS856{i$
z?Vg=mTv@+O@ey~z6d&1{F}<r$e5CluQ$~u97*5&2B>h~W_~=Ia?z0}A_?SgW4OMcc
zSvgOyNI_5KQk)FZuqlO1d0tAP2bl?e*g-z~t`K{=$f8-kRXq-%;&RI5o;9hQVpp}e
zAYY^}v#c^j7iHQ06X`0|Ps-whWqMVElChB!%xX8DkoBU6%4f(`YH@HgLX)Y@Q_`x|
zKH~=WkyY_N;|7c5s$P`F$$4y5?{h_G>oVDDGf8`KPFvN9(~@>xyxvEs;7Y0&lqnwR
zWVK44MDfU(b5*Bggvgz%Vv-R>idhvZokUIq%OrD1`EvQI%1bPylr~o7B%4IyxQ|$o
zI#$I>uPahK>4X@DvT6efdpRep3QGMHSz%S|ap6Ffys#==&O9kItV)%OmL@l>wvc*J
z$quX1lB<ebjz#{esN^+5w8m>@`NGn`2mBXB0l`k@jN>qQS$-Q=&1U2nk2y60$1#{h
z-Pp!+&H63P#A(a(y3nNKU(aa*lTMz~r<3GGhhcX|;!YQtMb+r0Gw420tz2a#4(d8E
zablJOP>q1P>*Kb%xVK5~s786}Waxj~(GH$5ubENE<j6M`=`AAK*iMNy#ygbsF2cFx
zBKGU157EZr4qrW#hm$rQp6I0wg>L@PhGPHPEo~^Wb2YS~z(W?&;R%dAREMTIbpKt>
z`XEeo==@0}dWa6V4xMc%<iEPGN#_9Q8~{6VCq;u{n3RbVP7~k0jl}ib2l8g(bj<zZ
zS4Lw-i0~l7gFli*AN`2%(4JGKb8_s)hWl|&?!le|V0UTIix40L2mwNX5FiAm3xQXl
z3BQ9^;WAu-C3p>f53j=;@Fu(kZ^JwAF1!ct!w2vod<0iv8CGBwuEBNq7}j7NK7kFm
z0iVK6*o4pE7Hq-i@CEz<Zo?m^3&e-k+Lr;J-}lh=o;pql5CVh%AwUQa0)zk|KnM^5
zga9Ex2oM6JA@JQSeEY+lqwudE?;Yv={oau=etkf`-@y2Z=i){@<3}(Sx9A!F9!z%g
zp79STi08ZHH)u^jQ+~sr;m;&UPmn24{WJUpTJR<O6~2NyV8QliZbQ-!H3IYSe=SNN
APXGV_

literal 48128
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


From 4f4863af6fbabf9accf38948610d21551da93e33 Mon Sep 17 00:00:00 2001
From: MS <disinvite@users.noreply.github.com>
Date: Fri, 23 Jun 2023 02:00:51 -0400
Subject: [PATCH 10/10] Use bitfield for MxVideoParamFlags (#40)

* Use bitfield for MxVideoParamFlags

Using a bitfield for MxVideoParamFlags results in the same xor/and logic that was partially inlined in the header file. This approach is a lot cleaner and there's a good chance this is what the devs would have landed on.

The code generation is really finicky -- other inlines in the header influence the code just by being there -- so I decided to stub out all of them. This got the match to 100%.

While I was in isle.cpp::SetupVideoFlags, I changed the signature so that the `m_using16bit` parameter is just `using16bit`.

* fix: cast Set16Bit inline arg to byte
---
 ISLE/isle.cpp               |  24 +++----
 ISLE/isle.h                 |   2 +-
 LEGO1/mxvideoparamflags.cpp |  20 +++---
 LEGO1/mxvideoparamflags.h   | 137 +++++++++++++-----------------------
 4 files changed, 71 insertions(+), 112 deletions(-)

diff --git a/ISLE/isle.cpp b/ISLE/isle.cpp
index 9f3c50c4..b6a19ab2 100644
--- a/ISLE/isle.cpp
+++ b/ISLE/isle.cpp
@@ -36,7 +36,7 @@ Isle::Isle()
   m_windowActive = 1;
 
   m_videoParam = MxVideoParam(MxRect32(0, 0, 639, 479), NULL, 1, MxVideoParamFlags());
-  m_videoParam.flags().Enable16Bit(MxDirectDraw::GetPrimaryBitDepth() == 16);
+  m_videoParam.flags().Set16Bit(MxDirectDraw::GetPrimaryBitDepth() == 16);
 
   m_windowHandle = NULL;
   m_cursorArrow = NULL;
@@ -228,22 +228,22 @@ void Isle::LoadConfig()
 
 // OFFSET: ISLE 0x401560
 void Isle::SetupVideoFlags(BOOL fullScreen, BOOL flipSurfaces, BOOL backBuffers,
-                           BOOL using8bit, BOOL m_using16bit, BOOL param_6, BOOL param_7,
+                           BOOL using8bit, BOOL using16bit, BOOL param_6, BOOL param_7,
                            BOOL wideViewAngle, char *deviceId)
 {
-  m_videoParam.flags().EnableFullScreen(fullScreen);
-  m_videoParam.flags().EnableFlipSurfaces(flipSurfaces);
-  m_videoParam.flags().EnableBackBuffers(backBuffers);
-  m_videoParam.flags().EnableUnknown1(param_6);
-  m_videoParam.flags().SetUnknown3(param_7);
-  m_videoParam.flags().EnableWideViewAngle(wideViewAngle);
-  m_videoParam.flags().EnableUnknown2();
+  m_videoParam.flags().SetFullScreen(fullScreen);
+  m_videoParam.flags().SetFlipSurfaces(flipSurfaces);
+  m_videoParam.flags().SetBackBuffers(!backBuffers);
+  m_videoParam.flags().Set_f2bit0(!param_6);
+  m_videoParam.flags().Set_f1bit7(param_7);
+  m_videoParam.flags().SetWideViewAngle(wideViewAngle);
+  m_videoParam.flags().Set_f2bit1(1);
   m_videoParam.SetDeviceName(deviceId);
   if (using8bit) {
-    m_videoParam.flags().Set8Bit();
+    m_videoParam.flags().Set16Bit(0);
   }
-  if (m_using16bit) {
-    m_videoParam.flags().Set16Bit();
+  if (using16bit) {
+    m_videoParam.flags().Set16Bit(1);
   }
 }
 
diff --git a/ISLE/isle.h b/ISLE/isle.h
index e556a5c4..0b31d748 100644
--- a/ISLE/isle.h
+++ b/ISLE/isle.h
@@ -27,7 +27,7 @@ class Isle
   BOOL SetupLegoOmni();
   void LoadConfig();
   void SetupVideoFlags(BOOL fullScreen, BOOL flipSurfaces, BOOL backBuffers,
-                       BOOL using8bit, BOOL m_using16bit, BOOL param_6, BOOL param_7,
+                       BOOL using8bit, BOOL using16bit, BOOL param_6, BOOL param_7,
                        BOOL wideViewAngle, char *deviceId);
 
   void SetupCursor(WPARAM wParam);
diff --git a/LEGO1/mxvideoparamflags.cpp b/LEGO1/mxvideoparamflags.cpp
index 97f01515..07fc9ee3 100644
--- a/LEGO1/mxvideoparamflags.cpp
+++ b/LEGO1/mxvideoparamflags.cpp
@@ -3,15 +3,13 @@
 // OFFSET: LEGO1 0x100bec40
 MxVideoParamFlags::MxVideoParamFlags()
 {
-  // TODO: convert to EnableXXX function calls
-  unsigned char bVar1 = this->m_flags1;
-  this->m_flags1 = bVar1 & 0xfe;
-  this->m_flags1 = bVar1 & 0xfc;
-  this->m_flags1 = bVar1 & 0xf8;
-  this->m_flags1 = bVar1 & 0xf0;
-  this->m_flags1 = bVar1 & 0xe0;
-  this->m_flags2 = this->m_flags2 | 2;
-  this->m_flags1 = bVar1 & 0xc0;
-  this->m_flags1 = bVar1 & 0xc0 | 0x40;
-  this->m_flags1 = 0xc0;
+  this->SetFullScreen(0);
+  this->SetFlipSurfaces(0);
+  this->SetBackBuffers(0);
+  this->Set_f1bit3(0);
+  this->Set_f1bit4(0);
+  this->Set16Bit(0);
+  this->SetWideViewAngle(1);
+  this->Set_f1bit7(1);
+  this->Set_f2bit1(1);
 }
diff --git a/LEGO1/mxvideoparamflags.h b/LEGO1/mxvideoparamflags.h
index ef1b971d..ba7d821e 100644
--- a/LEGO1/mxvideoparamflags.h
+++ b/LEGO1/mxvideoparamflags.h
@@ -1,88 +1,49 @@
-#ifndef MXVIDEOPARAMFLAGS_H
-#define MXVIDEOPARAMFLAGS_H
-
-#include "legoinc.h"
-
-class MxVideoParamFlags
-{
-public:
-  enum LowFlags
-  {
-    FULL_SCREEN = 0x1,
-    FLIP_SURFACES = 0x2,
-    BACK_BUFFERS = 0x4,
-    ENABLE_16BIT = 0x20,
-    WIDE_VIEW_ANGLE = 0x40,
-    UNKNOWN3 = 0x80
-  };
-
-  enum HighFlags
-  {
-    UNKNOWN1 = 0x1,
-    UNKNOWN2 = 0x2
-  };
-
-  __declspec(dllexport) MxVideoParamFlags();
-
-  inline void EnableFullScreen(BOOL e)
-  {
-    m_flags1 = (m_flags1 ^ (e << 0)) & FULL_SCREEN ^ m_flags1;
-  }
-
-  inline void EnableFlipSurfaces(BOOL e)
-  {
-    m_flags1 = (m_flags1 ^ (e << 1)) & FLIP_SURFACES ^ m_flags1;
-  }
-
-  inline void EnableBackBuffers(BOOL e)
-  {
-    m_flags1 = (m_flags1 ^ ((!e) << 2)) & BACK_BUFFERS ^ m_flags1;
-  }
-
-  inline void SetUnknown3(BOOL e)
-  {
-    m_flags1 = (m_flags1 ^ (e << 7)) & UNKNOWN3 ^ m_flags1;
-  }
-
-  inline void Set8Bit()
-  {
-    m_flags1 &= ~ENABLE_16BIT;
-  }
-
-  inline void Set16Bit()
-  {
-    m_flags1 |= ENABLE_16BIT;
-  }
-
-  inline void Enable16Bit(unsigned char e)
-  {
-    m_flags1 = ((e << 5) ^ m_flags1) & ENABLE_16BIT ^ m_flags1;
-  }
-
-  inline void EnableWideViewAngle(BOOL e)
-  {
-    m_flags1 = (m_flags1 ^ (e << 6)) & WIDE_VIEW_ANGLE ^ m_flags1;
-  }
-
-  inline void EnableUnknown1(BOOL e)
-  {
-    m_flags2 = (m_flags2 ^ ((!e) << 0)) & UNKNOWN1 ^ m_flags2;
-  }
-
-  inline void EnableUnknown2(BOOL e)
-  {
-    m_flags2 = (m_flags2 ^ (e << 1)) & UNKNOWN2 ^ m_flags2;
-  }
-
-  inline void EnableUnknown2()
-  {
-    m_flags2 |= UNKNOWN2;
-  }
-
-private:
-  unsigned char m_flags1;
-  unsigned char m_flags2;
-
-};
-
-#endif // MXVIDEOPARAMFLAGS_H
+#ifndef MXVIDEOPARAMFLAGS_H
+#define MXVIDEOPARAMFLAGS_H
+
+#include "legoinc.h"
+
+// Must be union with struct for match.
+typedef union {
+  struct {
+    BYTE bit0: 1;
+    BYTE bit1: 1;
+    BYTE bit2: 1;
+    BYTE bit3: 1;
+    BYTE bit4: 1;
+    BYTE bit5: 1;
+    BYTE bit6: 1;
+    BYTE bit7: 1;
+  };
+  // BYTE all; // ?
+} flag_bitfield;
+
+class MxVideoParamFlags
+{
+public:
+  __declspec(dllexport) MxVideoParamFlags();
+
+  inline void SetFullScreen(BOOL e)    { m_flags1.bit0 = e; }
+  inline void SetFlipSurfaces(BOOL e)  { m_flags1.bit1 = e; }
+  inline void SetBackBuffers(BOOL e)   { m_flags1.bit2 = e; }
+  inline void Set_f1bit3(BOOL e)       { m_flags1.bit3 = e; }
+  inline void Set_f1bit4(BOOL e)       { m_flags1.bit4 = e; }
+  inline void Set16Bit(BYTE e)         { m_flags1.bit5 = e; }
+  inline void SetWideViewAngle(BOOL e) { m_flags1.bit6 = e; }
+  inline void Set_f1bit7(BOOL e)       { m_flags1.bit7 = e; }
+  inline void Set_f2bit0(BOOL e)       { m_flags2.bit0 = e; }
+  inline void Set_f2bit1(BOOL e)       { m_flags2.bit1 = e; }
+  inline void Set_f2bit2(BOOL e)       { m_flags2.bit2 = e; }
+  inline void Set_f2bit3(BOOL e)       { m_flags2.bit3 = e; }
+  inline void Set_f2bit4(BOOL e)       { m_flags2.bit4 = e; }
+  inline void Set_f2bit5(BOOL e)       { m_flags2.bit5 = e; }
+  inline void Set_f2bit6(BOOL e)       { m_flags2.bit6 = e; }
+  inline void Set_f2bit7(BOOL e)       { m_flags2.bit7 = e; }
+
+private:
+  flag_bitfield m_flags1;
+  flag_bitfield m_flags2;
+
+};
+
+#endif // MXVIDEOPARAMFLAGS_H