isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-31 04:01:16 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Minor style fixes

Browse Source
This commit is contained in:
Christian Semmler 2024-01-13 14:56:40 -05:00
parent 5d0754849c
commit 4503454487
18 changed files with 40 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,7 @@ class Helicopter : public IslePathActor {
return !strcmp(p_name, Helicopter::ClassName()) || IslePathActor::IsA(p_name); return !strcmp(p_name, Helicopter::ClassName()) || IslePathActor::IsA(p_name);
} }
virtual MxResult Create(MxDSAction& p_dsObject) override; // vtable+0x18 virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
void VTable0x70(float p_float) override; // vtable+0x70 void VTable0x70(float p_float) override; // vtable+0x70
void VTable0x74(Matrix4& p_transform) override; // vtable+0x74 void VTable0x74(Matrix4& p_transform) override; // vtable+0x74
virtual MxU32 VTable0xcc() override; // vtable+0xcc virtual MxU32 VTable0xcc() override; // vtable+0xcc

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

@ -26,7 +26,7 @@ class Infocenter : public LegoWorld {
return !strcmp(p_name, Infocenter::ClassName()) || LegoWorld::IsA(p_name); return !strcmp(p_name, Infocenter::ClassName()) || LegoWorld::IsA(p_name);
} }
virtual MxResult Create(MxDSAction& p_dsObject) override; // vtable+0x18 virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
virtual void VTable0x50() override; // vtable+0x50 virtual void VTable0x50() override; // vtable+0x50
virtual MxBool VTable0x5c() override; // vtable+0x5c virtual MxBool VTable0x5c() override; // vtable+0x5c
virtual MxBool VTable0x64() override; // vtable+0x64 virtual MxBool VTable0x64() override; // vtable+0x64

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

@ -40,7 +40,7 @@ class Isle : public LegoWorld {
return !strcmp(p_name, Isle::ClassName()) || LegoWorld::IsA(p_name); return !strcmp(p_name, Isle::ClassName()) || LegoWorld::IsA(p_name);
} }
virtual MxResult Create(MxDSAction& p_dsObject) override; // vtable+0x18 virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
virtual void VTable0x50() override; // vtable+50 virtual void VTable0x50() override; // vtable+50
virtual void VTable0x58(MxCore* p_object) override; // vtable+58 virtual void VTable0x58(MxCore* p_object) override; // vtable+58
// FUNCTION: LEGO1 0x10030900 // FUNCTION: LEGO1 0x10030900

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

@ -28,7 +28,7 @@ class IslePathActor : public LegoPathActor {
return !strcmp(p_name, IslePathActor::ClassName()) || LegoPathActor::IsA(p_name); return !strcmp(p_name, IslePathActor::ClassName()) || LegoPathActor::IsA(p_name);
} }
virtual MxResult Create(MxDSAction& p_dsObject) override; // vtable+0x18 virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
// FUNCTION: LEGO1 0x10002e70 // FUNCTION: LEGO1 0x10002e70
virtual MxU32 VTable0xcc() { return 0; } // vtable+0xcc virtual MxU32 VTable0xcc() { return 0; } // vtable+0xcc
// FUNCTION: LEGO1 0x10002df0 // FUNCTION: LEGO1 0x10002df0

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

@ -32,7 +32,7 @@ class LegoEntity : public MxEntity {
return !strcmp(p_name, LegoEntity::ClassName()) || MxEntity::IsA(p_name); return !strcmp(p_name, LegoEntity::ClassName()) || MxEntity::IsA(p_name);
} }
virtual MxResult Create(MxDSAction& p_dsObject); // vtable+0x18 virtual MxResult Create(MxDSAction& p_dsAction); // vtable+0x18
virtual void Destroy(MxBool p_fromDestructor); // vtable+0x1c virtual void Destroy(MxBool p_fromDestructor); // vtable+0x1c
virtual void ParseAction(char*); // vtable+0x20 virtual void ParseAction(char*); // vtable+0x20
virtual void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2); // vtable+0x24 virtual void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2); // vtable+0x24

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

@ -116,7 +116,7 @@ class LegoOmni : public MxOmni {
MxDSAction& GetCurrentAction() { return m_action; } MxDSAction& GetCurrentAction() { return m_action; }
inline void SetNavController(LegoNavController* p_navController) { m_navController = p_navController; } inline void SetNavController(LegoNavController* p_navController) { m_navController = p_navController; }
inline void SetWorld(LegoWorld* p_world) { m_currentWorld = p_world; } inline void SetWorld(LegoWorld* p_currentWorld) { m_currentWorld = p_currentWorld; }
inline void SetExit(MxBool p_exit) { m_exit = p_exit; }; inline void SetExit(MxBool p_exit) { m_exit = p_exit; };
private: private:

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

@ -28,7 +28,7 @@ class LegoRace : public LegoWorld {
return !strcmp(p_name, LegoRace::ClassName()) || LegoWorld::IsA(p_name); return !strcmp(p_name, LegoRace::ClassName()) || LegoWorld::IsA(p_name);
} }
virtual MxResult Create(MxDSAction& p_dsObject) override; // vtable+0x18 virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
virtual MxBool VTable0x5c() override; // vtable+0x5c virtual MxBool VTable0x5c() override; // vtable+0x5c
virtual MxBool VTable0x64() override; // vtable+0x64 virtual MxBool VTable0x64() override; // vtable+0x64
virtual void VTable0x68(MxBool p_add) override; // vtable+0x68 virtual void VTable0x68(MxBool p_add) override; // vtable+0x68

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

