mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-22 16:04:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement/match Motocycle, consistent notification names (#1037)

Browse Source 
* Implement/match Motocycle, consistent notification names

* Format

* Fix

* Fix return types

* Fix return type

* Fix annotations

* Rename function
This commit is contained in:
Christian Semmler
2024-06-16 10:47:53 -04:00
committed by GitHub
parent 68023379d8
commit e4e0f4e4d3
62 changed files with 362 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
LEGO1/lego/legoomni/include/ambulance.h
View File

@@ -122,15 +122,15 @@ public:
return !strcmp(p_name, Ambulance::ClassName()) || IslePathActor::IsA(p_name);
}
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
void Destroy(MxBool p_fromDestructor) override; // vtable+0x1c
void VTable0x70(float p_time) override; // vtable+0x70
MxLong HandleClick() override; // vtable+0xcc
MxLong HandleControl(LegoControlManagerEvent& p_param) override; // vtable+0xd4
MxLong HandlePathStruct(LegoPathStructEvent& p_param) override; // vtable+0xdc
void Exit() override; // vtable+0xe4
virtual MxLong HandleButtonDown(LegoControlManagerEvent& p_param); // vtable+0xf0
virtual MxLong HandleEndAction(MxEndActionNotificationParam& p_param); // vtable+0xf4
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
void Destroy(MxBool p_fromDestructor) override; // vtable+0x1c
void VTable0x70(float p_time) override; // vtable+0x70
MxLong HandleClick() override; // vtable+0xcc
MxLong HandleControl(LegoControlManagerNotificationParam& p_param) override; // vtable+0xd4
MxLong HandlePathStruct(LegoPathStructNotificationParam& p_param) override; // vtable+0xdc
void Exit() override; // vtable+0xe4
virtual MxLong HandleButtonDown(LegoControlManagerNotificationParam& p_param); // vtable+0xf0
virtual MxLong HandleEndAction(MxEndActionNotificationParam& p_param); // vtable+0xf4
void CreateState();
void FUN_10036e60();

8
LEGO1/lego/legoomni/include/bike.h
View File

@@ -23,10 +23,10 @@ public:
return !strcmp(p_name, Bike::ClassName()) || IslePathActor::IsA(p_name);
}
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
MxLong HandleClick() override; // vtable+0xcc
MxLong HandleControl(LegoControlManagerEvent& p_param) override; // vtable+0xd4
void Exit() override; // vtable+0xe4
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
MxLong HandleClick() override; // vtable+0xcc
MxLong HandleControl(LegoControlManagerNotificationParam& p_param) override; // vtable+0xd4
void Exit() override; // vtable+0xe4
void ActivateSceneActions();

14
LEGO1/lego/legoomni/include/carrace.h
View File

@@ -44,13 +44,13 @@ public:
return !strcmp(p_name, CarRace::ClassName()) || LegoRace::IsA(p_name);
}
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
void ReadyWorld() override; // vtable+0x50
MxBool Escape() override; // vtable+0x64
MxLong HandleClick(LegoEventNotificationParam&) override; // vtable+0x6c
MxLong HandlePathStruct(LegoPathStructEvent&) override; // vtable+0x70
MxLong HandleEndAction(MxEndActionNotificationParam&) override; // vtable+0x74
MxLong HandleType0Notification(MxNotificationParam&) override; // vtable+0x78
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
void ReadyWorld() override; // vtable+0x50
MxBool Escape() override; // vtable+0x64
MxLong HandleClick(LegoEventNotificationParam&) override; // vtable+0x6c
MxLong HandlePathStruct(LegoPathStructNotificationParam&) override; // vtable+0x70
MxLong HandleEndAction(MxEndActionNotificationParam&) override; // vtable+0x74
MxLong HandleType0Notification(MxNotificationParam&) override; // vtable+0x78
// SYNTHETIC: LEGO1 0x10016c70
// CarRace::`scalar deleting destructor'

12
LEGO1/lego/legoomni/include/dunebuggy.h
View File

