From c460f66cff40395a3778f60e1c6001775e72616c Mon Sep 17 00:00:00 2001 From: Cydra Date: Sat, 24 Jun 2023 02:50:14 +0200 Subject: [PATCH] Again more classes and virtual function resolves. Builds and compares fine. --- LEGO1/act2brick.cpp | 50 ++++--- LEGO1/act2brick.h | 37 ++--- LEGO1/act2policestation.cpp | 9 ++ LEGO1/act2policestation.h | 12 ++ LEGO1/carrace.cpp | 7 + LEGO1/carrace.h | 12 ++ LEGO1/isleactor.cpp | 44 +++--- LEGO1/isleactor.h | 2 + LEGO1/legoentity.cpp | 8 ++ LEGO1/legoentity.h | 1 + LEGO1/legoinputmanager.cpp | 21 +++ LEGO1/legoinputmanager.h | 6 + LEGO1/legolocomotionanimpresenter.h | 34 ++--- LEGO1/legoloopinganimpresenter.h | 20 +-- LEGO1/legorace.cpp | 21 +++ LEGO1/legorace.h | 9 +- LEGO1/mxcompositepresenter.cpp | 62 +++++--- LEGO1/mxcompositepresenter.h | 38 ++--- LEGO1/mxdiskstreamcontroller.cpp | 15 ++ LEGO1/mxdiskstreamcontroller.h | 25 ++-- LEGO1/mxdschunk.cpp | 7 + LEGO1/mxdschunk.h | 23 +-- LEGO1/mxdsfile.h | 14 +- LEGO1/mxentity.h | 48 ++++--- LEGO1/mxeventmanager.cpp | 7 + LEGO1/mxeventmanager.h | 7 +- LEGO1/mxnotificationmanager.cpp | 15 ++ LEGO1/mxnotificationmanager.h | 12 +- LEGO1/mxpresenter.cpp | 216 +++++++++++++++------------- LEGO1/mxpresenter.h | 11 ++ LEGO1/mxsmkpresenter.h | 36 ++--- LEGO1/mxstreamer.cpp | 25 ++++ LEGO1/mxstreamer.h | 7 +- LEGO1/mxvideomanager.cpp | 15 ++ LEGO1/mxvideomanager.h | 10 +- isle.mak | 137 ++++++++++++------ isle.mdp | Bin 77824 -> 77824 bytes 37 files changed, 679 insertions(+), 344 deletions(-) create mode 100644 LEGO1/act2policestation.cpp create mode 100644 LEGO1/act2policestation.h create mode 100644 LEGO1/carrace.cpp create mode 100644 LEGO1/carrace.h create mode 100644 LEGO1/legoinputmanager.cpp create mode 100644 LEGO1/legorace.cpp create mode 100644 LEGO1/mxdiskstreamcontroller.cpp create mode 100644 LEGO1/mxdschunk.cpp create mode 100644 LEGO1/mxeventmanager.cpp create mode 100644 LEGO1/mxnotificationmanager.cpp create mode 100644 LEGO1/mxstreamer.cpp create mode 100644 LEGO1/mxvideomanager.cpp diff --git a/LEGO1/act2brick.cpp b/LEGO1/act2brick.cpp index fbaf90ab..aa7f6a12 100644 --- a/LEGO1/act2brick.cpp +++ b/LEGO1/act2brick.cpp @@ -1,21 +1,29 @@ -#include "act2brick.h" - -// OFFSET: LEGO1 0x1007a2b0 -Act2Brick::Act2Brick() -{ - // TODO -} - -// OFFSET: LEGO1 0x1007a470 -Act2Brick::~Act2Brick() -{ - // TODO -} - -// OFFSET: LEGO1 0x1007a7f0 -long Act2Brick::Tickle() -{ - // TODO - - return 0; -} +#include "act2brick.h" + +// OFFSET: LEGO1 0x1007a2b0 +Act2Brick::Act2Brick() +{ + // TODO +} + +// OFFSET: LEGO1 0x1007a470 +Act2Brick::~Act2Brick() +{ + // TODO +} + +// OFFSET: LEGO1 0x1007a8c0 +long Act2Brick::Notify(MxParam &p) +{ + // TODO + + return 0; +} + +// OFFSET: LEGO1 0x1007a7f0 +long Act2Brick::Tickle() +{ + // TODO + + return 0; +} diff --git a/LEGO1/act2brick.h b/LEGO1/act2brick.h index 25ddec12..f3c141a9 100644 --- a/LEGO1/act2brick.h +++ b/LEGO1/act2brick.h @@ -1,18 +1,19 @@ -#ifndef ACT2BRICK_H -#define ACT2BRICK_H - -#include "legopathactor.h" - -class Act2Brick : public LegoPathActor -{ -public: - Act2Brick(); - virtual ~Act2Brick(); // vtable+0x0 - - virtual long Tickle(); // vtable+08 - - // VTABLE 0x100d9b60 - // SIZE 0x194 -}; - -#endif // ACT2BRICK_H \ No newline at end of file +#ifndef ACT2BRICK_H +#define ACT2BRICK_H + +#include "legopathactor.h" + +class Act2Brick : public LegoPathActor +{ +public: + Act2Brick(); + virtual ~Act2Brick(); // vtable+0x0 + + virtual long Notify(MxParam &p); // vtable+0x4 + virtual long Tickle(); // vtable+08 + + // VTABLE 0x100d9b60 + // SIZE 0x194 +}; + +#endif // ACT2BRICK_H diff --git a/LEGO1/act2policestation.cpp b/LEGO1/act2policestation.cpp new file mode 100644 index 00000000..f1d2da5b --- /dev/null +++ b/LEGO1/act2policestation.cpp @@ -0,0 +1,9 @@ +#include "act2policestation.h" + +// OFFSET: LEGO1 0x100d53ac +long Act2PoliceStation::Notify(MxParam &p) +{ + // TODO + + return 0; +} \ No newline at end of file diff --git a/LEGO1/act2policestation.h b/LEGO1/act2policestation.h new file mode 100644 index 00000000..dd3014a6 --- /dev/null +++ b/LEGO1/act2policestation.h @@ -0,0 +1,12 @@ +#ifndef ACT2POLICESTATION_H +#define ACT2POLICESTATION_H + +#include "legoentity.h" + +class Act2PoliceStation : public LegoEntity +{ +public: + virtual long Notify(MxParam &p); // vtable+0x4 +}; + +#endif // ACT2POLICESTATION_H diff --git a/LEGO1/carrace.cpp b/LEGO1/carrace.cpp new file mode 100644 index 00000000..511965d0 --- /dev/null +++ b/LEGO1/carrace.cpp @@ -0,0 +1,7 @@ +#include "carrace.h" + +// OFFSET: LEGO1 0x10016a90 +CarRace::CarRace() +{ + // TODO +} \ No newline at end of file diff --git a/LEGO1/carrace.h b/LEGO1/carrace.h new file mode 100644 index 00000000..ddc8aa38 --- /dev/null +++ b/LEGO1/carrace.h @@ -0,0 +1,12 @@ +#ifndef CARRACE_H +#define CARRACE_H + +#include "legorace.h" + +class CarRace : public LegoRace +{ +public: + CarRace(); +}; + +#endif // CARRACE_H diff --git a/LEGO1/isleactor.cpp b/LEGO1/isleactor.cpp index 494820ed..f1f7f2cc 100644 --- a/LEGO1/isleactor.cpp +++ b/LEGO1/isleactor.cpp @@ -1,18 +1,26 @@ -#include "isleactor.h" - -// 0x100f07dc -static char* g_isleActorClassName = "IsleActor"; - -// OFFSET: LEGO1 0x1000e660 -const char *IsleActor::GetClassName() const -{ - return g_isleActorClassName; -} - -// OFFSET: LEGO1 0x1000e670 -MxBool IsleActor::IsClass(const char *name) const -{ - // TODO - - return MxBool(); -} +#include "isleactor.h" + +// 0x100f07dc +static char* g_isleActorClassName = "IsleActor"; + +// OFFSET: LEGO1 0x100d5178 +long IsleActor::Notify(MxParam &p) +{ + // TODO + + return 0; +} + +// OFFSET: LEGO1 0x1000e660 +const char *IsleActor::GetClassName() const +{ + return g_isleActorClassName; +} + +// OFFSET: LEGO1 0x1000e670 +MxBool IsleActor::IsClass(const char *name) const +{ + // TODO + + return MxBool(); +} diff --git a/LEGO1/isleactor.h b/LEGO1/isleactor.h index e226e738..49253426 100644 --- a/LEGO1/isleactor.h +++ b/LEGO1/isleactor.h @@ -5,6 +5,8 @@ class IsleActor : public LegoActor { +public: + virtual long Notify(MxParam &p); // vtable+0x4 virtual const char* GetClassName() const; // vtable+0xc virtual MxBool IsClass(const char *name) const; // vtable+0x10 diff --git a/LEGO1/legoentity.cpp b/LEGO1/legoentity.cpp index fcb5eb17..41936607 100644 --- a/LEGO1/legoentity.cpp +++ b/LEGO1/legoentity.cpp @@ -15,6 +15,14 @@ LegoEntity::~LegoEntity() Destroy(); } +// OFFSET: LEGO1 0x100114f0 +long LegoEntity::Notify(MxParam &p) +{ + // TODO + + return 0; +} + // OFFSET: LEGO1 0x1000c2f0 const char *LegoEntity::GetClassName() const { diff --git a/LEGO1/legoentity.h b/LEGO1/legoentity.h index 53b766b4..0894e21e 100644 --- a/LEGO1/legoentity.h +++ b/LEGO1/legoentity.h @@ -17,6 +17,7 @@ class LegoEntity : public MxEntity LegoEntity(); __declspec(dllexport) virtual ~LegoEntity(); // vtable+0x0 + virtual long Notify(MxParam &p); // vtable+0x4 virtual const char* GetClassName() const; // vtable+0xc virtual MxBool IsClass(const char *name) const; // vtable+0x10 diff --git a/LEGO1/legoinputmanager.cpp b/LEGO1/legoinputmanager.cpp new file mode 100644 index 00000000..951d6bdf --- /dev/null +++ b/LEGO1/legoinputmanager.cpp @@ -0,0 +1,21 @@ +#include "legoinputmanager.h" + +// OFFSET: LEGO1 0x1005b8f0 +LegoInputManager::~LegoInputManager() +{ + // TODO +} + +// OFFSET: LEGO1 0x1005b8b0 +long LegoInputManager::Tickle() +{ + // TODO + + return 0; +} + +// OFFSET: LEGO 0x1005bfe0 +void LegoInputManager::VTable0x38() +{ + // TODO +} diff --git a/LEGO1/legoinputmanager.h b/LEGO1/legoinputmanager.h index 714b4ce7..411b761d 100644 --- a/LEGO1/legoinputmanager.h +++ b/LEGO1/legoinputmanager.h @@ -16,10 +16,16 @@ __declspec(dllexport) enum NotificationId class LegoInputManager { public: + virtual ~LegoInputManager(); + __declspec(dllexport) void QueueEvent(NotificationId id, unsigned char p2, long p3, long p4, unsigned char p5); __declspec(dllexport) void Register(MxCore *); __declspec(dllexport) void UnRegister(MxCore *); + virtual long Tickle(); // vtable+0x8 + + virtual void VTable0x38(); // vtable0x38 + int m_unk00[0x400]; }; diff --git a/LEGO1/legolocomotionanimpresenter.h b/LEGO1/legolocomotionanimpresenter.h index e9b22478..87776e1c 100644 --- a/LEGO1/legolocomotionanimpresenter.h +++ b/LEGO1/legolocomotionanimpresenter.h @@ -1,17 +1,17 @@ -#ifndef LEGOLOCOMOTIONANIMPRESENTER_H -#define LEGOLOCOMOTIONANIMPRESENTER_H - -#include "legoloopinganimpresenter.h" - -class LegoLocomotionAnimPresenter : public LegoLoopingAnimPresenter -{ -public: - LegoLocomotionAnimPresenter(); - -private: - void Init(); - - // VTABLE 0x100d9170 -}; - -#endif // LEGOLOCOMOTIONANIMPRESENTER_H \ No newline at end of file +#ifndef LEGOLOCOMOTIONANIMPRESENTER_H +#define LEGOLOCOMOTIONANIMPRESENTER_H + +#include "legoloopinganimpresenter.h" + +class LegoLocomotionAnimPresenter : public LegoLoopingAnimPresenter +{ +public: + LegoLocomotionAnimPresenter(); + +private: + void Init(); + + // VTABLE 0x100d9170 +}; + +#endif // LEGOLOCOMOTIONANIMPRESENTER_H diff --git a/LEGO1/legoloopinganimpresenter.h b/LEGO1/legoloopinganimpresenter.h index 94639e44..e2599789 100644 --- a/LEGO1/legoloopinganimpresenter.h +++ b/LEGO1/legoloopinganimpresenter.h @@ -1,10 +1,10 @@ -#ifndef LEGOLOOPINGANIMPRESENTER_H -#define LEGOLOOPINGANIMPRESENTER_H - -#include "legoanimpresenter.h" - -class LegoLoopingAnimPresenter : public LegoAnimPresenter -{ -}; - -#endif // LEGOLOOPINGANIMPRESENTER_H +#ifndef LEGOLOOPINGANIMPRESENTER_H +#define LEGOLOOPINGANIMPRESENTER_H + +#include "legoanimpresenter.h" + +class LegoLoopingAnimPresenter : public LegoAnimPresenter +{ +}; + +#endif // LEGOLOOPINGANIMPRESENTER_H diff --git a/LEGO1/legorace.cpp b/LEGO1/legorace.cpp new file mode 100644 index 00000000..34a40f2c --- /dev/null +++ b/LEGO1/legorace.cpp @@ -0,0 +1,21 @@ +#include "legorace.h" + +// OFFSET: LEGO1 0x10015aa0 +LegoRace::LegoRace() +{ + // TODO +} + +// OFFSET: LEGO1 0x10015d40 +LegoRace::~LegoRace() +{ + // TODO +} + +// OFFSET: LEGO1 0x10015e00 +long LegoRace::Notify(MxParam &p) +{ + // TODO + + return 0; +} diff --git a/LEGO1/legorace.h b/LEGO1/legorace.h index 8a286905..d6c488d1 100644 --- a/LEGO1/legorace.h +++ b/LEGO1/legorace.h @@ -1,8 +1,15 @@ #ifndef LEGORACE_H #define LEGORACE_H -class LegoRace +#include "legoworld.h" + +class LegoRace : public LegoWorld { +public: + LegoRace(); + virtual ~LegoRace(); // vtable+0x0 + + virtual long Notify(MxParam &p); // vtable+0x4 }; #endif // LEGORACE_H \ No newline at end of file diff --git a/LEGO1/mxcompositepresenter.cpp b/LEGO1/mxcompositepresenter.cpp index 304037d5..2037c9c6 100644 --- a/LEGO1/mxcompositepresenter.cpp +++ b/LEGO1/mxcompositepresenter.cpp @@ -1,21 +1,41 @@ -#include "mxcompositepresenter.h" - -// OFFSET: LEGO1 0x100b60b0 -MxCompositePresenter::MxCompositePresenter() -{ - // TODO -} - -// OFFSET: LEGO1 0x100b6390 -MxCompositePresenter::~MxCompositePresenter() -{ - // TODO -} - -// OFFSET: LEGO1 0x100b6760 -long MxCompositePresenter::Notify(MxParam &p) -{ - // TODO - - return 0; -} +#include "mxcompositepresenter.h" + +// OFFSET: LEGO1 0x100b60b0 +MxCompositePresenter::MxCompositePresenter() +{ + // TODO +} + +// OFFSET: LEGO1 0x100b6390 +MxCompositePresenter::~MxCompositePresenter() +{ + // TODO +} + +// OFFSET: LEGO1 0x100b6760 +long MxCompositePresenter::Notify(MxParam &p) +{ + // TODO + + return 0; +} + +// OFFSET: LEGO1 0x100b6410 +long MxCompositePresenter::StartAction(MxStreamController *, MxDSAction *) +{ + // TODO + + return 0; +} + +// OFFSET: LEGO1 0x100b65e0 +void MxCompositePresenter::EndAction() +{ + // TODO +} + +// OFFSET: LEGO1 0x100b6c30 +void MxCompositePresenter::Enable(unsigned char) +{ + // TODO +} diff --git a/LEGO1/mxcompositepresenter.h b/LEGO1/mxcompositepresenter.h index d21884ea..79d2b987 100644 --- a/LEGO1/mxcompositepresenter.h +++ b/LEGO1/mxcompositepresenter.h @@ -1,17 +1,21 @@ -#ifndef MXCOMPOSITEPRESENTER_H -#define MXCOMPOSITEPRESENTER_H - -#include "mxpresenter.h" - -class MxCompositePresenter : public MxPresenter -{ -public: - MxCompositePresenter(); - virtual ~MxCompositePresenter(); // vtable+0x0 - - virtual long Notify(MxParam &p); // vtable+0x4, MxCore override - - // VTABLE 0x100dc618 -}; - -#endif // MXCOMPOSITEPRESENTER_H +#ifndef MXCOMPOSITEPRESENTER_H +#define MXCOMPOSITEPRESENTER_H + +#include "mxpresenter.h" + +class MxCompositePresenter : public MxPresenter +{ +public: + MxCompositePresenter(); + virtual ~MxCompositePresenter(); // vtable+0x0 + + virtual long Notify(MxParam &p); // vtable+0x4, MxCore override + + virtual long StartAction(MxStreamController *, MxDSAction *); // vtable+0x3c + virtual void EndAction(); // vtable+0x40 + virtual void Enable(unsigned char); // vtable+0x54 + + // VTABLE 0x100dc618 +}; + +#endif // MXCOMPOSITEPRESENTER_H diff --git a/LEGO1/mxdiskstreamcontroller.cpp b/LEGO1/mxdiskstreamcontroller.cpp new file mode 100644 index 00000000..cdd89797 --- /dev/null +++ b/LEGO1/mxdiskstreamcontroller.cpp @@ -0,0 +1,15 @@ +#include "mxdiskstreamcontroller.h" + +// OFFSET: LEGO1 0x100c7530 +MxDiskStreamController::~MxDiskStreamController() +{ + // TODO +} + +// OFFSET: LEGO1 0x100c8640 +long MxDiskStreamController::Tickle() +{ + // TODO + + return 0; +} \ No newline at end of file diff --git a/LEGO1/mxdiskstreamcontroller.h b/LEGO1/mxdiskstreamcontroller.h index 7acb277a..6005cfdc 100644 --- a/LEGO1/mxdiskstreamcontroller.h +++ b/LEGO1/mxdiskstreamcontroller.h @@ -1,11 +1,14 @@ -#ifndef MXDISKSTREAMCONTROLLER_H -#define MXDISKSTREAMCONTROLLER_H - -#include "mxstreamcontroller.h" - -class MxDiskStreamController : public MxStreamController -{ - -}; - -#endif // MXDISKSTREAMCONTROLLER_H +#ifndef MXDISKSTREAMCONTROLLER_H +#define MXDISKSTREAMCONTROLLER_H + +#include "mxstreamcontroller.h" + +class MxDiskStreamController : public MxStreamController +{ +public: + virtual ~MxDiskStreamController(); + + virtual long Tickle(); // vtable+0x8 +}; + +#endif // MXDISKSTREAMCONTROLLER_H diff --git a/LEGO1/mxdschunk.cpp b/LEGO1/mxdschunk.cpp new file mode 100644 index 00000000..94f2d840 --- /dev/null +++ b/LEGO1/mxdschunk.cpp @@ -0,0 +1,7 @@ +#include "mxdschunk.h" + +// OFFSET: LEGO1 0x100be170 +MxDSChunk::~MxDSChunk() +{ + // TODO +} \ No newline at end of file diff --git a/LEGO1/mxdschunk.h b/LEGO1/mxdschunk.h index dc7f24ca..f638c9b0 100644 --- a/LEGO1/mxdschunk.h +++ b/LEGO1/mxdschunk.h @@ -1,11 +1,12 @@ -#ifndef MXDSCHUNK_H -#define MXDSCHUNK_H - -#include "mxcore.h" - -class MxDSChunk : public MxCore -{ - -}; - -#endif // MXDSCHUNK_H +#ifndef MXDSCHUNK_H +#define MXDSCHUNK_H + +#include "mxcore.h" + +class MxDSChunk : public MxCore +{ +public: + virtual ~MxDSChunk(); +}; + +#endif // MXDSCHUNK_H diff --git a/LEGO1/mxdsfile.h b/LEGO1/mxdsfile.h index 4808b445..c7dd53b1 100644 --- a/LEGO1/mxdsfile.h +++ b/LEGO1/mxdsfile.h @@ -7,13 +7,13 @@ class MxDSFile : public MxDSSource { public: __declspec(dllexport) MxDSFile(const char *,unsigned long); - __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 Read(unsigned char *,unsigned long); - __declspec(dllexport) virtual long Seek(long,int); + __declspec(dllexport) virtual ~MxDSFile(); // vtable+0x0 + __declspec(dllexport) virtual long Open(unsigned long); // vtable+0x14 + __declspec(dllexport) virtual long Close(); // vtable+0x18 + __declspec(dllexport) virtual long Read(unsigned char *,unsigned long); // vtable+0x20 + __declspec(dllexport) virtual long Seek(long,int); // vtable+0x24 + __declspec(dllexport) virtual unsigned long GetBufferSize(); // vtable+0x28 + __declspec(dllexport) virtual unsigned long GetStreamBuffersNum(); // vtable+0x2c private: char m_unknown[0x70]; unsigned long m_buffersize; diff --git a/LEGO1/mxentity.h b/LEGO1/mxentity.h index f829e071..94043ffa 100644 --- a/LEGO1/mxentity.h +++ b/LEGO1/mxentity.h @@ -1,23 +1,25 @@ -#ifndef MXENTITY_H -#define MXENTITY_H - -#include "mxcore.h" - -#ifndef undefined4 -#define undefined4 int -#endif - -class MxAtomId; - -class MxEntity : public MxCore -{ -public: - virtual const char* GetClassName() const; // vtable+0xc - virtual MxBool IsClass(const char *name) const; // vtable+0x10 - - virtual undefined4 VTable0x14(undefined4 param_1, MxAtomId* param_2); // vtable+0x14 - - // VTABLE 0x100d53a4 -}; - -#endif // MXENTITY_H +#ifndef MXENTITY_H +#define MXENTITY_H + +#include "mxcore.h" + +#ifndef undefined4 +#define undefined4 int +#endif + +class MxAtomId; + +class MxEntity : public MxCore +{ +public: + virtual const char* GetClassName() const; // vtable+0xc + virtual MxBool IsClass(const char *name) const; // vtable+0x10 + + virtual undefined4 VTable0x14(undefined4 param_1, MxAtomId* param_2); // vtable+0x14 + + // VTABLE 0x100d53a4 + // 0x8: MxResult + // 0xc MxAtomId +}; + +#endif // MXENTITY_H diff --git a/LEGO1/mxeventmanager.cpp b/LEGO1/mxeventmanager.cpp new file mode 100644 index 00000000..442d5a32 --- /dev/null +++ b/LEGO1/mxeventmanager.cpp @@ -0,0 +1,7 @@ +#include "mxeventmanager.h" + +// OFFSET: LEGO1 0x100c03f0 +MxEventManager::~MxEventManager() +{ + // TODO +} \ No newline at end of file diff --git a/LEGO1/mxeventmanager.h b/LEGO1/mxeventmanager.h index 0e8e0f56..19ff0cbd 100644 --- a/LEGO1/mxeventmanager.h +++ b/LEGO1/mxeventmanager.h @@ -1,8 +1,13 @@ #ifndef MXEVENTMANAGER_H #define MXEVENTMANAGER_H -class MxEventManager +#include "mxcore.h" + +class MxEventManager : public MxCore { +public: + virtual ~MxEventManager(); + // VTABLE 0x100c0360 }; diff --git a/LEGO1/mxnotificationmanager.cpp b/LEGO1/mxnotificationmanager.cpp new file mode 100644 index 00000000..4e045957 --- /dev/null +++ b/LEGO1/mxnotificationmanager.cpp @@ -0,0 +1,15 @@ +#include "mxnotificationmanager.h" + +// OFFSET: LEGO1 0x100ac450 +MxNotificationManager::~MxNotificationManager() +{ + // TODO +} + +// OFFSET: LEGO1 0x100ac800 +long MxNotificationManager::Tickle() +{ + // TODO + + return 0; +} \ No newline at end of file diff --git a/LEGO1/mxnotificationmanager.h b/LEGO1/mxnotificationmanager.h index afa378e1..af52c005 100644 --- a/LEGO1/mxnotificationmanager.h +++ b/LEGO1/mxnotificationmanager.h @@ -1,9 +1,17 @@ #ifndef MXNOTIFICATIONMANAGER_H #define MXNOTIFICATIONMANAGER_H -class MxNotificationManager +#include "mxcore.h" + +class MxNotificationManager : public MxCore { - +public: + virtual ~MxNotificationManager(); // vtable+0x0 + + virtual long Tickle(); // vtable+0x8 + + // 0x10: MxCriticalSection + // VTABLE 0x100dc078 }; #endif // MXNOTIFICATIONMANAGER_H diff --git a/LEGO1/mxpresenter.cpp b/LEGO1/mxpresenter.cpp index 62226a20..65a20f5e 100644 --- a/LEGO1/mxpresenter.cpp +++ b/LEGO1/mxpresenter.cpp @@ -1,102 +1,114 @@ -#include "mxpresenter.h" - -// 0x100f0740 -static char* g_mxPresenterClassName = "MxPresenter"; - -// OFFSET: LEGO1 0x1000bee0 -void MxPresenter::DoneTickle() -{ - // TODO -} - -// OFFSET: LEGO1 0x100b4fc0 -void MxPresenter::ParseExtra() -{ - // TODO -} - -// OFFSET: LEGO1 0x1000c070 -MxPresenter::~MxPresenter() -{ - // TODO -} - -// OFFSET: LEGO1 0x100b5200 -long MxPresenter::Tickle() -{ - // TODO - - return 0; -} - -// OFFSET: LEGO1 0x1000bfe0 -const char *MxPresenter::GetClassName() const -{ - return g_mxPresenterClassName; -} - -// OFFSET: LEGO1 0x1000bff0 -MxBool MxPresenter::IsClass(const char *name) const -{ - // TODO - - return MxBool(); -} - -// OFFSET: LEGO1 0x100b4d80 -long MxPresenter::StartAction(MxStreamController *, MxDSAction *) -{ - // TODO - - return 0; -} - -// OFFSET: LEGO1 0x100d4d74 -void MxPresenter::EndAction() -{ - // TODO -} - -// OFFSET: LEGO1 0x100d4d8c -void MxPresenter::Enable(unsigned char) -{ - // TODO -} - -// OFFSET: LEGO1 0x1000be30 -void MxPresenter::VTable0x14() -{ - // TODO -} - -// OFFSET: LEGO1 0x1000be40 -void MxPresenter::VTable0x18() -{ - // TODO -} - -// OFFSET: LEGO1 0x1000be60 -void MxPresenter::VTable0x1c() -{ - // TODO -} - -// OFFSET: LEGO1 0x1000be80 -void MxPresenter::VTable0x20() -{ - // TODO -} - -// OFFSET: LEGO1 0x1000bea0 -unsigned int MxPresenter::VTable0x24() -{ - // TODO - - return 0; -} - -// OFFSET: LEGO1 0x1000bec0 -void MxPresenter::VTable0x28() -{ - // TODO -} +#include "mxpresenter.h" + +// 0x100f0740 +static char* g_mxPresenterClassName = "MxPresenter"; + +// OFFSET: LEGO1 0x1000bee0 +void MxPresenter::DoneTickle() +{ + // TODO +} + +// OFFSET: LEGO1 0x100b4d50 +void MxPresenter::Init() +{ + m_unk0x8 = 0; + m_action = NULL; + m_unk0x18 = 0; + m_unk0x3c = 0; + m_unk0xc = 0; + m_unk0x10 = 0; + m_unk0x14 = 0; +} + +// OFFSET: LEGO1 0x100b4fc0 +void MxPresenter::ParseExtra() +{ + // TODO +} + +// OFFSET: LEGO1 0x1000c070 +MxPresenter::~MxPresenter() +{ + // TODO +} + +// OFFSET: LEGO1 0x100b5200 +long MxPresenter::Tickle() +{ + // TODO + + return 0; +} + +// OFFSET: LEGO1 0x1000bfe0 +const char *MxPresenter::GetClassName() const +{ + return g_mxPresenterClassName; +} + +// OFFSET: LEGO1 0x1000bff0 +MxBool MxPresenter::IsClass(const char *name) const +{ + // TODO + + return MxBool(); +} + +// OFFSET: LEGO1 0x100b4d80 +long MxPresenter::StartAction(MxStreamController *, MxDSAction *) +{ + // TODO + + return 0; +} + +// OFFSET: LEGO1 0x100d4d74 +void MxPresenter::EndAction() +{ + // TODO +} + +// OFFSET: LEGO1 0x100d4d8c +void MxPresenter::Enable(unsigned char) +{ + // TODO +} + +// OFFSET: LEGO1 0x1000be30 +void MxPresenter::VTable0x14() +{ + // TODO +} + +// OFFSET: LEGO1 0x1000be40 +void MxPresenter::VTable0x18() +{ + // TODO +} + +// OFFSET: LEGO1 0x1000be60 +void MxPresenter::VTable0x1c() +{ + // TODO +} + +// OFFSET: LEGO1 0x1000be80 +void MxPresenter::VTable0x20() +{ + // TODO +} + +// OFFSET: LEGO1 0x1000bea0 +unsigned int MxPresenter::VTable0x24() +{ + // TODO + + return 0; +} + +// OFFSET: LEGO1 0x1000bec0 +void MxPresenter::VTable0x28() +{ + // TODO +} diff --git a/LEGO1/mxpresenter.h b/LEGO1/mxpresenter.h index 03c526a2..25526c55 100644 --- a/LEGO1/mxpresenter.h +++ b/LEGO1/mxpresenter.h @@ -3,6 +3,8 @@ #include "mxcore.h" +#include "mxcriticalsection.h" + class MxStreamController; class MxDSAction; @@ -28,6 +30,15 @@ class MxPresenter : public MxCore __declspec(dllexport) virtual void EndAction(); // vtable+0x40 __declspec(dllexport) virtual void Enable(unsigned char); // vtable+0x54 + int m_unk0x8; + int m_unk0xc; + int m_unk0x10; + int m_unk0x14; + int m_unk0x18; + MxDSAction* m_action; // 0 + MxCriticalSection m_criticalSection; + int m_unk0x3c; + // VTABLE 0x100d4d38 }; diff --git a/LEGO1/mxsmkpresenter.h b/LEGO1/mxsmkpresenter.h index b17f2972..49a8c1f3 100644 --- a/LEGO1/mxsmkpresenter.h +++ b/LEGO1/mxsmkpresenter.h @@ -1,18 +1,18 @@ -#ifndef MXSMKPRESENTER_H -#define MXSMKPRESENTER_H - -#include "mxvideopresenter.h" - -class MxSmkPresenter : public MxVideoPresenter -{ -public: - MxSmkPresenter(); - -private: - void Init(); - - // VTABLE 0x100dc348 - // SIZE 0x720 -}; - -#endif // MXSMKPRESENTER_H +#ifndef MXSMKPRESENTER_H +#define MXSMKPRESENTER_H + +#include "mxvideopresenter.h" + +class MxSmkPresenter : public MxVideoPresenter +{ +public: + MxSmkPresenter(); + +private: + void Init(); + + // VTABLE 0x100dc348 + // SIZE 0x720 +}; + +#endif // MXSMKPRESENTER_H diff --git a/LEGO1/mxstreamer.cpp b/LEGO1/mxstreamer.cpp new file mode 100644 index 00000000..22c3947e --- /dev/null +++ b/LEGO1/mxstreamer.cpp @@ -0,0 +1,25 @@ +#include "mxstreamer.h" + +#include "mxresult.h" + +// OFFSET: LEGO1 0x100b91d0 +MxStreamer::~MxStreamer() +{ + // TODO +} + +// OFFSET: LEGO1 0x100b9b60 +long MxStreamer::Notify(MxParam &p) +{ + // TODO + + return 0; +} + +// OFFSET: LEGO1 0x100b9190 +MxResult MxStreamer::VTable0x14() +{ + // TODO + + return MxResult(); +} diff --git a/LEGO1/mxstreamer.h b/LEGO1/mxstreamer.h index 785c475b..38d1dbc8 100644 --- a/LEGO1/mxstreamer.h +++ b/LEGO1/mxstreamer.h @@ -1,14 +1,19 @@ #ifndef MXSTREAMER_H #define MXSTREAMER_H +#include "mxcore.h" #include "mxstreamcontroller.h" -class MxStreamer +class MxStreamer : public MxCore { public: + virtual ~MxStreamer(); + __declspec(dllexport) MxStreamController *Open(const char *name, unsigned short p); __declspec(dllexport) long Close(const char *p); + virtual long Notify(MxParam &p); // vtable+0x4 + virtual MxResult VTable0x14(); // vtable+0x14 }; #endif // MXSTREAMER_H diff --git a/LEGO1/mxvideomanager.cpp b/LEGO1/mxvideomanager.cpp new file mode 100644 index 00000000..aa498199 --- /dev/null +++ b/LEGO1/mxvideomanager.cpp @@ -0,0 +1,15 @@ +#include "mxvideomanager.h" + +// OFFSET: LEGO1 0x100be2a0 +MxVideoManager::~MxVideoManager() +{ + // TODO +} + +// OFFSET: LEGO1 0x100bea90 +long MxVideoManager::Tickle() +{ + // TODO + + return 0; +} \ No newline at end of file diff --git a/LEGO1/mxvideomanager.h b/LEGO1/mxvideomanager.h index f2805b15..2c08dfe7 100644 --- a/LEGO1/mxvideomanager.h +++ b/LEGO1/mxvideomanager.h @@ -1,11 +1,17 @@ #ifndef MXVIDEOMANAGER_H #define MXVIDEOMANAGER_H -class MxVideoManager +#include "mxcore.h" + +class MxVideoManager : public MxCore { public: + virtual ~MxVideoManager(); + + virtual long Tickle(); // vtable+0x8 + __declspec(dllexport) void InvalidateRect(MxRect32 &); - __declspec(dllexport) virtual long RealizePalette(MxPalette *); + __declspec(dllexport) virtual long RealizePalette(MxPalette *); // vtable+0x30 }; #endif // MXVIDEOMANAGER_H diff --git a/isle.mak b/isle.mak index 69fb3151..6ed3250d 100644 --- a/isle.mak +++ b/isle.mak @@ -112,6 +112,7 @@ CLEAN : -@erase "$(INTDIR)\legopathpresenter.obj" -@erase "$(INTDIR)\legophonemepresenter.obj" -@erase "$(INTDIR)\legoplantmanager.obj" + -@erase "$(INTDIR)\legorace.obj" -@erase "$(INTDIR)\legosoundmanager.obj" -@erase "$(INTDIR)\legotexturepresenter.obj" -@erase "$(INTDIR)\legowavepresenter.obj" @@ -281,6 +282,7 @@ LINK32_OBJS= \ "$(INTDIR)\legopathpresenter.obj" \ "$(INTDIR)\legophonemepresenter.obj" \ "$(INTDIR)\legoplantmanager.obj" \ + "$(INTDIR)\legorace.obj" \ "$(INTDIR)\legosoundmanager.obj" \ "$(INTDIR)\legotexturepresenter.obj" \ "$(INTDIR)\legowavepresenter.obj" \ @@ -416,6 +418,7 @@ CLEAN : -@erase "$(INTDIR)\legopathpresenter.obj" -@erase "$(INTDIR)\legophonemepresenter.obj" -@erase "$(INTDIR)\legoplantmanager.obj" + -@erase "$(INTDIR)\legorace.obj" -@erase "$(INTDIR)\legosoundmanager.obj" -@erase "$(INTDIR)\legotexturepresenter.obj" -@erase "$(INTDIR)\legowavepresenter.obj" @@ -587,6 +590,7 @@ LINK32_OBJS= \ "$(INTDIR)\legopathpresenter.obj" \ "$(INTDIR)\legophonemepresenter.obj" \ "$(INTDIR)\legoplantmanager.obj" \ + "$(INTDIR)\legorace.obj" \ "$(INTDIR)\legosoundmanager.obj" \ "$(INTDIR)\legotexturepresenter.obj" \ "$(INTDIR)\legowavepresenter.obj" \ @@ -1266,8 +1270,10 @@ DEP_CPP_LEGOW=\ SOURCE=.\LEGO1\mxloopingsmkpresenter.cpp DEP_CPP_MXLOO=\ + ".\LEGO1\legoinc.h"\ ".\LEGO1\mxbool.h"\ ".\LEGO1\mxcore.h"\ + ".\LEGO1\mxcriticalsection.h"\ ".\LEGO1\mxloopingsmkpresenter.h"\ ".\LEGO1\mxmediapresenter.h"\ ".\LEGO1\mxpresenter.h"\ @@ -1285,8 +1291,10 @@ DEP_CPP_MXLOO=\ SOURCE=.\LEGO1\mxmediapresenter.cpp DEP_CPP_MXMED=\ + ".\LEGO1\legoinc.h"\ ".\LEGO1\mxbool.h"\ ".\LEGO1\mxcore.h"\ + ".\LEGO1\mxcriticalsection.h"\ ".\LEGO1\mxmediapresenter.h"\ ".\LEGO1\mxpresenter.h"\ @@ -1301,9 +1309,11 @@ DEP_CPP_MXMED=\ SOURCE=.\LEGO1\mxmusicpresenter.cpp DEP_CPP_MXMUS=\ + ".\LEGO1\legoinc.h"\ ".\LEGO1\mxaudiopresenter.h"\ ".\LEGO1\mxbool.h"\ ".\LEGO1\mxcore.h"\ + ".\LEGO1\mxcriticalsection.h"\ ".\LEGO1\mxmediapresenter.h"\ ".\LEGO1\mxmusicpresenter.h"\ ".\LEGO1\mxpresenter.h"\ @@ -1319,8 +1329,10 @@ DEP_CPP_MXMUS=\ SOURCE=.\LEGO1\mxpresenter.cpp DEP_CPP_MXPRE=\ + ".\LEGO1\legoinc.h"\ ".\LEGO1\mxbool.h"\ ".\LEGO1\mxcore.h"\ + ".\LEGO1\mxcriticalsection.h"\ ".\LEGO1\mxpresenter.h"\ @@ -1334,8 +1346,10 @@ DEP_CPP_MXPRE=\ SOURCE=.\LEGO1\mxsmkpresenter.cpp DEP_CPP_MXSMK=\ + ".\LEGO1\legoinc.h"\ ".\LEGO1\mxbool.h"\ ".\LEGO1\mxcore.h"\ + ".\LEGO1\mxcriticalsection.h"\ ".\LEGO1\mxmediapresenter.h"\ ".\LEGO1\mxpresenter.h"\ ".\LEGO1\mxsmkpresenter.h"\ @@ -1352,8 +1366,10 @@ DEP_CPP_MXSMK=\ SOURCE=.\LEGO1\mxstillpresenter.cpp DEP_CPP_MXSTI=\ + ".\LEGO1\legoinc.h"\ ".\LEGO1\mxbool.h"\ ".\LEGO1\mxcore.h"\ + ".\LEGO1\mxcriticalsection.h"\ ".\LEGO1\mxmediapresenter.h"\ ".\LEGO1\mxpresenter.h"\ ".\LEGO1\mxstillpresenter.h"\ @@ -1385,9 +1401,11 @@ DEP_CPP_MXTRA=\ SOURCE=.\LEGO1\mxwavepresenter.cpp DEP_CPP_MXWAV=\ + ".\LEGO1\legoinc.h"\ ".\LEGO1\mxaudiopresenter.h"\ ".\LEGO1\mxbool.h"\ ".\LEGO1\mxcore.h"\ + ".\LEGO1\mxcriticalsection.h"\ ".\LEGO1\mxmediapresenter.h"\ ".\LEGO1\mxpresenter.h"\ ".\LEGO1\mxsoundpresenter.h"\ @@ -2171,7 +2189,12 @@ DEP_CPP_JETSK=\ SOURCE=.\LEGO1\jetskiRace.cpp DEP_CPP_JETSKI=\ ".\LEGO1\jetskiRace.h"\ + ".\LEGO1\legoentity.h"\ ".\LEGO1\legorace.h"\ + ".\LEGO1\legoworld.h"\ + ".\LEGO1\mxbool.h"\ + ".\LEGO1\mxcore.h"\ + ".\LEGO1\mxentity.h"\ "$(INTDIR)\jetskiRace.obj" : $(SOURCE) $(DEP_CPP_JETSKI) "$(INTDIR)" @@ -2219,8 +2242,10 @@ DEP_CPP_JUKEBO=\ SOURCE=.\LEGO1\legoactioncontrolpresenter.cpp DEP_CPP_LEGOA=\ ".\LEGO1\legoactioncontrolpresenter.h"\ + ".\LEGO1\legoinc.h"\ ".\LEGO1\mxbool.h"\ ".\LEGO1\mxcore.h"\ + ".\LEGO1\mxcriticalsection.h"\ ".\LEGO1\mxmediapresenter.h"\ ".\LEGO1\mxpresenter.h"\ @@ -2271,9 +2296,11 @@ DEP_CPP_LEGOANI=\ SOURCE=.\LEGO1\legoanimmmpresenter.cpp DEP_CPP_LEGOANIM=\ ".\LEGO1\legoanimmmpresenter.h"\ + ".\LEGO1\legoinc.h"\ ".\LEGO1\mxbool.h"\ ".\LEGO1\mxcompositepresenter.h"\ ".\LEGO1\mxcore.h"\ + ".\LEGO1\mxcriticalsection.h"\ ".\LEGO1\mxpresenter.h"\ @@ -2288,8 +2315,10 @@ DEP_CPP_LEGOANIM=\ SOURCE=.\LEGO1\legoanimpresenter.cpp DEP_CPP_LEGOANIMP=\ ".\LEGO1\legoanimpresenter.h"\ + ".\LEGO1\legoinc.h"\ ".\LEGO1\mxbool.h"\ ".\LEGO1\mxcore.h"\ + ".\LEGO1\mxcriticalsection.h"\ ".\LEGO1\mxmediapresenter.h"\ ".\LEGO1\mxpresenter.h"\ ".\LEGO1\mxvideopresenter.h"\ @@ -2368,8 +2397,10 @@ SOURCE=.\LEGO1\legocarbuildanimpresenter.cpp DEP_CPP_LEGOCARB=\ ".\LEGO1\legoanimpresenter.h"\ ".\LEGO1\legocarbuildanimpresenter.h"\ + ".\LEGO1\legoinc.h"\ ".\LEGO1\mxbool.h"\ ".\LEGO1\mxcore.h"\ + ".\LEGO1\mxcriticalsection.h"\ ".\LEGO1\mxmediapresenter.h"\ ".\LEGO1\mxpresenter.h"\ ".\LEGO1\mxvideopresenter.h"\ @@ -2402,9 +2433,11 @@ DEP_CPP_LEGOCO=\ SOURCE=.\LEGO1\legoentitypresenter.cpp DEP_CPP_LEGOEN=\ ".\LEGO1\legoentitypresenter.h"\ + ".\LEGO1\legoinc.h"\ ".\LEGO1\mxbool.h"\ ".\LEGO1\mxcompositepresenter.h"\ ".\LEGO1\mxcore.h"\ + ".\LEGO1\mxcriticalsection.h"\ ".\LEGO1\mxpresenter.h"\ @@ -2419,8 +2452,10 @@ DEP_CPP_LEGOEN=\ SOURCE=.\LEGO1\legoflctexturepresenter.cpp DEP_CPP_LEGOF=\ ".\LEGO1\legoflctexturepresenter.h"\ + ".\LEGO1\legoinc.h"\ ".\LEGO1\mxbool.h"\ ".\LEGO1\mxcore.h"\ + ".\LEGO1\mxcriticalsection.h"\ ".\LEGO1\mxflcpresenter.h"\ ".\LEGO1\mxmediapresenter.h"\ ".\LEGO1\mxpresenter.h"\ @@ -2440,9 +2475,11 @@ SOURCE=.\LEGO1\legohideanimpresenter.cpp DEP_CPP_LEGOH=\ ".\LEGO1\legoanimpresenter.h"\ ".\LEGO1\legohideanimpresenter.h"\ + ".\LEGO1\legoinc.h"\ ".\LEGO1\legoloopinganimpresenter.h"\ ".\LEGO1\mxbool.h"\ ".\LEGO1\mxcore.h"\ + ".\LEGO1\mxcriticalsection.h"\ ".\LEGO1\mxmediapresenter.h"\ ".\LEGO1\mxpresenter.h"\ ".\LEGO1\mxvideopresenter.h"\ @@ -2481,10 +2518,12 @@ DEP_CPP_LEGOJ=\ SOURCE=.\LEGO1\legoloadcachesoundpresenter.cpp DEP_CPP_LEGOL=\ + ".\LEGO1\legoinc.h"\ ".\LEGO1\legoloadcachesoundpresenter.h"\ ".\LEGO1\mxaudiopresenter.h"\ ".\LEGO1\mxbool.h"\ ".\LEGO1\mxcore.h"\ + ".\LEGO1\mxcriticalsection.h"\ ".\LEGO1\mxmediapresenter.h"\ ".\LEGO1\mxpresenter.h"\ ".\LEGO1\mxsoundpresenter.h"\ @@ -2503,10 +2542,12 @@ DEP_CPP_LEGOL=\ SOURCE=.\LEGO1\legolocomotionanimpresenter.cpp DEP_CPP_LEGOLO=\ ".\LEGO1\legoanimpresenter.h"\ + ".\LEGO1\legoinc.h"\ ".\LEGO1\legolocomotionanimpresenter.h"\ ".\LEGO1\legoloopinganimpresenter.h"\ ".\LEGO1\mxbool.h"\ ".\LEGO1\mxcore.h"\ + ".\LEGO1\mxcriticalsection.h"\ ".\LEGO1\mxmediapresenter.h"\ ".\LEGO1\mxpresenter.h"\ ".\LEGO1\mxvideopresenter.h"\ @@ -2523,9 +2564,11 @@ DEP_CPP_LEGOLO=\ SOURCE=.\LEGO1\legopalettepresenter.cpp DEP_CPP_LEGOP=\ + ".\LEGO1\legoinc.h"\ ".\LEGO1\legopalettepresenter.h"\ ".\LEGO1\mxbool.h"\ ".\LEGO1\mxcore.h"\ + ".\LEGO1\mxcriticalsection.h"\ ".\LEGO1\mxmediapresenter.h"\ ".\LEGO1\mxpresenter.h"\ ".\LEGO1\mxvideopresenter.h"\ @@ -2559,9 +2602,11 @@ DEP_CPP_LEGOPA=\ SOURCE=.\LEGO1\legopathpresenter.cpp DEP_CPP_LEGOPAT=\ + ".\LEGO1\legoinc.h"\ ".\LEGO1\legopathpresenter.h"\ ".\LEGO1\mxbool.h"\ ".\LEGO1\mxcore.h"\ + ".\LEGO1\mxcriticalsection.h"\ ".\LEGO1\mxmediapresenter.h"\ ".\LEGO1\mxpresenter.h"\ @@ -2576,9 +2621,11 @@ DEP_CPP_LEGOPAT=\ SOURCE=.\LEGO1\legophonemepresenter.cpp DEP_CPP_LEGOPH=\ + ".\LEGO1\legoinc.h"\ ".\LEGO1\legophonemepresenter.h"\ ".\LEGO1\mxbool.h"\ ".\LEGO1\mxcore.h"\ + ".\LEGO1\mxcriticalsection.h"\ ".\LEGO1\mxflcpresenter.h"\ ".\LEGO1\mxmediapresenter.h"\ ".\LEGO1\mxpresenter.h"\ @@ -2624,9 +2671,11 @@ DEP_CPP_LEGOS=\ SOURCE=.\LEGO1\legotexturepresenter.cpp DEP_CPP_LEGOT=\ + ".\LEGO1\legoinc.h"\ ".\LEGO1\legotexturepresenter.h"\ ".\LEGO1\mxbool.h"\ ".\LEGO1\mxcore.h"\ + ".\LEGO1\mxcriticalsection.h"\ ".\LEGO1\mxmediapresenter.h"\ ".\LEGO1\mxpresenter.h"\ @@ -2641,10 +2690,12 @@ DEP_CPP_LEGOT=\ SOURCE=.\LEGO1\legowavepresenter.cpp DEP_CPP_LEGOWA=\ + ".\LEGO1\legoinc.h"\ ".\LEGO1\legowavepresenter.h"\ ".\LEGO1\mxaudiopresenter.h"\ ".\LEGO1\mxbool.h"\ ".\LEGO1\mxcore.h"\ + ".\LEGO1\mxcriticalsection.h"\ ".\LEGO1\mxmediapresenter.h"\ ".\LEGO1\mxpresenter.h"\ ".\LEGO1\mxsoundpresenter.h"\ @@ -2661,10 +2712,12 @@ DEP_CPP_LEGOWA=\ SOURCE=.\LEGO1\legoworldpresenter.cpp DEP_CPP_LEGOWO=\ ".\LEGO1\legoentitypresenter.h"\ + ".\LEGO1\legoinc.h"\ ".\LEGO1\legoworldpresenter.h"\ ".\LEGO1\mxbool.h"\ ".\LEGO1\mxcompositepresenter.h"\ ".\LEGO1\mxcore.h"\ + ".\LEGO1\mxcriticalsection.h"\ ".\LEGO1\mxpresenter.h"\ @@ -2698,10 +2751,12 @@ DEP_CPP_MOTOR=\ SOURCE=.\LEGO1\mxcompositemediapresenter.cpp DEP_CPP_MXCOM=\ + ".\LEGO1\legoinc.h"\ ".\LEGO1\mxbool.h"\ ".\LEGO1\mxcompositemediapresenter.h"\ ".\LEGO1\mxcompositepresenter.h"\ ".\LEGO1\mxcore.h"\ + ".\LEGO1\mxcriticalsection.h"\ ".\LEGO1\mxpresenter.h"\ @@ -2716,9 +2771,11 @@ DEP_CPP_MXCOM=\ SOURCE=.\LEGO1\mxcompositepresenter.cpp DEP_CPP_MXCOMP=\ + ".\LEGO1\legoinc.h"\ ".\LEGO1\mxbool.h"\ ".\LEGO1\mxcompositepresenter.h"\ ".\LEGO1\mxcore.h"\ + ".\LEGO1\mxcriticalsection.h"\ ".\LEGO1\mxpresenter.h"\ @@ -2732,10 +2789,12 @@ DEP_CPP_MXCOMP=\ SOURCE=.\LEGO1\mxcontrolpresenter.cpp DEP_CPP_MXCON=\ + ".\LEGO1\legoinc.h"\ ".\LEGO1\mxbool.h"\ ".\LEGO1\mxcompositepresenter.h"\ ".\LEGO1\mxcontrolpresenter.h"\ ".\LEGO1\mxcore.h"\ + ".\LEGO1\mxcriticalsection.h"\ ".\LEGO1\mxpresenter.h"\ @@ -2765,8 +2824,10 @@ DEP_CPP_MXENT=\ SOURCE=.\LEGO1\mxeventpresenter.cpp DEP_CPP_MXEVE=\ + ".\LEGO1\legoinc.h"\ ".\LEGO1\mxbool.h"\ ".\LEGO1\mxcore.h"\ + ".\LEGO1\mxcriticalsection.h"\ ".\LEGO1\mxeventpresenter.h"\ ".\LEGO1\mxmediapresenter.h"\ ".\LEGO1\mxpresenter.h"\ @@ -2782,8 +2843,10 @@ DEP_CPP_MXEVE=\ SOURCE=.\LEGO1\mxflcpresenter.cpp DEP_CPP_MXFLC=\ + ".\LEGO1\legoinc.h"\ ".\LEGO1\mxbool.h"\ ".\LEGO1\mxcore.h"\ + ".\LEGO1\mxcriticalsection.h"\ ".\LEGO1\mxflcpresenter.h"\ ".\LEGO1\mxmediapresenter.h"\ ".\LEGO1\mxpresenter.h"\ @@ -2800,8 +2863,10 @@ DEP_CPP_MXFLC=\ SOURCE=.\LEGO1\mxloopingflxpresenter.cpp DEP_CPP_MXLOOP=\ + ".\LEGO1\legoinc.h"\ ".\LEGO1\mxbool.h"\ ".\LEGO1\mxcore.h"\ + ".\LEGO1\mxcriticalsection.h"\ ".\LEGO1\mxflcpresenter.h"\ ".\LEGO1\mxloopingflxpresenter.h"\ ".\LEGO1\mxmediapresenter.h"\ @@ -2834,12 +2899,11 @@ DEP_CPP_MXDSF=\ # Begin Source File SOURCE=.\LEGO1\mxvideopresenter.cpp - -!IF "$(CFG)" == "LEGO1 - Win32 Release" - DEP_CPP_MXVIDEO=\ + ".\LEGO1\legoinc.h"\ ".\LEGO1\mxbool.h"\ ".\LEGO1\mxcore.h"\ + ".\LEGO1\mxcriticalsection.h"\ ".\LEGO1\mxmediapresenter.h"\ ".\LEGO1\mxpresenter.h"\ ".\LEGO1\mxvideopresenter.h"\ @@ -2849,30 +2913,11 @@ DEP_CPP_MXVIDEO=\ $(CPP) $(CPP_PROJ) $(SOURCE) -!ELSEIF "$(CFG)" == "LEGO1 - Win32 Debug" - -DEP_CPP_MXVIDEO=\ - ".\LEGO1\mxbool.h"\ - ".\LEGO1\mxcore.h"\ - ".\LEGO1\mxmediapresenter.h"\ - ".\LEGO1\mxpresenter.h"\ - ".\LEGO1\mxvideopresenter.h"\ - - -"$(INTDIR)\mxvideopresenter.obj" : $(SOURCE) $(DEP_CPP_MXVIDEO) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - # End Source File ################################################################################ # Begin Source File SOURCE=.\LEGO1\mxsoundmanager.cpp - -!IF "$(CFG)" == "LEGO1 - Win32 Release" - DEP_CPP_MXSOU=\ ".\LEGO1\mxbool.h"\ ".\LEGO1\mxcore.h"\ @@ -2883,28 +2928,11 @@ DEP_CPP_MXSOU=\ $(CPP) $(CPP_PROJ) $(SOURCE) -!ELSEIF "$(CFG)" == "LEGO1 - Win32 Debug" - -DEP_CPP_MXSOU=\ - ".\LEGO1\mxbool.h"\ - ".\LEGO1\mxcore.h"\ - ".\LEGO1\mxsoundmanager.h"\ - - -"$(INTDIR)\mxsoundmanager.obj" : $(SOURCE) $(DEP_CPP_MXSOU) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - # End Source File ################################################################################ # Begin Source File SOURCE=.\LEGO1\infocenter.cpp - -!IF "$(CFG)" == "LEGO1 - Win32 Release" - DEP_CPP_INFOCENT=\ ".\LEGO1\infocenter.h"\ ".\LEGO1\legoentity.h"\ @@ -2918,18 +2946,39 @@ DEP_CPP_INFOCENT=\ $(CPP) $(CPP_PROJ) $(SOURCE) -!ELSEIF "$(CFG)" == "LEGO1 - Win32 Debug" +# End Source File +################################################################################ +# Begin Source File -DEP_CPP_INFOCENT=\ - ".\LEGO1\infocenter.h"\ +SOURCE=.\LEGO1\legorace.cpp + +!IF "$(CFG)" == "LEGO1 - Win32 Release" + +DEP_CPP_LEGOR=\ ".\LEGO1\legoentity.h"\ + ".\LEGO1\legorace.h"\ ".\LEGO1\legoworld.h"\ ".\LEGO1\mxbool.h"\ ".\LEGO1\mxcore.h"\ ".\LEGO1\mxentity.h"\ -"$(INTDIR)\infocenter.obj" : $(SOURCE) $(DEP_CPP_INFOCENT) "$(INTDIR)" +"$(INTDIR)\legorace.obj" : $(SOURCE) $(DEP_CPP_LEGOR) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ELSEIF "$(CFG)" == "LEGO1 - Win32 Debug" + +DEP_CPP_LEGOR=\ + ".\LEGO1\legoentity.h"\ + ".\LEGO1\legorace.h"\ + ".\LEGO1\legoworld.h"\ + ".\LEGO1\mxbool.h"\ + ".\LEGO1\mxcore.h"\ + ".\LEGO1\mxentity.h"\ + + +"$(INTDIR)\legorace.obj" : $(SOURCE) $(DEP_CPP_LEGOR) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) @@ -3003,6 +3052,7 @@ DEP_CPP_ISLE_=\ ".\LEGO1\mxdssource.h"\ ".\LEGO1\mxentity.h"\ ".\LEGO1\mxeventmanager.h"\ + ".\LEGO1\mxmediapresenter.h"\ ".\LEGO1\mxmusicmanager.h"\ ".\LEGO1\mxnotificationmanager.h"\ ".\LEGO1\mxobjectfactory.h"\ @@ -3025,6 +3075,7 @@ DEP_CPP_ISLE_=\ ".\LEGO1\mxvideomanager.h"\ ".\LEGO1\mxvideoparam.h"\ ".\LEGO1\mxvideoparamflags.h"\ + ".\LEGO1\mxvideopresenter.h"\ ".\LEGO1\viewmanager.h"\ diff --git a/isle.mdp b/isle.mdp index c18ac1f5a87a88f93a670ceb8143b095919a839d..b1039a5403cc70c0ec2244aef928fb9307ae384d 100644 GIT binary patch delta 2016 zcmZp8z|!!5WdnzlKo~PasDiXK!vThThJ-&{Y!d}N>b;p6JYZrMZk}c`(#y$AQYg>N zD=x^-&jE9i^K(;j(v2Z9i791?1({GzaYkxR4wRjrlZs#^mX<&{rKOoEU{mr_l9FKx zfXw6qFsB}DS8gs?iGE&wPJVj6f_`ynQgLN*NouYY&><=L<;4p6DLFX``k8sjMX9-| zc_oQCR(U{m1u02ZN227)u~CP=?eO}iOCt6d8t;O#ujD@ z`uU|L=&D`neSCn*Gjj`ozDAey@dO&hr56J>I0kA>Om0P5PI5s}YBA6msYQDENm&?5 zvP!d4lkzKo3NlM7v8qTa&CE&3%u7#I#;qo|qAW8dHNPNnlMIK@Xxt6axHA}yyCIwJ zTt?$=$i`j7Zq3Q78;m9=#ISG`B_^lpB^MMhGENp)C9?T^;{tV<91BQpbLPrMk;w*I zI456RAv#&%UGC)9YdG0+Qq%K+vYRjNHRhVU{;k?(fd}(>H=n%fj^Ir`c~y6F?>jr5 z$+7ozHyuh~oLqNIV{^h`Ii|^X@99piJE}4H!&R-#nqL>O;#0vk-I9YbOW-^c!&zm1 y83u=)=a@G9Z_APSM0d@xaN^Q(!c7?$u_xhS)sq&UXf*(xTqIJKxaCb%RuEiE-K#<8HlC9xzi#)p6j)}B@|;i*Y65stnA z0WtLj83iD-pf)PFW#*(7D`-?$m}$lYXIB=a#smNzkV?FL?wKVq$+;uQk0*W5|ap_ zb&FH7V@mS#bHL_9LM=BlI};RS_24kWG*B-kza%fU1fdNjfMT3|6SGr6PGLX-8jOq@ zMc#7UARz@#2u2Uu80Y-l-26OnII}XaF>Gd$VG$Zl1S2;Q@G}Si6M?~KA{faffh2QH!V=#{C;J%$Y#0yQe2zkPR{3@Y;jU;^WSUk z2;Sts*K{Xm?dxV^a55HbRET91_{_}k!6TlLA)}<2&EOde+h#$o5B%Gt7&(Rb`58WdS|}X? VC19D!2NUHsYfU=ExJ-|c2>_qu5p)0m