From 4db49fe6a6e3480413b37706c41fed51163f82b0 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Mon, 26 Jun 2023 18:48:19 +0200
Subject: [PATCH 01/31] match MxAutoLocker ctor/dtor (#52)

---
 LEGO1/mxautolocker.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LEGO1/mxautolocker.h b/LEGO1/mxautolocker.h
index 16dcb907..a2ce6caa 100644
--- a/LEGO1/mxautolocker.h
+++ b/LEGO1/mxautolocker.h
@@ -7,7 +7,7 @@ class MxAutoLocker
 {
   public:
     MxAutoLocker(MxCriticalSection* cs);
-    virtual ~MxAutoLocker();
+    ~MxAutoLocker();
   private:
     MxCriticalSection* m_criticalSection;
 };

From 6e8b93b07c818cfe15cc490428e7e762d6007494 Mon Sep 17 00:00:00 2001
From: MattKC <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 27 Jun 2023 10:56:59 -0700
Subject: [PATCH 02/31] Update CONTRIBUTING.md

---
 CONTRIBUTING.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 331b5746..2c6519ce 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,7 +6,7 @@ Generally, decompilation is a fairly advanced skill. If you aren't already famil
 
 ## Ghidra Server
 
-For documenting the original binaries and generating pseudocode that we decompile with, we primarily use [Ghidra](https://ghidra-sre.org/) (it's free and open source). To help with collaboration, we have a shared Ghidra repository with all of our current work. It is available to the public but read-only; to contribute to it yourself, you'll need approval from a current maintainer.
+For documenting the original binaries and generating pseudocode that we decompile with, we primarily use [Ghidra](https://ghidra-sre.org/) (it's free and open source). To help with collaboration, we have a shared Ghidra repository with all of our current work. You are free to check it out and mess around with it locally, however to prevent sabotage, you will need to request permission before you can push back to the server (ask in the Matrix room).
 
 To access the Ghidra repository, use the following details:
 
@@ -21,6 +21,7 @@ In general, we're not exhaustively strict about coding style, but there are some
 - `PascalCase` for classes and function names.
 - `m_camelCase` for member variables.
 - `g_camelCase` for global variables.
+- `p_camelCase` for function parameters.
 
 ## Kinds of Contributions
 

From 51ec2c97c60e107b27e15e06b4db8301add35966 Mon Sep 17 00:00:00 2001
From: Mark Langen <stravant@gmail.com>
Date: Tue, 27 Jun 2023 11:44:02 -0700
Subject: [PATCH 03/31] 100% Match of MxDSFile (#51)

* 100% Match of MxDSFile

* ...almost, MxDSFile::Open is still not quite matching but all of the
  other methods are 100% matching.

* Turns out that most of the virtual methods and some of the members are
  actually on the MxDSSource base class, which I've pulled out as part
  of this.

* In order to implement the methods I added the MXIOINFO class, which
  seems to be a thin wrapper around the MMIOINFO windows structure. We
  can tell this because MMIOINFO::~MMIOINFO was included in the DLL
  exports, and calls down to a function which deconstructs something
  looking exactly like MMIOINFO.

* Add mxdssource.cpp

* mattkc feedback

* some accuracy improvements

* Use FOURCC macro

* Tirival solve in mxioinfo.cpp

* Update mxdsfile.cpp

0xFFFFFFFF -> -1

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
---
 LEGO1/mxdsfile.cpp   | 126 ++++++++++++++++++++++++++++++++++++++++++-
 LEGO1/mxdsfile.h     |  40 +++++++++++---
 LEGO1/mxdssource.cpp |  14 +++++
 LEGO1/mxdssource.h   |  30 +++++++++++
 LEGO1/mxioinfo.cpp   |  49 +++++++++++++++++
 LEGO1/mxioinfo.h     |  12 +++++
 LEGO1/mxstring.h     |   2 +
 isle.mak             |  83 ++++++++++++++++++++++++++++
 isle.mdp             | Bin 50176 -> 52224 bytes
 9 files changed, 348 insertions(+), 8 deletions(-)
 create mode 100644 LEGO1/mxdssource.cpp
 create mode 100644 LEGO1/mxdssource.h
 create mode 100644 LEGO1/mxioinfo.cpp

diff --git a/LEGO1/mxdsfile.cpp b/LEGO1/mxdsfile.cpp
index 27d6668d..327fab46 100644
--- a/LEGO1/mxdsfile.cpp
+++ b/LEGO1/mxdsfile.cpp
@@ -1,6 +1,130 @@
 #include "mxdsfile.h"
 
+#include <stdio.h>
+
+#define SI_MAJOR_VERSION 2
+#define SI_MINOR_VERSION 2
+
+#define FOURCC(a, b, c, d) (((a) << 0) | ((b) << 8) | ((c) << 16) | ((d) << 24))
+
+// OFFSET: LEGO1 0x100cc4b0
+MxDSFile::MxDSFile(const char *filename, unsigned long skipReadingChunks)
+{
+  m_filename = filename;
+  m_skipReadingChunks = skipReadingChunks;
+}
+
+// OFFSET: LEGO1 0x100bfed0
+MxDSFile::~MxDSFile()
+{
+  Close();
+}
+
+// OFFSET: LEGO1 0x100cc590
+long MxDSFile::Open(unsigned long uStyle)
+{
+  // No idea what's stopping this one matching, but I'm pretty
+  // confident it has the correct behavior.
+  long longResult = 1;
+  memset(&m_io, 0, sizeof(MXIOINFO));
+
+  if (m_io.Open(m_filename.GetData(), uStyle) != 0) {
+    return -1;
+  }
+
+  m_io.SetBuffer(NULL, 0, 0);
+  m_position = 0;
+
+  if (m_skipReadingChunks == 0) {
+    longResult = ReadChunks();
+  }
+
+  if (longResult != 0) {
+    Close(); // vtable + 0x18
+  }
+  else {
+    Seek(0, 0); // vtable + 0x24
+  }
+
+  return longResult;
+}
+
+// OFFSET: LEGO1 0x100cc780
+long MxDSFile::Read(unsigned char *pch, unsigned long cch)
+{
+  if (m_io.Read((char*)pch, cch) != cch)
+    return -1;
+
+  m_position += cch;
+  return 0;
+}
+
+// OFFSET: LEGO1 0x100cc620
+long MxDSFile::ReadChunks()
+{
+  _MMCKINFO topChunk;
+  _MMCKINFO childChunk;
+  char tempBuffer[80];
+  
+  topChunk.fccType = FOURCC('O', 'M', 'N', 'I');
+  if (m_io.Descend(&topChunk, NULL, MMIO_FINDRIFF) != 0) {
+    return -1;
+  }
+  childChunk.ckid = FOURCC('M', 'x', 'H', 'd');
+  if (m_io.Descend(&childChunk, &topChunk, 0) != 0) {
+    return -1;
+  }
+
+  m_io.Read((char*)&m_header, 0xc);
+  if ((m_header.majorVersion == SI_MAJOR_VERSION) && (m_header.minorVersion == SI_MINOR_VERSION))
+  {
+    childChunk.ckid = FOURCC('M', 'x', 'O', 'f');
+    if (m_io.Descend(&childChunk, &topChunk, 0) != 0) {
+      return -1;
+    }
+    unsigned long* pLengthInDWords = &m_lengthInDWords;
+    m_io.Read((char *)pLengthInDWords, 4);
+    m_pBuffer = malloc(*pLengthInDWords * 4);
+    m_io.Read((char*)m_pBuffer, *pLengthInDWords * 4);
+    return 0;
+  }
+  else
+  {
+    sprintf(tempBuffer, "Wrong SI file version. %d.%d expected.", SI_MAJOR_VERSION, SI_MINOR_VERSION);
+    MessageBoxA(NULL, tempBuffer, NULL, MB_ICONERROR);
+    return -1;
+  }
+}
+
+// OFFSET: LEGO1 0x100cc7b0
+long MxDSFile::Seek(long lOffset, int iOrigin)
+{
+  return (m_position = m_io.Seek(lOffset, iOrigin)) == -1 ? -1 : 0;
+}
+
+// OFFSET: LEGO1 0x100cc7e0
 unsigned long MxDSFile::GetBufferSize()
 {
-  return this->m_buffersize;
+  return m_header.bufferSize;
+}
+
+// OFFSET: LEGO1 0x100cc7f0
+unsigned long MxDSFile::GetStreamBuffersNum()
+{
+  return m_header.streamBuffersNum;
+}
+
+// OFFSET: LEGO1 0x100cc740
+long MxDSFile::Close()
+{
+  m_io.Close(0);
+  m_position = -1;
+  memset(&m_header, 0, sizeof(m_header));
+  if (m_lengthInDWords != 0)
+  {
+    m_lengthInDWords = 0;
+    free(m_pBuffer);
+    m_pBuffer = NULL;
+  }
+  return 0;
 }
diff --git a/LEGO1/mxdsfile.h b/LEGO1/mxdsfile.h
index d28928dc..e1e170d4 100644
--- a/LEGO1/mxdsfile.h
+++ b/LEGO1/mxdsfile.h
@@ -1,20 +1,46 @@
 #ifndef MXDSFILE_H
 #define MXDSFILE_H
 
-class MxDSFile
+#include "mxcore.h"
+#include "mxstring.h"
+#include "mxioinfo.h"
+#include "mxdssource.h"
+class MxDSFile : public MxDSSource
 {
 public:
-  __declspec(dllexport) MxDSFile(const char *,unsigned long);
+  __declspec(dllexport) MxDSFile(const char *filename, unsigned long skipReadingChunks);
   __declspec(dllexport) virtual ~MxDSFile();
-  __declspec(dllexport) virtual long Close();
-  __declspec(dllexport) virtual unsigned long GetBufferSize();
-  __declspec(dllexport) virtual unsigned long GetStreamBuffersNum();
   __declspec(dllexport) virtual long Open(unsigned long);
+  __declspec(dllexport) virtual long Close();
   __declspec(dllexport) virtual long Read(unsigned char *,unsigned long);
   __declspec(dllexport) virtual long Seek(long,int);
+  __declspec(dllexport) virtual unsigned long GetBufferSize();
+  __declspec(dllexport) virtual unsigned long GetStreamBuffersNum();
+
 private:
-  char m_unknown[0x70];
-  unsigned long m_buffersize;
+  long ReadChunks();
+  struct ChunkHeader {
+    ChunkHeader()
+      : majorVersion(0)
+      , minorVersion(0)
+      , bufferSize(0)
+      , streamBuffersNum(0)
+    {}
+
+    unsigned short majorVersion;
+    unsigned short minorVersion;
+    unsigned long bufferSize;
+    short streamBuffersNum;
+    short reserved;
+  };
+
+  MxString m_filename;
+  MXIOINFO m_io;
+  ChunkHeader m_header;
+
+  // If false, read chunks immediately on open, otherwise
+  // skip reading chunks until ReadChunks is explicitly called.
+  unsigned long m_skipReadingChunks;
 };
 
 #endif // MXDSFILE_H
diff --git a/LEGO1/mxdssource.cpp b/LEGO1/mxdssource.cpp
new file mode 100644
index 00000000..8612c5c4
--- /dev/null
+++ b/LEGO1/mxdssource.cpp
@@ -0,0 +1,14 @@
+#include "mxdssource.h"
+
+// OFFSET: LEGO1 0x100bffd0
+void MxDSSource::SomethingWhichCallsRead(void* pUnknownObject)
+{
+  // TODO: Calls read, reading into a buffer somewhere in pUnknownObject.
+  Read(NULL, 0);
+}
+
+// OFFSET: LEGO1 0x100bfff0
+long MxDSSource::GetLengthInDWords()
+{
+  return m_lengthInDWords;
+}
\ No newline at end of file
diff --git a/LEGO1/mxdssource.h b/LEGO1/mxdssource.h
new file mode 100644
index 00000000..7ee01490
--- /dev/null
+++ b/LEGO1/mxdssource.h
@@ -0,0 +1,30 @@
+#ifndef MXDSSOURCE_H
+#define MXDSSOURCE_H
+
+#include "mxcore.h"
+
+class MxDSSource : public MxCore
+{
+public:
+  MxDSSource()
+    : m_lengthInDWords(0)
+    , m_pBuffer(0)
+    , m_position(-1)
+  {}
+
+  virtual long Open(unsigned long) = 0;
+  virtual long Close() = 0;
+  virtual void SomethingWhichCallsRead(void* pUnknownObject);
+  virtual long Read(unsigned char *, unsigned long) = 0;
+  virtual long Seek(long, int) = 0;
+  virtual unsigned long GetBufferSize() = 0;
+  virtual unsigned long GetStreamBuffersNum() = 0;
+  virtual long GetLengthInDWords();
+
+protected:
+  unsigned long m_lengthInDWords;
+  void* m_pBuffer;
+  long m_position;
+};
+
+#endif // MXDSSOURCE_H
\ No newline at end of file
diff --git a/LEGO1/mxioinfo.cpp b/LEGO1/mxioinfo.cpp
new file mode 100644
index 00000000..ebe2a480
--- /dev/null
+++ b/LEGO1/mxioinfo.cpp
@@ -0,0 +1,49 @@
+#include "mxioinfo.h"
+
+// OFFSET: LEGO1 0x100cc800
+MXIOINFO::MXIOINFO()
+{
+  memset(&m_info, 0, sizeof(MMIOINFO));
+}
+
+// OFFSET: LEGO1 0x100cc820
+MXIOINFO::~MXIOINFO()
+{
+  Close(0);
+}
+
+// OFFSET: LEGO1 0x100cc830
+unsigned short MXIOINFO::Open(const char *filename, DWORD fdwOpen)
+{
+  return 0;
+}
+
+// OFFSET: LEGO1 0x100cc8e0
+void MXIOINFO::Close(long arg)
+{
+  
+}
+
+// OFFSET: LEGO1 0x100cc930
+unsigned long MXIOINFO::Read(HPSTR pch, LONG cch)
+{
+  return 0;
+}
+
+// OFFSET: LEGO1 0x100cca00
+LONG MXIOINFO::Seek(LONG lOffset, int iOrigin)
+{
+  return 0;
+}
+
+// OFFSET: LEGO1 0x100ccbc0
+void MXIOINFO::SetBuffer(LPSTR pchBuffer, LONG cchBuffer, LONG unk)
+{
+  
+}
+
+// OFFSET: LEGO1 0x100cce60
+unsigned short MXIOINFO::Descend(LPMMCKINFO pmmcki, const MMCKINFO *pmmckiParent, UINT fuDescend)
+{
+  return 0;
+}
\ No newline at end of file
diff --git a/LEGO1/mxioinfo.h b/LEGO1/mxioinfo.h
index d3f2a40e..59ee3807 100644
--- a/LEGO1/mxioinfo.h
+++ b/LEGO1/mxioinfo.h
@@ -1,10 +1,22 @@
 #ifndef MXIOINFO_H
 #define MXIOINFO_H
 
+#include "legoinc.h"
+#include "mmsystem.h"
 class MXIOINFO
 {
 public:
+  MXIOINFO();
   __declspec(dllexport) ~MXIOINFO();
+
+  unsigned short Open(const char *filename, DWORD fdwOpen);
+  void Close(long arg);
+  LONG Seek(LONG lOffset, int iOrigin);
+  unsigned long Read(HPSTR pch, LONG cch);
+  void SetBuffer(LPSTR pchBuffer, LONG cchBuffer, LONG unk);
+  unsigned short Descend(LPMMCKINFO pmmcki, const MMCKINFO *pmmckiParent, UINT fuDescend);
+
+  MMIOINFO m_info;
 };
 
 #endif // MXIOINFO_H
diff --git a/LEGO1/mxstring.h b/LEGO1/mxstring.h
index 0f9ff9f3..a9a25ba1 100644
--- a/LEGO1/mxstring.h
+++ b/LEGO1/mxstring.h
@@ -16,6 +16,8 @@ class MxString : public MxCore
   void ToLowerCase();
   const MxString &operator=(MxString *);
 
+  inline const char *GetData() const { return m_data; }
+
 private:
   char *m_data;
   unsigned short m_length;
diff --git a/isle.mak b/isle.mak
index 59570097..7eaf3d48 100644
--- a/isle.mak
+++ b/isle.mak
@@ -61,7 +61,10 @@ CLEAN :
 	-@erase "$(INTDIR)\mxautolocker.obj"
 	-@erase "$(INTDIR)\mxcore.obj"
 	-@erase "$(INTDIR)\mxcriticalsection.obj"
+	-@erase "$(INTDIR)\mxdsfile.obj"
 	-@erase "$(INTDIR)\mxdsobject.obj"
+	-@erase "$(INTDIR)\mxdssource.obj"
+	-@erase "$(INTDIR)\mxioinfo.obj"
 	-@erase "$(INTDIR)\mxomni.obj"
 	-@erase "$(INTDIR)\mxomnicreateflags.obj"
 	-@erase "$(INTDIR)\mxomnicreateparam.obj"
@@ -138,7 +141,10 @@ LINK32_OBJS= \
 	"$(INTDIR)\mxautolocker.obj" \
 	"$(INTDIR)\mxcore.obj" \
 	"$(INTDIR)\mxcriticalsection.obj" \
+	"$(INTDIR)\mxdsfile.obj" \
 	"$(INTDIR)\mxdsobject.obj" \
+	"$(INTDIR)\mxdssource.obj" \
+	"$(INTDIR)\mxioinfo.obj" \
 	"$(INTDIR)\mxomni.obj" \
 	"$(INTDIR)\mxomnicreateflags.obj" \
 	"$(INTDIR)\mxomnicreateparam.obj" \
@@ -181,7 +187,10 @@ CLEAN :
 	-@erase "$(INTDIR)\mxautolocker.obj"
 	-@erase "$(INTDIR)\mxcore.obj"
 	-@erase "$(INTDIR)\mxcriticalsection.obj"
+	-@erase "$(INTDIR)\mxdsfile.obj"
 	-@erase "$(INTDIR)\mxdsobject.obj"
+	-@erase "$(INTDIR)\mxdssource.obj"
+	-@erase "$(INTDIR)\mxioinfo.obj"
 	-@erase "$(INTDIR)\mxomni.obj"
 	-@erase "$(INTDIR)\mxomnicreateflags.obj"
 	-@erase "$(INTDIR)\mxomnicreateparam.obj"
@@ -260,7 +269,10 @@ LINK32_OBJS= \
 	"$(INTDIR)\mxautolocker.obj" \
 	"$(INTDIR)\mxcore.obj" \
 	"$(INTDIR)\mxcriticalsection.obj" \
+	"$(INTDIR)\mxdsfile.obj" \
 	"$(INTDIR)\mxdsobject.obj" \
+	"$(INTDIR)\mxdssource.obj" \
+	"$(INTDIR)\mxioinfo.obj" \
 	"$(INTDIR)\mxomni.obj" \
 	"$(INTDIR)\mxomnicreateflags.obj" \
 	"$(INTDIR)\mxomnicreateparam.obj" \
@@ -524,7 +536,9 @@ DEP_CPP_LEGOO=\
 	".\LEGO1\mxdsaction.h"\
 	".\LEGO1\mxdsfile.h"\
 	".\LEGO1\mxdsobject.h"\
+	".\LEGO1\mxdssource.h"\
 	".\LEGO1\mxeventmanager.h"\
+	".\LEGO1\mxioinfo.h"\
 	".\LEGO1\mxmusicmanager.h"\
 	".\LEGO1\mxnotificationmanager.h"\
 	".\LEGO1\mxobjectfactory.h"\
@@ -645,8 +659,11 @@ DEP_CPP_MXOMN=\
 SOURCE=.\LEGO1\mxvideoparam.cpp
 DEP_CPP_MXVID=\
 	".\LEGO1\legoinc.h"\
+	".\LEGO1\mxbool.h"\
+	".\LEGO1\mxcore.h"\
 	".\LEGO1\mxpalette.h"\
 	".\LEGO1\mxrect32.h"\
+	".\LEGO1\mxresult.h"\
 	".\LEGO1\mxvariabletable.h"\
 	".\LEGO1\mxvideoparam.h"\
 	".\LEGO1\mxvideoparamflags.h"\
@@ -684,6 +701,7 @@ DEP_CPP_MXOMNI=\
 	".\LEGO1\mxomnicreateparambase.h"\
 	".\LEGO1\mxpalette.h"\
 	".\LEGO1\mxrect32.h"\
+	".\LEGO1\mxresult.h"\
 	".\LEGO1\mxstring.h"\
 	".\LEGO1\mxvariabletable.h"\
 	".\LEGO1\mxvideoparam.h"\
@@ -708,6 +726,7 @@ DEP_CPP_MXOMNIC=\
 	".\LEGO1\mxomnicreateparambase.h"\
 	".\LEGO1\mxpalette.h"\
 	".\LEGO1\mxrect32.h"\
+	".\LEGO1\mxresult.h"\
 	".\LEGO1\mxstring.h"\
 	".\LEGO1\mxvariabletable.h"\
 	".\LEGO1\mxvideoparam.h"\
@@ -773,7 +792,9 @@ DEP_CPP_LEGON=\
 	".\LEGO1\mxdsaction.h"\
 	".\LEGO1\mxdsfile.h"\
 	".\LEGO1\mxdsobject.h"\
+	".\LEGO1\mxdssource.h"\
 	".\LEGO1\mxeventmanager.h"\
+	".\LEGO1\mxioinfo.h"\
 	".\LEGO1\mxmusicmanager.h"\
 	".\LEGO1\mxnotificationmanager.h"\
 	".\LEGO1\mxobjectfactory.h"\
@@ -842,6 +863,7 @@ DEP_CPP_MXUNK=\
 	".\LEGO1\mxbool.h"\
 	".\LEGO1\mxcore.h"\
 	".\LEGO1\mxcriticalsection.h"\
+	".\LEGO1\mxresult.h"\
 	".\LEGO1\mxunknown100dc6b0.h"\
 	
 
@@ -861,6 +883,7 @@ DEP_CPP_MXVIDEO=\
 	".\LEGO1\mxcriticalsection.h"\
 	".\LEGO1\mxpalette.h"\
 	".\LEGO1\mxrect32.h"\
+	".\LEGO1\mxresult.h"\
 	".\LEGO1\mxunknown100dc6b0.h"\
 	".\LEGO1\mxvariabletable.h"\
 	".\LEGO1\mxvideomanager.h"\
@@ -878,13 +901,62 @@ DEP_CPP_MXVIDEO=\
 
 SOURCE=.\LEGO1\mxpalette.cpp
 DEP_CPP_MXPAL=\
+	".\LEGO1\mxbool.h"\
+	".\LEGO1\mxcore.h"\
 	".\LEGO1\mxpalette.h"\
+	".\LEGO1\mxresult.h"\
 	
 
 "$(INTDIR)\mxpalette.obj" : $(SOURCE) $(DEP_CPP_MXPAL) "$(INTDIR)"
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\mxioinfo.cpp
+DEP_CPP_MXIOI=\
+	".\LEGO1\mxioinfo.h"\
+	
+
+"$(INTDIR)\mxioinfo.obj" : $(SOURCE) $(DEP_CPP_MXIOI) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\mxdsfile.cpp
+DEP_CPP_MXDSF=\
+	".\LEGO1\mxbool.h"\
+	".\LEGO1\mxcore.h"\
+	".\LEGO1\mxdsfile.h"\
+	".\LEGO1\mxdssource.h"\
+	".\LEGO1\mxioinfo.h"\
+	".\LEGO1\mxstring.h"\
+	
+
+"$(INTDIR)\mxdsfile.obj" : $(SOURCE) $(DEP_CPP_MXDSF) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\mxdssource.cpp
+DEP_CPP_MXDSS=\
+	".\LEGO1\mxbool.h"\
+	".\LEGO1\mxcore.h"\
+	".\LEGO1\mxdssource.h"\
+	
+
+"$(INTDIR)\mxdssource.obj" : $(SOURCE) $(DEP_CPP_MXDSS) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
 # End Source File
 # End Target
 ################################################################################
@@ -944,7 +1016,9 @@ DEP_CPP_ISLE_=\
 	".\LEGO1\mxdsaction.h"\
 	".\LEGO1\mxdsfile.h"\
 	".\LEGO1\mxdsobject.h"\
+	".\LEGO1\mxdssource.h"\
 	".\LEGO1\mxeventmanager.h"\
+	".\LEGO1\mxioinfo.h"\
 	".\LEGO1\mxmusicmanager.h"\
 	".\LEGO1\mxnotificationmanager.h"\
 	".\LEGO1\mxobjectfactory.h"\
@@ -982,25 +1056,34 @@ 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"\
+	".\LEGO1\mxdssource.h"\
 	".\LEGO1\mxeventmanager.h"\
+	".\LEGO1\mxioinfo.h"\
 	".\LEGO1\mxmusicmanager.h"\
 	".\LEGO1\mxnotificationmanager.h"\
 	".\LEGO1\mxobjectfactory.h"\
diff --git a/isle.mdp b/isle.mdp
index 390064aa600f2bb5cc48156405e1040876938d6d..9449bd89ad80f94b71cded5a7863892a0bbb9186 100644
GIT binary patch
literal 52224
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

literal 50176
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
IhQK`h4@5i>LI3~&


From 24ec7023bdfd3b455e58655570ab859f1e7e6b2e Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Tue, 27 Jun 2023 22:07:29 +0200
Subject: [PATCH 04/31] isle: match WndProc and re-arrange functions in
 `ISLE.EXE` (#45)

* match WinProc

* minor accuracy improvement

* WndProc at 50%

* fix WM_DISPLAYCHANGE branching

* fix type

* fix x/y comparison

* WndProc 82%

* 84%

* 97%

* rearrange functions to get close to the original

* remove newline

* inline no longer necessary

* merge
---
 ISLE/define.cpp             |   2 +-
 ISLE/define.h               |   2 +-
 ISLE/isle.cpp               | 563 +++++++++++++++++++++++++++++++++---
 ISLE/isle.h                 | 217 +-------------
 ISLE/main.cpp               | 311 --------------------
 LEGO1/mxpalette.cpp         |   0
 LEGO1/mxunknown100dc6b0.cpp |   0
 LEGO1/mxunknown100dc6b0.h   |   0
 LEGO1/mxvideomanager.cpp    |   0
 isle.mak                    | 122 ++------
 isle.mdp                    | Bin 52224 -> 51200 bytes
 11 files changed, 568 insertions(+), 649 deletions(-)
 delete mode 100644 ISLE/main.cpp
 mode change 100755 => 100644 LEGO1/mxpalette.cpp
 mode change 100755 => 100644 LEGO1/mxunknown100dc6b0.cpp
 mode change 100755 => 100644 LEGO1/mxunknown100dc6b0.h
 mode change 100755 => 100644 LEGO1/mxvideomanager.cpp

diff --git a/ISLE/define.cpp b/ISLE/define.cpp
index b5501b08..0a77efd9 100644
--- a/ISLE/define.cpp
+++ b/ISLE/define.cpp
@@ -28,7 +28,7 @@ int g_targetWidth = 640;
 int g_targetHeight = 480;
 
 // 0x410060
-unsigned int g_targetDepth = 16;
+int g_targetDepth = 16;
 
 // 0x410064
 int g_reqEnableRMDevice = 0;
diff --git a/ISLE/define.h b/ISLE/define.h
index 27a347b7..41f7de27 100644
--- a/ISLE/define.h
+++ b/ISLE/define.h
@@ -18,7 +18,7 @@ extern int g_rmDisabled;
 extern int g_waitingForTargetDepth;
 extern int g_targetWidth;
 extern int g_targetHeight;
-extern unsigned int g_targetDepth;
+extern int g_targetDepth;
 extern int g_reqEnableRMDevice;
 extern int g_startupDelay;
 extern long g_lastFrameTime;
diff --git a/ISLE/isle.cpp b/ISLE/isle.cpp
index 051572ef..efaa2564 100644
--- a/ISLE/isle.cpp
+++ b/ISLE/isle.cpp
@@ -1,4 +1,18 @@
 #include "isle.h"
+#include "define.h"
+
+#include <dsound.h>
+
+#include "legoomni.h"
+#include "legoanimationmanager.h"
+#include "legobuildingmanager.h"
+#include "legomodelpresenter.h"
+#include "legopartpresenter.h"
+#include "legoworldpresenter.h"
+#include "mxdirectdraw.h"
+#include "mxdsaction.h"
+
+#include "res/resource.h"
 
 // OFFSET: ISLE 0x401000
 Isle::Isle()
@@ -97,6 +111,459 @@ void Isle::Close()
   }
 }
 
+// OFFSET: ISLE 0x4013b0
+BOOL Isle::SetupLegoOmni()
+{
+  BOOL result = FALSE;
+  char mediaPath[256];
+  GetProfileStringA("LEGO Island", "MediaPath", "", mediaPath, sizeof(mediaPath));
+
+  BOOL failure = Lego()->Create(MxOmniCreateParam(mediaPath, (struct HWND__ *) m_windowHandle, m_videoParam, MxOmniCreateFlags())) == FAILURE;
+  if (!failure) {
+    VariableTable()->SetVariable("ACTOR_01", "");
+    TickleManager()->vtable1c(VideoManager(), 10);
+    result = TRUE;
+  }
+
+  return result;
+}
+
+// OFFSET: ISLE 0x401560
+void Isle::SetupVideoFlags(BOOL fullScreen, BOOL flipSurfaces, BOOL backBuffers,
+                           BOOL using8bit, BOOL using16bit, BOOL param_6, BOOL param_7,
+                           BOOL wideViewAngle, char *deviceId)
+{
+  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().Set16Bit(0);
+  }
+  if (using16bit) {
+    m_videoParam.flags().Set16Bit(1);
+  }
+}
+
+BOOL FindExistingInstance(void);
+BOOL StartDirectSound(void);
+
+// OFFSET: ISLE 0x401610
+int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd)
+{
+  // Look for another instance, if we find one, bring it to the foreground instead
+  if (!FindExistingInstance()) {
+    return 0;
+  }
+
+  // Attempt to create DirectSound instance
+  BOOL soundReady = FALSE;
+  for (int i = 0; i < 20; i++) {
+    if (StartDirectSound()) {
+      soundReady = TRUE;
+      break;
+    }
+    Sleep(500);
+  }
+
+  // Throw error if sound unavailable
+  if (!soundReady) {
+    MessageBoxA(NULL, "\"LEGO\xAE Island\" is not detecting a DirectSound compatible sound card.  Please quit all other applications and try again.",
+      "Lego Island Error", MB_OK);
+    return 0;
+  }
+
+  // Create global app instance
+  g_isle = new Isle();
+
+  // Create window
+  if (g_isle->SetupWindow(hInstance, lpCmdLine) != SUCCESS) {
+    MessageBoxA(NULL, "\"LEGO\xAE Island\" failed to start.  Please quit all other applications and try again.", "LEGO\xAE Island Error", MB_OK);
+    return 0;
+  }
+
+  // Get reference to window
+  HWND window;
+  if (g_isle->m_windowHandle) {
+    window = g_isle->m_windowHandle;
+  }
+
+  // Load accelerators (this call actually achieves nothing - there is no "AppAccel" resource in the original - but we'll keep this for authenticity)
+  // This line may actually be here because it's in DFVIEW, an example project that ships with
+  // MSVC420, and was such a clean example of a Win32 app, that it was later adapted
+  // into an "ExeSkeleton" sample for MSVC600. It's quite possible Mindscape derived
+  // this app from that example since they no longer had the luxury of the
+  // MFC AppWizard which we know they used for the frontend used during development (ISLEMFC.EXE, MAIN.EXE, et al.)
+  LoadAcceleratorsA(hInstance, "AppAccel");
+
+  MSG msg;
+
+  while (!g_closed) {
+    while (!PeekMessageA(&msg, NULL, 0, 0, PM_NOREMOVE)) {
+      if (g_isle) {
+        g_isle->Tick(1);
+      }
+    }
+
+    if (g_isle) {
+      g_isle->Tick(0);
+    }
+
+    while (!g_closed) {
+      if (!PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) {
+        break;
+      }
+
+      MSG nextMsg;
+      if (!g_isle
+          || !g_isle->m_windowHandle
+          || msg.message != WM_MOUSEMOVE
+          || !PeekMessageA(&nextMsg, NULL, 0, 0, PM_NOREMOVE)
+          || nextMsg.message != WM_MOUSEMOVE) {
+        TranslateMessage(&msg);
+        DispatchMessageA(&msg);
+      }
+
+      if (g_reqEnableRMDevice) {
+        g_reqEnableRMDevice = 0;
+        VideoManager()->EnableRMDevice();
+        g_rmDisabled = 0;
+        Lego()->vtable3c();
+      }
+
+      if (g_closed) {
+        break;
+      }
+
+      if (g_mousedown == 0) {
+LAB_00401bc7:
+        if (g_mousemoved) {
+          g_mousemoved = FALSE;
+        }
+      } else if (g_mousemoved) {
+        if (g_isle) {
+          g_isle->Tick(0);
+        }
+        goto LAB_00401bc7;
+      }
+    }
+  }
+
+  DestroyWindow(window);
+
+  return msg.wParam;
+}
+
+// OFFSET: ISLE 0x401ca0
+BOOL FindExistingInstance(void)
+{
+  HWND hWnd = FindWindowA(WNDCLASS_NAME, WINDOW_TITLE);
+  if (hWnd) {
+    if (SetForegroundWindow(hWnd)) {
+      ShowWindow(hWnd, SW_RESTORE);
+    }
+    return 0;
+  }
+  return 1;
+}
+
+// OFFSET: ISLE 0x401ce0
+BOOL StartDirectSound(void)
+{
+  LPDIRECTSOUND lpDS = NULL;
+  HRESULT ret = DirectSoundCreate(NULL, &lpDS, NULL);
+  if (ret == DS_OK && lpDS != NULL) {
+    lpDS->Release();
+    return TRUE;
+  }
+
+  return FALSE;
+}
+
+// OFFSET: ISLE 0x401d20
+LRESULT WINAPI WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+  NotificationId type;
+  unsigned char keyCode = 0;
+
+  if (!g_isle) {
+    return DefWindowProcA(hWnd, uMsg, wParam, lParam);
+  }
+
+  switch (uMsg) {
+  case WM_PAINT:
+    return DefWindowProcA(hWnd, uMsg, wParam, lParam);
+  case WM_ACTIVATE:
+    return DefWindowProcA(hWnd, uMsg, wParam, lParam);
+  case WM_ACTIVATEAPP:
+    if (g_isle) {
+      if ((wParam != 0) && (g_isle->m_fullScreen)) {
+        MoveWindow(hWnd, g_windowRect.left, g_windowRect.top,
+                   (g_windowRect.right - g_windowRect.left) + 1,
+                   (g_windowRect.bottom - g_windowRect.top) + 1, TRUE);
+      }
+      g_isle->m_windowActive = wParam;
+    }
+    return DefWindowProcA(hWnd,uMsg,wParam,lParam);
+  case WM_CLOSE:
+    if (!g_closed && g_isle) {
+      if (g_isle) {
+        delete g_isle;
+      }
+      g_isle = NULL;
+      g_closed = TRUE;
+      return 0;
+    }
+    return DefWindowProcA(hWnd,uMsg,wParam,lParam);
+  case WM_GETMINMAXINFO:
+    ((MINMAXINFO*) lParam)->ptMaxTrackSize.x = (g_windowRect.right - g_windowRect.left) + 1;
+    ((MINMAXINFO*) lParam)->ptMaxTrackSize.y = (g_windowRect.bottom - g_windowRect.top) + 1;
+    ((MINMAXINFO*) lParam)->ptMinTrackSize.x = (g_windowRect.right - g_windowRect.left) + 1;
+    ((MINMAXINFO*) lParam)->ptMinTrackSize.y = (g_windowRect.bottom - g_windowRect.top) + 1;
+    return 0;
+  case WM_ENTERMENULOOP:
+    return DefWindowProcA(hWnd,uMsg,wParam,lParam);
+  case WM_SYSCOMMAND:
+    if (wParam == SC_SCREENSAVE) {
+      return 0;
+    }
+    if (wParam == SC_CLOSE && g_closed == 0) {
+      if (g_isle) {
+        if (g_rmDisabled) {
+          ShowWindow(g_isle->m_windowHandle, SW_RESTORE);
+        }
+        PostMessageA(g_isle->m_windowHandle, WM_CLOSE, 0, 0);
+        return 0;
+      }
+    } else if (g_isle && g_isle->m_fullScreen && (wParam == SC_MOVE || wParam == SC_KEYMENU)) {
+      return 0;
+    }
+    return DefWindowProcA(hWnd,uMsg,wParam,lParam);
+  case WM_EXITMENULOOP:
+    return DefWindowProcA(hWnd, uMsg, wParam, lParam);
+  case WM_MOVING:
+    if (g_isle && g_isle->m_fullScreen) {
+      GetWindowRect(hWnd, (LPRECT) lParam);
+      return 0;
+    }
+    return DefWindowProcA(hWnd, uMsg, wParam, lParam);
+  case WM_NCPAINT:
+    if (g_isle && g_isle->m_fullScreen) {
+      return 0;
+    }
+    return DefWindowProcA(hWnd, uMsg, wParam, lParam);
+  case WM_DISPLAYCHANGE:
+    if (g_isle && VideoManager() && g_isle->m_fullScreen && VideoManager()->m_unk74 && VideoManager()->m_unk74[0x220]) {
+      int targetWidth = LOWORD(lParam);
+      int targetHeight = HIWORD(lParam);
+      int targetDepth = wParam;
+
+      if (g_waitingForTargetDepth) {
+        g_waitingForTargetDepth = 0;
+        g_targetDepth = targetDepth;
+      }
+      else {
+        BOOL valid = FALSE;
+        if (targetWidth == g_targetWidth && targetHeight == g_targetHeight && g_targetDepth == targetDepth) {
+          valid = TRUE;
+        }
+
+        if (g_rmDisabled) {
+          if (valid) {
+             g_reqEnableRMDevice = 1;
+          }
+        }
+        else if (!valid) {
+          g_rmDisabled = 1;
+          Lego()->vtable38();
+          VideoManager()->DisableRMDevice();
+        }
+      }
+    }
+    return DefWindowProcA(hWnd, uMsg, wParam, lParam);
+  case WM_SETCURSOR:
+    if (g_isle) {
+      HCURSOR hCursor = g_isle->m_cursorCurrent;
+      if (hCursor == g_isle->m_cursorBusy || hCursor == g_isle->m_cursorNo || !hCursor) {
+        SetCursor(hCursor);
+        return 0;
+      }
+    }
+    break;
+  case WM_KEYDOWN:
+    // While this probably should be (HIWORD(lParam) & KF_REPEAT), this seems
+    // to be what the assembly is actually doing
+    if (lParam & (KF_REPEAT << 16)) {
+      return DefWindowProcA(hWnd, uMsg, wParam, lParam);
+    }
+    keyCode = wParam;
+    type = KEYDOWN;
+    break;
+  case WM_MOUSEMOVE:
+    g_mousemoved = 1;
+    type = MOUSEMOVE;
+    break;
+  case WM_TIMER:
+    type = TIMER;
+    break;
+  case WM_LBUTTONDOWN:
+    g_mousedown = 1;
+    type = MOUSEDOWN;
+    break;
+  case WM_LBUTTONUP:
+    g_mousedown = 0;
+    type = MOUSEUP;
+    break;
+  case 0x5400:
+    if (g_isle) {
+      g_isle->SetupCursor(wParam);
+      return 0;
+    }
+    break;
+  default:
+    return DefWindowProcA(hWnd,uMsg,wParam,lParam);
+  }
+
+  if (g_isle) {
+    if (InputManager()) {
+      InputManager()->QueueEvent(type, wParam, LOWORD(lParam), HIWORD(lParam), keyCode);
+    }
+    if (g_isle && g_isle->m_drawCursor && type == MOUSEMOVE) {
+      int x = LOWORD(lParam);
+      int y = HIWORD(lParam);
+      if (x >= 640) {
+        x = 639;
+      }
+      if (y >= 480) {
+        y = 479;
+      }
+      VideoManager()->MoveCursor(x,y);
+    }
+  }
+
+  return 0;
+}
+
+// OFFSET: ISLE 0x4023e0
+MxResult Isle::SetupWindow(HINSTANCE hInstance, LPSTR lpCmdLine)
+{
+  WNDCLASSA wndclass;
+  ZeroMemory(&wndclass, sizeof(WNDCLASSA));
+
+  LoadConfig();
+
+  SetupVideoFlags(m_fullScreen, m_flipSurfaces, m_backBuffersInVram, m_using8bit,
+                  m_using16bit, m_unk24, FALSE, m_wideViewAngle, m_deviceId);
+
+  MxOmni::SetSound3D(m_use3dSound);
+
+  srand(timeGetTime() / 1000);
+  SystemParametersInfoA(SPI_SETMOUSETRAILS, 0, NULL, 0);
+
+  ZeroMemory(&wndclass, sizeof(WNDCLASSA));
+
+  wndclass.cbClsExtra = 0;
+  wndclass.style = CS_HREDRAW | CS_VREDRAW;
+  wndclass.lpfnWndProc = WndProc;
+  wndclass.cbWndExtra = 0;
+  wndclass.hIcon = LoadIconA(hInstance, MAKEINTRESOURCEA(APP_ICON));
+  wndclass.hCursor = m_cursorArrow = m_cursorCurrent = LoadCursorA(hInstance, MAKEINTRESOURCEA(ISLE_ARROW));
+  m_cursorBusy = LoadCursorA(hInstance, MAKEINTRESOURCEA(ISLE_BUSY));
+  m_cursorNo = LoadCursorA(hInstance, MAKEINTRESOURCEA(ISLE_NO));
+  wndclass.hInstance = hInstance;
+  wndclass.hbrBackground = (HBRUSH) GetStockObject(BLACK_BRUSH);
+  wndclass.lpszClassName = WNDCLASS_NAME;
+
+  if (!RegisterClassA(&wndclass)) {
+    return FAILURE;
+  }
+
+  if (m_fullScreen) {
+    AdjustWindowRectEx(&g_windowRect, WS_CAPTION | WS_SYSMENU, 0, WS_EX_APPWINDOW);
+
+    m_windowHandle = CreateWindowExA(
+      WS_EX_APPWINDOW,
+      WNDCLASS_NAME,
+      WINDOW_TITLE,
+      WS_CAPTION | WS_SYSMENU,
+      g_windowRect.left,
+      g_windowRect.top,
+      g_windowRect.right - g_windowRect.left + 1,
+      g_windowRect.bottom - g_windowRect.top + 1,
+      NULL, NULL, hInstance, NULL
+    );
+  } else {
+    AdjustWindowRectEx(&g_windowRect, WS_CAPTION | WS_SYSMENU, 0, WS_EX_APPWINDOW);
+
+    m_windowHandle = CreateWindowExA(
+      WS_EX_APPWINDOW,
+      WNDCLASS_NAME,
+      WINDOW_TITLE,
+      WS_CAPTION | WS_SYSMENU | WS_MAXIMIZEBOX | WS_MINIMIZEBOX,
+      CW_USEDEFAULT,
+      CW_USEDEFAULT,
+      g_windowRect.right - g_windowRect.left + 1,
+      g_windowRect.bottom - g_windowRect.top + 1,
+      NULL, NULL, hInstance, NULL
+    );
+  }
+
+  if (!m_windowHandle) {
+    return FAILURE;
+  }
+
+  if (m_fullScreen) {
+    MoveWindow(m_windowHandle, g_windowRect.left, g_windowRect.top, (g_windowRect.right - g_windowRect.left) + 1, (g_windowRect.bottom - g_windowRect.top) + 1, TRUE);
+  }
+
+  ShowWindow(m_windowHandle, SW_SHOWNORMAL);
+  UpdateWindow(m_windowHandle);
+  if (!SetupLegoOmni()) {
+    return FAILURE;
+  }
+
+  GameState()->SetSavePath(m_savePath);
+  GameState()->SerializePlayersInfo(1);
+  GameState()->SerializeScoreHistory(1);
+
+  int iVar10;
+  switch (m_islandQuality) {
+    case 0:
+      iVar10 = 1;
+      break;
+    case 1:
+      iVar10 = 2;
+      break;
+    default:
+      iVar10 = 100;
+  }
+
+  int uVar1 = (m_islandTexture == 0);
+  LegoModelPresenter::configureLegoModelPresenter(uVar1);
+  LegoPartPresenter::configureLegoPartPresenter(uVar1,iVar10);
+  LegoWorldPresenter::configureLegoWorldPresenter(m_islandQuality);
+  LegoBuildingManager::configureLegoBuildingManager(m_islandQuality);
+  LegoROI::configureLegoROI(iVar10);
+  LegoAnimationManager::configureLegoAnimationManager(m_islandQuality);
+  if (LegoOmni::GetInstance()) {
+    if (LegoOmni::GetInstance()->GetInputManager()) {
+      LegoOmni::GetInstance()->GetInputManager()->m_useJoystick = m_useJoystick;
+      LegoOmni::GetInstance()->GetInputManager()->m_joystickIndex = m_joystickIndex;
+    }
+  }
+  if (m_fullScreen) {
+    MoveWindow(m_windowHandle, g_windowRect.left, g_windowRect.top, (g_windowRect.right - g_windowRect.left) + 1, (g_windowRect.bottom - g_windowRect.top) + 1, TRUE);
+  }
+  ShowWindow(m_windowHandle, SW_SHOWNORMAL);
+  UpdateWindow(m_windowHandle);
+
+  return SUCCESS;
+}
+
 // OFFSET: ISLE 0x402740
 BOOL Isle::ReadReg(LPCSTR name, LPSTR outValue, DWORD outSize)
 {
@@ -216,42 +683,72 @@ void Isle::LoadConfig()
   }
 }
 
-// OFFSET: ISLE 0x401560
-void Isle::SetupVideoFlags(BOOL fullScreen, BOOL flipSurfaces, BOOL backBuffers,
-                           BOOL using8bit, BOOL using16bit, BOOL param_6, BOOL param_7,
-                           BOOL wideViewAngle, char *deviceId)
+// OFFSET: ISLE 0x402c20
+inline void Isle::Tick(BOOL sleepIfNotNextFrame)
 {
-  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().Set16Bit(0);
-  }
-  if (using16bit) {
-    m_videoParam.flags().Set16Bit(1);
-  }
-}
-
-// OFFSET: ISLE 0x4013b0
-BOOL Isle::SetupLegoOmni()
-{
-  BOOL result = FALSE;
-  char mediaPath[256];
-  GetProfileStringA("LEGO Island", "MediaPath", "", mediaPath, sizeof(mediaPath));
-
-  BOOL failure = Lego()->Create(MxOmniCreateParam(mediaPath, (struct HWND__ *) m_windowHandle, m_videoParam, MxOmniCreateFlags())) == FAILURE;
-  if (!failure) {
-    VariableTable()->SetVariable("ACTOR_01", "");
-    TickleManager()->vtable1c(VideoManager(), 10);
-    result = TRUE;
+  if (!this->m_windowActive) {
+    Sleep(0);
+    return;
   }
 
-  return result;
+  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)
+    Sleep(0);
 }
 
 // OFFSET: ISLE 0x402e80
diff --git a/ISLE/isle.h b/ISLE/isle.h
index d899d037..d45d33a3 100644
--- a/ISLE/isle.h
+++ b/ISLE/isle.h
@@ -2,20 +2,9 @@
 #define ISLE_H
 
 #include "legoinc.h"
-#include "define.h"
 
-#include "legoomni.h"
-#include "legoanimationmanager.h"
-#include "legobuildingmanager.h"
-#include "legomodelpresenter.h"
-#include "legopartpresenter.h"
-#include "legoworldpresenter.h"
 #include "mxresult.h"
 #include "mxvideoparam.h"
-#include "mxdirectdraw.h"
-#include "mxdsaction.h"
-#include "mxomni.h"
-#include "res/resource.h"
 
 class Isle
 {
@@ -25,24 +14,21 @@ class Isle
 
   void Close();
 
+  BOOL SetupLegoOmni();
+  void SetupVideoFlags(BOOL fullScreen, BOOL flipSurfaces, BOOL backBuffers,
+                       BOOL using8bit, BOOL using16bit, BOOL param_6, BOOL param_7,
+                       BOOL wideViewAngle, char *deviceId);
+  MxResult SetupWindow(HINSTANCE hInstance, LPSTR lpCmdLine);
+
   BOOL ReadReg(LPCSTR name, LPSTR outValue, DWORD outSize);
   int ReadRegBool(LPCSTR name, BOOL *out);
   int ReadRegInt(LPCSTR name, int *out);
 
-  MxResult SetupWindow(HINSTANCE hInstance, LPSTR lpCmdLine);
-
-  void Tick(BOOL sleepIfNotNextFrame);
-
-  BOOL SetupLegoOmni();
   void LoadConfig();
-  void SetupVideoFlags(BOOL fullScreen, BOOL flipSurfaces, BOOL backBuffers,
-                       BOOL using8bit, BOOL using16bit, BOOL param_6, BOOL param_7,
-                       BOOL wideViewAngle, char *deviceId);
-
+  void Tick(BOOL sleepIfNotNextFrame);
   void SetupCursor(WPARAM wParam);
 
-// private:
-
+  // private:
   // 0
   LPSTR m_hdPath;
   LPSTR m_cdPath;
@@ -85,193 +71,6 @@ class Isle
   HCURSOR m_cursorBusy;
   HCURSOR m_cursorNo;
   HCURSOR m_cursorCurrent;
-
 };
 
-extern LRESULT WINAPI WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
-
-// OFFSET: ISLE 0x4023e0
-inline MxResult Isle::SetupWindow(HINSTANCE hInstance, LPSTR lpCmdLine)
-{
-  WNDCLASSA wndclass;
-  ZeroMemory(&wndclass, sizeof(WNDCLASSA));
-
-  LoadConfig();
-
-  SetupVideoFlags(m_fullScreen, m_flipSurfaces, m_backBuffersInVram, m_using8bit,
-                  m_using16bit, m_unk24, FALSE, m_wideViewAngle, m_deviceId);
-
-  MxOmni::SetSound3D(m_use3dSound);
-
-  srand(timeGetTime() / 1000);
-  SystemParametersInfoA(SPI_SETMOUSETRAILS, 0, NULL, 0);
-
-  ZeroMemory(&wndclass, sizeof(WNDCLASSA));
-
-  wndclass.cbClsExtra = 0;
-  wndclass.style = CS_HREDRAW | CS_VREDRAW;
-  wndclass.lpfnWndProc = WndProc;
-  wndclass.cbWndExtra = 0;
-  wndclass.hIcon = LoadIconA(hInstance, MAKEINTRESOURCEA(APP_ICON));
-  wndclass.hCursor = m_cursorArrow = m_cursorCurrent = LoadCursorA(hInstance, MAKEINTRESOURCEA(ISLE_ARROW));
-  m_cursorBusy = LoadCursorA(hInstance, MAKEINTRESOURCEA(ISLE_BUSY));
-  m_cursorNo = LoadCursorA(hInstance, MAKEINTRESOURCEA(ISLE_NO));
-  wndclass.hInstance = hInstance;
-  wndclass.hbrBackground = (HBRUSH) GetStockObject(BLACK_BRUSH);
-  wndclass.lpszClassName = WNDCLASS_NAME;
-
-  if (!RegisterClassA(&wndclass)) {
-    return FAILURE;
-  }
-
-  if (m_fullScreen) {
-    AdjustWindowRectEx(&g_windowRect, WS_CAPTION | WS_SYSMENU, 0, WS_EX_APPWINDOW);
-
-    m_windowHandle = CreateWindowExA(
-      WS_EX_APPWINDOW,
-      WNDCLASS_NAME,
-      WINDOW_TITLE,
-      WS_CAPTION | WS_SYSMENU,
-      g_windowRect.left,
-      g_windowRect.top,
-      g_windowRect.right - g_windowRect.left + 1,
-      g_windowRect.bottom - g_windowRect.top + 1,
-      NULL, NULL, hInstance, NULL
-    );
-  } else {
-    AdjustWindowRectEx(&g_windowRect, WS_CAPTION | WS_SYSMENU, 0, WS_EX_APPWINDOW);
-
-    m_windowHandle = CreateWindowExA(
-      WS_EX_APPWINDOW,
-      WNDCLASS_NAME,
-      WINDOW_TITLE,
-      WS_CAPTION | WS_SYSMENU | WS_MAXIMIZEBOX | WS_MINIMIZEBOX,
-      CW_USEDEFAULT,
-      CW_USEDEFAULT,
-      g_windowRect.right - g_windowRect.left + 1,
-      g_windowRect.bottom - g_windowRect.top + 1,
-      NULL, NULL, hInstance, NULL
-    );
-  }
-
-  if (!m_windowHandle) {
-    return FAILURE;
-  }
-
-  if (m_fullScreen) {
-    MoveWindow(m_windowHandle, g_windowRect.left, g_windowRect.top, (g_windowRect.right - g_windowRect.left) + 1, (g_windowRect.bottom - g_windowRect.top) + 1, TRUE);
-  }
-
-  ShowWindow(m_windowHandle, SW_SHOWNORMAL);
-  UpdateWindow(m_windowHandle);
-  if (!SetupLegoOmni()) {
-    return FAILURE;
-  }
-
-  GameState()->SetSavePath(m_savePath);
-  GameState()->SerializePlayersInfo(1);
-  GameState()->SerializeScoreHistory(1);
-
-  int iVar10;
-  switch (m_islandQuality) {
-    case 0:
-      iVar10 = 1;
-      break;
-    case 1:
-      iVar10 = 2;
-      break;
-    default:
-      iVar10 = 100;
-  }
-
-  int uVar1 = (m_islandTexture == 0);
-  LegoModelPresenter::configureLegoModelPresenter(uVar1);
-  LegoPartPresenter::configureLegoPartPresenter(uVar1,iVar10);
-  LegoWorldPresenter::configureLegoWorldPresenter(m_islandQuality);
-  LegoBuildingManager::configureLegoBuildingManager(m_islandQuality);
-  LegoROI::configureLegoROI(iVar10);
-  LegoAnimationManager::configureLegoAnimationManager(m_islandQuality);
-  if (LegoOmni::GetInstance()) {
-    if (LegoOmni::GetInstance()->GetInputManager()) {
-      LegoOmni::GetInstance()->GetInputManager()->m_useJoystick = m_useJoystick;
-      LegoOmni::GetInstance()->GetInputManager()->m_joystickIndex = m_joystickIndex;
-    }
-  }
-  if (m_fullScreen) {
-    MoveWindow(m_windowHandle, g_windowRect.left, g_windowRect.top, (g_windowRect.right - g_windowRect.left) + 1, (g_windowRect.bottom - g_windowRect.top) + 1, TRUE);
-  }
-  ShowWindow(m_windowHandle, SW_SHOWNORMAL);
-  UpdateWindow(m_windowHandle);
-
-  return SUCCESS;
-}
-
-// OFFSET: ISLE 0x402c20
-inline void Isle::Tick(BOOL sleepIfNotNextFrame)
-{
-  if (!this->m_windowActive) {
-    Sleep(0);
-    return;
-  }
-
-  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)
-    Sleep(0);
-}
-
 #endif // ISLE_H
diff --git a/ISLE/main.cpp b/ISLE/main.cpp
deleted file mode 100644
index f45e9529..00000000
--- a/ISLE/main.cpp
+++ /dev/null
@@ -1,311 +0,0 @@
-#include <dsound.h>
-
-#include "legoinc.h"
-#include "define.h"
-
-#include "legoomni.h"
-#include "isle.h"
-
-// OFFSET: ISLE 0x401ca0
-BOOL FindExistingInstance(void)
-{
-  HWND hWnd = FindWindowA(WNDCLASS_NAME, WINDOW_TITLE);
-  if (hWnd) {
-    if (SetForegroundWindow(hWnd)) {
-      ShowWindow(hWnd, SW_RESTORE);
-    }
-    return 0;
-  }
-  return 1;
-}
-
-// OFFSET: ISLE 0x401ce0
-BOOL StartDirectSound(void)
-{
-  LPDIRECTSOUND lpDS = NULL;
-  HRESULT ret = DirectSoundCreate(NULL, &lpDS, NULL);
-  if (ret == DS_OK && lpDS != NULL) {
-    lpDS->Release();
-    return TRUE;
-  }
-
-  return FALSE;
-}
-
-// OFFSET: ISLE 0x401610
-int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd)
-{
-  // Look for another instance, if we find one, bring it to the foreground instead
-  if (!FindExistingInstance()) {
-    return 0;
-  }
-
-  // Attempt to create DirectSound instance
-  BOOL soundReady = FALSE;
-  for (int i = 0; i < 20; i++) {
-    if (StartDirectSound()) {
-      soundReady = TRUE;
-      break;
-    }
-    Sleep(500);
-  }
-
-  // Throw error if sound unavailable
-  if (!soundReady) {
-    MessageBoxA(NULL, "\"LEGO\xAE Island\" is not detecting a DirectSound compatible sound card.  Please quit all other applications and try again.",
-      "Lego Island Error", MB_OK);
-    return 0;
-  }
-
-  // Create global app instance
-  g_isle = new Isle();
-
-  // Create window
-  if (g_isle->SetupWindow(hInstance, lpCmdLine) != SUCCESS) {
-    MessageBoxA(NULL, "\"LEGO\xAE Island\" failed to start.  Please quit all other applications and try again.", "LEGO\xAE Island Error", MB_OK);
-    return 0;
-  }
-
-  // Get reference to window
-  HWND window;
-  if (g_isle->m_windowHandle) {
-    window = g_isle->m_windowHandle;
-  }
-
-  // Load accelerators (this call actually achieves nothing - there is no "AppAccel" resource in the original - but we'll keep this for authenticity)
-  // This line may actually be here because it's in DFVIEW, an example project that ships with
-  // MSVC420, and was such a clean example of a Win32 app, that it was later adapted
-  // into an "ExeSkeleton" sample for MSVC600. It's quite possible Mindscape derived
-  // this app from that example since they no longer had the luxury of the
-  // MFC AppWizard which we know they used for the frontend used during development (ISLEMFC.EXE, MAIN.EXE, et al.)
-  LoadAcceleratorsA(hInstance, "AppAccel");
-
-  MSG msg;
-
-  while (!g_closed) {
-    while (!PeekMessageA(&msg, NULL, 0, 0, PM_NOREMOVE)) {
-      if (g_isle) {
-        g_isle->Tick(1);
-      }
-    }
-
-    if (g_isle) {
-      g_isle->Tick(0);
-    }
-
-    while (!g_closed) {
-      if (!PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) {
-        break;
-      }
-
-      MSG nextMsg;
-      if (!g_isle
-          || !g_isle->m_windowHandle
-          || msg.message != WM_MOUSEMOVE
-          || !PeekMessageA(&nextMsg, NULL, 0, 0, PM_NOREMOVE)
-          || nextMsg.message != WM_MOUSEMOVE) {
-        TranslateMessage(&msg);
-        DispatchMessageA(&msg);
-      }
-
-      if (g_reqEnableRMDevice) {
-        g_reqEnableRMDevice = 0;
-        VideoManager()->EnableRMDevice();
-        g_rmDisabled = 0;
-        Lego()->vtable3c();
-      }
-
-      if (g_closed) {
-        break;
-      }
-
-      if (g_mousedown == 0) {
-LAB_00401bc7:
-        if (g_mousemoved) {
-          g_mousemoved = FALSE;
-        }
-      } else if (g_mousemoved) {
-        if (g_isle) {
-          g_isle->Tick(0);
-        }
-        goto LAB_00401bc7;
-      }
-    }
-  }
-
-  DestroyWindow(window);
-
-  return msg.wParam;
-}
-
-// OFFSET: ISLE 0x401d20
-LRESULT WINAPI WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-  if (!g_isle) {
-    return DefWindowProcA(hWnd, uMsg, wParam, lParam);
-  }
-
-  switch (uMsg) {
-  case WM_PAINT:
-    return DefWindowProcA(hWnd, WM_PAINT, wParam, lParam);
-  case WM_ACTIVATE:
-    return DefWindowProcA(hWnd, WM_ACTIVATE, wParam, lParam);
-  case WM_ACTIVATEAPP:
-    if (g_isle) {
-      if ((wParam != 0) && (g_isle->m_fullScreen)) {
-        MoveWindow(hWnd, g_windowRect.left, g_windowRect.top,
-                   (g_windowRect.right - g_windowRect.left) + 1,
-                   (g_windowRect.bottom - g_windowRect.top) + 1, TRUE);
-      }
-      g_isle->m_windowActive = wParam;
-    }
-    return DefWindowProcA(hWnd,WM_ACTIVATEAPP,wParam,lParam);
-  case WM_CLOSE:
-    if (!g_closed && g_isle) {
-      if (g_isle) {
-        delete g_isle;
-      }
-      g_isle = NULL;
-      g_closed = TRUE;
-      return 0;
-    }
-    return DefWindowProcA(hWnd,WM_CLOSE,wParam,lParam);
-  case WM_GETMINMAXINFO:
-  {
-    MINMAXINFO *mmi = (MINMAXINFO *) lParam;
-
-    mmi->ptMaxTrackSize.x = (g_windowRect.right - g_windowRect.left) + 1;
-    mmi->ptMaxTrackSize.y = (g_windowRect.bottom - g_windowRect.top) + 1;
-    mmi->ptMinTrackSize.x = (g_windowRect.right - g_windowRect.left) + 1;
-    mmi->ptMinTrackSize.y = (g_windowRect.bottom - g_windowRect.top) + 1;
-
-    return 0;
-  }
-  case WM_ENTERMENULOOP:
-    return DefWindowProcA(hWnd,WM_ENTERMENULOOP,wParam,lParam);
-  case WM_SYSCOMMAND:
-    if (wParam == SC_SCREENSAVE) {
-      return 0;
-    }
-    if (wParam == SC_CLOSE && g_closed == 0) {
-      if (g_isle) {
-        if (g_rmDisabled) {
-          ShowWindow(g_isle->m_windowHandle, SW_RESTORE);
-        }
-        PostMessageA(g_isle->m_windowHandle, WM_CLOSE, 0, 0);
-        return 0;
-      }
-    } else if (g_isle && g_isle->m_fullScreen && (wParam == SC_MOVE || wParam == SC_KEYMENU)) {
-      return 0;
-    }
-    return DefWindowProcA(hWnd,WM_SYSCOMMAND,wParam,lParam);
-  case WM_EXITMENULOOP:
-    return DefWindowProcA(hWnd, WM_EXITMENULOOP, wParam, lParam);
-  case WM_MOVING:
-    if (g_isle && g_isle->m_fullScreen) {
-      GetWindowRect(hWnd, (LPRECT) lParam);
-      return 0;
-    }
-    return DefWindowProcA(hWnd, WM_MOVING, wParam, lParam);
-  case WM_NCPAINT:
-    if (g_isle && g_isle->m_fullScreen) {
-      return 0;
-    }
-    return DefWindowProcA(hWnd, WM_NCPAINT, wParam, lParam);
-  case WM_DISPLAYCHANGE:
-    if (g_isle && VideoManager() && g_isle->m_fullScreen && VideoManager()->m_unk74 && VideoManager()->m_unk74[0x220]) {
-      if (!g_waitingForTargetDepth) {
-        unsigned char valid = FALSE;
-        if (LOWORD(lParam) == g_targetWidth && HIWORD(lParam) == g_targetHeight && g_targetDepth == wParam) {
-          valid = TRUE;
-        }
-        if (!g_rmDisabled) {
-          if (!valid) {
-            g_rmDisabled = 1;
-            Lego()->vtable38();
-            VideoManager()->DisableRMDevice();
-          }
-        } else if (valid) {
-          g_reqEnableRMDevice = 1;
-        }
-      } else {
-        g_waitingForTargetDepth = 0;
-        g_targetDepth = wParam;
-      }
-    }
-    return DefWindowProcA(hWnd, WM_DISPLAYCHANGE, wParam, lParam);
-  case WM_SETCURSOR:
-  case WM_KEYDOWN:
-  case WM_MOUSEMOVE:
-  case WM_TIMER:
-  case WM_LBUTTONDOWN:
-  case WM_LBUTTONUP:
-  case 0x5400:
-  {
-
-    NotificationId type = NONE;
-    unsigned char keyCode = 0;
-
-    switch (uMsg) {
-    case WM_KEYDOWN:
-      // While this probably should be (HIWORD(lParam) & KF_REPEAT), this seems
-      // to be what the assembly is actually doing
-      if (lParam & (KF_REPEAT << 16)) {
-        return DefWindowProcA(hWnd, WM_KEYDOWN, wParam, lParam);
-      }
-      keyCode = wParam;
-      type = KEYDOWN;
-      break;
-    case WM_MOUSEMOVE:
-      g_mousemoved = 1;
-      type = MOUSEMOVE;
-      break;
-    case WM_TIMER:
-      type = TIMER;
-      break;
-    case WM_SETCURSOR:
-      if (g_isle) {
-        HCURSOR hCursor = g_isle->m_cursorCurrent;
-        if (hCursor == g_isle->m_cursorBusy || hCursor == g_isle->m_cursorNo || !hCursor) {
-          SetCursor(hCursor);
-          return 0;
-        }
-      }
-      break;
-    case WM_LBUTTONDOWN:
-      g_mousedown = 1;
-      type = MOUSEDOWN;
-      break;
-    case WM_LBUTTONUP:
-      g_mousedown = 0;
-      type = MOUSEUP;
-      break;
-    case 0x5400:
-      if (g_isle) {
-        g_isle->SetupCursor(wParam);
-        return 0;
-      }
-    }
-
-    if (g_isle) {
-      if (InputManager()) {
-        InputManager()->QueueEvent(type, wParam, LOWORD(lParam), HIWORD(lParam), keyCode);
-      }
-      if (g_isle && g_isle->m_drawCursor && type == MOUSEMOVE) {
-        unsigned short x = LOWORD(lParam);
-        unsigned short y = HIWORD(lParam);
-        if (639 < x) {
-          x = 639;
-        }
-        if (479 < y) {
-          y = 479;
-        }
-        VideoManager()->MoveCursor(x,y);
-      }
-    }
-    return 0;
-  }
-  }
-
-  return DefWindowProcA(hWnd,uMsg,wParam,lParam);
-}
\ No newline at end of file
diff --git a/LEGO1/mxpalette.cpp b/LEGO1/mxpalette.cpp
old mode 100755
new mode 100644
diff --git a/LEGO1/mxunknown100dc6b0.cpp b/LEGO1/mxunknown100dc6b0.cpp
old mode 100755
new mode 100644
diff --git a/LEGO1/mxunknown100dc6b0.h b/LEGO1/mxunknown100dc6b0.h
old mode 100755
new mode 100644
diff --git a/LEGO1/mxvideomanager.cpp b/LEGO1/mxvideomanager.cpp
old mode 100755
new mode 100644
diff --git a/isle.mak b/isle.mak
index 7eaf3d48..23583c29 100644
--- a/isle.mak
+++ b/isle.mak
@@ -311,7 +311,6 @@ CLEAN :
 	-@erase "$(INTDIR)\define.obj"
 	-@erase "$(INTDIR)\isle.obj"
 	-@erase "$(INTDIR)\isle.res"
-	-@erase "$(INTDIR)\main.obj"
 	-@erase "$(INTDIR)\vc40.pdb"
 	-@erase ".\Release\ISLE.EXE"
 	-@erase ".\Release\ISLE.PDB"
@@ -372,7 +371,6 @@ LINK32_OBJS= \
 	"$(INTDIR)\define.obj" \
 	"$(INTDIR)\isle.obj" \
 	"$(INTDIR)\isle.res" \
-	"$(INTDIR)\main.obj" \
 	".\Release\LEGO1.LIB"
 
 ".\Release\ISLE.EXE" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -401,7 +399,6 @@ CLEAN :
 	-@erase "$(INTDIR)\define.obj"
 	-@erase "$(INTDIR)\isle.obj"
 	-@erase "$(INTDIR)\isle.res"
-	-@erase "$(INTDIR)\main.obj"
 	-@erase "$(INTDIR)\vc40.idb"
 	-@erase "$(INTDIR)\vc40.pdb"
 	-@erase ".\Debug\ISLE.EXE"
@@ -464,7 +461,6 @@ LINK32_OBJS= \
 	"$(INTDIR)\define.obj" \
 	"$(INTDIR)\isle.obj" \
 	"$(INTDIR)\isle.res" \
-	"$(INTDIR)\main.obj" \
 	".\LEGO1\Debug\LEGO1.lib"
 
 ".\Debug\ISLE.EXE" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -917,6 +913,7 @@ DEP_CPP_MXPAL=\
 
 SOURCE=.\LEGO1\mxioinfo.cpp
 DEP_CPP_MXIOI=\
+	".\LEGO1\legoinc.h"\
 	".\LEGO1\mxioinfo.h"\
 	
 
@@ -930,6 +927,7 @@ DEP_CPP_MXIOI=\
 
 SOURCE=.\LEGO1\mxdsfile.cpp
 DEP_CPP_MXDSF=\
+	".\LEGO1\legoinc.h"\
 	".\LEGO1\mxbool.h"\
 	".\LEGO1\mxcore.h"\
 	".\LEGO1\mxdsfile.h"\
@@ -974,19 +972,6 @@ DEP_CPP_MXDSS=\
 ################################################################################
 # Begin Source File
 
-SOURCE=.\ISLE\define.cpp
-DEP_CPP_DEFIN=\
-	".\ISLE\define.h"\
-	
-
-"$(INTDIR)\define.obj" : $(SOURCE) $(DEP_CPP_DEFIN) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-# End Source File
-################################################################################
-# Begin Source File
-
 SOURCE=.\ISLE\isle.cpp
 DEP_CPP_ISLE_=\
 	".\ISLE\define.h"\
@@ -1048,71 +1033,6 @@ DEP_CPP_ISLE_=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-# End Source File
-################################################################################
-# Begin Source File
-
-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"\
-	".\LEGO1\mxdssource.h"\
-	".\LEGO1\mxeventmanager.h"\
-	".\LEGO1\mxioinfo.h"\
-	".\LEGO1\mxmusicmanager.h"\
-	".\LEGO1\mxnotificationmanager.h"\
-	".\LEGO1\mxobjectfactory.h"\
-	".\LEGO1\mxomni.h"\
-	".\LEGO1\mxomnicreateflags.h"\
-	".\LEGO1\mxomnicreateparam.h"\
-	".\LEGO1\mxomnicreateparambase.h"\
-	".\LEGO1\mxpalette.h"\
-	".\LEGO1\mxrect32.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\mxunknown100dc6b0.h"\
-	".\LEGO1\mxvariabletable.h"\
-	".\LEGO1\mxvideomanager.h"\
-	".\LEGO1\mxvideoparam.h"\
-	".\LEGO1\mxvideoparamflags.h"\
-	".\LEGO1\viewmanager.h"\
-	
-
-"$(INTDIR)\main.obj" : $(SOURCE) $(DEP_CPP_MAIN_) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
 # End Source File
 ################################################################################
 # Begin Source File
@@ -1262,18 +1182,6 @@ SOURCE=.\LEGO1\legoworldpresenter.h
 ################################################################################
 # Begin Source File
 
-SOURCE=.\LEGO1\mxatomid.h
-
-!IF  "$(CFG)" == "ISLE - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-################################################################################
-# Begin Source File
-
 SOURCE=.\LEGO1\mxbackgroundaudiomanager.h
 
 !IF  "$(CFG)" == "ISLE - Win32 Release"
@@ -1553,6 +1461,32 @@ SOURCE=.\LEGO1\mxvideoparamflags.h
 !ENDIF 
 
 # End Project Dependency
+################################################################################
+# Begin Source File
+
+SOURCE=.\LEGO1\mxatomid.h
+
+!IF  "$(CFG)" == "ISLE - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "ISLE - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+################################################################################
+# Begin Source File
+
+SOURCE=.\ISLE\define.cpp
+DEP_CPP_DEFIN=\
+	".\ISLE\define.h"\
+	".\LEGO1\legoinc.h"\
+	
+
+"$(INTDIR)\define.obj" : $(SOURCE) $(DEP_CPP_DEFIN) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+# End Source File
 # End Target
 # End Project
 ################################################################################
diff --git a/isle.mdp b/isle.mdp
index 9449bd89ad80f94b71cded5a7863892a0bbb9186..d9512305a07494826c1af13a85dc6a272fbd5283 100644
GIT binary patch
literal 51200
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

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


From b0807663210ba6780c5350fa25130e8bcf14e5a9 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 27 Jun 2023 15:59:44 -0700
Subject: [PATCH 05/31] generate progress SVGs

---
 .github/workflows/build.yml |   6 ++-
 tools/reccmp/isle.png       | Bin 0 -> 5448 bytes
 tools/reccmp/lego1.png      | Bin 0 -> 5615 bytes
 tools/reccmp/reccmp.py      |  60 ++++++++++++++++++++++++++++-
 tools/reccmp/template.svg   |  74 ++++++++++++++++++++++++++++++++++++
 5 files changed, 137 insertions(+), 3 deletions(-)
 create mode 100644 tools/reccmp/isle.png
 create mode 100755 tools/reccmp/lego1.png
 create mode 100644 tools/reccmp/template.svg

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index afa88865..295d88f3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -61,8 +61,8 @@ jobs:
         C:\msys64\usr\bin\wget.exe https://legoisland.org/download/LEGO1.DLL
         pip install capstone
         pip install colorama
-        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 .
+        python3 tools/reccmp/reccmp.py -S ISLEPROGRESS.SVG --svg-icon tools/reccmp/isle.png -H ISLEPROGRESS.HTML ISLE.EXE Release/ISLE.EXE Release/ISLE.PDB .
+        python3 tools/reccmp/reccmp.py -S LEGO1PROGRESS.SVG -T 1929 --svg-icon tools/reccmp/lego1.png -H LEGO1PROGRESS.HTML LEGO1.DLL Release/LEGO1.DLL Release/LEGO1.PDB .
       
     - name: Upload Artifact
       uses: actions/upload-artifact@master
@@ -72,3 +72,5 @@ jobs:
           Release
           ISLEPROGRESS.HTML
           LEGO1PROGRESS.HTML
+          ISLEPROGRESS.SVG
+          LEGO1PROGRESS.SVG
diff --git a/tools/reccmp/isle.png b/tools/reccmp/isle.png
new file mode 100644
index 0000000000000000000000000000000000000000..cfa26a234f1eeb4d65808b0097e809eb5bfd6ba7
GIT binary patch
literal 5448
zcmcIm1yohr*4_xx-F1*I>6C_Z=#GQ5GzUZ^L@B{Tr*xN~(hYKulI{lSk}d%y1f?F_
zamRaiynFw9|LYxZkG<BKW9>QDoa>wOn`4J+sw?1NQepxCfTN@+s|^6R;5P#u`Fcl;
zNQB^e!EjPEcme=eL^lHoNKGdP089-#2t-rU*3s4RiLIj(tr7%6>*V5SWB14!0NiIX
zbYM`OEmDb-g(I*^2s~cJQJVyvRvR1+Cyrrer^CQk4x!7QCedmkkds59>dp#5j*Nsy
zkZ5sWhha{kt<t@Y^nVi))_b<(^~Qdp;beW_vU*Z-qxdkRY6z_v9XnBxUrP{<T>z#b
z_~hT!-nq2OCGCsJ=mg-SS6R_LxnMv7PJP71@6tD;eE^W$$FR_WX0^0t9_rvLylrrb
zF%mogso6E=o(ejg7?Adi1m^<M@<{NEWM&;83k5Liv$R+NG&un?mKW<|06gO~#R~~A
zil-w%%8CJKiL66p0b4Pkc<6qZ9H7qw5ZkD<ivUxc0FRQMjUrH912hlfV^sp^*Z_}K
zNFW=4;suy>GcdRV0Vx2n{DGeM*Sn?o8|>FerBsU7GK$Fg8liJKqv`2!(Xb9Gk=-R0
zGQVY>D$UjEkwU@eD}eXuupa=jVo0uUdwAhKh+8^1C=`jnHRarHLcOB5uvocV8!B>=
z27o13pOH%r?kY;S7%JT1@-@>QitPietfwd8HkEkN)j-zPjNYNs4K{Mw(Y4dlYpbhM
z%I#ny^IkpgOIWLEv);v{?>^$^C&!;YEHnD@nfNN8oPKKUKT^%19*V^Xu$WtqQaG={
zx;h7q(YGsE)atVnuV@iEN6Mx~9P;JRhk|3-I+#YUtd<u!&X6S+1%dL1l1N@LocSh}
z$lp|0@bz7rmrnrTpx&|NBP%*G+}3|-$n9!h>Ovul34q%u#X1AP16f8cXm6EN7dimQ
zX8E$0%TOJ)kaIMnQn%cmYr#4<6AAz`wzq=u!I)NXY8NxMVm~lz&_Fqe-HiLAG)SOX
z%Qh&^374x?_dTwJ6W$MV^vo94244&mnQn9<bGn%jB#SV8hDda>l)zKE7DW`oa7Nmm
z5MnKQl^8)qUhOa_t*#>IK*HsgNU*VdU5r>az~^@!)S$o{?^~%Q@e#WkQkySK86f`}
zYuL(_H#LehD{a{29i>EsQ1-@fkuBa#lq95!r+Jecjlca74_9X!xZ)lMMx13|1${Ag
zQ72{j{bJ<$&|}M?3O5u&U%6%sArv<-tvQX1qQ0uW`jlcmEj6P6!3>5l26BK_D+_&G
zzREl1I)d-*<Q9Cq!TO3E3=@P=MBMmZA&_=qM#4}CA4_fYEv1UL&{4us`O(MP3|kxp
zX#$Fr3~@a(R`!)>BJmuwce?{uGgjMH`B$k{=?;uAGc2T?-=69$vugJ~RHj(NUlUkE
zwNB=f(S4JuJ)fTqB@m1<1eatZw9B-D^N9qWriu*slPam?l)O$DqqHTnJ+Uj>bgd(p
zPoPmx8rB=_+fvv}+C)Bb!^R0B@$U+Ou~MXwqmjcX+{nw4RdXrE!YR6-Ji@#?$r~wn
zDUQ1O><ISfBr(013Can~2~_Od(1OC;!i7RC-9z0zXjH)i9q&?kU4EUF0*sG|MY@F<
znmamFI<Nw<{NO@Zz9UrXt&hP)D5^o5YMTb+tyWfr=}JQ<EtVxkl{*KWJx)>3Q(wV$
z=8A#o=g-*dlP^H^;Sz-f*&+~rWq!RX?ZbE*DYTVj=hJjob&L(xyre^)um$3Mwq-V|
zTmjWuUTb6f!o;LR{UXI8ts;e;MxoN(yo}sNxq5>$UtF0kWfo%=1z6PJ?TihbX`T5z
z%sf&x3DM(Hu0s19s_c4Mx2DH=d&!v}9>6nI9rG4E8aIAWdvjkvFC2d49V=k#qgG)v
zqRwIul8bi;Iy;JkxVvV*YC%leq#-%x3Fb*l0Wq~B;%~;~U&`Y}*mWAOFs?XsI&{8a
zMrEdBR#Dql+e_6}tIcK06;l;c?HcGGcs($YBA6z@JIS|^wvjfOwpe3k=x)e?$Va@l
zR;pYz%r)3UG&~M86fwxr*EKY$k}t_9VVbBfsm~+Gt5uIvFUp*NwUvKG^dJgqD9YES
zP-jaK4hU~^m<1WErlYiNFRn4pyUzRNg#;Q-@HB1_$Pnc7<edw#=zY<J)WP&UDesP>
z#4T=^{t*7q6#oi>sE@7PE<-16OaVp)t9{~s7!n?;;@8KOB*~RV)j8kYxT@@W>};~+
zIeMItR+ZMen?GB&C$wj`7d-c>U*Hv6rUCzx;kItbC#|&+DXdosJobylJ{k}WUs&}9
z1Ggo2j9$rPc}<R6;feV^ndCP~mscy2E8@Znd<zDq{ld*P-8Fq0ZH}3yfs2qA3|CfH
zo>wD49-IjYh8*fE<7;&5?9}r)T~nl#=&bd(%IRI1h^$%}5}7E!62G;U5<1)N&(S4x
zCmYFwF@tuvfto&>6T@ic>*nEYKG-aQ!GU@~Qjty}`jjKQNrG-8bC4&CvOi=KWf#(5
zyc!~9oXUdil7(Ck#b<=;1nQ(Zxoiyj$MrMxl^&^3i*T`*3O#=GVex$TFnBp*8EeIh
zESbC8#K|Lju=OY~kF<b`kV7<4S~W!dUi=pseD-|O2&MxfH>OBTk5*7CjGlW$Xe49`
zV$4pXexS&%<{A4rra{nyv4cN{W34uTr69UN6-RYGO*E4<^%<=LpM+>5uYYVzv@^Jn
zPAv`r+lH;%JnJjA4y?TFcpP5CO_PAuV_y|reA|E%69LZMgc`C=vZGbPto3Y~210v9
z5{okL4(#?<_0C2Mr|-YI+9hlyT#7~H1gYq8g7nuLiyw+qiaUGEVy=+fz8iEOwOIUp
z7=qnlT%%}LFR9e0k=awt-uFREuU|_wlKl>rF6LUG_s-npu8D>|x4~ky`H!FsDoK*i
zuu|e#vLuohQ>=6DYgECGy-g`|@$U+X+H0+bY({Oi))zQ4jc^kSlh%`PALC5Vyu(?%
z|8DpAo7^mS(g5phy*~m{`=&|!eS>vg&)|TV6!b0h2>Jsmv^P3mZ9aMWcw~>ttKpl#
z=kZyihLa1)o)5FSNV;m{HsjW3N@rCkQl+7VTc?R<4kjh)4$iw>$fL*?XbiZB$=Z+O
zpiv2^cGSe(9R=L3J0C7H_T4yfgm83UrgttgILUgfZk=E(p3vZk&OD3oDqcbxyYmbL
z193kDryiurr|G1g8Ce+BY4l5uOl&WBo-54W!AlnqH}FtCg!b6YZ267F!48HZG7>Vp
zeYn2Qna#dNcx_k?E<VI_+^@rTT^g0U3f~ZG5F0c;c<*{pIlD%r_g*ixOw`n2+jU#~
zGHy(xt3JIxwY1jQzIM;EvD(Y#WQ!_OcyRux(c>%W)x>zFh{Sy3p{L_X$I0;`>Aa5%
z%f(<{{j?j)UP*&SgXxj<uFN!KK6qTp=yGmqf9}P@X1A=vkvWAE)Ik5C%b4RRJjm^+
zl&HQSoS>b|dy*m|%Tg{ETjzO@A*&(gOtQ<@mwlyVq})EI<2#dsBgrG#Ne4-BO%Bg<
zF1DL@D9UC#TRUk!^tki$J~+C6w%g)1=LXt;vxuj$`keL!>y_>IiesJOyt6opxVS46
z<mAJ1OMcGT>;Fw!OGRxp0Pti20JuK@e80M0w*cTN4*+bN0f1;S0FXJxns&$o05YJd
z3YELIxw=-mo`03DuBEH1D|B>p3=9lROiU~+ENpCS92^{6TwFXnJbZk70s;a;LP8=U
zB4T1<5)u+pQc^N9GIDZq3JMBJN=hm!Dr#zK5C}v=Lv!cO9a>siIyyRfdU^&121Z6k
zCMG6kW@Z)^7FJePHa0ePcJ{k>?{aW(aB^~TadB~TbMx@<@bdEV@$vEV^9u+F2nq@c
z2?+@c3*WnUPeepSR8&+<OiWx{TtY%ZQc_Y%N=jN<T1G|&3<g6W5LsDSIXO9bd3gl|
z1w}<gB_$<gWn~o=6;)MLH8nMLb#)C54NXl=EiEl=ZEYPL9Vis4tE+qe{(U_?J$-$B
z0|Ns?Lqj7YBV%J@6BCmM4<4ABnwpuJnVXwiSXfwET3T6ISzBA%*x0~eFk4$&J3G6F
z4<Fjw+dq2r$iczk@#Dvij*d=FPR`EGE-o%lo;-1Nb$$Bu>9c3g+}zyU-Q7JrJUl%;
zy}Z1hKY#A+?d{{^^Wwz|I2`Wl>+9#|=kM<y5D*X;7#I{36dW8J5)u*`8X6WB79JiR
z5fSn7<;%#($f&5O=;-K}n3&ku*tod3`1tsQgoMPz#H6I8<mBX(l$6xe)U>p;^z`(M
zjEv08%vY~oWo2b$XJ@~D{rb(DH*ep*&B@8h&CSir%gfKtFDNJ|EG#T4Dk?56E-5J~
zEiEl8D=RNAuc)Y~tgNi6s(SbCU3GOe0)eQhsd@kYeQj-RU0q#$eSJeiLt|s(hYuf`
znwpxMn_F61T3cJ&+S=ON+dDcsIy*bNy1Kf%yL)<idV72O`uh6&`v(RF1_uX+hK7cR
zhet+6Mn^}-#>PH={5U>7J~1&dIXO8sH8njwJu@>iJ3Bi!H#a{&zp${dxVZS~)2F4S
zrRC-2m6es%)z!7Nwe|J&jg5`X&CRW?t?ljYot>S}pFi*J?(XgF?eFh@`SRuK*RKZ$
z2Zx7;M@L7;$H(8keLFchIXyl7{{8!pA3x5{&d$%zFD@=FFE6j_oIBdc_`33uT(#A8
z0O|E98vsBvRFai}y3c%`m%;U?#h2D9cG!QhN|Pl-X92Qte^C~_)B&of-beVR;(AeA
zu}j^;mj;kf{?0@U2X4KGBaq^ahU+M_COWZbuQ$+tYO=YN?-TzM#+WxTYXXC}@E0mn
zl%8t-r288){^W=m73=uEi(%Bi3&ej=ODBC-AdPVi!LNbc9Q+HgH&~%(0sqnbozzUu
z!%%*nZ-Z^NRR;Pukbi3O2XQ(X!u9rVH-nLWE)O^H*4+8gUF8KUYAhrBG=7HscPiq)
zE+sC;F;Dcn``^B)5Y}I6?UyM38>){pfVn@R^l!gitK7auLh}aJ-wR0nNtQPT*Jl#n
zc>4?C;~W4A25V6^0{<WFYn?A;4l)v9#DY!tnf@k2euD>(MDvDpqgm+#<Uh#TKfw4m
zF8;Tt6k~iLfs(+r4*y9-q~A8{{4)~#6*hWko7#l`CdW^;nt#wDbdmOCbdksfrGCB)
z{<k^$i(+sB!72Vp_98Y*;%~@x?dG@a{G%rKTay1dFaPFYH+>EB+I`kFd;bsN&)e^>
jkufR7GXBgvx+RGW7`y5!@OdyV1J{p|oVsi&*v#)=@KL|*

literal 0
HcmV?d00001

diff --git a/tools/reccmp/lego1.png b/tools/reccmp/lego1.png
new file mode 100755
index 0000000000000000000000000000000000000000..f76a54da16876d4bbb51cbff06e8a9c93df60aa6
GIT binary patch
literal 5615
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

literal 0
HcmV?d00001

diff --git a/tools/reccmp/reccmp.py b/tools/reccmp/reccmp.py
index 777cce2f..d50dc9ae 100755
--- a/tools/reccmp/reccmp.py
+++ b/tools/reccmp/reccmp.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 
 import argparse
+import base64
 from capstone import *
 import difflib
 import struct
@@ -15,9 +16,12 @@
 parser.add_argument('recompiled', metavar='recompiled-binary', help='The recompiled binary')
 parser.add_argument('pdb', metavar='recompiled-pdb', help='The PDB of the recompiled binary')
 parser.add_argument('decomp_dir', metavar='decomp-dir', help='The decompiled source tree')
+parser.add_argument('--total', '-T', metavar='total-func-count', help='Total number of expected functions (improves total accuracy statistic)')
 parser.add_argument('--verbose', '-v', metavar='offset', help='Print assembly diff for specific function (original file\'s offset)')
 parser.add_argument('--html', '-H', metavar='output-file', help='Generate searchable HTML summary of status and diffs')
 parser.add_argument('--no-color', '-n', action='store_true', help='Do not color the output')
+parser.add_argument('--svg', '-S', metavar='output-svg', help='Generate SVG graphic of progress')
+parser.add_argument('--svg-icon', metavar='svg-icon', help='Icon to use in SVG (PNG)')
 
 args = parser.parse_args()
 
@@ -50,6 +54,8 @@
 if not os.path.isdir(source):
   parser.error('Source directory does not exist')
 
+svg = args.svg
+
 # Declare a class that can automatically convert virtual executable addresses
 # to file addresses
 class Bin:
@@ -365,7 +371,8 @@ def parse_asm(file, addr, size):
 
             # If html, record the diffs to an HTML file
             if html:
-              htmlinsert.append('{address: "%s", name: "%s", matching: %s, diff: "%s"}' % (hex(addr), recinfo.name, str(ratio), '\\n'.join(udiff).replace('"', '\\"').replace('\n', '\\n')))
+              escaped = '\\n'.join(udiff).replace('"', '\\"').replace('\n', '\\n').replace('<', '&lt;').replace('>', '&gt;')
+              htmlinsert.append('{address: "%s", name: "%s", matching: %s, diff: "%s"}' % (hex(addr), recinfo.name, str(ratio), escape))
 
       except UnicodeDecodeError:
         break
@@ -389,6 +396,49 @@ def gen_html(html, data):
   htmlfile.write(templatedata)
   htmlfile.close()
 
+def gen_svg(svg, name, icon, implemented_funcs, total_funcs, raw_accuracy):
+  templatefile = open(get_file_in_script_dir('template.svg'), 'r')
+  if not templatefile:
+    print('Failed to find SVG template file, can\'t generate SVG summary')
+    return
+
+  templatedata = templatefile.read()
+  templatefile.close()
+
+  # Replace icon
+  if args.svg_icon:
+    iconfile = open(args.svg_icon, 'rb')
+    templatedata = templatedata.replace('{icon}', base64.b64encode(iconfile.read()).decode('utf-8'), 1)
+    iconfile.close()
+
+  # Replace name
+  templatedata = templatedata.replace('{name}', name, 1)
+
+  # Replace implemented statistic
+  templatedata = templatedata.replace('{implemented}', '%.2f%% (%i/%i)' % (implemented_funcs / total_funcs * 100, implemented_funcs, total_funcs), 1)
+
+  # Replace accuracy statistic
+  templatedata = templatedata.replace('{accuracy}', '%.2f%%' % (raw_accuracy / implemented_funcs * 100), 1)
+
+  # Generate progress bar width
+  total_statistic = raw_accuracy / total_funcs
+  percenttemplate = '{progbar'
+  percentstart = templatedata.index(percenttemplate)
+  percentend = templatedata.index('}', percentstart)
+  progwidth = float(templatedata[percentstart + len(percenttemplate) + 1:percentend]) * total_statistic
+  templatedata = templatedata[0:percentstart] + str(progwidth) + templatedata[percentend + 1:]
+
+  # Replace percentage statistic
+  templatedata = templatedata.replace('{percent}', '%.2f%%' % (total_statistic * 100), 1)
+
+  svgfile = open(svg, 'w')
+  if not svgfile:
+    print('Failed to write to SVG file %s' % svg)
+    return
+
+  svgfile.write(templatedata)
+  svgfile.close()
+
 if html:
   gen_html(html, htmlinsert)
 
@@ -396,5 +446,13 @@ def gen_html(html, data):
   if not found_verbose_target:
     print('Failed to find the function with address %s' % hex(verbose))
 else:
+  implemented_funcs = function_count
+
+  if args.total:
+    function_count = int(args.total)
+
   if function_count > 0:
     print('\nTotal accuracy %.2f%% across %i functions' % (total_accuracy / function_count * 100, function_count))
+
+    if svg:
+      gen_svg(svg, os.path.basename(original), args.svg_icon, implemented_funcs, function_count, total_accuracy)
diff --git a/tools/reccmp/template.svg b/tools/reccmp/template.svg
new file mode 100644
index 00000000..cb37b94c
--- /dev/null
+++ b/tools/reccmp/template.svg
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="640"
+   height="640"
+   viewBox="0 0 169.33333 169.33333"
+   version="1.1"
+   id="svg5"
+   xml:space="preserve"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs2"><rect
+       x="79.651809"
+       y="538.62568"
+       width="480.69626"
+       height="32.696293"
+       id="rect1277" /></defs><g
+     id="g1273"
+     transform="translate(-3.9577451e-7,-0.93505135)"><image
+       width="84.666664"
+       height="84.666664"
+       preserveAspectRatio="none"
+       style="image-rendering:optimizeSpeed"
+       xlink:href="data:image/png;base64,{icon}"
+       id="image1060"
+       x="42.333336"
+       y="20.367643" /><text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.7px;font-family:mono;-inkscape-font-specification:mono;text-align:center;text-anchor:middle;fill:#ffffff;stroke:#ffffff;stroke-width:2.64583"
+       x="84.476158"
+       y="116.82081"
+       id="text740"><tspan
+         id="tspan738"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:mono;-inkscape-font-specification:mono;text-align:center;text-anchor:middle;stroke:none;stroke-width:2.64583"
+         x="84.476158"
+         y="116.82081">{name}</tspan></text><g
+       id="g1250"
+       transform="translate(-1.3006529e-5,8.5767994)"><rect
+         style="fill:none;stroke:#ffffff;stroke-width:0.87411;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1167"
+         width="127.18422"
+         height="8.6508904"
+         x="21.074554"
+         y="134.86963" /><rect
+         style="display:inline;fill:#ffffff;stroke:none;stroke-width:2.6764"
+         id="rect1169"
+         width="{progbar:127.18422}"
+         height="8.6508904"
+         x="21.074554"
+         y="134.86963" /><text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;font-family:mono;-inkscape-font-specification:mono;text-align:start;text-anchor:start;fill:#c0c0c0;fill-opacity:1;stroke:none;stroke-width:1.05833;stroke-dasharray:none;stroke-opacity:1"
+         x="76.841347"
+         y="140.70638"
+         id="text2152"><tspan
+           style="font-size:4.23333px;fill:#c0c0c0;fill-opacity:1;stroke-width:1.05833"
+           x="76.841347"
+           y="140.70638"
+           id="tspan2150">{percent}</tspan></text></g><text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;font-family:mono;-inkscape-font-specification:mono;text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.05833;stroke-dasharray:none;stroke-opacity:1"
+       x="46.947659"
+       y="128.42285"
+       id="text1260"><tspan
+         id="tspan1258"
+         style="font-size:4.23333px;stroke-width:1.05833"
+         x="46.947659"
+         y="128.42285">Implemented: {implemented}</tspan><tspan
+         style="font-size:4.23333px;stroke-width:1.05833"
+         x="46.947659"
+         y="133.71451"
+         id="tspan1262">Accuracy:    {accuracy}</tspan></text></g></svg>

From 4a1e3a5b7e0c0d2ce85c9f27ea213884c25c636f Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 27 Jun 2023 16:01:49 -0700
Subject: [PATCH 06/31] reccmp: fixed typo

---
 tools/reccmp/reccmp.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/reccmp/reccmp.py b/tools/reccmp/reccmp.py
index d50dc9ae..3368bb72 100755
--- a/tools/reccmp/reccmp.py
+++ b/tools/reccmp/reccmp.py
@@ -372,7 +372,7 @@ def parse_asm(file, addr, size):
             # If html, record the diffs to an HTML file
             if html:
               escaped = '\\n'.join(udiff).replace('"', '\\"').replace('\n', '\\n').replace('<', '&lt;').replace('>', '&gt;')
-              htmlinsert.append('{address: "%s", name: "%s", matching: %s, diff: "%s"}' % (hex(addr), recinfo.name, str(ratio), escape))
+              htmlinsert.append('{address: "%s", name: "%s", matching: %s, diff: "%s"}' % (hex(addr), recinfo.name, str(ratio), escaped))
 
       except UnicodeDecodeError:
         break

From f9e9723a67425abd3b296c3f49878b680d6d53bb Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 27 Jun 2023 16:12:04 -0700
Subject: [PATCH 07/31] reccmp: give svg template background color

---
 tools/reccmp/template.svg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/reccmp/template.svg b/tools/reccmp/template.svg
index cb37b94c..6f7fac79 100644
--- a/tools/reccmp/template.svg
+++ b/tools/reccmp/template.svg
@@ -16,7 +16,7 @@
        y="538.62568"
        width="480.69626"
        height="32.696293"
-       id="rect1277" /></defs><g
+       id="rect1277" /></defs><rect x="0" y="0" width="100%" height="100%" fill="#0d1117" /><g
      id="g1273"
      transform="translate(-3.9577451e-7,-0.93505135)"><image
        width="84.666664"

From d8d83eb02eca49a388d7e5aa3b5c52f7edae6ec5 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 27 Jun 2023 16:12:11 -0700
Subject: [PATCH 08/31] ci: upload release

---
 .github/workflows/build.yml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 295d88f3..bd2884ba 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,7 +29,7 @@ jobs:
       if: steps.cache-dx5.outputs.cache-hit != 'true'
       run: |
         cd dx5sdk
-        C:\msys64\usr\bin\wget.exe https://archive.org/download/idx5sdk/idx5sdk.exe
+        curl -fLOSs https://archive.org/download/idx5sdk/idx5sdk.exe
         7z x .\idx5sdk.exe
         7z x .\DX5SDK.EXE
 
@@ -57,8 +57,8 @@ jobs:
     - name: Summarize Accuracy
       shell: cmd
       run: |
-        C:\msys64\usr\bin\wget.exe https://legoisland.org/download/ISLE.EXE
-        C:\msys64\usr\bin\wget.exe https://legoisland.org/download/LEGO1.DLL
+        curl -fLOSs https://legoisland.org/download/ISLE.EXE
+        curl -fLOSs https://legoisland.org/download/LEGO1.DLL
         pip install capstone
         pip install colorama
         python3 tools/reccmp/reccmp.py -S ISLEPROGRESS.SVG --svg-icon tools/reccmp/isle.png -H ISLEPROGRESS.HTML ISLE.EXE Release/ISLE.EXE Release/ISLE.PDB .
@@ -74,3 +74,15 @@ jobs:
           LEGO1PROGRESS.HTML
           ISLEPROGRESS.SVG
           LEGO1PROGRESS.SVG
+
+    - name: Upload Continuous Release
+      shell: bash
+      run: |
+        curl -fLOSs https://raw.githubusercontent.com/probonopd/uploadtool/master/upload.sh
+        ./upload.sh \
+          Release/ISLE.EXE \
+          Release/LEGO1.DLL \
+          Release/ISLEPROGRESS.HTML \
+          Release/ISLEPROGRESS.SVG \
+          Release/LEGO1PROGRESS.HTML \
+          Release/LEGO1PROGRESS.SVG

From b2bd8bc766f68c9651e6eae2a0d8038b518204ad Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 27 Jun 2023 16:15:38 -0700
Subject: [PATCH 09/31] ci: fix typo

---
 .github/workflows/build.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bd2884ba..656fa600 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -82,7 +82,7 @@ jobs:
         ./upload.sh \
           Release/ISLE.EXE \
           Release/LEGO1.DLL \
-          Release/ISLEPROGRESS.HTML \
-          Release/ISLEPROGRESS.SVG \
-          Release/LEGO1PROGRESS.HTML \
-          Release/LEGO1PROGRESS.SVG
+          ISLEPROGRESS.HTML \
+          ISLEPROGRESS.SVG \
+          LEGO1PROGRESS.HTML \
+          LEGO1PROGRESS.SVG

From 883720941ac7a34d9dc403429c6e3822f8d87700 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 27 Jun 2023 16:25:26 -0700
Subject: [PATCH 10/31] ci: provide GITHUB_TOKEN as env

---
 .github/workflows/build.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 656fa600..4fb71936 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -77,6 +77,8 @@ jobs:
 
     - name: Upload Continuous Release
       shell: bash
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         curl -fLOSs https://raw.githubusercontent.com/probonopd/uploadtool/master/upload.sh
         ./upload.sh \

From 066b7311ad57d40517caac9737fbf9b5ef1564d4 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 27 Jun 2023 17:10:11 -0700
Subject: [PATCH 11/31] rename Isle to IsleApp

---
 ISLE/define.cpp |  2 +-
 ISLE/define.h   |  4 ++--
 ISLE/isle.cpp   | 28 ++++++++++++++--------------
 ISLE/isle.h     |  6 +++---
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/ISLE/define.cpp b/ISLE/define.cpp
index 0a77efd9..f236ea29 100644
--- a/ISLE/define.cpp
+++ b/ISLE/define.cpp
@@ -1,7 +1,7 @@
 #include "define.h"
 
 // 0x410030
-Isle *g_isle = 0;
+IsleApp *g_isle = 0;
 
 // 0x410034
 unsigned char g_mousedown = 0;
diff --git a/ISLE/define.h b/ISLE/define.h
index 41f7de27..4da8666d 100644
--- a/ISLE/define.h
+++ b/ISLE/define.h
@@ -3,9 +3,9 @@
 
 #include "legoinc.h"
 
-class Isle;
+class IsleApp;
 
-extern Isle *g_isle;
+extern IsleApp *g_isle;
 extern int g_closed;
 // 0x4101c4
 #define WNDCLASS_NAME "Lego Island MainNoM App"
diff --git a/ISLE/isle.cpp b/ISLE/isle.cpp
index efaa2564..ab4d7efd 100644
--- a/ISLE/isle.cpp
+++ b/ISLE/isle.cpp
@@ -15,7 +15,7 @@
 #include "res/resource.h"
 
 // OFFSET: ISLE 0x401000
-Isle::Isle()
+IsleApp::IsleApp()
 {
   m_hdPath = NULL;
   m_cdPath = NULL;
@@ -52,7 +52,7 @@ Isle::Isle()
 }
 
 // OFFSET: ISLE 0x4011a0
-Isle::~Isle()
+IsleApp::~IsleApp()
 {
   if (LegoOmni::GetInstance()) {
     Close();
@@ -77,7 +77,7 @@ Isle::~Isle()
 }
 
 // OFFSET: ISLE 0x401260
-void Isle::Close()
+void IsleApp::Close()
 {
   MxDSAction ds;
   ds.SetUnknown24(-2);
@@ -112,7 +112,7 @@ void Isle::Close()
 }
 
 // OFFSET: ISLE 0x4013b0
-BOOL Isle::SetupLegoOmni()
+BOOL IsleApp::SetupLegoOmni()
 {
   BOOL result = FALSE;
   char mediaPath[256];
@@ -129,7 +129,7 @@ BOOL Isle::SetupLegoOmni()
 }
 
 // OFFSET: ISLE 0x401560
-void Isle::SetupVideoFlags(BOOL fullScreen, BOOL flipSurfaces, BOOL backBuffers,
+void IsleApp::SetupVideoFlags(BOOL fullScreen, BOOL flipSurfaces, BOOL backBuffers,
                            BOOL using8bit, BOOL using16bit, BOOL param_6, BOOL param_7,
                            BOOL wideViewAngle, char *deviceId)
 {
@@ -178,7 +178,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
   }
 
   // Create global app instance
-  g_isle = new Isle();
+  g_isle = new IsleApp();
 
   // Create window
   if (g_isle->SetupWindow(hInstance, lpCmdLine) != SUCCESS) {
@@ -449,7 +449,7 @@ LRESULT WINAPI WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 }
 
 // OFFSET: ISLE 0x4023e0
-MxResult Isle::SetupWindow(HINSTANCE hInstance, LPSTR lpCmdLine)
+MxResult IsleApp::SetupWindow(HINSTANCE hInstance, LPSTR lpCmdLine)
 {
   WNDCLASSA wndclass;
   ZeroMemory(&wndclass, sizeof(WNDCLASSA));
@@ -565,7 +565,7 @@ MxResult Isle::SetupWindow(HINSTANCE hInstance, LPSTR lpCmdLine)
 }
 
 // OFFSET: ISLE 0x402740
-BOOL Isle::ReadReg(LPCSTR name, LPSTR outValue, DWORD outSize)
+BOOL IsleApp::ReadReg(LPCSTR name, LPSTR outValue, DWORD outSize)
 {
   HKEY hKey;
   DWORD valueType;
@@ -584,7 +584,7 @@ BOOL Isle::ReadReg(LPCSTR name, LPSTR outValue, DWORD outSize)
 }
 
 // OFFSET: ISLE 0x4027b0
-int Isle::ReadRegBool(LPCSTR name, BOOL *out)
+int IsleApp::ReadRegBool(LPCSTR name, BOOL *out)
 {
   char buffer[256];
 
@@ -606,7 +606,7 @@ int Isle::ReadRegBool(LPCSTR name, BOOL *out)
 }
 
 // OFFSET: ISLE 0x402880
-int Isle::ReadRegInt(LPCSTR name, int *out)
+int IsleApp::ReadRegInt(LPCSTR name, int *out)
 {
   char buffer[256];
 
@@ -619,7 +619,7 @@ int Isle::ReadRegInt(LPCSTR name, int *out)
 }
 
 // OFFSET: ISLE 0x4028d0
-void Isle::LoadConfig()
+void IsleApp::LoadConfig()
 {
   char buffer[1024];
 
@@ -684,7 +684,7 @@ void Isle::LoadConfig()
 }
 
 // OFFSET: ISLE 0x402c20
-inline void Isle::Tick(BOOL sleepIfNotNextFrame)
+inline void IsleApp::Tick(BOOL sleepIfNotNextFrame)
 {
   if (!this->m_windowActive) {
     Sleep(0);
@@ -752,7 +752,7 @@ inline void Isle::Tick(BOOL sleepIfNotNextFrame)
 }
 
 // OFFSET: ISLE 0x402e80
-void Isle::SetupCursor(WPARAM wParam)
+void IsleApp::SetupCursor(WPARAM wParam)
 {
   switch (wParam) {
   case 0:
@@ -778,4 +778,4 @@ void Isle::SetupCursor(WPARAM wParam)
   }
 
   SetCursor(m_cursorCurrent);
-}
\ No newline at end of file
+}
diff --git a/ISLE/isle.h b/ISLE/isle.h
index d45d33a3..1aad487f 100644
--- a/ISLE/isle.h
+++ b/ISLE/isle.h
@@ -6,11 +6,11 @@
 #include "mxresult.h"
 #include "mxvideoparam.h"
 
-class Isle
+class IsleApp
 {
 public:
-  Isle();
-  ~Isle();
+  IsleApp();
+  ~IsleApp();
 
   void Close();
 

From 5915cc3ea26696f23ef0cdb0a87134ac1d614a79 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 27 Jun 2023 17:17:26 -0700
Subject: [PATCH 12/31] ci: try converting SVG to PNG

---
 .github/workflows/build.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4fb71936..167b4561 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -63,6 +63,8 @@ jobs:
         pip install colorama
         python3 tools/reccmp/reccmp.py -S ISLEPROGRESS.SVG --svg-icon tools/reccmp/isle.png -H ISLEPROGRESS.HTML ISLE.EXE Release/ISLE.EXE Release/ISLE.PDB .
         python3 tools/reccmp/reccmp.py -S LEGO1PROGRESS.SVG -T 1929 --svg-icon tools/reccmp/lego1.png -H LEGO1PROGRESS.HTML LEGO1.DLL Release/LEGO1.DLL Release/LEGO1.PDB .
+        convert ISLEPROGRESS.SVG ISLEPROGRESS.PNG
+        convert LEGO1PROGRESS.SVG LEGO1PROGRESS.PNG
       
     - name: Upload Artifact
       uses: actions/upload-artifact@master
@@ -74,6 +76,8 @@ jobs:
           LEGO1PROGRESS.HTML
           ISLEPROGRESS.SVG
           LEGO1PROGRESS.SVG
+          ISLEPROGRESS.PNG
+          LEGO1PROGRESS.PNG
 
     - name: Upload Continuous Release
       shell: bash
@@ -86,5 +90,7 @@ jobs:
           Release/LEGO1.DLL \
           ISLEPROGRESS.HTML \
           ISLEPROGRESS.SVG \
+          ISLEPROGRESS.PNG \
           LEGO1PROGRESS.HTML \
+          LEGO1PROGRESS.PNG \
           LEGO1PROGRESS.SVG

From 0191c6560beae0bb26a3cfc5499d096272772cbc Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 27 Jun 2023 17:26:30 -0700
Subject: [PATCH 13/31] ci: attempt to use inkscape to produce PNGs

---
 .github/workflows/build.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 167b4561..7e66cdcf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -63,8 +63,10 @@ jobs:
         pip install colorama
         python3 tools/reccmp/reccmp.py -S ISLEPROGRESS.SVG --svg-icon tools/reccmp/isle.png -H ISLEPROGRESS.HTML ISLE.EXE Release/ISLE.EXE Release/ISLE.PDB .
         python3 tools/reccmp/reccmp.py -S LEGO1PROGRESS.SVG -T 1929 --svg-icon tools/reccmp/lego1.png -H LEGO1PROGRESS.HTML LEGO1.DLL Release/LEGO1.DLL Release/LEGO1.PDB .
-        convert ISLEPROGRESS.SVG ISLEPROGRESS.PNG
-        convert LEGO1PROGRESS.SVG LEGO1PROGRESS.PNG
+
+        #pacman -Sy mingw-w64-x86_64-inkscape
+        inkscape -w 1024 ISLEPROGRESS.SVG -o ISLEPROGRESS.PNG
+        inkscape -w 1024 LEGO1PROGRESS.SVG -o LEGO1PROGRESS.PNG
       
     - name: Upload Artifact
       uses: actions/upload-artifact@master

From a3887f554d73f8655bdd4d552f3969ce282b62ab Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 27 Jun 2023 17:28:46 -0700
Subject: [PATCH 14/31] ci: attempt installing inkscape

---
 .github/workflows/build.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7e66cdcf..7f1b95ad 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -63,10 +63,6 @@ jobs:
         pip install colorama
         python3 tools/reccmp/reccmp.py -S ISLEPROGRESS.SVG --svg-icon tools/reccmp/isle.png -H ISLEPROGRESS.HTML ISLE.EXE Release/ISLE.EXE Release/ISLE.PDB .
         python3 tools/reccmp/reccmp.py -S LEGO1PROGRESS.SVG -T 1929 --svg-icon tools/reccmp/lego1.png -H LEGO1PROGRESS.HTML LEGO1.DLL Release/LEGO1.DLL Release/LEGO1.PDB .
-
-        #pacman -Sy mingw-w64-x86_64-inkscape
-        inkscape -w 1024 ISLEPROGRESS.SVG -o ISLEPROGRESS.PNG
-        inkscape -w 1024 LEGO1PROGRESS.SVG -o LEGO1PROGRESS.PNG
       
     - name: Upload Artifact
       uses: actions/upload-artifact@master
@@ -78,14 +74,16 @@ jobs:
           LEGO1PROGRESS.HTML
           ISLEPROGRESS.SVG
           LEGO1PROGRESS.SVG
-          ISLEPROGRESS.PNG
-          LEGO1PROGRESS.PNG
 
     - name: Upload Continuous Release
       shell: bash
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
+        pacman -Sy mingw-w64-x86_64-inkscape
+        inkscape -w 1024 ISLEPROGRESS.SVG -o ISLEPROGRESS.PNG
+        inkscape -w 1024 LEGO1PROGRESS.SVG -o LEGO1PROGRESS.PNG
+
         curl -fLOSs https://raw.githubusercontent.com/probonopd/uploadtool/master/upload.sh
         ./upload.sh \
           Release/ISLE.EXE \

From dd3ce5ac613dea723c84dac94db3af0b32d10cf3 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 27 Jun 2023 17:31:46 -0700
Subject: [PATCH 15/31] ci: attempt to install inkscape through msys2

---
 .github/workflows/build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7f1b95ad..df651c1b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -80,9 +80,9 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        pacman -Sy mingw-w64-x86_64-inkscape
-        inkscape -w 1024 ISLEPROGRESS.SVG -o ISLEPROGRESS.PNG
-        inkscape -w 1024 LEGO1PROGRESS.SVG -o LEGO1PROGRESS.PNG
+        /c/msys64/usr/bin/pacman -Sy mingw-w64-x86_64-inkscape
+        /c/msys64/mingw64/bin/inkscape -w 1024 ISLEPROGRESS.SVG -o ISLEPROGRESS.PNG
+        /c/msys64/mingw64/bin/inkscape -w 1024 LEGO1PROGRESS.SVG -o LEGO1PROGRESS.PNG
 
         curl -fLOSs https://raw.githubusercontent.com/probonopd/uploadtool/master/upload.sh
         ./upload.sh \

From 4ba4352058c21c09f850d71efb8126d3eb649901 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 27 Jun 2023 17:38:37 -0700
Subject: [PATCH 16/31] ci: pacman noconfirm

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index df651c1b..bf64b158 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -80,7 +80,7 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        /c/msys64/usr/bin/pacman -Sy mingw-w64-x86_64-inkscape
+        /c/msys64/usr/bin/pacman -Sy --noconfirm mingw-w64-x86_64-inkscape
         /c/msys64/mingw64/bin/inkscape -w 1024 ISLEPROGRESS.SVG -o ISLEPROGRESS.PNG
         /c/msys64/mingw64/bin/inkscape -w 1024 LEGO1PROGRESS.SVG -o LEGO1PROGRESS.PNG
 

From 40fdc5b2f56d96224813143dfdbb82b4c876ae44 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 27 Jun 2023 17:42:07 -0700
Subject: [PATCH 17/31] ci: use alternative download

---
 .github/workflows/build.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bf64b158..a51b9395 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -80,9 +80,12 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        /c/msys64/usr/bin/pacman -Sy --noconfirm mingw-w64-x86_64-inkscape
-        /c/msys64/mingw64/bin/inkscape -w 1024 ISLEPROGRESS.SVG -o ISLEPROGRESS.PNG
-        /c/msys64/mingw64/bin/inkscape -w 1024 LEGO1PROGRESS.SVG -o LEGO1PROGRESS.PNG
+        # Convert SVGs to PNG
+        INKSCAPE_DIR=inkscape-1.2.2_2022-12-09_732a01da63-x64
+        curl -fLOSs https://inkscape.org/gallery/item/37364/$INKSCAPE_DIR.7z
+        7z x $INKSCAPE_DIR.7z
+        $INKSCAPE_DIR/bin/inkscape -w 1024 ISLEPROGRESS.SVG -o ISLEPROGRESS.PNG
+        $INKSCAPE_DIR/bin/inkscape -w 1024 LEGO1PROGRESS.SVG -o LEGO1PROGRESS.PNG
 
         curl -fLOSs https://raw.githubusercontent.com/probonopd/uploadtool/master/upload.sh
         ./upload.sh \

From f03cee6b6e1c200cc82f54abd3bb605fe079bf83 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 27 Jun 2023 18:00:53 -0700
Subject: [PATCH 18/31] reccmp: improve progress bar text rendering

---
 tools/reccmp/reccmp.py    |  2 +-
 tools/reccmp/template.svg | 40 ++++++++++++++++++++++++---------------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/tools/reccmp/reccmp.py b/tools/reccmp/reccmp.py
index 3368bb72..a8d3cd07 100755
--- a/tools/reccmp/reccmp.py
+++ b/tools/reccmp/reccmp.py
@@ -429,7 +429,7 @@ def gen_svg(svg, name, icon, implemented_funcs, total_funcs, raw_accuracy):
   templatedata = templatedata[0:percentstart] + str(progwidth) + templatedata[percentend + 1:]
 
   # Replace percentage statistic
-  templatedata = templatedata.replace('{percent}', '%.2f%%' % (total_statistic * 100), 1)
+  templatedata = templatedata.replace('{percent}', '%.2f%%' % (total_statistic * 100), 2)
 
   svgfile = open(svg, 'w')
   if not svgfile:
diff --git a/tools/reccmp/template.svg b/tools/reccmp/template.svg
index 6f7fac79..091d721d 100644
--- a/tools/reccmp/template.svg
+++ b/tools/reccmp/template.svg
@@ -10,13 +10,12 @@
    xml:space="preserve"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"><defs
-     id="defs2"><rect
-       x="79.651809"
-       y="538.62568"
-       width="480.69626"
-       height="32.696293"
-       id="rect1277" /></defs><rect x="0" y="0" width="100%" height="100%" fill="#0d1117" /><g
+   xmlns:svg="http://www.w3.org/2000/svg"><defs>
+        <clipPath id="progBarCutoff">
+          <rect width="{progbar:127.18422}" height="8.6508904" x="21.074554" y="134.86963" />
+        </clipPath>
+      </defs><rect
+     x="0" y="0" width="100%" height="100%" fill="#0d1117" /><g
      id="g1273"
      transform="translate(-3.9577451e-7,-0.93505135)"><image
        width="84.666664"
@@ -43,19 +42,30 @@
          width="127.18422"
          height="8.6508904"
          x="21.074554"
-         y="134.86963" /><rect
-         style="display:inline;fill:#ffffff;stroke:none;stroke-width:2.6764"
-         id="rect1169"
-         width="{progbar:127.18422}"
-         height="8.6508904"
-         x="21.074554"
          y="134.86963" /><text
          xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;font-family:mono;-inkscape-font-specification:mono;text-align:start;text-anchor:start;fill:#c0c0c0;fill-opacity:1;stroke:none;stroke-width:1.05833;stroke-dasharray:none;stroke-opacity:1"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;font-family:mono;-inkscape-font-specification:mono;text-align:start;text-anchor:start;fill:white;fill-opacity:1;stroke:none;stroke-width:1.05833;stroke-dasharray:none;stroke-opacity:1"
          x="76.841347"
          y="140.70638"
          id="text2152"><tspan
-           style="font-size:4.23333px;fill:#c0c0c0;fill-opacity:1;stroke-width:1.05833"
+           style="font-size:4.23333px;fill:white;fill-opacity:1;stroke-width:1.05833"
+           x="76.841347"
+           y="140.70638"
+           id="tspan2150">{percent}</tspan></text><rect
+         style="display:inline;fill:#ffffff;stroke:none;stroke-width:2.6764"
+         id="rect1169"
+         width="127.18422"
+         height="8.6508904"
+         x="21.074554"
+         y="134.86963"
+         clip-path="url(#progBarCutoff)" /><text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;font-family:mono;-inkscape-font-specification:mono;text-align:start;text-anchor:start;fill:black;fill-opacity:1;stroke:none;stroke-width:1.05833;stroke-dasharray:none;stroke-opacity:1"
+         x="76.841347"
+         y="140.70638"
+         id="text2152"
+         clip-path="url(#progBarCutoff)"><tspan
+           style="font-size:4.23333px;fill:black;fill-opacity:1;stroke-width:1.05833"
            x="76.841347"
            y="140.70638"
            id="tspan2150">{percent}</tspan></text></g><text

From 1ea15e64783e5954b0712e7542cadb9649d93efa Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 27 Jun 2023 18:04:30 -0700
Subject: [PATCH 19/31] reccmp: use entire canvas for progress images

---
 tools/reccmp/template.svg | 56 +++++++++++++++++++++++++++++++--------
 1 file changed, 45 insertions(+), 11 deletions(-)

diff --git a/tools/reccmp/template.svg b/tools/reccmp/template.svg
index 091d721d..a88ea83c 100644
--- a/tools/reccmp/template.svg
+++ b/tools/reccmp/template.svg
@@ -8,16 +8,50 @@
    version="1.1"
    id="svg5"
    xml:space="preserve"
+   sodipodi:docname="template.svg"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"><defs>
-        <clipPath id="progBarCutoff">
-          <rect width="{progbar:127.18422}" height="8.6508904" x="21.074554" y="134.86963" />
+   xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
+     id="namedview26"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#505050"
+     showgrid="false"
+     inkscape:zoom="1.6046875"
+     inkscape:cx="239.29893"
+     inkscape:cy="319.68841"
+     inkscape:window-width="2560"
+     inkscape:window-height="1379"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg5" /><defs
+     id="defs5">
+        <clipPath
+   id="progBarCutoff">
+          <rect
+   width="{progbar:127.18422}"
+   height="8.6508904"
+   x="21.074554"
+   y="134.86963"
+   id="rect2" />
         </clipPath>
       </defs><rect
-     x="0" y="0" width="100%" height="100%" fill="#0d1117" /><g
+     x="0"
+     y="0"
+     width="100%"
+     height="100%"
+     fill="#0d1117"
+     id="rect7" /><g
      id="g1273"
-     transform="translate(-3.9577451e-7,-0.93505135)"><image
+     transform="matrix(1.2683581,0,0,1.2683581,-22.720982,-24.134879)"><image
        width="84.666664"
        height="84.666664"
        preserveAspectRatio="none"
@@ -44,11 +78,11 @@
          x="21.074554"
          y="134.86963" /><text
          xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;font-family:mono;-inkscape-font-specification:mono;text-align:start;text-anchor:start;fill:white;fill-opacity:1;stroke:none;stroke-width:1.05833;stroke-dasharray:none;stroke-opacity:1"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;font-family:mono;-inkscape-font-specification:mono;text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.05833;stroke-dasharray:none;stroke-opacity:1"
          x="76.841347"
          y="140.70638"
          id="text2152"><tspan
-           style="font-size:4.23333px;fill:white;fill-opacity:1;stroke-width:1.05833"
+           style="font-size:4.23333px;fill:#ffffff;fill-opacity:1;stroke-width:1.05833"
            x="76.841347"
            y="140.70638"
            id="tspan2150">{percent}</tspan></text><rect
@@ -60,15 +94,15 @@
          y="134.86963"
          clip-path="url(#progBarCutoff)" /><text
          xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;font-family:mono;-inkscape-font-specification:mono;text-align:start;text-anchor:start;fill:black;fill-opacity:1;stroke:none;stroke-width:1.05833;stroke-dasharray:none;stroke-opacity:1"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;font-family:mono;-inkscape-font-specification:mono;text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.05833;stroke-dasharray:none;stroke-opacity:1"
          x="76.841347"
          y="140.70638"
-         id="text2152"
+         id="text18"
          clip-path="url(#progBarCutoff)"><tspan
-           style="font-size:4.23333px;fill:black;fill-opacity:1;stroke-width:1.05833"
+           style="font-size:4.23333px;fill:#000000;fill-opacity:1;stroke-width:1.05833"
            x="76.841347"
            y="140.70638"
-           id="tspan2150">{percent}</tspan></text></g><text
+           id="tspan16">{percent}</tspan></text></g><text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;font-family:mono;-inkscape-font-specification:mono;text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.05833;stroke-dasharray:none;stroke-opacity:1"
        x="46.947659"

From b393851ebd0f8e670a14a8580609607273dddc1f Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 27 Jun 2023 18:10:36 -0700
Subject: [PATCH 20/31] reccmp: change svg canvas size

---
 tools/reccmp/template.svg | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/tools/reccmp/template.svg b/tools/reccmp/template.svg
index a88ea83c..cc5b774d 100644
--- a/tools/reccmp/template.svg
+++ b/tools/reccmp/template.svg
@@ -3,8 +3,8 @@
 
 <svg
    width="640"
-   height="640"
-   viewBox="0 0 169.33333 169.33333"
+   height="480"
+   viewBox="0 0 169.33333 127"
    version="1.1"
    id="svg5"
    xml:space="preserve"
@@ -26,7 +26,7 @@
      showgrid="false"
      inkscape:zoom="1.6046875"
      inkscape:cx="239.29893"
-     inkscape:cy="319.68841"
+     inkscape:cy="219.98053"
      inkscape:window-width="2560"
      inkscape:window-height="1379"
      inkscape:window-x="0"
@@ -51,24 +51,24 @@
      fill="#0d1117"
      id="rect7" /><g
      id="g1273"
-     transform="matrix(1.2683581,0,0,1.2683581,-22.720982,-24.134879)"><image
-       width="84.666664"
-       height="84.666664"
+     transform="matrix(1.2683581,0,0,1.2683581,-22.720969,-65.913871)"><image
+       width="53.066437"
+       height="53.066437"
        preserveAspectRatio="none"
        style="image-rendering:optimizeSpeed"
        xlink:href="data:image/png;base64,{icon}"
        id="image1060"
-       x="42.333336"
-       y="20.367643" /><text
+       x="58.13345"
+       y="51.967873" /><text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.7px;font-family:mono;-inkscape-font-specification:mono;text-align:center;text-anchor:middle;fill:#ffffff;stroke:#ffffff;stroke-width:2.64583"
-       x="84.476158"
-       y="116.82081"
+       x="84.666656"
+       y="118.35877"
        id="text740"><tspan
          id="tspan738"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:mono;-inkscape-font-specification:mono;text-align:center;text-anchor:middle;stroke:none;stroke-width:2.64583"
-         x="84.476158"
-         y="116.82081">{name}</tspan></text><g
+         x="84.666656"
+         y="118.35877">{name}</tspan></text><g
        id="g1250"
        transform="translate(-1.3006529e-5,8.5767994)"><rect
          style="fill:none;stroke:#ffffff;stroke-width:0.87411;stroke-dasharray:none;stroke-opacity:1"
@@ -106,13 +106,13 @@
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;font-family:mono;-inkscape-font-specification:mono;text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.05833;stroke-dasharray:none;stroke-opacity:1"
        x="46.947659"
-       y="128.42285"
+       y="129.67447"
        id="text1260"><tspan
          id="tspan1258"
          style="font-size:4.23333px;stroke-width:1.05833"
          x="46.947659"
-         y="128.42285">Implemented: {implemented}</tspan><tspan
+         y="129.67447">Implemented: {implemented}</tspan><tspan
          style="font-size:4.23333px;stroke-width:1.05833"
          x="46.947659"
-         y="133.71451"
+         y="134.96613"
          id="tspan1262">Accuracy:    {accuracy}</tspan></text></g></svg>

From 612730f6312305683526bc803c3386e96f98fa7f Mon Sep 17 00:00:00 2001
From: MattKC <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 27 Jun 2023 18:12:52 -0700
Subject: [PATCH 21/31] readme: add progress images

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 14b0f424..f89f1f15 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ This is a **work-in-progress** decompilation of LEGO Island version 1.1. It aims
 
 ## Status
 
-*TODO: A progress bar showing the percentage progress of this decompilation.*
+<img src="https://github.com/isledecomp/isle/releases/download/continuous/ISLEPROGRESS.PNG" width="50%"><img src="https://github.com/isledecomp/isle/releases/download/continuous/LEGO1PROGRESS.PNG" width="50%">
 
 Currently `ISLE.EXE` is completely decompiled, however there are some known inaccuracies. It should work if you pair it with the original game's `LEGO1.DLL` (and other files), however small things may not work correctly yet. Work on decompiling `LEGO1.DLL` has only just started and currently it is too incomplete to be usable.
 

From f7c84d719b008b1a55f551d5b4078a2f8e8c13ca Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 27 Jun 2023 18:25:23 -0700
Subject: [PATCH 22/31] reccmp: use bold font for easier readability

---
 tools/reccmp/template.svg | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/reccmp/template.svg b/tools/reccmp/template.svg
index cc5b774d..1cded1e3 100644
--- a/tools/reccmp/template.svg
+++ b/tools/reccmp/template.svg
@@ -61,12 +61,12 @@
        x="58.13345"
        y="51.967873" /><text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.7px;font-family:mono;-inkscape-font-specification:mono;text-align:center;text-anchor:middle;fill:#ffffff;stroke:#ffffff;stroke-width:2.64583"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12.7px;font-family:mono;-inkscape-font-specification:mono;text-align:center;text-anchor:middle;fill:#ffffff;stroke:#ffffff;stroke-width:2.64583"
        x="84.666656"
        y="118.35877"
        id="text740"><tspan
          id="tspan738"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:mono;-inkscape-font-specification:mono;text-align:center;text-anchor:middle;stroke:none;stroke-width:2.64583"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:mono;-inkscape-font-specification:mono;text-align:center;text-anchor:middle;stroke:none;stroke-width:2.64583"
          x="84.666656"
          y="118.35877">{name}</tspan></text><g
        id="g1250"
@@ -78,7 +78,7 @@
          x="21.074554"
          y="134.86963" /><text
          xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;font-family:mono;-inkscape-font-specification:mono;text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.05833;stroke-dasharray:none;stroke-opacity:1"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.23333px;font-family:mono;-inkscape-font-specification:mono;text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.05833;stroke-dasharray:none;stroke-opacity:1"
          x="76.841347"
          y="140.70638"
          id="text2152"><tspan
@@ -94,7 +94,7 @@
          y="134.86963"
          clip-path="url(#progBarCutoff)" /><text
          xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;font-family:mono;-inkscape-font-specification:mono;text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.05833;stroke-dasharray:none;stroke-opacity:1"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.23333px;font-family:mono;-inkscape-font-specification:mono;text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.05833;stroke-dasharray:none;stroke-opacity:1"
          x="76.841347"
          y="140.70638"
          id="text18"
@@ -104,7 +104,7 @@
            y="140.70638"
            id="tspan16">{percent}</tspan></text></g><text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;font-family:mono;-inkscape-font-specification:mono;text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.05833;stroke-dasharray:none;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.23333px;font-family:mono;-inkscape-font-specification:mono;text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.05833;stroke-dasharray:none;stroke-opacity:1"
        x="46.947659"
        y="129.67447"
        id="text1260"><tspan

From 008fd80a6fba49eafcd786aa8aafca8794a0a00a Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 27 Jun 2023 18:58:15 -0700
Subject: [PATCH 23/31] ci: create text progress reports too for
 auto-comparison

---
 .github/workflows/build.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a51b9395..c7ab40ae 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -55,14 +55,14 @@ jobs:
         .\msvc420\bin\NMAKE.EXE /f isle.mak CFG="ISLE - Win32 Release"
 
     - name: Summarize Accuracy
-      shell: cmd
+      shell: bash
       run: |
         curl -fLOSs https://legoisland.org/download/ISLE.EXE
         curl -fLOSs https://legoisland.org/download/LEGO1.DLL
         pip install capstone
         pip install colorama
-        python3 tools/reccmp/reccmp.py -S ISLEPROGRESS.SVG --svg-icon tools/reccmp/isle.png -H ISLEPROGRESS.HTML ISLE.EXE Release/ISLE.EXE Release/ISLE.PDB .
-        python3 tools/reccmp/reccmp.py -S LEGO1PROGRESS.SVG -T 1929 --svg-icon tools/reccmp/lego1.png -H LEGO1PROGRESS.HTML LEGO1.DLL Release/LEGO1.DLL Release/LEGO1.PDB .
+        python3 tools/reccmp/reccmp.py -S ISLEPROGRESS.SVG --svg-icon tools/reccmp/isle.png -H ISLEPROGRESS.HTML ISLE.EXE Release/ISLE.EXE Release/ISLE.PDB . | tee ISLEPROGRESS.TXT
+        python3 tools/reccmp/reccmp.py -S LEGO1PROGRESS.SVG -T 1929 --svg-icon tools/reccmp/lego1.png -H LEGO1PROGRESS.HTML LEGO1.DLL Release/LEGO1.DLL Release/LEGO1.PDB . | tee LEGO1PROGRESS.TXT
       
     - name: Upload Artifact
       uses: actions/upload-artifact@master
@@ -92,8 +92,10 @@ jobs:
           Release/ISLE.EXE \
           Release/LEGO1.DLL \
           ISLEPROGRESS.HTML \
+          ISLEPROGRESS.TXT \
           ISLEPROGRESS.SVG \
           ISLEPROGRESS.PNG \
           LEGO1PROGRESS.HTML \
+          LEGO1PROGRESS.TXT \
           LEGO1PROGRESS.PNG \
           LEGO1PROGRESS.SVG

From ad2d84ce58faf09689551d584863700f9c45c05e Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 27 Jun 2023 19:01:04 -0700
Subject: [PATCH 24/31] ci: compare accuracy to current master

---
 .github/workflows/build.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c7ab40ae..f146cf51 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -63,6 +63,13 @@ jobs:
         pip install colorama
         python3 tools/reccmp/reccmp.py -S ISLEPROGRESS.SVG --svg-icon tools/reccmp/isle.png -H ISLEPROGRESS.HTML ISLE.EXE Release/ISLE.EXE Release/ISLE.PDB . | tee ISLEPROGRESS.TXT
         python3 tools/reccmp/reccmp.py -S LEGO1PROGRESS.SVG -T 1929 --svg-icon tools/reccmp/lego1.png -H LEGO1PROGRESS.HTML LEGO1.DLL Release/LEGO1.DLL Release/LEGO1.PDB . | tee LEGO1PROGRESS.TXT
+
+        # Compare with current master
+        curl -fLSs -o ISLEPROGRESS-OLD.TXT https://github.com/isledecomp/isle/releases/download/continuous/ISLEPROGRESS.TXT
+        curl -fLSs -o LEGO1PROGRESS-OLD.TXT https://github.com/isledecomp/isle/releases/download/continuous/LEGO1PROGRESS.TXT
+
+        diff -u ISLEPROGRESS-OLD.TXT ISLEPROGRESS.TXT
+        diff -u LEGO1PROGRESS-OLD.TXT LEGO1PROGRESS.TXT
       
     - name: Upload Artifact
       uses: actions/upload-artifact@master

From c7cf9ee8fdac717b608d2cdfeb1bf56892b5ce55 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 27 Jun 2023 19:02:26 -0700
Subject: [PATCH 25/31] ci: compare accuracy as separate step

---
 .github/workflows/build.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f146cf51..18ad2d7a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -64,6 +64,9 @@ jobs:
         python3 tools/reccmp/reccmp.py -S ISLEPROGRESS.SVG --svg-icon tools/reccmp/isle.png -H ISLEPROGRESS.HTML ISLE.EXE Release/ISLE.EXE Release/ISLE.PDB . | tee ISLEPROGRESS.TXT
         python3 tools/reccmp/reccmp.py -S LEGO1PROGRESS.SVG -T 1929 --svg-icon tools/reccmp/lego1.png -H LEGO1PROGRESS.HTML LEGO1.DLL Release/LEGO1.DLL Release/LEGO1.PDB . | tee LEGO1PROGRESS.TXT
 
+    - name: Compare Accuracy With Current Master
+      shell: bash
+      run: |
         # Compare with current master
         curl -fLSs -o ISLEPROGRESS-OLD.TXT https://github.com/isledecomp/isle/releases/download/continuous/ISLEPROGRESS.TXT
         curl -fLSs -o LEGO1PROGRESS-OLD.TXT https://github.com/isledecomp/isle/releases/download/continuous/LEGO1PROGRESS.TXT

From e7b5ea53dfee29eb65697d801c15c8f232692dcd Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 27 Jun 2023 19:04:07 -0700
Subject: [PATCH 26/31] rename GetClassName/IsClass, declare mxtypes

Was intended as a simple code improvement, however it also seems to make WinMain, MxString::operator=, MxDSFile::Open 100% (all of which just needed registers to be switched around)
---
 ISLE/define.h               |   2 +-
 ISLE/isle.cpp               |   2 +-
 ISLE/isle.h                 |   2 +-
 LEGO1/dllmain.cpp           |   2 +-
 LEGO1/legoinc.h             |  10 ----------
 LEGO1/legonavcontroller.cpp |  14 +++++++-------
 LEGO1/legonavcontroller.h   |   2 +-
 LEGO1/legoomni.cpp          |   2 +-
 LEGO1/legoomni.h            |   6 ++----
 LEGO1/mxbool.h              |   9 ---------
 LEGO1/mxcore.h              |   8 +++-----
 LEGO1/mxcriticalsection.h   |   2 +-
 LEGO1/mxdsfile.h            |   1 +
 LEGO1/mxioinfo.h            |   4 +++-
 LEGO1/mxomnicreateflags.cpp |  20 ++++++++++----------
 LEGO1/mxomnicreateflags.h   |  22 +++++++++++-----------
 LEGO1/mxomnicreateparam.h   |   3 ++-
 LEGO1/mxticklemanager.h     |   4 ++--
 LEGO1/mxtimer.cpp           |   8 ++++----
 LEGO1/mxtypes.h             |  21 +++++++++++++++++++++
 LEGO1/mxvideomanager.cpp    |   4 ++--
 LEGO1/mxvideoparam.h        |   2 +-
 LEGO1/mxvideoparamflags.h   |   2 +-
 isle.mak                    |  20 +++++++-------------
 isle.mdp                    | Bin 51200 -> 49664 bytes
 25 files changed, 84 insertions(+), 88 deletions(-)
 delete mode 100644 LEGO1/legoinc.h
 delete mode 100644 LEGO1/mxbool.h
 create mode 100644 LEGO1/mxtypes.h

diff --git a/ISLE/define.h b/ISLE/define.h
index 4da8666d..ffc74654 100644
--- a/ISLE/define.h
+++ b/ISLE/define.h
@@ -1,7 +1,7 @@
 #ifndef DEFINE_H
 #define DEFINE_H
 
-#include "legoinc.h"
+#include <windows.h>
 
 class IsleApp;
 
diff --git a/ISLE/isle.cpp b/ISLE/isle.cpp
index ab4d7efd..938de251 100644
--- a/ISLE/isle.cpp
+++ b/ISLE/isle.cpp
@@ -101,7 +101,7 @@ void IsleApp::Close()
     } while (lVar8 == 0);
 
     while (Lego()) {
-      if (Lego()->vtable28(ds) != MX_FALSE) {
+      if (Lego()->vtable28(ds) != FALSE) {
         break;
       }
 
diff --git a/ISLE/isle.h b/ISLE/isle.h
index 1aad487f..7f01cf7d 100644
--- a/ISLE/isle.h
+++ b/ISLE/isle.h
@@ -1,7 +1,7 @@
 #ifndef ISLE_H
 #define ISLE_H
 
-#include "legoinc.h"
+#include <windows.h>
 
 #include "mxresult.h"
 #include "mxvideoparam.h"
diff --git a/LEGO1/dllmain.cpp b/LEGO1/dllmain.cpp
index 43654cb6..58d0149f 100644
--- a/LEGO1/dllmain.cpp
+++ b/LEGO1/dllmain.cpp
@@ -1,4 +1,4 @@
-#include "legoinc.h"
+#include <windows.h>
 
 // OFFSET: LEGO1 0x10091ee0
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
diff --git a/LEGO1/legoinc.h b/LEGO1/legoinc.h
deleted file mode 100644
index d1377c23..00000000
--- a/LEGO1/legoinc.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef LEGOINC_H
-#define LEGOINC_H
-
-// It is recommended to include this over <windows.h> directly because this way
-// we can undef stuff that might cause issues with our code.
-
-#include <windows.h>
-#undef GetClassName
-
-#endif // LEGOINC_H
diff --git a/LEGO1/legonavcontroller.cpp b/LEGO1/legonavcontroller.cpp
index e9110d7b..af618de9 100644
--- a/LEGO1/legonavcontroller.cpp
+++ b/LEGO1/legonavcontroller.cpp
@@ -26,7 +26,7 @@ float g_turnDecel = 50.0f;
 // 0x100f4c50
 float g_turnSensitivity = 0.4f;
 // 0x100f4c54
-MxBool g_turnUseVelocity = MX_FALSE;
+MxBool g_turnUseVelocity = FALSE;
 
 // OFFSET: LEGO1 0x10054d40
 void LegoNavController::GetDefaults(int *p_mouseDeadzone, float *p_movementMaxSpeed, float *p_turnMaxSpeed,
@@ -77,9 +77,9 @@ LegoNavController::LegoNavController()
   this->m_targetTurnSpeed = 0.0f;
   this->m_movementAccel = 0.0f;
   this->m_turnAccel = 0.0f;
-  this->m_trackDefault = MX_FALSE;
-  this->m_unk5D = MX_FALSE;
-  this->m_unk6C = MX_FALSE;
+  this->m_trackDefault = FALSE;
+  this->m_unk5D = FALSE;
+  this->m_unk6C = FALSE;
   this->m_unk64 = 0;
   this->m_unk68 = 0;
   this->m_unk60 = 0;
@@ -133,12 +133,12 @@ void LegoNavController::ResetToDefault()
 // OFFSET: LEGO1 0x10054e40
 void LegoNavController::SetTargets(int p_hPos, int p_vPos, MxBool p_accel)
 {
-  if (this->m_trackDefault != MX_FALSE)
+  if (this->m_trackDefault != FALSE)
   {
     ResetToDefault();
   }
 
-  if (p_accel != MX_FALSE)
+  if (p_accel != FALSE)
   {
     this->m_targetTurnSpeed = CalculateNewTargetSpeed(p_hPos, this->m_hMax / 2, this->m_turnMaxSpeed);
     this->m_targetMovementSpeed = CalculateNewTargetSpeed(this->m_vMax - p_vPos, this->m_vMax / 2, this->m_movementMaxSpeed);
@@ -184,4 +184,4 @@ float LegoNavController::CalculateNewAccel(int p_pos, int p_center, float p_maxA
   }
 
   return result;
-}
\ No newline at end of file
+}
diff --git a/LEGO1/legonavcontroller.h b/LEGO1/legonavcontroller.h
index 3220d794..35bcf4d3 100644
--- a/LEGO1/legonavcontroller.h
+++ b/LEGO1/legonavcontroller.h
@@ -2,8 +2,8 @@
 #define LEGONAVCONTROLLER_H
 
 #include "mxcore.h"
-#include "mxbool.h"
 #include "mxtimer.h"
+#include "mxtypes.h"
 
 class LegoNavController : public MxCore
 {
diff --git a/LEGO1/legoomni.cpp b/LEGO1/legoomni.cpp
index 30d86cb9..3d8be0d7 100644
--- a/LEGO1/legoomni.cpp
+++ b/LEGO1/legoomni.cpp
@@ -99,7 +99,7 @@ void LegoOmni::vtable24(MxDSAction &ds)
 MxBool LegoOmni::vtable28(MxDSAction &ds)
 {
   // FIXME: Stub
-  return MX_TRUE;
+  return TRUE;
 }
 
 void LegoOmni::vtable2c()
diff --git a/LEGO1/legoomni.h b/LEGO1/legoomni.h
index 4a66d14d..852c5b07 100644
--- a/LEGO1/legoomni.h
+++ b/LEGO1/legoomni.h
@@ -32,12 +32,10 @@ class LegoOmni : public MxOmni
   virtual long Notify(MxParam &p); // vtable+04
 
   // OFFSET: LEGO1 0x10058aa0
-  inline virtual const char *GetClassName() const { return "LegoOmni"; }; // vtable+0c
+  inline virtual const char *ClassName() const { return "LegoOmni"; }; // vtable+0c
 
   // OFFSET: LEGO1 0x10058ab0
-  inline virtual MxBool IsClass(const char *name) const {
-    return !strcmp(name, LegoOmni::GetClassName()) || MxOmni::IsClass(name);
-  }; // vtable+10;
+  inline virtual MxBool IsA(const char *name) const { return !strcmp(name, LegoOmni::ClassName()) || MxOmni::IsA(name); }; // vtable+10;
 
   virtual void Init(); // vtable+14
   virtual MxResult Create(MxOmniCreateParam &p); // vtable+18
diff --git a/LEGO1/mxbool.h b/LEGO1/mxbool.h
deleted file mode 100644
index 4b6e4a2d..00000000
--- a/LEGO1/mxbool.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef MXBOOL_H
-#define MXBOOL_H
-
-typedef unsigned char MxBool;
-
-#define MX_TRUE 1
-#define MX_FALSE 0
-
-#endif // MXBOOL_H
diff --git a/LEGO1/mxcore.h b/LEGO1/mxcore.h
index 37f079da..d870b3b3 100644
--- a/LEGO1/mxcore.h
+++ b/LEGO1/mxcore.h
@@ -3,7 +3,7 @@
 
 #include <string.h>
 
-#include "mxbool.h"
+#include "mxtypes.h"
 
 class MxParam;
 
@@ -16,12 +16,10 @@ class MxCore
   virtual long Tickle(); // vtable+08
 
   // OFFSET: LEGO1 0x100144c0
-  inline virtual const char *GetClassName() const { return "MxCore"; }; // vtable+0c
+  inline virtual const char *ClassName() const { return "MxCore"; }; // vtable+0c
 
   // OFFSET: LEGO1 0x100140d0
-  inline virtual MxBool IsClass(const char *name) const {
-    return !strcmp(name, MxCore::GetClassName());
-  }; // vtable+10
+  inline virtual MxBool IsA(const char *name) const { return !strcmp(name, MxCore::ClassName()); }; // vtable+10
 
 private:
   unsigned int m_id;
diff --git a/LEGO1/mxcriticalsection.h b/LEGO1/mxcriticalsection.h
index 5b905741..81d96d37 100644
--- a/LEGO1/mxcriticalsection.h
+++ b/LEGO1/mxcriticalsection.h
@@ -1,7 +1,7 @@
 #ifndef MXCRITICALSECTION_H
 #define MXCRITICALSECTION_H
 
-#include "legoinc.h"
+#include <windows.h>
 
 class MxCriticalSection
 {
diff --git a/LEGO1/mxdsfile.h b/LEGO1/mxdsfile.h
index e1e170d4..ee577e78 100644
--- a/LEGO1/mxdsfile.h
+++ b/LEGO1/mxdsfile.h
@@ -5,6 +5,7 @@
 #include "mxstring.h"
 #include "mxioinfo.h"
 #include "mxdssource.h"
+
 class MxDSFile : public MxDSSource
 {
 public:
diff --git a/LEGO1/mxioinfo.h b/LEGO1/mxioinfo.h
index 59ee3807..c88a55b9 100644
--- a/LEGO1/mxioinfo.h
+++ b/LEGO1/mxioinfo.h
@@ -1,8 +1,10 @@
 #ifndef MXIOINFO_H
 #define MXIOINFO_H
 
-#include "legoinc.h"
+#include <windows.h>
+
 #include "mmsystem.h"
+
 class MXIOINFO
 {
 public:
diff --git a/LEGO1/mxomnicreateflags.cpp b/LEGO1/mxomnicreateflags.cpp
index 9826dc5b..8e0803a9 100644
--- a/LEGO1/mxomnicreateflags.cpp
+++ b/LEGO1/mxomnicreateflags.cpp
@@ -3,15 +3,15 @@
 // OFFSET: LEGO1 0x100b0a30
 MxOmniCreateFlags::MxOmniCreateFlags()
 {
-  this->CreateObjectFactory(MX_TRUE);
-  this->CreateVariableTable(MX_TRUE);
-  this->CreateTickleManager(MX_TRUE);
-  this->CreateNotificationManager(MX_TRUE);
-  this->CreateVideoManager(MX_TRUE);
-  this->CreateSoundManager(MX_TRUE);
-  this->CreateMusicManager(MX_TRUE);
-  this->CreateEventManager(MX_TRUE);
+  this->CreateObjectFactory(TRUE);
+  this->CreateVariableTable(TRUE);
+  this->CreateTickleManager(TRUE);
+  this->CreateNotificationManager(TRUE);
+  this->CreateVideoManager(TRUE);
+  this->CreateSoundManager(TRUE);
+  this->CreateMusicManager(TRUE);
+  this->CreateEventManager(TRUE);
 
-  this->CreateTimer(MX_TRUE);
-  this->CreateStreamer(MX_TRUE);
+  this->CreateTimer(TRUE);
+  this->CreateStreamer(TRUE);
 }
diff --git a/LEGO1/mxomnicreateflags.h b/LEGO1/mxomnicreateflags.h
index 464a5f3c..d8d37447 100644
--- a/LEGO1/mxomnicreateflags.h
+++ b/LEGO1/mxomnicreateflags.h
@@ -1,7 +1,7 @@
 #ifndef MXOMNICREATEFLAGS_H
 #define MXOMNICREATEFLAGS_H
 
-#include "mxbool.h"
+#include "mxtypes.h"
 
 class MxOmniCreateFlags
 {
@@ -36,17 +36,17 @@ class MxOmniCreateFlags
   const inline MxBool CreateTimer() const { return this->m_flags2 & Flag_CreateTimer; }
   const inline MxBool CreateStreamer() const { return this->m_flags2 & Flag_CreateStreamer; }
 
-  inline void CreateObjectFactory(MxBool b) { this->m_flags1 = (b == MX_TRUE ? this->m_flags1 | Flag_CreateObjectFactory : this->m_flags1 & ~Flag_CreateObjectFactory); }
-  inline void CreateVariableTable(MxBool b) { this->m_flags1 = (b == MX_TRUE ? this->m_flags1 | Flag_CreateVariableTable : this->m_flags1 & ~Flag_CreateVariableTable); }
-  inline void CreateTickleManager(MxBool b) { this->m_flags1 = (b == MX_TRUE ? this->m_flags1 | Flag_CreateTickleManager : this->m_flags1 & ~Flag_CreateTickleManager); }
-  inline void CreateNotificationManager(MxBool b) { this->m_flags1 = (b == MX_TRUE ? this->m_flags1 | Flag_CreateNotificationManager : this->m_flags1 & ~Flag_CreateNotificationManager); }
-  inline void CreateVideoManager(MxBool b) { this->m_flags1 = (b == MX_TRUE ? this->m_flags1 | Flag_CreateVideoManager : this->m_flags1 & ~Flag_CreateVideoManager); }
-  inline void CreateSoundManager(MxBool b) { this->m_flags1 = (b == MX_TRUE ? this->m_flags1 | Flag_CreateSoundManager : this->m_flags1 & ~Flag_CreateSoundManager); }
-  inline void CreateMusicManager(MxBool b) { this->m_flags1 = (b == MX_TRUE ? this->m_flags1 | Flag_CreateMusicManager : this->m_flags1 & ~Flag_CreateMusicManager); }
-  inline void CreateEventManager(MxBool b) { this->m_flags1 = (b == MX_TRUE ? this->m_flags1 | Flag_CreateEventManager : this->m_flags1 & ~Flag_CreateEventManager); }
+  inline void CreateObjectFactory(MxBool b) { this->m_flags1 = (b == TRUE ? this->m_flags1 | Flag_CreateObjectFactory : this->m_flags1 & ~Flag_CreateObjectFactory); }
+  inline void CreateVariableTable(MxBool b) { this->m_flags1 = (b == TRUE ? this->m_flags1 | Flag_CreateVariableTable : this->m_flags1 & ~Flag_CreateVariableTable); }
+  inline void CreateTickleManager(MxBool b) { this->m_flags1 = (b == TRUE ? this->m_flags1 | Flag_CreateTickleManager : this->m_flags1 & ~Flag_CreateTickleManager); }
+  inline void CreateNotificationManager(MxBool b) { this->m_flags1 = (b == TRUE ? this->m_flags1 | Flag_CreateNotificationManager : this->m_flags1 & ~Flag_CreateNotificationManager); }
+  inline void CreateVideoManager(MxBool b) { this->m_flags1 = (b == TRUE ? this->m_flags1 | Flag_CreateVideoManager : this->m_flags1 & ~Flag_CreateVideoManager); }
+  inline void CreateSoundManager(MxBool b) { this->m_flags1 = (b == TRUE ? this->m_flags1 | Flag_CreateSoundManager : this->m_flags1 & ~Flag_CreateSoundManager); }
+  inline void CreateMusicManager(MxBool b) { this->m_flags1 = (b == TRUE ? this->m_flags1 | Flag_CreateMusicManager : this->m_flags1 & ~Flag_CreateMusicManager); }
+  inline void CreateEventManager(MxBool b) { this->m_flags1 = (b == TRUE ? this->m_flags1 | Flag_CreateEventManager : this->m_flags1 & ~Flag_CreateEventManager); }
 
-  inline void CreateTimer(MxBool b) { this->m_flags2 = (b == MX_TRUE ? this->m_flags2 | Flag_CreateTimer : this->m_flags2 & ~Flag_CreateTimer); }
-  inline void CreateStreamer(MxBool b) { this->m_flags2 = (b == MX_TRUE ? this->m_flags2 | Flag_CreateStreamer : this->m_flags2 & ~Flag_CreateStreamer); }
+  inline void CreateTimer(MxBool b) { this->m_flags2 = (b == TRUE ? this->m_flags2 | Flag_CreateTimer : this->m_flags2 & ~Flag_CreateTimer); }
+  inline void CreateStreamer(MxBool b) { this->m_flags2 = (b == TRUE ? this->m_flags2 | Flag_CreateStreamer : this->m_flags2 & ~Flag_CreateStreamer); }
 
 private:
   unsigned char m_flags1;
diff --git a/LEGO1/mxomnicreateparam.h b/LEGO1/mxomnicreateparam.h
index ad11cb55..31dcd447 100644
--- a/LEGO1/mxomnicreateparam.h
+++ b/LEGO1/mxomnicreateparam.h
@@ -1,7 +1,8 @@
 #ifndef MXOMNICREATEPARAM_H
 #define MXOMNICREATEPARAM_H
 
-#include "legoinc.h"
+#include <windows.h>
+
 #include "mxomnicreateflags.h"
 #include "mxomnicreateparambase.h"
 #include "mxstring.h"
diff --git a/LEGO1/mxticklemanager.h b/LEGO1/mxticklemanager.h
index afcea455..24600dca 100644
--- a/LEGO1/mxticklemanager.h
+++ b/LEGO1/mxticklemanager.h
@@ -9,8 +9,8 @@ class MxTickleManager : public MxCore
   virtual ~MxTickleManager();
 
   virtual long Tickle();
-  virtual const char *GetClassName() const;
-  virtual MxBool IsClass(const char *name) const;
+  virtual const char *ClassName() const;
+  virtual MxBool IsA(const char *name) const;
   virtual void vtable14();
   virtual void vtable18();
   virtual void vtable1c(void *v, int p);
diff --git a/LEGO1/mxtimer.cpp b/LEGO1/mxtimer.cpp
index 0b51e9da..47afaa03 100644
--- a/LEGO1/mxtimer.cpp
+++ b/LEGO1/mxtimer.cpp
@@ -1,6 +1,6 @@
 #include "mxtimer.h"
 
-#include "legoinc.h"
+#include <windows.h>
 
 // 0x10101414
 long MxTimer::s_LastTimeCalculated = 0;
@@ -11,7 +11,7 @@ long MxTimer::s_LastTimeTimerStarted = 0;
 // OFFSET: LEGO1 0x100ae060
 MxTimer::MxTimer()
 {
-  this->m_isRunning = MX_FALSE;
+  this->m_isRunning = FALSE;
   m_startTime = timeGetTime();
   // yeah this is somehow what the asm is
   s_LastTimeCalculated = m_startTime;
@@ -21,7 +21,7 @@ MxTimer::MxTimer()
 void MxTimer::Start()
 {
   s_LastTimeTimerStarted = this->GetRealTime();
-  this->m_isRunning = MX_TRUE;
+  this->m_isRunning = TRUE;
 }
 
 // OFFSET: LEGO1 0x100ae180
@@ -29,7 +29,7 @@ void MxTimer::Stop()
 {
   long elapsed = this->GetRealTime();
   long startTime = elapsed - MxTimer::s_LastTimeTimerStarted;
-  this->m_isRunning = MX_FALSE;
+  this->m_isRunning = FALSE;
   // this feels very stupid but it's what the assembly does
   this->m_startTime = this->m_startTime + startTime - 5;
 }
diff --git a/LEGO1/mxtypes.h b/LEGO1/mxtypes.h
new file mode 100644
index 00000000..f6e23970
--- /dev/null
+++ b/LEGO1/mxtypes.h
@@ -0,0 +1,21 @@
+#ifndef MXTYPE_H
+#define MXTYPE_H
+
+typedef unsigned char MxU8;
+typedef char MxS8;
+typedef unsigned short MxU16;
+typedef short MxS16;
+typedef unsigned int MxU32;
+typedef int MxS32;
+
+typedef unsigned char MxBool;
+
+#ifndef TRUE
+#define TRUE 1
+#endif
+
+#ifndef FALSE
+#define FALSE 0
+#endif
+
+#endif MXTYPE_H
diff --git a/LEGO1/mxvideomanager.cpp b/LEGO1/mxvideomanager.cpp
index c7a41c99..7c1625d1 100644
--- a/LEGO1/mxvideomanager.cpp
+++ b/LEGO1/mxvideomanager.cpp
@@ -14,7 +14,7 @@ int MxVideoManager::Init()
   this->m_unk58 = NULL;
   this->m_unk5c = 0;
   this->m_videoParam.SetPalette(NULL);
-  this->m_unk60 = MX_FALSE;
+  this->m_unk60 = FALSE;
   return 0;
 }
 
@@ -33,4 +33,4 @@ long MxVideoManager::RealizePalette(MxPalette *p_palette)
 
   this->m_criticalSection.Leave();
   return 0;
-}
\ No newline at end of file
+}
diff --git a/LEGO1/mxvideoparam.h b/LEGO1/mxvideoparam.h
index 70569978..3e00a920 100644
--- a/LEGO1/mxvideoparam.h
+++ b/LEGO1/mxvideoparam.h
@@ -4,8 +4,8 @@
 #include <ddraw.h>
 
 #include "mxpalette.h"
-#include "mxbool.h"
 #include "mxrect32.h"
+#include "mxtypes.h"
 #include "mxvariabletable.h"
 #include "mxvideoparamflags.h"
 
diff --git a/LEGO1/mxvideoparamflags.h b/LEGO1/mxvideoparamflags.h
index 4e030499..f25ab4bd 100644
--- a/LEGO1/mxvideoparamflags.h
+++ b/LEGO1/mxvideoparamflags.h
@@ -1,7 +1,7 @@
 #ifndef MXVIDEOPARAMFLAGS_H
 #define MXVIDEOPARAMFLAGS_H
 
-#include "legoinc.h"
+#include <windows.h>
 
 // Must be union with struct for match.
 typedef union {
diff --git a/isle.mak b/isle.mak
index 23583c29..899c2b03 100644
--- a/isle.mak
+++ b/isle.mak
@@ -500,11 +500,8 @@ DEP_CPP_MXCOR=\
 # Begin Source File
 
 SOURCE=.\LEGO1\dllmain.cpp
-DEP_CPP_DLLMA=\
-	".\LEGO1\legoinc.h"\
-	
 
-"$(INTDIR)\dllmain.obj" : $(SOURCE) $(DEP_CPP_DLLMA) "$(INTDIR)"
+"$(INTDIR)\dllmain.obj" : $(SOURCE) "$(INTDIR)"
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
@@ -518,7 +515,6 @@ DEP_CPP_LEGOO=\
 	".\LEGO1\lego3dview.h"\
 	".\LEGO1\legoentity.h"\
 	".\LEGO1\legogamestate.h"\
-	".\LEGO1\legoinc.h"\
 	".\LEGO1\legoinputmanager.h"\
 	".\LEGO1\legonavcontroller.h"\
 	".\LEGO1\legoomni.h"\
@@ -526,7 +522,6 @@ DEP_CPP_LEGOO=\
 	".\LEGO1\legovideomanager.h"\
 	".\LEGO1\mxatomid.h"\
 	".\LEGO1\mxbackgroundaudiomanager.h"\
-	".\LEGO1\mxbool.h"\
 	".\LEGO1\mxcore.h"\
 	".\LEGO1\mxcriticalsection.h"\
 	".\LEGO1\mxdsaction.h"\
@@ -552,6 +547,7 @@ DEP_CPP_LEGOO=\
 	".\LEGO1\mxticklemanager.h"\
 	".\LEGO1\mxtimer.h"\
 	".\LEGO1\mxtransitionmanager.h"\
+	".\LEGO1\mxtypes.h"\
 	".\LEGO1\mxunknown100dc6b0.h"\
 	".\LEGO1\mxvariabletable.h"\
 	".\LEGO1\mxvideomanager.h"\
@@ -599,10 +595,9 @@ DEP_CPP_MXAUT=\
 
 SOURCE=.\LEGO1\mxtimer.cpp
 DEP_CPP_MXTIM=\
-	".\LEGO1\legoinc.h"\
-	".\LEGO1\mxbool.h"\
 	".\LEGO1\mxcore.h"\
 	".\LEGO1\mxtimer.h"\
+	".\LEGO1\mxtypes.h"\
 	
 
 "$(INTDIR)\mxtimer.obj" : $(SOURCE) $(DEP_CPP_MXTIM) "$(INTDIR)"
@@ -755,8 +750,8 @@ DEP_CPP_MXSTR=\
 
 SOURCE=.\LEGO1\mxomnicreateflags.cpp
 DEP_CPP_MXOMNICR=\
-	".\LEGO1\mxbool.h"\
 	".\LEGO1\mxomnicreateflags.h"\
+	".\LEGO1\mxtypes.h"\
 	
 
 "$(INTDIR)\mxomnicreateflags.obj" : $(SOURCE) $(DEP_CPP_MXOMNICR) "$(INTDIR)"
@@ -773,7 +768,6 @@ DEP_CPP_LEGON=\
 	".\LEGO1\lego3dview.h"\
 	".\LEGO1\legoentity.h"\
 	".\LEGO1\legogamestate.h"\
-	".\LEGO1\legoinc.h"\
 	".\LEGO1\legoinputmanager.h"\
 	".\LEGO1\legonavcontroller.h"\
 	".\LEGO1\legoomni.h"\
@@ -782,7 +776,6 @@ DEP_CPP_LEGON=\
 	".\LEGO1\legovideomanager.h"\
 	".\LEGO1\mxatomid.h"\
 	".\LEGO1\mxbackgroundaudiomanager.h"\
-	".\LEGO1\mxbool.h"\
 	".\LEGO1\mxcore.h"\
 	".\LEGO1\mxcriticalsection.h"\
 	".\LEGO1\mxdsaction.h"\
@@ -808,6 +801,7 @@ DEP_CPP_LEGON=\
 	".\LEGO1\mxticklemanager.h"\
 	".\LEGO1\mxtimer.h"\
 	".\LEGO1\mxtransitionmanager.h"\
+	".\LEGO1\mxtypes.h"\
 	".\LEGO1\mxunknown100dc6b0.h"\
 	".\LEGO1\mxvariabletable.h"\
 	".\LEGO1\mxvideomanager.h"\
@@ -873,13 +867,12 @@ DEP_CPP_MXUNK=\
 
 SOURCE=.\LEGO1\mxvideomanager.cpp
 DEP_CPP_MXVIDEO=\
-	".\LEGO1\legoinc.h"\
-	".\LEGO1\mxbool.h"\
 	".\LEGO1\mxcore.h"\
 	".\LEGO1\mxcriticalsection.h"\
 	".\LEGO1\mxpalette.h"\
 	".\LEGO1\mxrect32.h"\
 	".\LEGO1\mxresult.h"\
+	".\LEGO1\mxtypes.h"\
 	".\LEGO1\mxunknown100dc6b0.h"\
 	".\LEGO1\mxvariabletable.h"\
 	".\LEGO1\mxvideomanager.h"\
@@ -1021,6 +1014,7 @@ DEP_CPP_ISLE_=\
 	".\LEGO1\mxticklemanager.h"\
 	".\LEGO1\mxtimer.h"\
 	".\LEGO1\mxtransitionmanager.h"\
+	".\LEGO1\mxtypes.h"\
 	".\LEGO1\mxunknown100dc6b0.h"\
 	".\LEGO1\mxvariabletable.h"\
 	".\LEGO1\mxvideomanager.h"\
diff --git a/isle.mdp b/isle.mdp
index d9512305a07494826c1af13a85dc6a272fbd5283..d86f4dbf53b7652cd6e1bf1e9c389e342ba0ef2a 100644
GIT binary patch
literal 49664
zcmeHQ*>>E<5iNwIOj5G7kd$nB$(UYcTf@y(5@)qYk)c9Mj%b^*GPVN(AP3<9n1jJc
zqu=0@KOldTAMj(I{SisJ8%sBUULaY~HpO#9Lgel0s@rQ-H)^i$ZY@v1B-jAI0Q?#|
z2L6j*W6i+7$J%-{{%iOM{tk=qGEgpFV&9RK@nJw*@cuJCW}~GU1C#Iq?*e;kt);Eo
zt))ADYw6}{YiYZ+xN~jm=E`DgX`{8cw|!%6HGRCXaqa3?Tj}%n<o6pl_jbwuHv5a)
zyF1r9x4fQb54<J%pLXBrl0SVz#BN6AKhqL!?N?4~cJa=qoo*C(oxo0#&LDO={-Eb|
zm~8sgcKZEAEz0!{{4m3D`|t@FKn9QjWB?gJ29N<{02x3AkO5=>85mOre*A6%reM?h
z0gmDJ<nfrYFurC_!3h!pnuZyeg_Cd!UL0R4#?bN^m;fucn?7LtFJ}XPA_K?(GJp&q
z1IPd}fD9l5$N(~c3?Ku~5d#?idyX3OAxt?9XW%THgE^Ro1vn2E9zq5dc~%*iA+g_y
zO!<F(D_FsTg6xG5_Gfxokp6X&{5!E{Cr)=Ie^|{Q*7Apsb2*>yT;Bn}`+qqf_!AjG
z29N<{02x3AkO5=>89)Y*0b~Ffcv1{t{O?II|8&&*3S5L&;Wc<2-hf|13*LM>)Iu#D
z3j;H7_Mdr082`(ez@NwfGJp&q1IPd}fD9l5$N(~c3?Ku@!1Klc#{ZtT7JV>#-h#K`
z9e5YsgZJSQd;lLlSaC!@(+s5XKYH13o+j68U2g69;o52|OW-#JR`K;#gPeSp^{xgL
zdjpoouN^y<wJHa)bc3CqcNp2BPqP2{Q5e{vedxvQ?ux0%{?PBaet1}v_|R11&<?yo
zVkcg^+cshSus=)+(aR=y5V>BjPi*$Wglex~h8r9Oq2KN<ndJ8EI1$9YW5UM~k!m#V
zuJ3wLbK~wsanBXBxT4b{81386(P117L)RX<KCeg12`T0izWeR&+Xm@T)H8ydC?<{k
zfnJj9$DWh8v3;-Iecu2b*beQThK3DB?%=>D87oajG-&-`L_tpMk^XwnvkwP`-Xh{j
zud#!6_dUH)eY@u+bTAkihO)G_+5k2f_L6p2J63|xAR#6NP823_)a%i)V&Fb4U>sCT
zGMNtA-OGBj6W=-Nc}4Hn4yj<2_<?aYBB<C72YzY(GH7wvj(vNdGywf(?5b?QX0587
zGlCI^X1&JHx^@x;zT569cwkvrd45&Pf;l#c6^qA)w?8}-mkvXHY-o~<u9l_ko^G!f
z*nUWJzgm{IhtTDNjVA`xE*rtfiAgItc5guXG#$^Z%t!hTV-J(47dc0yADH#ddkjMw
zsNh-~G~jKTYG5#u!_zL%gcv^Aq}_~_`9x1lrOZA_0^Fdzih=rIYBe>5c8AcuD@-t~
z9@APdi1z<M`a~oBvmw(&|6zC(M)$&%<z?5ovcH^)*RIdm2+rpxR>>uOJLD5N!)nJ$
zF!CcmJct^ZnXP5b=o>`C*vXn7&Xu;8wHX38m$<p4iN@K^A2*jSZZ2_iDM^5zI*a4A
zxm+l3E+vr(!=4Jamz})d;P%q83_E4MgT?J-?E^USe)QCBFI54|Y4&L$fqi6=6qoB?
z#1Y-mOGBOVX@<T5{nHeC8JaxF{9N*DdF-@YRI>l2B~MJx@9ti`MRG8ng!M1&_|QwX
z6EDbqeXd=M++q?Vi8|LeNkB<}&E+uBLzdv?b6m+kmH=PRfpYIyQsQM^qT(A%z=gh|
zXDq=9<`)x}1SZtY-CX9*NWg+=9Lz_$z675exJN80@g^suQljvOC8dhiDS5*ZpkM+Q
z-^>KLCoHMsJU77={a^`H&|C0=B|t%MnGY-}agl4m8cXzmCGZ6f7bhqQQqWoOe)T}X
z_mu!kgbALn1Ulh*eT!t<Sl{saUg&zEbAO%0K1pcHi?e}0O=90HsBOV%5l06;hom8G
zHDrc1w;wv~t{QWiV%FT8Sq<`3ioEN4Bsi`X$YA8i!%yz(V60x@^hGW3Txx}Q_M!&Q
zQE)ldqtSJiqS@4<0WlWYA&R<Mremp#Y6Q*(qddZ@mUvNpXreAOSD&vndYqzX6Zs*A
zS}0LBKf+Lhn5-;bW~wq99U9n~VC3B;eW*dNB-&*oST8Ra4t%G9ybHl7j1vEVM1)JR
zd$s9j$uSEH6dn*RqgdPP$+$LkH`0dHSzTjU37wq=s8uD#aoG&b79@@QlffvTN;N3b
z2>FSSx^f0e&x6z;((<HxgiYq7dA3eg4vy54Ne|`6Mrs(*lEB!Zks3srymDlu#?IuM
z91VX9QjcCOleBtu1=UC=+E$L1)RGDRO{cM!#DgW>R8O?6ZnZSpzDO6C1_PB;FYGim
z0@)-#Onh=gthSrB(*3?iPE^&Hsp<KR>wCC*6MqF)Z+bqe?kc!?<LX`9(NK32T)oTJ
zKGaO%>dh~Ps9D0*Tg^?ndZ*tN;kMK5@+S;i66c-7q}crz@h+nT_C_9xpdM!ZCZkMp
z5gwsMYBw2WB`%1Slzi!WjIao$Q0e8Hj55)$iK44F8D#~ESe@un*VTAcluJAi@g}28
z>{$_?IpKAwCF835*E+mpT=lS7rp02eh0ZCj*Hdu9Z!*fHpAn>IL7%!T0hEV*>L4))
zCER3`RVqZl#2`RjreFjQ1Jq%Hez}KR2NkU^`k`s$l5D0L;tMagju!&Ug4bHd2{v)R
z)d0&q*E+1|PPvCETr`rJC2%jgq;<)Hp4=&|!(QPXsOFZ|(Z!Gw9Md|gn2i*!X}yG?
zMa|u;qlK=@okO~%u0w@h!=aj9GsRA+ERxeWKk(s!*80H;55?7MCR9}~J4*Cx;t^)o
zB{eR?33gJY0nCymC%sXn0X_0??s?S$rix21D3&i3{*lLvn?$`ID5gA5Evm19DuezH
zA!sJDwpywbc;o?VMnHX?RMk&HXnatqKo8|1lkjQ2_^IR)m#TW9S2J8l5J|l9uiiak
ztUN!e5{{rSR_@#v=)hQcah@r#g0XTEFMYzX@+Q&k21m}#1K_ybQLRt7-7%lI<8~*#
z6^7fL?0Sr_oZ!`f@(ZBqEh`=_;Nb#$!A#@-JfBws9_e<cbZ$Ve?BW+PfD9l5$N(~c
z3?Ku@05X6KAOpw%GVlyC@Z;ALFa?{|4{!{(Cy$>&3sB{s!@y-|!xAjR3ar8!d<>t!
z75EkW8h!(x!f)Ys@O$_J{1N^HpTSjFhYh#}o3I6chHbbGe}NtN9B#l(_yYb4w_q2(
zgs*;%GFbL8GjNHFefoC$vHTr&F^L<dXu=dtn4+mj$iQ#S8q&|?w`L7VOw(JlhD?t9
z?al1|V`F@FYgU_JQFzzWU{ii;)(FG=pF;j(%>PLeIwze$?65S@#ZW48n_&J=HVd%y
zikSbiBkwKMIgqiXP3lDN@0N2yG)rKK`9G^8Rmg#28Plf<Sy0Gje9Zr;%;!h@XZe*Z
zZNhBXb#(1QObayFUQk%&lDQ%SbeaZ?;xV~A$yu7;N;i!N;gu{yN?zPtVsiP8a=wth
zlJ&5g%j)O<u>Q>7voe0f0EcESiFPXDuZAe5mg@Uf7RVFxiIE9IjkvumcG{Bd<sRII
aZ{QC64La~Gd<Wk@<_Hv4_aqsZf&T%9A<WMJ

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


From 706be168af9e3477d6166684ae740c51fa7357e7 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 27 Jun 2023 19:06:04 -0700
Subject: [PATCH 27/31] msvc: force update dependencies

---
 isle.mak |  37 ++++++++++++-------------------------
 isle.mdp | Bin 49664 -> 49664 bytes
 2 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/isle.mak b/isle.mak
index 899c2b03..ea007e37 100644
--- a/isle.mak
+++ b/isle.mak
@@ -34,7 +34,7 @@ NULL=nul
 !ENDIF 
 ################################################################################
 # Begin Project
-# PROP Target_Last_Scanned "isle - Win32 Debug"
+# PROP Target_Last_Scanned "ISLE - Win32 Debug"
 
 !IF  "$(CFG)" == "LEGO1 - Win32 Release"
 
@@ -487,8 +487,8 @@ LINK32_OBJS= \
 
 SOURCE=.\LEGO1\mxcore.cpp
 DEP_CPP_MXCOR=\
-	".\LEGO1\mxbool.h"\
 	".\LEGO1\mxcore.h"\
+	".\LEGO1\mxtypes.h"\
 	
 
 "$(INTDIR)\mxcore.obj" : $(SOURCE) $(DEP_CPP_MXCOR) "$(INTDIR)"
@@ -566,7 +566,6 @@ DEP_CPP_LEGOO=\
 
 SOURCE=.\LEGO1\mxcriticalsection.cpp
 DEP_CPP_MXCRI=\
-	".\LEGO1\legoinc.h"\
 	".\LEGO1\mxcriticalsection.h"\
 	
 
@@ -580,7 +579,6 @@ DEP_CPP_MXCRI=\
 
 SOURCE=.\LEGO1\mxautolocker.cpp
 DEP_CPP_MXAUT=\
-	".\LEGO1\legoinc.h"\
 	".\LEGO1\mxautolocker.h"\
 	".\LEGO1\mxcriticalsection.h"\
 	
@@ -610,9 +608,7 @@ DEP_CPP_MXTIM=\
 
 SOURCE=.\LEGO1\mxomni.cpp
 DEP_CPP_MXOMN=\
-	".\LEGO1\legoinc.h"\
 	".\LEGO1\mxatomid.h"\
-	".\LEGO1\mxbool.h"\
 	".\LEGO1\mxcore.h"\
 	".\LEGO1\mxcriticalsection.h"\
 	".\LEGO1\mxeventmanager.h"\
@@ -632,6 +628,7 @@ DEP_CPP_MXOMN=\
 	".\LEGO1\mxstring.h"\
 	".\LEGO1\mxticklemanager.h"\
 	".\LEGO1\mxtimer.h"\
+	".\LEGO1\mxtypes.h"\
 	".\LEGO1\mxunknown100dc6b0.h"\
 	".\LEGO1\mxvariabletable.h"\
 	".\LEGO1\mxvideomanager.h"\
@@ -649,12 +646,11 @@ DEP_CPP_MXOMN=\
 
 SOURCE=.\LEGO1\mxvideoparam.cpp
 DEP_CPP_MXVID=\
-	".\LEGO1\legoinc.h"\
-	".\LEGO1\mxbool.h"\
 	".\LEGO1\mxcore.h"\
 	".\LEGO1\mxpalette.h"\
 	".\LEGO1\mxrect32.h"\
 	".\LEGO1\mxresult.h"\
+	".\LEGO1\mxtypes.h"\
 	".\LEGO1\mxvariabletable.h"\
 	".\LEGO1\mxvideoparam.h"\
 	".\LEGO1\mxvideoparamflags.h"\
@@ -670,7 +666,6 @@ DEP_CPP_MXVID=\
 
 SOURCE=.\LEGO1\mxvideoparamflags.cpp
 DEP_CPP_MXVIDE=\
-	".\LEGO1\legoinc.h"\
 	".\LEGO1\mxvideoparamflags.h"\
 	
 
@@ -684,8 +679,6 @@ DEP_CPP_MXVIDE=\
 
 SOURCE=.\LEGO1\mxomnicreateparam.cpp
 DEP_CPP_MXOMNI=\
-	".\LEGO1\legoinc.h"\
-	".\LEGO1\mxbool.h"\
 	".\LEGO1\mxcore.h"\
 	".\LEGO1\mxomnicreateflags.h"\
 	".\LEGO1\mxomnicreateparam.h"\
@@ -694,6 +687,7 @@ DEP_CPP_MXOMNI=\
 	".\LEGO1\mxrect32.h"\
 	".\LEGO1\mxresult.h"\
 	".\LEGO1\mxstring.h"\
+	".\LEGO1\mxtypes.h"\
 	".\LEGO1\mxvariabletable.h"\
 	".\LEGO1\mxvideoparam.h"\
 	".\LEGO1\mxvideoparamflags.h"\
@@ -709,8 +703,6 @@ DEP_CPP_MXOMNI=\
 
 SOURCE=.\LEGO1\mxomnicreateparambase.cpp
 DEP_CPP_MXOMNIC=\
-	".\LEGO1\legoinc.h"\
-	".\LEGO1\mxbool.h"\
 	".\LEGO1\mxcore.h"\
 	".\LEGO1\mxomnicreateflags.h"\
 	".\LEGO1\mxomnicreateparam.h"\
@@ -719,6 +711,7 @@ DEP_CPP_MXOMNIC=\
 	".\LEGO1\mxrect32.h"\
 	".\LEGO1\mxresult.h"\
 	".\LEGO1\mxstring.h"\
+	".\LEGO1\mxtypes.h"\
 	".\LEGO1\mxvariabletable.h"\
 	".\LEGO1\mxvideoparam.h"\
 	".\LEGO1\mxvideoparamflags.h"\
@@ -735,9 +728,9 @@ DEP_CPP_MXOMNIC=\
 
 SOURCE=.\LEGO1\mxstring.cpp
 DEP_CPP_MXSTR=\
-	".\LEGO1\mxbool.h"\
 	".\LEGO1\mxcore.h"\
 	".\LEGO1\mxstring.h"\
+	".\LEGO1\mxtypes.h"\
 	
 
 "$(INTDIR)\mxstring.obj" : $(SOURCE) $(DEP_CPP_MXSTR) "$(INTDIR)"
@@ -821,9 +814,9 @@ DEP_CPP_LEGON=\
 SOURCE=.\LEGO1\mxdsobject.cpp
 DEP_CPP_MXDSO=\
 	".\LEGO1\mxatomid.h"\
-	".\LEGO1\mxbool.h"\
 	".\LEGO1\mxcore.h"\
 	".\LEGO1\mxdsobject.h"\
+	".\LEGO1\mxtypes.h"\
 	
 
 "$(INTDIR)\mxdsobject.obj" : $(SOURCE) $(DEP_CPP_MXDSO) "$(INTDIR)"
@@ -849,11 +842,10 @@ DEP_CPP_MXATO=\
 
 SOURCE=.\LEGO1\mxunknown100dc6b0.cpp
 DEP_CPP_MXUNK=\
-	".\LEGO1\legoinc.h"\
-	".\LEGO1\mxbool.h"\
 	".\LEGO1\mxcore.h"\
 	".\LEGO1\mxcriticalsection.h"\
 	".\LEGO1\mxresult.h"\
+	".\LEGO1\mxtypes.h"\
 	".\LEGO1\mxunknown100dc6b0.h"\
 	
 
@@ -890,10 +882,10 @@ DEP_CPP_MXVIDEO=\
 
 SOURCE=.\LEGO1\mxpalette.cpp
 DEP_CPP_MXPAL=\
-	".\LEGO1\mxbool.h"\
 	".\LEGO1\mxcore.h"\
 	".\LEGO1\mxpalette.h"\
 	".\LEGO1\mxresult.h"\
+	".\LEGO1\mxtypes.h"\
 	
 
 "$(INTDIR)\mxpalette.obj" : $(SOURCE) $(DEP_CPP_MXPAL) "$(INTDIR)"
@@ -906,7 +898,6 @@ DEP_CPP_MXPAL=\
 
 SOURCE=.\LEGO1\mxioinfo.cpp
 DEP_CPP_MXIOI=\
-	".\LEGO1\legoinc.h"\
 	".\LEGO1\mxioinfo.h"\
 	
 
@@ -920,13 +911,12 @@ DEP_CPP_MXIOI=\
 
 SOURCE=.\LEGO1\mxdsfile.cpp
 DEP_CPP_MXDSF=\
-	".\LEGO1\legoinc.h"\
-	".\LEGO1\mxbool.h"\
 	".\LEGO1\mxcore.h"\
 	".\LEGO1\mxdsfile.h"\
 	".\LEGO1\mxdssource.h"\
 	".\LEGO1\mxioinfo.h"\
 	".\LEGO1\mxstring.h"\
+	".\LEGO1\mxtypes.h"\
 	
 
 "$(INTDIR)\mxdsfile.obj" : $(SOURCE) $(DEP_CPP_MXDSF) "$(INTDIR)"
@@ -939,9 +929,9 @@ DEP_CPP_MXDSF=\
 
 SOURCE=.\LEGO1\mxdssource.cpp
 DEP_CPP_MXDSS=\
-	".\LEGO1\mxbool.h"\
 	".\LEGO1\mxcore.h"\
 	".\LEGO1\mxdssource.h"\
+	".\LEGO1\mxtypes.h"\
 	
 
 "$(INTDIR)\mxdssource.obj" : $(SOURCE) $(DEP_CPP_MXDSS) "$(INTDIR)"
@@ -976,7 +966,6 @@ DEP_CPP_ISLE_=\
 	".\LEGO1\legobuildingmanager.h"\
 	".\LEGO1\legoentity.h"\
 	".\LEGO1\legogamestate.h"\
-	".\LEGO1\legoinc.h"\
 	".\LEGO1\legoinputmanager.h"\
 	".\LEGO1\legomodelpresenter.h"\
 	".\LEGO1\legonavcontroller.h"\
@@ -987,7 +976,6 @@ DEP_CPP_ISLE_=\
 	".\LEGO1\legoworldpresenter.h"\
 	".\LEGO1\mxatomid.h"\
 	".\LEGO1\mxbackgroundaudiomanager.h"\
-	".\LEGO1\mxbool.h"\
 	".\LEGO1\mxcore.h"\
 	".\LEGO1\mxcriticalsection.h"\
 	".\LEGO1\mxdirectdraw.h"\
@@ -1473,7 +1461,6 @@ SOURCE=.\LEGO1\mxatomid.h
 SOURCE=.\ISLE\define.cpp
 DEP_CPP_DEFIN=\
 	".\ISLE\define.h"\
-	".\LEGO1\legoinc.h"\
 	
 
 "$(INTDIR)\define.obj" : $(SOURCE) $(DEP_CPP_DEFIN) "$(INTDIR)"
diff --git a/isle.mdp b/isle.mdp
index d86f4dbf53b7652cd6e1bf1e9c389e342ba0ef2a..56789362a8e8383ca4db0ab95d5f19ac0cc4e1d1 100644
GIT binary patch
delta 308
zcmZo@VQy$)-oVSX`8O9U|3rm%{L$6S3@i+8j58P}F+{LT+We90BjY9+ex}V|xOjjH
zo?=&Eki@k4GZ!yV!9?r|TnH(Mm?1rRcd^3e|HWHbCnr?0Oy;Uq*!*Au3*+P+ReqDT
zCuvRIS*(OZR%$lS<}Xcm*(b->=x$c(-iK<yX6;E+8F5HS&3?wWQ9*{0|8@?hw->Du
W;sb^SI5=J~O=7sgw3%<;CuRU${%sck

delta 906
zcmZo@VQy$)-oVRMA8xFm?;fF`AC;+~?{B1_@2Q~V<Ld5jsHC9pqM#J+>1S*NVfwka
zI)%DJ*zrJd7ys~JAkVEp$uro;H6|!ECpED+RUgFBD@e`&N<{*Vb<0PU2I)va65;}C
z0g5Fna4Aim7%ev0A&Qq-3C?EaNl8u1%uCfvE+|mq+APQ=%g=u!j+ud#!HsbS!z6|X
zmPtUtkBpmS_?hYl)E~vE9MtfKK@yV*@qtI3uyYvzJ0oUDvn1u`=S*&_lb`&zTVb+7
zH!E{yUh-taGMUK^oq?Mhs#91u|C+(VIGLx(Z}Nl&mdUqfC`|r0lWlU$L>0E&3bHiw
zY))&s%Z_Z<=GT*6L+ydu!Oj6S9OM$9eVbz@_A?T%W%Iw8&-nOngkh%9MQeokP}A;a
IzI~sV0jez+^Z)<=


From aaf61ba48e21f9a97839c5609945ebe754b1b62a Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 27 Jun 2023 19:08:43 -0700
Subject: [PATCH 28/31] ci: ignore return code of diff

diff returns a 1 error code if diffs are found which halts the script, but we don't consider this an error, we're just interested in the information
---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 18ad2d7a..692c01c6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -71,8 +71,8 @@ jobs:
         curl -fLSs -o ISLEPROGRESS-OLD.TXT https://github.com/isledecomp/isle/releases/download/continuous/ISLEPROGRESS.TXT
         curl -fLSs -o LEGO1PROGRESS-OLD.TXT https://github.com/isledecomp/isle/releases/download/continuous/LEGO1PROGRESS.TXT
 
-        diff -u ISLEPROGRESS-OLD.TXT ISLEPROGRESS.TXT
-        diff -u LEGO1PROGRESS-OLD.TXT LEGO1PROGRESS.TXT
+        diff -u ISLEPROGRESS-OLD.TXT ISLEPROGRESS.TXT || true
+        diff -u LEGO1PROGRESS-OLD.TXT LEGO1PROGRESS.TXT || true
       
     - name: Upload Artifact
       uses: actions/upload-artifact@master

From 8e6e2a39622ab4f919bdaf9c4b4b934f19cb78e7 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 27 Jun 2023 19:46:04 -0700
Subject: [PATCH 29/31] reccmp: fix SVGs on light backgrounds

---
 tools/reccmp/template.svg | 65 ++++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/tools/reccmp/template.svg b/tools/reccmp/template.svg
index 1cded1e3..bd36e9b2 100644
--- a/tools/reccmp/template.svg
+++ b/tools/reccmp/template.svg
@@ -25,31 +25,25 @@
      inkscape:deskcolor="#505050"
      showgrid="false"
      inkscape:zoom="1.6046875"
-     inkscape:cx="239.29893"
-     inkscape:cy="219.98053"
+     inkscape:cx="158.90944"
+     inkscape:cy="220.6037"
      inkscape:window-width="2560"
      inkscape:window-height="1379"
      inkscape:window-x="0"
      inkscape:window-y="0"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg5" /><defs
+     inkscape:current-layer="g1273" /><defs
      id="defs5">
         <clipPath
    id="progBarCutoff">
           <rect
    width="{progbar:127.18422}"
    height="8.6508904"
-   x="21.074554"
-   y="134.86963"
+   x="21.118132"
+   y="134.05507"
    id="rect2" />
         </clipPath>
-      </defs><rect
-     x="0"
-     y="0"
-     width="100%"
-     height="100%"
-     fill="#0d1117"
-     id="rect7" /><g
+      </defs><g
      id="g1273"
      transform="matrix(1.2683581,0,0,1.2683581,-22.720969,-65.913871)"><image
        width="53.066437"
@@ -61,58 +55,65 @@
        x="58.13345"
        y="51.967873" /><text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12.7px;font-family:mono;-inkscape-font-specification:mono;text-align:center;text-anchor:middle;fill:#ffffff;stroke:#ffffff;stroke-width:2.64583"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12.7px;font-family:mono;-inkscape-font-specification:mono;text-align:center;text-anchor:middle;fill:#ffffff;stroke:#000000;stroke-width:1.25161812;stroke-opacity:1;stroke-dasharray:none;paint-order:stroke fill markers"
        x="84.666656"
        y="118.35877"
        id="text740"><tspan
          id="tspan738"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:mono;-inkscape-font-specification:mono;text-align:center;text-anchor:middle;stroke:none;stroke-width:2.64583"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:mono;-inkscape-font-specification:mono;text-align:center;text-anchor:middle;stroke:#000000;stroke-width:1.25161812;stroke-opacity:1;stroke-dasharray:none;paint-order:stroke fill markers"
          x="84.666656"
          y="118.35877">{name}</tspan></text><g
        id="g1250"
-       transform="translate(-1.3006529e-5,8.5767994)"><rect
-         style="fill:none;stroke:#ffffff;stroke-width:0.87411;stroke-dasharray:none;stroke-opacity:1"
+       transform="translate(-0.04358834,8.1397473)"><rect
+         style="display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:2.50324;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1619"
+         width="127.18422"
+         height="8.6508904"
+         x="21.118132"
+         y="134.05507" /><rect
+         style="display:inline;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0.87411;stroke-dasharray:none;stroke-opacity:1"
          id="rect1167"
          width="127.18422"
          height="8.6508904"
-         x="21.074554"
-         y="134.86963" /><text
+         x="21.118132"
+         y="134.05507" /><text
          xml:space="preserve"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.23333px;font-family:mono;-inkscape-font-specification:mono;text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.05833;stroke-dasharray:none;stroke-opacity:1"
-         x="76.841347"
-         y="140.70638"
+         x="76.884926"
+         y="139.89182"
          id="text2152"><tspan
            style="font-size:4.23333px;fill:#ffffff;fill-opacity:1;stroke-width:1.05833"
-           x="76.841347"
-           y="140.70638"
+           x="76.884926"
+           y="139.89182"
            id="tspan2150">{percent}</tspan></text><rect
          style="display:inline;fill:#ffffff;stroke:none;stroke-width:2.6764"
          id="rect1169"
          width="127.18422"
          height="8.6508904"
-         x="21.074554"
-         y="134.86963"
+         x="21.118132"
+         y="134.05507"
          clip-path="url(#progBarCutoff)" /><text
          xml:space="preserve"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.23333px;font-family:mono;-inkscape-font-specification:mono;text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.05833;stroke-dasharray:none;stroke-opacity:1"
-         x="76.841347"
-         y="140.70638"
+         x="76.884926"
+         y="139.89182"
          id="text18"
-         clip-path="url(#progBarCutoff)"><tspan
+         clip-path="url(#progBarCutoff)"
+         inkscape:label="text18"><tspan
            style="font-size:4.23333px;fill:#000000;fill-opacity:1;stroke-width:1.05833"
-           x="76.841347"
-           y="140.70638"
+           x="76.884926"
+           y="139.89182"
            id="tspan16">{percent}</tspan></text></g><text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.23333px;font-family:mono;-inkscape-font-specification:mono;text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.05833;stroke-dasharray:none;stroke-opacity:1"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.23333px;font-family:mono;-inkscape-font-specification:mono;text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.83441208;stroke-dasharray:none;stroke-opacity:1;opacity:1;stroke-linejoin:miter;stroke-linecap:butt;paint-order:stroke fill markers"
        x="46.947659"
        y="129.67447"
        id="text1260"><tspan
          id="tspan1258"
-         style="font-size:4.23333px;stroke-width:1.05833"
+         style="font-size:4.23333px;stroke-width:0.83441208;stroke:#000000;stroke-opacity:1;stroke-dasharray:none;stroke-linejoin:miter;stroke-linecap:butt;paint-order:stroke fill markers"
          x="46.947659"
          y="129.67447">Implemented: {implemented}</tspan><tspan
-         style="font-size:4.23333px;stroke-width:1.05833"
+         style="font-size:4.23333px;stroke-width:0.83441208;stroke:#000000;stroke-opacity:1;stroke-dasharray:none;stroke-linejoin:miter;stroke-linecap:butt;paint-order:stroke fill markers"
          x="46.947659"
          y="134.96613"
          id="tspan1262">Accuracy:    {accuracy}</tspan></text></g></svg>

From 8da62cc596f51180a0cf620e43624e3bdf35d742 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 27 Jun 2023 19:55:17 -0700
Subject: [PATCH 30/31] ci: convert to 512px png

These might scale down better, the ones in the readme seem really blurry
---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 692c01c6..54722601 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -94,8 +94,8 @@ jobs:
         INKSCAPE_DIR=inkscape-1.2.2_2022-12-09_732a01da63-x64
         curl -fLOSs https://inkscape.org/gallery/item/37364/$INKSCAPE_DIR.7z
         7z x $INKSCAPE_DIR.7z
-        $INKSCAPE_DIR/bin/inkscape -w 1024 ISLEPROGRESS.SVG -o ISLEPROGRESS.PNG
-        $INKSCAPE_DIR/bin/inkscape -w 1024 LEGO1PROGRESS.SVG -o LEGO1PROGRESS.PNG
+        $INKSCAPE_DIR/bin/inkscape -w 512 ISLEPROGRESS.SVG -o ISLEPROGRESS.PNG
+        $INKSCAPE_DIR/bin/inkscape -w 512 LEGO1PROGRESS.SVG -o LEGO1PROGRESS.PNG
 
         curl -fLOSs https://raw.githubusercontent.com/probonopd/uploadtool/master/upload.sh
         ./upload.sh \

From 2d9af630ba63e3da2302d19164092138e2295cc0 Mon Sep 17 00:00:00 2001
From: MS <disinvite@users.noreply.github.com>
Date: Tue, 27 Jun 2023 22:57:30 -0400
Subject: [PATCH 31/31] lego1: Two more operators for MxString (#53)

Followed the hint from @madebr in #31 that the next function in MxString was operator+. The one after that is operator+= and both are at 100%.

Squashed commits:
* Removed unnecessary consts
* Replaced malloc/free with new/delete, which solved swapped regs in operator=
* Use delete[] when freeing char* m_data
---
 LEGO1/mxstring.cpp | 55 ++++++++++++++++++++++++++++++++++++----------
 LEGO1/mxstring.h   |  4 +++-
 2 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/LEGO1/mxstring.cpp b/LEGO1/mxstring.cpp
index 09130a39..e2f24cab 100644
--- a/LEGO1/mxstring.cpp
+++ b/LEGO1/mxstring.cpp
@@ -6,7 +6,7 @@
 MxString::MxString()
 {
   // Set string to one char in length and set that char to null terminator
-  this->m_data = (char *)malloc(1);
+  this->m_data = new char[1];
   this->m_data[0] = 0;
   this->m_length = 0;
 }
@@ -15,7 +15,7 @@ MxString::MxString()
 MxString::MxString(const MxString &str)
 {
   this->m_length = str.m_length;
-  this->m_data = (char *)malloc(this->m_length + 1);
+  this->m_data = new char[this->m_length + 1];
   strcpy(this->m_data, str.m_data);
 }
 
@@ -24,10 +24,10 @@ MxString::MxString(const char *str)
 {
   if (str) {
     this->m_length = strlen(str);
-    this->m_data = (char *)malloc(this->m_length + 1);
+    this->m_data = new char[this->m_length + 1];
     strcpy(this->m_data, str);
   } else {
-    this->m_data = (char *)malloc(1);
+    this->m_data = new char[1];
     this->m_data[0] = 0;
     this->m_length = 0;
   }
@@ -36,7 +36,7 @@ MxString::MxString(const char *str)
 // OFFSET: LEGO1 0x100ae420
 MxString::~MxString()
 {
-  free(this->m_data);
+  delete[] this->m_data;
 }
 
 // OFFSET: LEGO1 0x100ae490
@@ -52,30 +52,63 @@ void MxString::ToLowerCase()
 }
 
 // OFFSET: LEGO1 0x100ae4b0
-const MxString &MxString::operator=(MxString *param)
+MxString &MxString::operator=(MxString *param)
 {
   if (this->m_data != param->m_data)
   {
-    free(this->m_data);
+    delete[] this->m_data;
     this->m_length = param->m_length;
-    this->m_data = (char *)malloc(this->m_length + 1);
+    this->m_data = new char[this->m_length + 1];
     strcpy(this->m_data, param->m_data);
   }
 
   return *this;
 }
 
-// TODO: this *mostly* matches, again weird with the comparison
 // OFFSET: LEGO1 0x100ae510
 const MxString &MxString::operator=(const char *param)
 {
   if (this->m_data != param)
   {
-    free(this->m_data);
+    delete[] this->m_data;
     this->m_length = strlen(param);
-    this->m_data = (char *)malloc(this->m_length + 1);
+    this->m_data = new char[this->m_length + 1];
     strcpy(this->m_data, param);
   }
 
   return *this;
 }
+
+// Return type is intentionally just MxString, not MxString&.
+// This forces MSVC to add $ReturnUdt$ to the stack for 100% match.
+// OFFSET: LEGO1 0x100ae580
+MxString MxString::operator+(const char *str)
+{
+  // MxString constructor allocates 1 byte for m_data, so free that first
+  MxString tmp;
+  delete[] tmp.m_data;
+
+  tmp.m_length = strlen(str) + this->m_length;
+  tmp.m_data = new char[tmp.m_length + 1];
+  
+  strcpy(tmp.m_data, this->m_data);
+  strcpy(tmp.m_data + this->m_length, str);
+
+  return MxString(tmp);
+}
+
+// OFFSET: LEGO1 0x100ae690
+MxString& MxString::operator+=(const char *str)
+{
+  int newlen = this->m_length + strlen(str);
+
+  char *tmp = new char[newlen + 1];
+  strcpy(tmp, this->m_data);
+  strcpy(tmp + this->m_length, str);
+  
+  delete[] this->m_data;
+  this->m_length = newlen;
+  this->m_data = tmp;
+
+  return *this;
+}
diff --git a/LEGO1/mxstring.h b/LEGO1/mxstring.h
index a9a25ba1..03da0ec4 100644
--- a/LEGO1/mxstring.h
+++ b/LEGO1/mxstring.h
@@ -14,7 +14,9 @@ class MxString : public MxCore
   MxString(const char *);
   void ToUpperCase();
   void ToLowerCase();
-  const MxString &operator=(MxString *);
+  MxString&  operator=(MxString *);
+  MxString   operator+(const char *);
+  MxString& operator+=(const char *);
 
   inline const char *GetData() const { return m_data; }