@@ -23,12 +23,12 @@ public:
return !strcmp(p_name, DuneBuggy::ClassName()) || IslePathActor::IsA(p_name);
}
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
void VTable0x70(float p_float) override; // vtable+0x70
MxLong HandleClick() override; // vtable+0xcc
MxLong HandleControl(LegoControlManagerEvent& p_param) override; // vtable+0xd4
MxLong HandlePathStruct(LegoPathStructEvent& p_param) override; // vtable+0xdc
void Exit() override; // vtable+0xe4
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
void VTable0x70(float p_float) override; // vtable+0x70
MxLong HandleClick() override; // vtable+0xcc
MxLong HandleControl(LegoControlManagerNotificationParam& p_param) override; // vtable+0xd4
MxLong HandlePathStruct(LegoPathStructNotificationParam& p_param) override; // vtable+0xdc
void Exit() override; // vtable+0xe4
void FUN_10068350();

4
LEGO1/lego/legoomni/include/elevatorbottom.h
View File

@@ -5,7 +5,7 @@
#include "legogamestate.h"
#include "legoworld.h"
class LegoControlManagerEvent;
class LegoControlManagerNotificationParam;
// VTABLE: LEGO1 0x100d5f20
// SIZE 0xfc
@@ -44,7 +44,7 @@ public:
private:
LegoGameState::Area m_destLocation; // 0xf8
MxLong HandleControl(LegoControlManagerEvent& p_param);
MxLong HandleControl(LegoControlManagerNotificationParam& p_param);
};
#endif // ELEVATORBOTTOM_H

14
LEGO1/lego/legoomni/include/gasstation.h
View File

@@ -75,12 +75,12 @@ public:
return !strcmp(p_name, GasStation::ClassName()) || LegoWorld::IsA(p_name);
}
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
void ReadyWorld() override; // vtable+0x50
MxBool VTable0x5c() override; // vtable+0x5c
MxBool Escape() override; // vtable+0x64
void Enable(MxBool p_enable) override; // vtable+0x68
virtual MxLong HandleControl(LegoControlManagerEvent& p_param); // vtable+0x6c
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
void ReadyWorld() override; // vtable+0x50
MxBool VTable0x5c() override; // vtable+0x5c
MxBool Escape() override; // vtable+0x64
void Enable(MxBool p_enable) override; // vtable+0x68
virtual MxLong HandleControl(LegoControlManagerNotificationParam& p_param); // vtable+0x6c
inline void PlayAction(MxU32 p_objectId);
@@ -90,7 +90,7 @@ public:
private:
MxLong HandleEndAction(MxEndActionNotificationParam& p_param);
MxLong HandleKeyPress(MxS8 p_key);
MxLong HandleButtonDown(LegoControlManagerEvent& p_param);
MxLong HandleButtonDown(LegoControlManagerNotificationParam& p_param);
MxS16 m_currentActorId; // 0xf8
undefined2 m_unk0xfa; // 0xfa

14
LEGO1/lego/legoomni/include/helicopter.h
View File

@@ -65,13 +65,13 @@ public:
return !strcmp(p_name, Helicopter::ClassName()) || IslePathActor::IsA(p_name);
}
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
void VTable0x70(float p_float) override; // vtable+0x70
void VTable0x74(Matrix4& p_transform) override; // vtable+0x74
MxLong HandleClick() override; // vtable+0xcc
MxLong HandleControl(LegoControlManagerEvent& p_param) override; // vtable+0xd4
MxLong HandleEndAnim(LegoEndAnimNotificationParam& p_param) override; // vtable+0xd8
void Exit() override; // vtable+0xe4
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
void VTable0x70(float p_float) override; // vtable+0x70
void VTable0x74(Matrix4& p_transform) override; // vtable+0x74
MxLong HandleClick() override; // vtable+0xcc
MxLong HandleControl(LegoControlManagerNotificationParam& p_param) override; // vtable+0xd4
MxLong HandleEndAnim(LegoEndAnimNotificationParam& p_param) override; // vtable+0xd8
void Exit() override; // vtable+0xe4
// SYNTHETIC: LEGO1 0x10003210
// Helicopter::`scalar deleting destructor'

