diff --git a/LEGO1/act2brick.cpp b/LEGO1/act2brick.cpp index 84c8bbb3..dde79d0b 100644 --- a/LEGO1/act2brick.cpp +++ b/LEGO1/act2brick.cpp @@ -21,7 +21,7 @@ MxLong Act2Brick::Notify(MxParam &p) } // OFFSET: LEGO1 0x1007a7f0 STUB -MxLong Act2Brick::Tickle() +MxResult Act2Brick::Tickle() { // TODO diff --git a/LEGO1/act2brick.h b/LEGO1/act2brick.h index bf909198..65aba252 100644 --- a/LEGO1/act2brick.h +++ b/LEGO1/act2brick.h @@ -12,7 +12,7 @@ class Act2Brick : public LegoPathActor virtual ~Act2Brick() override; // vtable+0x0 virtual MxLong Notify(MxParam &p) override; // vtable+0x4 - virtual MxLong Tickle() override; // vtable+0x08 + virtual MxResult Tickle() override; // vtable+0x08 // OFFSET: LEGO1 0x1007a360 inline virtual const char *ClassName() const override // vtable+0x0c diff --git a/LEGO1/gasstation.cpp b/LEGO1/gasstation.cpp index 33590dc9..eb178ef0 100644 --- a/LEGO1/gasstation.cpp +++ b/LEGO1/gasstation.cpp @@ -21,7 +21,7 @@ MxLong GasStation::Notify(MxParam &p) } // OFFSET: LEGO1 0x10005c90 STUB -MxLong GasStation::Tickle() +MxResult GasStation::Tickle() { // TODO diff --git a/LEGO1/gasstation.h b/LEGO1/gasstation.h index 7f2263d0..e88c028a 100644 --- a/LEGO1/gasstation.h +++ b/LEGO1/gasstation.h @@ -13,7 +13,7 @@ class GasStation : public LegoWorld virtual ~GasStation() override; // vtable+0x0 virtual MxLong Notify(MxParam &p) override; // vtable+0x4 - virtual MxLong Tickle() override; // vtable+0x8 + virtual MxResult Tickle() override; // vtable+0x8 // OFFSET: LEGO1 0x10004780 inline virtual const char *ClassName() const override // vtable+0x0c diff --git a/LEGO1/infocenter.cpp b/LEGO1/infocenter.cpp index b9ea67c6..eb7e65fc 100644 --- a/LEGO1/infocenter.cpp +++ b/LEGO1/infocenter.cpp @@ -21,7 +21,7 @@ MxLong Infocenter::Notify(MxParam &p) } // OFFSET: LEGO1 0x10070af0 STUB -MxLong Infocenter::Tickle() +MxResult Infocenter::Tickle() { // TODO diff --git a/LEGO1/infocenter.h b/LEGO1/infocenter.h index a6e06f0f..1d385993 100644 --- a/LEGO1/infocenter.h +++ b/LEGO1/infocenter.h @@ -12,7 +12,7 @@ class Infocenter : public LegoWorld virtual ~Infocenter() override; virtual MxLong Notify(MxParam &p) override; // vtable+0x4 - virtual MxLong Tickle() override; // vtable+0x8 + virtual MxResult Tickle() override; // vtable+0x8 // OFFSET: LEGO1 0x1006eb40 inline virtual const char *ClassName() const override // vtable+0x0c diff --git a/LEGO1/legoanimationmanager.cpp b/LEGO1/legoanimationmanager.cpp index d396d431..20e0a0e3 100644 --- a/LEGO1/legoanimationmanager.cpp +++ b/LEGO1/legoanimationmanager.cpp @@ -23,7 +23,7 @@ MxLong LegoAnimationManager::Notify(MxParam &p) } // OFFSET: LEGO1 0x10061cc0 STUB -MxLong LegoAnimationManager::Tickle() +MxResult LegoAnimationManager::Tickle() { // TODO diff --git a/LEGO1/legoanimationmanager.h b/LEGO1/legoanimationmanager.h index 49b95f94..ec07603d 100644 --- a/LEGO1/legoanimationmanager.h +++ b/LEGO1/legoanimationmanager.h @@ -12,7 +12,7 @@ class LegoAnimationManager : public MxCore virtual ~LegoAnimationManager() override; // vtable+0x0 virtual MxLong Notify(MxParam &p) override; // vtable+0x4 - virtual MxLong Tickle() override; // vtable+0x8 + virtual MxResult Tickle() override; // vtable+0x8 // OFFSET: LEGO1 0x1005ec80 inline virtual const char *ClassName() const override // vtable+0x0c diff --git a/LEGO1/legocarbuild.cpp b/LEGO1/legocarbuild.cpp index c9254c37..e204529b 100644 --- a/LEGO1/legocarbuild.cpp +++ b/LEGO1/legocarbuild.cpp @@ -21,7 +21,7 @@ MxLong LegoCarBuild::Notify(MxParam &p) } // OFFSET: LEGO1 0x100238b0 STUB -MxLong LegoCarBuild::Tickle() +MxResult LegoCarBuild::Tickle() { // TODO diff --git a/LEGO1/legocarbuild.h b/LEGO1/legocarbuild.h index d320cd6e..1d68b0c1 100644 --- a/LEGO1/legocarbuild.h +++ b/LEGO1/legocarbuild.h @@ -12,7 +12,7 @@ class LegoCarBuild : public LegoWorld virtual ~LegoCarBuild() override; virtual MxLong Notify(MxParam &p) override; // vtable+0x4 - virtual MxLong Tickle() override; // vtable+0x8 + virtual MxResult Tickle() override; // vtable+0x8 // OFFSET: LEGO1 0x10022940 inline virtual const char *ClassName() const override // vtable+0x0c diff --git a/LEGO1/legocontrolmanager.cpp b/LEGO1/legocontrolmanager.cpp index 16733e13..91ff8c39 100644 --- a/LEGO1/legocontrolmanager.cpp +++ b/LEGO1/legocontrolmanager.cpp @@ -13,7 +13,7 @@ LegoControlManager::~LegoControlManager() } // OFFSET: LEGO1 0x10029600 STUB -MxLong LegoControlManager::Tickle() +MxResult LegoControlManager::Tickle() { // TODO diff --git a/LEGO1/legocontrolmanager.h b/LEGO1/legocontrolmanager.h index c4563776..0088ac0f 100644 --- a/LEGO1/legocontrolmanager.h +++ b/LEGO1/legocontrolmanager.h @@ -10,7 +10,7 @@ class LegoControlManager : public MxCore LegoControlManager(); virtual ~LegoControlManager() override; // vtable+0x0 - virtual MxLong Tickle() override; // vtable+0x8 + virtual MxResult Tickle() override; // vtable+0x8 // OFFSET: LEGO1 0x10028cb0 inline virtual const char *ClassName() const override // vtable+0x0c diff --git a/LEGO1/legoinputmanager.cpp b/LEGO1/legoinputmanager.cpp index 90be0c2c..7c6489ee 100644 --- a/LEGO1/legoinputmanager.cpp +++ b/LEGO1/legoinputmanager.cpp @@ -35,7 +35,7 @@ void LegoInputManager::UnRegister(MxCore *) } // OFFSET: LEGO1 0x1005b8b0 STUB -MxLong LegoInputManager::Tickle() +MxResult LegoInputManager::Tickle() { // TODO diff --git a/LEGO1/legoinputmanager.h b/LEGO1/legoinputmanager.h index 7ae2dd62..3a35d4b1 100644 --- a/LEGO1/legoinputmanager.h +++ b/LEGO1/legoinputmanager.h @@ -26,7 +26,7 @@ class LegoInputManager : public MxPresenter __declspec(dllexport) void Register(MxCore *); __declspec(dllexport) void UnRegister(MxCore *); - virtual MxLong Tickle() override; // vtable+0x8 + virtual MxResult Tickle() override; // vtable+0x8 undefined m_pad40[0x15c]; int m_joystickIndex; diff --git a/LEGO1/legopathcontroller.cpp b/LEGO1/legopathcontroller.cpp index 0cebbc0f..f8b64109 100644 --- a/LEGO1/legopathcontroller.cpp +++ b/LEGO1/legopathcontroller.cpp @@ -13,7 +13,7 @@ LegoPathController::~LegoPathController() } // OFFSET: LEGO1 0x10045c10 STUB -MxLong LegoPathController::Tickle() +MxResult LegoPathController::Tickle() { // TODO return 0; diff --git a/LEGO1/legopathcontroller.h b/LEGO1/legopathcontroller.h index ba415076..61dbdcfe 100644 --- a/LEGO1/legopathcontroller.h +++ b/LEGO1/legopathcontroller.h @@ -11,7 +11,7 @@ class LegoPathController : public MxCore LegoPathController(); virtual ~LegoPathController() override; - virtual MxLong Tickle() override; // vtable+08 + virtual MxResult Tickle() override; // vtable+08 // OFFSET: LEGO1 0x10045110 inline const char *ClassName() const override // vtable+0xc diff --git a/LEGO1/legoplantmanager.cpp b/LEGO1/legoplantmanager.cpp index eee83726..515d330d 100644 --- a/LEGO1/legoplantmanager.cpp +++ b/LEGO1/legoplantmanager.cpp @@ -13,7 +13,7 @@ LegoPlantManager::~LegoPlantManager() } // OFFSET: LEGO1 0x10026e00 STUB -MxLong LegoPlantManager::Tickle() +MxResult LegoPlantManager::Tickle() { // TODO diff --git a/LEGO1/legoplantmanager.h b/LEGO1/legoplantmanager.h index 3e8bfefe..b8e8dd9d 100644 --- a/LEGO1/legoplantmanager.h +++ b/LEGO1/legoplantmanager.h @@ -11,7 +11,7 @@ class LegoPlantManager : public MxCore LegoPlantManager(); virtual ~LegoPlantManager() override; // vtable+0x0 - virtual MxLong Tickle() override; // vtable+0x8 + virtual MxResult Tickle() override; // vtable+0x8 // OFFSET: LEGO1 0x10026290 inline const char *ClassName() const override // vtable+0xc diff --git a/LEGO1/legosoundmanager.cpp b/LEGO1/legosoundmanager.cpp index e56747f6..01f8fee5 100644 --- a/LEGO1/legosoundmanager.cpp +++ b/LEGO1/legosoundmanager.cpp @@ -13,7 +13,7 @@ LegoSoundManager::~LegoSoundManager() } // OFFSET: LEGO1 0x1002a3a0 STUB -MxLong LegoSoundManager::Tickle() +MxResult LegoSoundManager::Tickle() { // TODO return 0; diff --git a/LEGO1/legosoundmanager.h b/LEGO1/legosoundmanager.h index 1d191e03..90e23fba 100644 --- a/LEGO1/legosoundmanager.h +++ b/LEGO1/legosoundmanager.h @@ -10,7 +10,7 @@ class LegoSoundManager : public MxSoundManager public: LegoSoundManager(); virtual ~LegoSoundManager() override; - virtual MxLong Tickle() override; // vtable+08 + virtual MxResult Tickle() override; // vtable+08 private: void Init(); diff --git a/LEGO1/mxcore.cpp b/LEGO1/mxcore.cpp index 78441d8d..ab73e242 100644 --- a/LEGO1/mxcore.cpp +++ b/LEGO1/mxcore.cpp @@ -22,7 +22,7 @@ MxLong MxCore::Notify(MxParam &p) } // OFFSET: LEGO1 0x10001f70 -MxLong MxCore::Tickle() +MxResult MxCore::Tickle() { return 0; } \ No newline at end of file diff --git a/LEGO1/mxdiskstreamcontroller.cpp b/LEGO1/mxdiskstreamcontroller.cpp index 61243410..9e37edc4 100644 --- a/LEGO1/mxdiskstreamcontroller.cpp +++ b/LEGO1/mxdiskstreamcontroller.cpp @@ -13,7 +13,7 @@ MxDiskStreamController::~MxDiskStreamController() } // OFFSET: LEGO1 0x100c8640 STUB -MxLong MxDiskStreamController::Tickle() +MxResult MxDiskStreamController::Tickle() { // TODO diff --git a/LEGO1/mxdiskstreamcontroller.h b/LEGO1/mxdiskstreamcontroller.h index c0142663..1f66984c 100644 --- a/LEGO1/mxdiskstreamcontroller.h +++ b/LEGO1/mxdiskstreamcontroller.h @@ -14,7 +14,7 @@ class MxDiskStreamController : public MxStreamController MxDiskStreamController(); virtual ~MxDiskStreamController() override; - virtual MxLong Tickle() override; // vtable+0x8 + virtual MxResult Tickle() override; // vtable+0x8 // OFFSET: LEGO1 0x100c7360 inline virtual const char *ClassName() const override // vtable+0x0c diff --git a/LEGO1/mxmediapresenter.cpp b/LEGO1/mxmediapresenter.cpp index 31e68abc..6a59a0ec 100644 --- a/LEGO1/mxmediapresenter.cpp +++ b/LEGO1/mxmediapresenter.cpp @@ -3,7 +3,7 @@ DECOMP_SIZE_ASSERT(MxMediaPresenter, 0x50); // OFFSET: LEGO1 0x100b5d10 STUB -MxLong MxMediaPresenter::Tickle() +MxResult MxMediaPresenter::Tickle() { // TODO return 0; diff --git a/LEGO1/mxmediapresenter.h b/LEGO1/mxmediapresenter.h index 64de0614..741ab49f 100644 --- a/LEGO1/mxmediapresenter.h +++ b/LEGO1/mxmediapresenter.h @@ -14,7 +14,7 @@ class MxMediaPresenter : public MxPresenter Init(); } - virtual MxLong Tickle() override; // vtable+0x8, override MxCore + virtual MxResult Tickle() override; // vtable+0x8, override MxCore // OFFSET: LEGO1 0x1000c5c0 inline virtual const char *ClassName() const override // vtable+0xc diff --git a/LEGO1/mxpresenter.cpp b/LEGO1/mxpresenter.cpp index e82aa3a4..838b0af3 100644 --- a/LEGO1/mxpresenter.cpp +++ b/LEGO1/mxpresenter.cpp @@ -79,7 +79,7 @@ MxPresenter::~MxPresenter() } // OFFSET: LEGO1 0x100b5200 -MxLong MxPresenter::Tickle() +MxResult MxPresenter::Tickle() { MxAutoLocker lock(&this->m_criticalSection); diff --git a/LEGO1/mxpresenter.h b/LEGO1/mxpresenter.h index b7e99edf..86b078a6 100644 --- a/LEGO1/mxpresenter.h +++ b/LEGO1/mxpresenter.h @@ -29,7 +29,7 @@ class MxPresenter : public MxCore MxPresenter() { Init(); } __declspec(dllexport) virtual ~MxPresenter(); // vtable+0x0 - __declspec(dllexport) virtual MxLong Tickle() override; // vtable+0x8 + __declspec(dllexport) virtual MxResult Tickle() override; // vtable+0x8 // OFFSET: LEGO1 0x1000bfe0 inline virtual const char *ClassName() const override// vtable+0xc diff --git a/LEGO1/mxtransitionmanager.cpp b/LEGO1/mxtransitionmanager.cpp index 8af3f497..fdae06ea 100644 --- a/LEGO1/mxtransitionmanager.cpp +++ b/LEGO1/mxtransitionmanager.cpp @@ -13,7 +13,7 @@ MxTransitionManager::~MxTransitionManager() } // OFFSET: LEGO1 0x1004bac0 STUB -MxLong MxTransitionManager::Tickle() +MxResult MxTransitionManager::Tickle() { // TODO diff --git a/LEGO1/mxtransitionmanager.h b/LEGO1/mxtransitionmanager.h index c6cc28aa..215cd2d7 100644 --- a/LEGO1/mxtransitionmanager.h +++ b/LEGO1/mxtransitionmanager.h @@ -14,7 +14,7 @@ class MxTransitionManager : public MxCore __declspec(dllexport) void SetWaitIndicator(MxVideoPresenter *videoPresenter); - virtual MxLong Tickle(); // vtable+0x8 + virtual MxResult Tickle(); // vtable+0x8 }; #endif // MXTRANSITIONMANAGER_H diff --git a/LEGO1/mxvideomanager.cpp b/LEGO1/mxvideomanager.cpp index 81d431a9..8f64dbd4 100644 --- a/LEGO1/mxvideomanager.cpp +++ b/LEGO1/mxvideomanager.cpp @@ -15,7 +15,7 @@ MxVideoManager::~MxVideoManager() } // OFFSET: LEGO1 0x100bea90 -MxLong MxVideoManager::Tickle() +MxResult MxVideoManager::Tickle() { MxAutoLocker lock(&this->m_criticalSection); diff --git a/LEGO1/mxvideomanager.h b/LEGO1/mxvideomanager.h index a7cde92f..4068b793 100644 --- a/LEGO1/mxvideomanager.h +++ b/LEGO1/mxvideomanager.h @@ -13,7 +13,7 @@ class MxVideoManager : public MxMediaManager public: virtual ~MxVideoManager(); - virtual MxLong Tickle(); // vtable+0x8 + virtual MxResult Tickle(); // vtable+0x8 __declspec(dllexport) void InvalidateRect(MxRect32 &); __declspec(dllexport) virtual MxLong RealizePalette(MxPalette *); // vtable+0x30