From 70f7dad43cc442226c1ed316b62056132d074706 Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Tue, 27 Jun 2023 19:25:48 -0700
Subject: [PATCH] further conform to current master

---
 ISLE/{isle.cpp => isleapp.cpp} | 2 +-
 ISLE/{isle.h => isleapp.h}     | 6 +++---
 LEGO1/act3state.cpp            | 2 +-
 LEGO1/bumpbouy.h               | 2 +-
 LEGO1/helicopterstate.cpp      | 4 ++--
 LEGO1/infocenterstate.cpp      | 2 +-
 LEGO1/isle.h                   | 6 +-----
 LEGO1/jukeboxstate.cpp         | 2 +-
 LEGO1/legoact2state.cpp        | 2 +-
 LEGO1/legostate.cpp            | 4 ++--
 LEGO1/mxdsfile.h               | 2 ++
 LEGO1/radiostate.cpp           | 2 +-
 LEGO1/scorestate.cpp           | 2 +-
 13 files changed, 18 insertions(+), 20 deletions(-)
 rename ISLE/{isle.cpp => isleapp.cpp} (99%)
 rename ISLE/{isle.h => isleapp.h} (96%)

diff --git a/ISLE/isle.cpp b/ISLE/isleapp.cpp
similarity index 99%
rename from ISLE/isle.cpp
rename to ISLE/isleapp.cpp
index 938de251..3697e816 100644
--- a/ISLE/isle.cpp
+++ b/ISLE/isleapp.cpp
@@ -1,4 +1,4 @@
-#include "isle.h"
+#include "isleapp.h"
 #include "define.h"
 
 #include <dsound.h>
diff --git a/ISLE/isle.h b/ISLE/isleapp.h
similarity index 96%
rename from ISLE/isle.h
rename to ISLE/isleapp.h
index 7f01cf7d..70b2ba20 100644
--- a/ISLE/isle.h
+++ b/ISLE/isleapp.h
@@ -1,5 +1,5 @@
-#ifndef ISLE_H
-#define ISLE_H
+#ifndef ISLEAPP_H
+#define ISLEAPP_H
 
 #include <windows.h>
 
@@ -73,4 +73,4 @@ class IsleApp
   HCURSOR m_cursorCurrent;
 };
 
-#endif // ISLE_H
+#endif // ISLEAPP_H
diff --git a/LEGO1/act3state.cpp b/LEGO1/act3state.cpp
index 11652f56..d1c30417 100644
--- a/LEGO1/act3state.cpp
+++ b/LEGO1/act3state.cpp
@@ -9,5 +9,5 @@ Act3State::Act3State()
 // OFFSET: LEGO1 0x100d4fdc
 MxBool Act3State::VTable0x14()
 {
-  return MX_FALSE;
+  return FALSE;
 }
\ No newline at end of file
diff --git a/LEGO1/bumpbouy.h b/LEGO1/bumpbouy.h
index cdeecf05..949ad95d 100644
--- a/LEGO1/bumpbouy.h
+++ b/LEGO1/bumpbouy.h
@@ -1,7 +1,7 @@
 #ifndef BUMPBOUY_H
 #define BUMPBOUY_H
 