6
LEGO1/lego/legoomni/include/hospital.h
View File

@@ -7,7 +7,7 @@
#include "legostate.h"
#include "legoworld.h"
class LegoControlManagerEvent;
class LegoControlManagerNotificationParam;
class MxEndActionNotificationParam;
class MxStillPresenter;
@@ -89,8 +89,8 @@ public:
private:
MxLong HandleKeyPress(MxS8 p_key);
MxLong HandleEndAction(MxEndActionNotificationParam& p_param);
MxLong HandleButtonDown(LegoControlManagerEvent& p_param);
MxBool HandleControl(LegoControlManagerEvent& p_param);
MxLong HandleButtonDown(LegoControlManagerNotificationParam& p_param);
MxBool HandleControl(LegoControlManagerNotificationParam& p_param);
MxS16 m_currentActorId; // 0xf8
LegoGameState::Area m_destLocation; // 0xfc

4
LEGO1/lego/legoomni/include/infocenter.h
View File

@@ -10,7 +10,7 @@
class MxNotificationParam;
class MxStillPresenter;
class LegoControlManagerEvent;
class LegoControlManagerNotificationParam;
// VTABLE: LEGO1 0x100d93a8
// SIZE 0x94
@@ -129,7 +129,7 @@ private:
MxLong HandleKeyPress(MxS8 p_key);
MxU8 HandleMouseMove(MxS32 p_x, MxS32 p_y);
MxU8 HandleButtonUp(MxS32 p_x, MxS32 p_y);
MxU8 HandleControl(LegoControlManagerEvent& p_param);
MxU8 HandleControl(LegoControlManagerNotificationParam& p_param);
MxLong HandleEndAction(MxEndActionNotificationParam& p_param);
MxLong HandleNotification0(MxNotificationParam& p_param);

4
LEGO1/lego/legoomni/include/infocenterdoor.h
View File

@@ -4,7 +4,7 @@
#include "legogamestate.h"
#include "legoworld.h"
class LegoControlManagerEvent;
class LegoControlManagerNotificationParam;
// VTABLE: LEGO1 0x100d72d8
// SIZE 0xfc
@@ -43,7 +43,7 @@ public:
private:
LegoGameState::Area m_destLocation; // 0xf8
MxLong HandleControl(LegoControlManagerEvent& p_param);
MxLong HandleControl(LegoControlManagerNotificationParam& p_param);
};
#endif // INFOCENTERDOOR_H

6
LEGO1/lego/legoomni/include/isle.h
View File

@@ -15,7 +15,7 @@ class Jetski;
class JukeBoxEntity;
class LegoNamedTexture;
class Motocycle;
class LegoPathStructEvent;
class LegoPathStructNotificationParam;
class Pizza;
class Pizzeria;
class RaceCar;
@@ -198,8 +198,8 @@ public:
protected:
MxLong HandleEndAction(MxEndActionNotificationParam& p_param);
MxLong HandleControl(LegoControlManagerEvent& p_param);
MxLong HandlePathStruct(LegoPathStructEvent& p_param);
MxLong HandleControl(LegoControlManagerNotificationParam& p_param);
MxLong HandlePathStruct(LegoPathStructNotificationParam& p_param);
MxLong HandleTransitionEnd();
void HandleElevatorEndAction();
void UpdateGlobe();

16
LEGO1/lego/legoomni/include/isleactor.h
View File