@ -33,15 +33,15 @@ class LegoWorld : public LegoEntity {
return !strcmp(p_name, LegoWorld::ClassName()) || LegoEntity::IsA(p_name); return !strcmp(p_name, LegoWorld::ClassName()) || LegoEntity::IsA(p_name);
} }
virtual MxResult Create(MxDSAction& p_dsObject); // vtable+0x18 virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
virtual void VTable0x50(); // vtable+50 virtual void VTable0x50(); // vtable+0x50
virtual LegoCameraController* VTable0x54(); // vtable+54 virtual LegoCameraController* VTable0x54(); // vtable+0x54
virtual void VTable0x58(MxCore* p_object); // vtable+58 virtual void VTable0x58(MxCore* p_object); // vtable+0x58
virtual MxBool VTable0x5c(); // vtable+5c virtual MxBool VTable0x5c(); // vtable+0x5c
// FUNCTION: LEGO1 0x100010a0 // FUNCTION: LEGO1 0x100010a0
virtual void VTable0x60() {} // vtable+60 virtual void VTable0x60() {} // vtable+0x60
virtual MxBool VTable0x64(); // vtable+64 virtual MxBool VTable0x64(); // vtable+0x64
virtual void VTable0x68(MxBool p_add); // vtable+68 virtual void VTable0x68(MxBool p_add); // vtable+0x68
inline LegoCameraController* GetCamera() { return m_cameraController; } inline LegoCameraController* GetCamera() { return m_cameraController; }
inline undefined4 GetUnknown0xec() { return m_unk0xec; } inline undefined4 GetUnknown0xec() { return m_unk0xec; }

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