-#include "mxbool.h"
+#include "mxtypes.h"
 
 class BumpBouy
 {
diff --git a/LEGO1/helicopterstate.cpp b/LEGO1/helicopterstate.cpp
index bba14ce6..1c2c0140 100644
--- a/LEGO1/helicopterstate.cpp
+++ b/LEGO1/helicopterstate.cpp
@@ -3,11 +3,11 @@
 // OFFSET: LEGO1 0x1000e0b0
 MxBool HelicopterState::VTable0x14()
 {
-  return MX_FALSE;
+  return FALSE;
 }
 
 // OFFSET: LEGO1 0x1000e0c0 STUB
 MxBool HelicopterState::VTable0x18()
 {
-  return MX_TRUE;
+  return TRUE;
 }
diff --git a/LEGO1/infocenterstate.cpp b/LEGO1/infocenterstate.cpp
index dc747e0f..1c3b6a59 100644
--- a/LEGO1/infocenterstate.cpp
+++ b/LEGO1/infocenterstate.cpp
@@ -15,5 +15,5 @@ InfoCenterState::~InfoCenterState()
 // OFFSET: LEGO1 0x10071830
 MxBool InfoCenterState::VTable0x14()
 {
-  return MX_FALSE;
+  return FALSE;
 }
diff --git a/LEGO1/isle.h b/LEGO1/isle.h
index 9b8764b0..a8fc14e7 100644
--- a/LEGO1/isle.h
+++ b/LEGO1/isle.h
@@ -3,17 +3,13 @@
 
 #include "legoworld.h"
 
-#ifndef undefined4
-#define undefined4 int
-#endif
-
 class Isle : public LegoWorld
 {
 public:
   Isle();
 
   virtual void VTable0x50(); // vtable+0x50
-  virtual undefined4  VTable0x64(); // vtable+0x64
+  virtual int  VTable0x64(); // vtable+0x64
   virtual void VTable0x6c(int* param); // vtable+0x6c
 
   // VTABLE 0x100d6fb8
diff --git a/LEGO1/jukeboxstate.cpp b/LEGO1/jukeboxstate.cpp
index 30567ff4..60390c54 100644
--- a/LEGO1/jukeboxstate.cpp
+++ b/LEGO1/jukeboxstate.cpp
@@ -3,5 +3,5 @@
 // OFFSET: LEGO1 0x1000f300
 MxBool JukeBoxState::VTable0x14()
 {
-  return MX_FALSE;
+  return FALSE;
 }
\ No newline at end of file
diff --git a/LEGO1/legoact2state.cpp b/LEGO1/legoact2state.cpp
index e8ed8cad..c8631046 100644
--- a/LEGO1/legoact2state.cpp
+++ b/LEGO1/legoact2state.cpp
@@ -3,5 +3,5 @@
 // OFFSET: LEGO1 0x1000df70
 MxBool LegoAct2State::VTable0x14()
 {
-  return MX_FALSE;
+  return FALSE;
 }
\ No newline at end of file
diff --git a/LEGO1/legostate.cpp b/LEGO1/legostate.cpp
index 10613bbc..8876db07 100644
--- a/LEGO1/legostate.cpp
+++ b/LEGO1/legostate.cpp
@@ -3,13 +3,13 @@
 // OFFSET: LEGO1 0x10005f90
 MxBool LegoState::VTable0x14()
 {
-  return MX_TRUE;
+  return TRUE;
 }
 
 // OFFSET: LEGO1 0x10005fa0
 MxBool LegoState::VTable0x18()
 {
-  return MX_FALSE;
+  return FALSE;
 }
 
 // OFFSET: LEGO1 0x10005fb0 STUB
diff --git a/LEGO1/mxdsfile.h b/LEGO1/mxdsfile.h
index ddfbde14..ec7c10ae 100644
--- a/LEGO1/mxdsfile.h
+++ b/LEGO1/mxdsfile.h
@@ -2,6 +2,8 @@
 #define MXDSFILE_H
 
 #include "mxdssource.h"
+#include "mxioinfo.h"
+#include "mxstring.h"
 
 class MxDSFile : public MxDSSource
 {
diff --git a/LEGO1/radiostate.cpp b/LEGO1/radiostate.cpp
index 9ab68d3f..c429d2c8 100644
--- a/LEGO1/radiostate.cpp
+++ b/LEGO1/radiostate.cpp
@@ -9,5 +9,5 @@ RadioState::RadioState()
 // OFFSET: LEGO1 0x1002cf50
 MxBool RadioState::VTable0x14()
 {
-  return MX_FALSE;
+  return FALSE;
 }
diff --git a/LEGO1/scorestate.cpp b/LEGO1/scorestate.cpp
index 1277de20..cd4b3451 100644
--- a/LEGO1/scorestate.cpp
+++ b/LEGO1/scorestate.cpp
@@ -3,7 +3,7 @@
 // OFFSET: LEGO1 0x1000de20
 MxBool ScoreState::VTable0x14()
 {
-  return MX_FALSE;
+  return FALSE;
 }
 
 // OFFSET: LEGO1 0x1000de30 STUB