@@ -3,6 +3,8 @@
#include "legoactor.h"
class LegoControlManagerNotificationParam;
class LegoPathStructNotificationParam;
class LegoWorld;
class MxEndActionNotificationParam;
class MxNotificationParam;
@@ -29,25 +31,25 @@ public:
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
// FUNCTION: LEGO1 0x1000e5f0
virtual undefined4 HandleClick() { return 0; } // vtable+0x68
virtual MxLong HandleClick() { return 0; } // vtable+0x68
// FUNCTION: LEGO1 0x1000e600
virtual undefined4 VTable0x6c() { return 0; } // vtable+0x6c
virtual MxLong VTable0x6c() { return 0; } // vtable+0x6c
// FUNCTION: LEGO1 0x1000e610
virtual undefined4 VTable0x70() { return 0; } // vtable+0x70
virtual MxLong HandleEndAnim() { return 0; } // vtable+0x70
// FUNCTION: LEGO1 0x1000e620
virtual undefined4 HandleEndAction(MxEndActionNotificationParam&) { return 0; } // vtable+0x74
virtual MxLong HandleEndAction(MxEndActionNotificationParam&) { return 0; } // vtable+0x74
// FUNCTION: LEGO1 0x1000e630
virtual undefined4 HandleButtonDown(MxNotificationParam&) { return 0; } // vtable+0x78
virtual MxLong HandleButtonDown(LegoControlManagerNotificationParam&) { return 0; } // vtable+0x78
// FUNCTION: LEGO1 0x1000e640
virtual undefined4 HandleButtonUp(MxNotificationParam&) { return 0; } // vtable+0x7c
virtual MxLong HandleButtonUp(LegoControlManagerNotificationParam&) { return 0; } // vtable+0x7c
// FUNCTION: LEGO1 0x1000e650
virtual undefined4 VTable0x80(MxParam&) { return 0; } // vtable+0x80
virtual MxLong HandlePathStruct(LegoPathStructNotificationParam&) { return 0; } // vtable+0x80
protected:
LegoWorld* m_world; // 0x78

8
LEGO1/lego/legoomni/include/islepathactor.h
View File

@@ -6,10 +6,10 @@
#include "mxtypes.h"
#include "roi/legoroi.h"
class LegoControlManagerEvent;
class LegoControlManagerNotificationParam;
class LegoEndAnimNotificationParam;
class LegoWorld;
class LegoPathStructEvent;
class LegoPathStructNotificationParam;
// VTABLE: LEGO1 0x100d4398
// SIZE 0x160
@@ -113,13 +113,13 @@ public:
virtual MxLong HandleNotification0() { return 0; } // vtable+0xd0
// FUNCTION: LEGO1 0x10002e80
virtual MxLong HandleControl(LegoControlManagerEvent&) { return 0; } // vtable+0xd4
virtual MxLong HandleControl(LegoControlManagerNotificationParam&) { return 0; } // vtable+0xd4
// FUNCTION: LEGO1 0x10002e90
virtual MxLong HandleEndAnim(LegoEndAnimNotificationParam&) { return 0; } // vtable+0xd8
// FUNCTION: LEGO1 0x10002e00
virtual MxLong HandlePathStruct(LegoPathStructEvent&) { return 0; } // vtable+0xdc
virtual MxLong HandlePathStruct(LegoPathStructNotificationParam&) { return 0; } // vtable+0xdc
virtual void Enter(); // vtable+0xe0
virtual void Exit(); // vtable+0xe4

12
LEGO1/lego/legoomni/include/jetski.h
View File

@@ -4,7 +4,7 @@
#include "decomp.h"
#include "islepathactor.h"
class LegoControlManagerEvent;
class LegoControlManagerNotificationParam;
// VTABLE: LEGO1 0x100d9ec8
// SIZE 0x164
@@ -25,11 +25,11 @@ public:
return !strcmp(p_name, Jetski::ClassName()) || IslePathActor::IsA(p_name);
}
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
void VTable0x70(float p_float) override; // vtable+0x70
MxLong HandleClick() override; // vtable+0xcc
MxLong HandleControl(LegoControlManagerEvent&) override; // vtable+0xd4
void Exit() override; // vtable+0xe4
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
void VTable0x70(float p_float) override; // vtable+0x70
MxLong HandleClick() override; // vtable+0xcc
MxLong HandleControl(LegoControlManagerNotificationParam&) override; // vtable+0xd4
void Exit() override; // vtable+0xe4
void FUN_1007e990();

12
LEGO1/lego/legoomni/include/jetskirace.h
View File