@ -31,7 +31,7 @@ class Score : public LegoWorld {
// SYNTHETIC: LEGO1 0x100011e0 // SYNTHETIC: LEGO1 0x100011e0
// Score::`scalar deleting destructor' // Score::`scalar deleting destructor'
virtual MxResult Create(MxDSAction& p_dsObject) override; // vtable+18 virtual MxResult Create(MxDSAction& p_dsAction) override; // vtable+18
virtual void VTable0x50() override; // vtable+50 virtual void VTable0x50() override; // vtable+50
virtual MxBool VTable0x5c() override; // vtable+5c virtual MxBool VTable0x5c() override; // vtable+5c
virtual MxBool VTable0x64() override; // vtable+64 virtual MxBool VTable0x64() override; // vtable+64

4
LEGO1/lego/legoomni/src/build/helicopter.cpp
View File

@ -27,9 +27,9 @@ Helicopter::~Helicopter()
} }
// FUNCTION: LEGO1 0x100032c0 // FUNCTION: LEGO1 0x100032c0
MxResult Helicopter::Create(MxDSAction& p_dsObject) MxResult Helicopter::Create(MxDSAction& p_dsAction)
{ {
MxResult result = IslePathActor::Create(p_dsObject); MxResult result = IslePathActor::Create(p_dsAction);
LegoWorld* world = GetCurrentWorld(); LegoWorld* world = GetCurrentWorld();
SetWorld(world); SetWorld(world);
if (world->IsA("Act3")) { if (world->IsA("Act3")) {

6
LEGO1/lego/legoomni/src/entity/legoentity.cpp
View File

@ -42,10 +42,10 @@ void LegoEntity::SetWorldTransform(const Vector3& p_loc, const Vector3& p_dir, c
} }
// FUNCTION: LEGO1 0x100107e0 // FUNCTION: LEGO1 0x100107e0
MxResult LegoEntity::Create(MxDSAction& p_dsObject) MxResult LegoEntity::Create(MxDSAction& p_dsAction)
{ {
m_mxEntityId = p_dsObject.GetObjectId(); m_mxEntityId = p_dsAction.GetObjectId();
m_atom = p_dsObject.GetAtomId(); m_atom = p_dsAction.GetAtomId();
Init(); Init();
return SUCCESS; return SUCCESS;
} }

2
LEGO1/lego/legoomni/src/entity/legorace.cpp
View File

@ -62,7 +62,7 @@ MxBool LegoRace::VTable0x64()
} }
// STUB: LEGO1 0x10015ce0 // STUB: LEGO1 0x10015ce0
MxResult LegoRace::Create(MxDSAction& p_dsObject) MxResult LegoRace::Create(MxDSAction& p_dsAction)
{ {
// TODO // TODO
return SUCCESS; return SUCCESS;

14
LEGO1/lego/legoomni/src/entity/legoworld.cpp
View File

@ -41,14 +41,14 @@ LegoWorld::~LegoWorld()
} }
// STUB: LEGO1 0x1001e0b0 // STUB: LEGO1 0x1001e0b0
MxResult LegoWorld::Create(MxDSAction& p_dsObject) MxResult LegoWorld::Create(MxDSAction& p_dsAction)
{ {
MxEntity::Create(p_dsObject); MxEntity::Create(p_dsAction);
// TODO: Intitialize lists // TODO: Intitialize lists
if (VTable0x54()) { if (VTable0x54()) {
if (p_dsObject.GetFlags() & 0x20) { if (p_dsAction.GetFlags() & MxDSAction::Flag_Enabled) {
if (GetCurrentWorld()) { if (GetCurrentWorld()) {
GetCurrentWorld()->VTable0x68(0); GetCurrentWorld()->VTable0x68(0);
} }
@ -86,7 +86,7 @@ MxLong LegoWorld::Notify(MxParam& p_param)
// FUNCTION: LEGO1 0x1001f630 // FUNCTION: LEGO1 0x1001f630
LegoCameraController* LegoWorld::VTable0x54() LegoCameraController* LegoWorld::VTable0x54()
{ {
MxBool ok = FALSE; MxBool success = FALSE;
if (!VideoManager()) { if (!VideoManager()) {
goto done; goto done;
@ -102,15 +102,17 @@ LegoCameraController* LegoWorld::VTable0x54()
VideoManager()->GetVideoParam().GetRect().GetWidth(), VideoManager()->GetVideoParam().GetRect().GetWidth(),
VideoManager()->GetVideoParam().GetRect().GetHeight() VideoManager()->GetVideoParam().GetRect().GetHeight()
); );
ok = TRUE;
success = TRUE;
done: done:
if (!ok) { if (!success) {
if (m_cameraController) { if (m_cameraController) {
delete m_cameraController; delete m_cameraController;
m_cameraController = NULL; m_cameraController = NULL;
} }
} }
return m_cameraController; return m_cameraController;
} }

2
LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
View File

@ -13,7 +13,7 @@ Infocenter::~Infocenter()
} }
// STUB: LEGO1 0x1006ed90 // STUB: LEGO1 0x1006ed90
MxResult Infocenter::Create(MxDSAction& p_dsObject) MxResult Infocenter::Create(MxDSAction& p_dsAction)
{ {
return FAILURE; return FAILURE;
} }

4
LEGO1/lego/legoomni/src/infocenter/score.cpp
View File

@ -39,9 +39,9 @@ Score::~Score()
} }
// FUNCTION: LEGO1 0x100012a0 // FUNCTION: LEGO1 0x100012a0
MxResult Score::Create(MxDSAction& p_dsObject) MxResult Score::Create(MxDSAction& p_dsAction)
{ {
MxResult result = LegoWorld::Create(p_dsObject); MxResult result = LegoWorld::Create(p_dsAction);
if (result == SUCCESS) { if (result == SUCCESS) {
InputManager()->SetWorld(this); InputManager()->SetWorld(this);

4
LEGO1/lego/legoomni/src/isle/isle.cpp
View File

@ -54,11 +54,11 @@ Isle::~Isle()
} }
// FUNCTION: LEGO1 0x10030b20 // FUNCTION: LEGO1 0x10030b20
MxResult Isle::Create(MxDSAction& p_dsObject) MxResult Isle::Create(MxDSAction& p_dsAction)
{ {
GameState()->FUN_1003ceb0(); GameState()->FUN_1003ceb0();
MxResult result = LegoWorld::Create(p_dsObject); MxResult result = LegoWorld::Create(p_dsAction);
if (result == SUCCESS) { if (result == SUCCESS) {
ControlManager()->Register(this); ControlManager()->Register(this);
InputManager()->SetWorld(this); InputManager()->SetWorld(this);

4
LEGO1/lego/legoomni/src/isle/islepathactor.cpp
View File

@ -12,9 +12,9 @@ IslePathActor::IslePathActor()
} }
// FUNCTION: LEGO1 0x1001a280 // FUNCTION: LEGO1 0x1001a280
MxResult IslePathActor::Create(MxDSAction& p_dsObject) MxResult IslePathActor::Create(MxDSAction& p_dsAction)
{ {
return MxEntity::Create(p_dsObject); return MxEntity::Create(p_dsAction);
} }
// STUB: LEGO1 0x1001a350 // STUB: LEGO1 0x1001a350

6
LEGO1/omni/include/mxentity.h
View File

@ -38,10 +38,10 @@ class MxEntity : public MxCore {
return SUCCESS; return SUCCESS;
}; // vtable+0x14 }; // vtable+0x14
inline MxResult Create(MxDSAction& p_dsObject) inline MxResult Create(MxDSAction& p_dsAction)
{ {
m_mxEntityId = p_dsObject.GetObjectId(); m_mxEntityId = p_dsAction.GetObjectId();
m_atom = p_dsObject.GetAtomId(); m_atom = p_dsAction.GetAtomId();
return SUCCESS; return SUCCESS;
} }