further conform to current master

ISLE/isleapp.cpp

@@ -1,4 +1,4 @@
-#include "isle.h"
+#include "isleapp.h"
 #include "define.h"
 
 #include <dsound.h>

ISLE/isleapp.h

@@ -1,5 +1,5 @@
-#ifndef ISLE_H
+#ifndef ISLEAPP_H
-#define ISLE_H
+#define ISLEAPP_H
 
 #include <windows.h>
 
@@ -73,4 +73,4 @@ class IsleApp
   HCURSOR m_cursorCurrent;
 };
 
-#endif // ISLE_H
+#endif // ISLEAPP_H

LEGO1/act3state.cpp

@@ -9,5 +9,5 @@ Act3State::Act3State()
 // OFFSET: LEGO1 0x100d4fdc
 MxBool Act3State::VTable0x14()
 {
-  return MX_FALSE;
+  return FALSE;
 }

LEGO1/bumpbouy.h

@@ -1,7 +1,7 @@
 #ifndef BUMPBOUY_H
 #define BUMPBOUY_H
 
-#include "mxbool.h"
+#include "mxtypes.h"
 
 class BumpBouy
 {

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;
 }

LEGO1/infocenterstate.cpp

@@ -15,5 +15,5 @@ InfoCenterState::~InfoCenterState()
 // OFFSET: LEGO1 0x10071830
 MxBool InfoCenterState::VTable0x14()
 {
-  return MX_FALSE;
+  return FALSE;
 }

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

LEGO1/jukeboxstate.cpp

@@ -3,5 +3,5 @@
 // OFFSET: LEGO1 0x1000f300
 MxBool JukeBoxState::VTable0x14()
 {
-  return MX_FALSE;
+  return FALSE;
 }

LEGO1/legoact2state.cpp

@@ -3,5 +3,5 @@
 // OFFSET: LEGO1 0x1000df70
 MxBool LegoAct2State::VTable0x14()
 {
-  return MX_FALSE;
+  return FALSE;
 }

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

LEGO1/mxdsfile.h

@@ -2,6 +2,8 @@
 #define MXDSFILE_H
 
 #include "mxdssource.h"
+#include "mxioinfo.h"
+#include "mxstring.h"
 
 class MxDSFile : public MxDSSource
 {

LEGO1/radiostate.cpp

@@ -9,5 +9,5 @@ RadioState::RadioState()
 // OFFSET: LEGO1 0x1002cf50
 MxBool RadioState::VTable0x14()
 {
-  return MX_FALSE;
+  return FALSE;
 }

LEGO1/scorestate.cpp

@@ -3,7 +3,7 @@
 // OFFSET: LEGO1 0x1000de20
 MxBool ScoreState::VTable0x14()
 {
-  return MX_FALSE;
+  return FALSE;
 }
 
 // OFFSET: LEGO1 0x1000de30 STUB