@@ -48,12 +48,12 @@ public:
return !strcmp(p_name, JetskiRace::ClassName()) || LegoRace::IsA(p_name);
}
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
void ReadyWorld() override; // vtable+0x50
MxBool Escape() override; // vtable+0x64
MxLong HandleClick(LegoEventNotificationParam&) override; // vtable+0x6c
MxLong HandlePathStruct(LegoPathStructEvent&) override; // vtable+0x70
MxLong HandleEndAction(MxEndActionNotificationParam&) override; // vtable+0x74
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
void ReadyWorld() override; // vtable+0x50
MxBool Escape() override; // vtable+0x64
MxLong HandleClick(LegoEventNotificationParam&) override; // vtable+0x6c
MxLong HandlePathStruct(LegoPathStructNotificationParam&) override; // vtable+0x70
MxLong HandleEndAction(MxEndActionNotificationParam&) override; // vtable+0x74
};
// SYNTHETIC: LEGO1 0x1000f530

4
LEGO1/lego/legoomni/include/jukebox.h
View File

@@ -6,7 +6,7 @@
#include "legostate.h"
#include "legoworld.h"
class LegoControlManagerEvent;
class LegoControlManagerNotificationParam;
// VTABLE: LEGO1 0x100d4a90
// SIZE 0x10
@@ -79,7 +79,7 @@ public:
// JukeBox::`scalar deleting destructor'
private:
MxBool HandleControl(LegoControlManagerEvent& p_param);
MxBool HandleControl(LegoControlManagerNotificationParam& p_param);
LegoGameState::Area m_destLocation; // 0xf8
JukeBoxState* m_state; // 0xfc

22
LEGO1/lego/legoomni/include/legocontrolmanager.h
View File

