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] 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 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 #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 // 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 directly because this way -// we can undef stuff that might cause issues with our code. - -#include -#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 -#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 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 + #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 + #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 // 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 #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 // 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 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