@@ -10,9 +10,9 @@ class MxControlPresenter;
// VTABLE: LEGO1 0x100d6a98
// SIZE 0x2c
class LegoControlManagerEvent : public LegoEventNotificationParam {
class LegoControlManagerNotificationParam : public LegoEventNotificationParam {
public:
inline LegoControlManagerEvent() : LegoEventNotificationParam()
inline LegoControlManagerNotificationParam() : LegoEventNotificationParam()
{
m_clickedObjectId = -1;
m_clickedAtom = NULL;
@@ -34,10 +34,10 @@ public:
};
// SYNTHETIC: LEGO1 0x10028bf0
// LegoControlManagerEvent::`scalar deleting destructor'
// LegoControlManagerNotificationParam::`scalar deleting destructor'
// SYNTHETIC: LEGO1 0x10028c60
// LegoControlManagerEvent::~LegoControlManagerEvent
// LegoControlManagerNotificationParam::~LegoControlManagerNotificationParam
// VTABLE: LEGO1 0x100d6a80
class LegoControlManager : public MxCore {
@@ -84,13 +84,13 @@ public:
// LegoControlManager::`scalar deleting destructor'
private:
undefined4 m_unk0x08; // 0x08
undefined4 m_unk0x0c; // 0x0c
MxBool m_unk0x10; // 0x10
MxPresenter* m_unk0x14; // 0x14
LegoControlManagerEvent m_event; // 0x18
MxPresenterList* m_presenterList; // 0x44
LegoNotifyList m_notifyList; // 0x48
undefined4 m_unk0x08; // 0x08
undefined4 m_unk0x0c; // 0x0c
MxBool m_unk0x10; // 0x10
MxPresenter* m_unk0x14; // 0x14
LegoControlManagerNotificationParam m_event; // 0x18
MxPresenterList* m_presenterList; // 0x44
LegoNotifyList m_notifyList; // 0x48
};
#endif // LEGOCONTROLMANAGER_H

11
LEGO1/lego/legoomni/include/legopathstruct.h
View File

@@ -11,9 +11,10 @@ class LegoWorld;
// VTABLE: LEGO1 0x100d6230
// SIZE 0x10
class LegoPathStructEvent : public MxNotificationParam {
class LegoPathStructNotificationParam : public MxNotificationParam {
public:
LegoPathStructEvent(NotificationId p_type, MxCore* p_sender, MxU8 p_trigger, MxS16 p_data) : MxNotificationParam()
LegoPathStructNotificationParam(NotificationId p_type, MxCore* p_sender, MxU8 p_trigger, MxS16 p_data)
: MxNotificationParam()
{
m_type = p_type;
m_sender = p_sender;
@@ -24,7 +25,7 @@ public:
// FUNCTION: LEGO1 0x1001bac0
MxNotificationParam* Clone() const override
{
return new LegoPathStructEvent(m_type, m_sender, m_trigger, m_data);
return new LegoPathStructNotificationParam(m_type, m_sender, m_trigger, m_data);
} // vtable+0x04
inline MxU8 GetTrigger() { return m_trigger; }
@@ -99,10 +100,10 @@ private:
};
// SYNTHETIC: LEGO1 0x1001bb80
// LegoPathStructEvent::`scalar deleting destructor'
// LegoPathStructNotificationParam::`scalar deleting destructor'
// SYNTHETIC: LEGO1 0x1001bbf0
// LegoPathStructEvent::~LegoPathStructEvent
// LegoPathStructNotificationParam::~LegoPathStructNotificationParam
// SYNTHETIC: LEGO1 0x10047440
// LegoPathStructBase::`scalar deleting destructor'

12
LEGO1/lego/legoomni/include/legorace.h
View File

@@ -13,7 +13,7 @@ class LegoEventNotificationParam;
class LegoPathActor;
class MxEndActionNotificationParam;
class MxNotificationParam;
class LegoPathStructEvent;
class LegoPathStructNotificationParam;
// VTABLE: LEGO1 0x100d5e30
// SIZE 0x2c
@@ -114,11 +114,11 @@ public:
// FUNCTION: LEGO1 0x1000dae0
MxBool VTable0x5c() override { return TRUE; } // vtable+0x5c
MxBool Escape() override; // vtable+0x64
void Enable(MxBool p_enable) override; // vtable+0x68
virtual MxLong HandleClick(LegoEventNotificationParam&) = 0; // vtable+0x6c
virtual MxLong HandlePathStruct(LegoPathStructEvent&); // vtable+0x70
virtual MxLong HandleEndAction(MxEndActionNotificationParam&); // vtable+0x74
MxBool Escape() override; // vtable+0x64
void Enable(MxBool p_enable) override; // vtable+0x68
virtual MxLong HandleClick(LegoEventNotificationParam&) = 0; // vtable+0x6c
virtual MxLong HandlePathStruct(LegoPathStructNotificationParam&); // vtable+0x70
virtual MxLong HandleEndAction(MxEndActionNotificationParam&); // vtable+0x74
// FUNCTION: LEGO1 0x1000dab0
virtual MxLong HandleType0Notification(MxNotificationParam&) { return 0; } // vtable+0x78

2
LEGO1/lego/legoomni/include/legovariables.h
View File

@@ -3,6 +3,8 @@
#include "mxvariable.h"
extern const char* g_varMOTOSPEED;
extern const char* g_varMOTOFUEL;
extern const char* g_varAMBULSPEED;
extern const char* g_varAMBULFUEL;
extern const char* g_varTOWFUEL;

26
LEGO1/lego/legoomni/include/motocycle.h → LEGO1/lego/legoomni/include/motorcycle.h
View File

@@ -1,5 +1,5 @@
#ifndef MOTOCYCLE_H
#define MOTOCYCLE_H
#ifndef MOTORCYCLE_H
#define MOTORCYCLE_H
#include "decomp.h"
#include "islepathactor.h"
@@ -23,22 +23,22 @@ public:
return !strcmp(p_name, Motocycle::ClassName()) || IslePathActor::IsA(p_name);
}
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
void VTable0x70(float p_float) override; // vtable+0x70
MxLong HandleClick() override; // vtable+0xcc
MxLong HandleControl(LegoControlManagerEvent& p_param) override; // vtable+0xd4
MxLong HandlePathStruct(LegoPathStructEvent&) override; // vtable+0xdc
void Exit() override; // vtable+0xe4
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
void VTable0x70(float p_time) override; // vtable+0x70
MxLong HandleClick() override; // vtable+0xcc
MxLong HandleControl(LegoControlManagerNotificationParam& p_param) override; // vtable+0xd4
MxLong HandlePathStruct(LegoPathStructNotificationParam&) override; // vtable+0xdc
void Exit() override; // vtable+0xe4
void FUN_10035e10();
void ActivateSceneActions();
// SYNTHETIC: LEGO1 0x100359d0
// Motocycle::`scalar deleting destructor'
private:
undefined m_unk0x160[4];
MxFloat m_unk0x164;
undefined m_unk0x168[4];
undefined m_unk0x160[4]; // 0x160
MxFloat m_fuel; // 0x164
MxFloat m_time; // 0x168
};
#endif // MOTOCYCLE_H
#endif // MOTORCYCLE_H

4
LEGO1/lego/legoomni/include/mxcontrolpresenter.h
View File

@@ -4,7 +4,7 @@
#include "decomp.h"
#include "mxcompositepresenter.h"
class LegoControlManagerEvent;
class LegoControlManagerNotificationParam;
class MxVideoPresenter;
// VTABLE: LEGO1 0x100d7b88
@@ -39,7 +39,7 @@ public:
virtual void VTable0x68(MxBool p_unk0x50); // vtable+0x68
virtual void VTable0x6c(MxS16 p_unk0x4e); // vtable+0x6c
MxBool FUN_10044480(LegoControlManagerEvent* p_event, MxPresenter* p_presenter);
MxBool FUN_10044480(LegoControlManagerNotificationParam* p_param, MxPresenter* p_presenter);
MxBool FUN_10044270(MxS32 p_x, MxS32 p_y, MxVideoPresenter* p_presenter);
inline MxS16 GetUnknown0x4e() { return m_unk0x4e; }

6
LEGO1/lego/legoomni/include/pizza.h
View File

@@ -99,9 +99,9 @@ public:
}
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
undefined4 HandleClick() override; // vtable+0x68
undefined4 HandleEndAction(MxEndActionNotificationParam&) override; // vtable+0x74
undefined4 VTable0x80(MxParam&) override; // vtable+0x80
MxLong HandleClick() override; // vtable+0x68
MxLong HandleEndAction(MxEndActionNotificationParam&) override; // vtable+0x74
MxLong HandlePathStruct(LegoPathStructNotificationParam&) override; // vtable+0x80
void CreateState();
void FUN_10038220(MxU32 p_objectId);

2
LEGO1/lego/legoomni/include/pizzeria.h
View File

@@ -68,7 +68,7 @@ public:
}
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
undefined4 HandleClick() override; // vtable+0x68
MxLong HandleClick() override; // vtable+0x68
void CreateState();

4
LEGO1/lego/legoomni/include/police.h
View File

@@ -7,7 +7,7 @@
#include "legoworld.h"
#include "radio.h"
class LegoControlManagerEvent;
class LegoControlManagerNotificationParam;
class LegoEventNotificationParam;
class MxDSAction;
@@ -79,7 +79,7 @@ public:
// Police::`scalar deleting destructor'
private:
MxLong HandleControl(LegoControlManagerEvent& p_param);
MxLong HandleControl(LegoControlManagerNotificationParam& p_param);
MxLong HandleEndAction(MxEndActionNotificationParam& p_param);
MxLong HandleKeyPress(LegoEventNotificationParam& p_param);

4
LEGO1/lego/legoomni/include/radio.h
View File

@@ -4,7 +4,7 @@
#include "legostate.h"
#include "mxcore.h"
class LegoControlManagerEvent;
class LegoControlManagerNotificationParam;
class MxAtomId;
class MxEndActionNotificationParam;
@@ -84,7 +84,7 @@ private:
MxBool m_audioEnabled; // 0x0d
MxLong HandleEndAction(MxEndActionNotificationParam& p_param);
MxLong HandleControl(LegoControlManagerEvent& p_param);
MxLong HandleControl(LegoControlManagerNotificationParam& p_param);
};
#endif // RADIO_H

4
LEGO1/lego/legoomni/include/registrationbook.h
View File

@@ -7,7 +7,7 @@ class InfocenterState;
class MxControlPresenter;
class MxEndActionNotificationParam;
class MxStillPresenter;
class LegoControlManagerEvent;
class LegoControlManagerNotificationParam;
// VTABLE: LEGO1 0x100d9928
// SIZE 0x2d0
@@ -64,7 +64,7 @@ private:
MxLong HandleEndAction(MxEndActionNotificationParam& p_param);
MxLong HandleKeyPress(MxU8 p_key);
MxLong HandleControl(LegoControlManagerEvent& p_param);
MxLong HandleControl(LegoControlManagerNotificationParam& p_param);
MxLong HandleNotification19(MxParam& p_param);
void FUN_100775c0(MxS16 p_playerIndex);
void WriteInfocenterLetters(MxS16);

4
LEGO1/lego/legoomni/include/score.h
View File

@@ -5,7 +5,7 @@
#include "legostate.h"
#include "legoworld.h"
class LegoControlManagerEvent;
class LegoControlManagerNotificationParam;
class MxEndActionNotificationParam;
// VTABLE: LEGO1 0x100d53f8
@@ -80,7 +80,7 @@ public:
void Paint();
MxLong FUN_10001510(MxEndActionNotificationParam& p_param);
MxLong FUN_100016d0(LegoControlManagerEvent& p_param);
MxLong FUN_100016d0(LegoControlManagerNotificationParam& p_param);
void FillArea(MxU32 i_activity, MxU32 i_actor, MxS16 score);
protected:

10
LEGO1/lego/legoomni/include/skateboard.h
View File

@@ -26,11 +26,11 @@ public:
return !strcmp(p_name, SkateBoard::ClassName()) || IslePathActor::IsA(p_name);
}
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
MxLong HandleClick() override; // vtable+0xcc
MxLong HandleNotification0() override; // vtable+0xd0
MxLong HandleControl(LegoControlManagerEvent& p_param) override; // vtable+0xd4
void Exit() override; // vtable+0xe4
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
MxLong HandleClick() override; // vtable+0xcc
MxLong HandleNotification0() override; // vtable+0xd0
MxLong HandleControl(LegoControlManagerNotificationParam& p_param) override; // vtable+0xd4
void Exit() override; // vtable+0xe4
inline void SetUnknown0x160(MxBool p_unk0x160) { m_unk0x160 = p_unk0x160; }

16
LEGO1/lego/legoomni/include/towtrack.h
View File

@@ -82,14 +82,14 @@ public:
return !strcmp(p_name, TowTrack::ClassName()) || IslePathActor::IsA(p_name);
}
MxLong Notify(MxParam& p_param) override; // vtable+0x04
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
void VTable0x70(float p_float) override; // vtable+0x70
MxLong HandleClick() override; // vtable+0xcc
MxLong HandleControl(LegoControlManagerEvent& p_param) override; // vtable+0xd4
MxLong HandleEndAnim(LegoEndAnimNotificationParam& p_param) override; // vtable+0xd8
MxLong HandlePathStruct(LegoPathStructEvent& p_param) override; // vtable+0xdc
void Exit() override; // vtable+0xe4
MxLong Notify(MxParam& p_param) override; // vtable+0x04
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
void VTable0x70(float p_float) override; // vtable+0x70
MxLong HandleClick() override; // vtable+0xcc
MxLong HandleControl(LegoControlManagerNotificationParam& p_param) override; // vtable+0xd4
MxLong HandleEndAnim(LegoEndAnimNotificationParam& p_param) override; // vtable+0xd8
MxLong HandlePathStruct(LegoPathStructNotificationParam& p_param) override; // vtable+0xdc
void Exit() override; // vtable+0xe4
void CreateState();
void FUN_1004dab0();