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

Rename functions

Browse Source
This commit is contained in:
Christian Semmler 2024-02-02 12:06:05 -05:00
parent fe86917659
commit f85a28e778
32 changed files with 62 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,7 @@ class Act3 : public LegoWorld {
MxBool VTable0x5c() override; // vtable+0x5c MxBool VTable0x5c() override; // vtable+0x5c
void VTable0x60() override; // vtable+0x60 void VTable0x60() override; // vtable+0x60
MxBool VTable0x64() override; // vtable+0x64 MxBool VTable0x64() override; // vtable+0x64
void VTable0x68(MxBool p_add) override; // vtable+0x68 void Enable(MxBool p_enable) override; // vtable+0x68
inline void SetUnkown420c(MxEntity* p_entity) { m_unk0x420c = p_entity; } inline void SetUnkown420c(MxEntity* p_entity) { m_unk0x420c = p_entity; }
inline void SetUnkown4270(MxU32 p_unk0x4270) { m_unk0x4270 = p_unk0x4270; } inline void SetUnkown4270(MxU32 p_unk0x4270) { m_unk0x4270 = p_unk0x4270; }

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

@ -34,8 +34,8 @@ class ElevatorBottom : public LegoWorld {
// FUNCTION: LEGO1 0x10017f10 // FUNCTION: LEGO1 0x10017f10
MxBool VTable0x5c() override { return TRUE; } // vtable+0x5c MxBool VTable0x5c() override { return TRUE; } // vtable+0x5c
MxBool VTable0x64() override; // vtable+0x64 MxBool VTable0x64() override; // vtable+0x64
void VTable0x68(MxBool p_add) override; // vtable+0x68 void Enable(MxBool p_enable) override; // vtable+0x68
// SYNTHETIC: LEGO1 0x10018040 // SYNTHETIC: LEGO1 0x10018040
// ElevatorBottom::`scalar deleting destructor' // ElevatorBottom::`scalar deleting destructor'

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

@ -33,7 +33,7 @@ class GasStation : public LegoWorld {
void ReadyWorld() override; // vtable+0x50 void ReadyWorld() override; // vtable+0x50
MxBool VTable0x5c() override; // vtable+0x5c MxBool VTable0x5c() override; // vtable+0x5c
MxBool VTable0x64() override; // vtable+0x64 MxBool VTable0x64() override; // vtable+0x64
void VTable0x68(MxBool p_add) override; // vtable+0x68 void Enable(MxBool p_enable) override; // vtable+0x68
// SYNTHETIC: LEGO1 0x100048a0 // SYNTHETIC: LEGO1 0x100048a0
// GasStation::`scalar deleting destructor' // GasStation::`scalar deleting destructor'

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

@ -31,7 +31,7 @@ class Hospital : public LegoWorld {
void ReadyWorld() override; // vtable+0x50 void ReadyWorld() override; // vtable+0x50
MxBool VTable0x5c() override; // vtable+0x5c MxBool VTable0x5c() override; // vtable+0x5c
MxBool VTable0x64() override; // vtable+0x64 MxBool VTable0x64() override; // vtable+0x64
void VTable0x68(MxBool p_add) override; // vtable+0x68 void Enable(MxBool p_enable) override; // vtable+0x68
// SYNTHETIC: LEGO1 0x100747d0 // SYNTHETIC: LEGO1 0x100747d0
// Hospital::`scalar deleting destructor' // Hospital::`scalar deleting destructor'

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

@ -188,7 +188,7 @@ class Infocenter : public LegoWorld {
void ReadyWorld() override; // vtable+0x50 void ReadyWorld() override; // vtable+0x50
MxBool VTable0x5c() override; // vtable+0x5c MxBool VTable0x5c() override; // vtable+0x5c
MxBool VTable0x64() override; // vtable+0x64 MxBool VTable0x64() override; // vtable+0x64
void VTable0x68(MxBool p_add) override; // vtable+0x68 void Enable(MxBool p_enable) override; // vtable+0x68
// SYNTHETIC: LEGO1 0x1006ec60 // SYNTHETIC: LEGO1 0x1006ec60
// Infocenter::`scalar deleting destructor' // Infocenter::`scalar deleting destructor'

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

@ -33,8 +33,8 @@ class InfocenterDoor : public LegoWorld {
// FUNCTION: LEGO1 0x100377a0 // FUNCTION: LEGO1 0x100377a0
MxBool VTable0x5c() override { return TRUE; } // vtable+0x5c MxBool VTable0x5c() override { return TRUE; } // vtable+0x5c
MxBool VTable0x64() override; // vtable+0x64 MxBool VTable0x64() override; // vtable+0x64
void VTable0x68(MxBool p_add) override; // vtable+0x68 void Enable(MxBool p_enable) override; // vtable+0x68
// SYNTHETIC: LEGO1 0x100378d0 // SYNTHETIC: LEGO1 0x100378d0
// InfocenterDoor::`scalar deleting destructor' // InfocenterDoor::`scalar deleting destructor'

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

@ -47,7 +47,7 @@ class Isle : public LegoWorld {
// FUNCTION: LEGO1 0x10033170 // FUNCTION: LEGO1 0x10033170
void VTable0x60() override {} // vtable+60 void VTable0x60() override {} // vtable+60
MxBool VTable0x64() override; // vtable+64 MxBool VTable0x64() override; // vtable+64
void VTable0x68(MxBool p_add) override; // vtable+68 void Enable(MxBool p_enable) override; // vtable+68
virtual void VTable0x6c(IslePathActor* p_actor); // vtable+6c virtual void VTable0x6c(IslePathActor* p_actor); // vtable+6c
inline void SetUnknown13c(MxU32 p_unk0x13c) { m_unk0x13c = p_unk0x13c; } inline void SetUnknown13c(MxU32 p_unk0x13c) { m_unk0x13c = p_unk0x13c; }

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

@ -30,7 +30,7 @@ class JukeBox : public LegoWorld {
void ReadyWorld() override; // vtable+0x50 void ReadyWorld() override; // vtable+0x50
MxBool VTable0x5c() override; // vtable+0x5c MxBool VTable0x5c() override; // vtable+0x5c
MxBool VTable0x64() override; // vtable+0x64 MxBool VTable0x64() override; // vtable+0x64
void VTable0x68(MxBool p_add) override; // vtable+0x68 void Enable(MxBool p_enable) override; // vtable+0x68
// SYNTHETIC: LEGO1 0x1005d810 // SYNTHETIC: LEGO1 0x1005d810
// JukeBox::`scalar deleting destructor' // JukeBox::`scalar deleting destructor'

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

@ -16,7 +16,7 @@ class LegoAct2 : public LegoWorld {
MxBool VTable0x5c() override; // vtable+0x5c MxBool VTable0x5c() override; // vtable+0x5c
void VTable0x60() override; // vtable+0x60 void VTable0x60() override; // vtable+0x60
MxBool VTable0x64() override; // vtable+0x64 MxBool VTable0x64() override; // vtable+0x64
void VTable0x68(MxBool p_add) override; // vtable+0x68 void Enable(MxBool p_enable) override; // vtable+0x68
// SYNTHETIC: LEGO1 0x1004fe20 // SYNTHETIC: LEGO1 0x1004fe20
// LegoAct2::`scalar deleting destructor' // LegoAct2::`scalar deleting destructor'

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

@ -30,7 +30,7 @@ class LegoCarBuild : public LegoWorld {
void ReadyWorld() override; // vtable+0x50 void ReadyWorld() override; // vtable+0x50
MxBool VTable0x5c() override; // vtable+0x5c MxBool VTable0x5c() override; // vtable+0x5c
MxBool VTable0x64() override; // vtable+0x64 MxBool VTable0x64() override; // vtable+0x64
void VTable0x68(MxBool p_add) override; // vtable+0x68 void Enable(MxBool p_enable) override; // vtable+0x68
// SYNTHETIC: LEGO1 0x10022a60 // SYNTHETIC: LEGO1 0x10022a60
// LegoCarBuild::`scalar deleting destructor' // LegoCarBuild::`scalar deleting destructor'

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

@ -31,7 +31,7 @@ class LegoRace : public LegoWorld {
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18 MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
MxBool VTable0x5c() override; // vtable+0x5c MxBool VTable0x5c() override; // vtable+0x5c
MxBool VTable0x64() override; // vtable+0x64 MxBool VTable0x64() override; // vtable+0x64
void VTable0x68(MxBool p_add) override; // vtable+0x68 void Enable(MxBool p_enable) override; // vtable+0x68
virtual undefined4 VTable0x6c(undefined4) = 0; // vtable+0x6c virtual undefined4 VTable0x6c(undefined4) = 0; // vtable+0x6c
virtual undefined4 VTable0x70(undefined4); // vtable+0x70 virtual undefined4 VTable0x70(undefined4); // vtable+0x70
virtual undefined4 VTable0x74(undefined4); // vtable+0x74 virtual undefined4 VTable0x74(undefined4); // vtable+0x74

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

@ -61,8 +61,8 @@ class LegoWorld : public LegoEntity {
// FUNCTION: LEGO1 0x100010a0 // FUNCTION: LEGO1 0x100010a0
virtual void VTable0x60() {} // vtable+0x60 virtual void VTable0x60() {} // vtable+0x60
virtual MxBool VTable0x64(); // vtable+0x64 virtual MxBool VTable0x64(); // vtable+0x64
virtual void VTable0x68(MxBool p_add); // vtable+0x68 virtual void Enable(MxBool p_enable); // 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/police.h
View File

@ -34,7 +34,7 @@ class Police : public LegoWorld {
void ReadyWorld() override; // vtable+0x50 void ReadyWorld() override; // vtable+0x50
MxBool VTable0x5c() override; // vtable+0x5c MxBool VTable0x5c() override; // vtable+0x5c
MxBool VTable0x64() override; // vtable+0x64 MxBool VTable0x64() override; // vtable+0x64
void VTable0x68(MxBool p_add) override; // vtable+0x68 void Enable(MxBool p_enable) override; // vtable+0x68
// SYNTHETIC: LEGO1 0x1005e300 // SYNTHETIC: LEGO1 0x1005e300
// Police::`scalar deleting destructor' // Police::`scalar deleting destructor'

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

@ -29,7 +29,7 @@ class RegistrationBook : public LegoWorld {
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18 MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
void ReadyWorld() override; // vtable+0x50 void ReadyWorld() override; // vtable+0x50
MxBool VTable0x64() override; // vtable+0x64 MxBool VTable0x64() override; // vtable+0x64
void VTable0x68(MxBool p_add) override; // vtable+0x68 void Enable(MxBool p_enable) override; // vtable+0x68
// SYNTHETIC: LEGO1 0x10076f30 // SYNTHETIC: LEGO1 0x10076f30
// RegistrationBook::`scalar deleting destructor' // RegistrationBook::`scalar deleting destructor'

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

@ -35,7 +35,7 @@ class Score : public LegoWorld {
void ReadyWorld() override; // vtable+50 void ReadyWorld() override; // vtable+50
MxBool VTable0x5c() override; // vtable+5c MxBool VTable0x5c() override; // vtable+5c
MxBool VTable0x64() override; // vtable+64 MxBool VTable0x64() override; // vtable+64
void VTable0x68(MxBool p_add) override; // vtable+68 void Enable(MxBool p_enable) override; // vtable+68
void Paint(); void Paint();
MxLong FUN_10001510(MxEndActionNotificationParam& p_param); MxLong FUN_10001510(MxEndActionNotificationParam& p_param);

2
LEGO1/lego/legoomni/src/act2/legoact2.cpp
View File

@ -35,7 +35,7 @@ void LegoAct2::ReadyWorld()
} }
// STUB: LEGO1 0x10050cf0 // STUB: LEGO1 0x10050cf0
void LegoAct2::VTable0x68(MxBool p_add) void LegoAct2::Enable(MxBool p_enable)
{ {
// TODO // TODO
} }

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

@ -77,7 +77,7 @@ void Act3::FUN_10073430()
} }
// STUB: LEGO1 0x10073a90 // STUB: LEGO1 0x10073a90
void Act3::VTable0x68(MxBool p_add) void Act3::Enable(MxBool p_enable)
{ {
// TODO // TODO
} }

2
LEGO1/lego/legoomni/src/build/legocarbuild.cpp
View File

@ -49,7 +49,7 @@ void LegoCarBuild::ReadyWorld()
} }
// STUB: LEGO1 0x100256c0 // STUB: LEGO1 0x100256c0
void LegoCarBuild::VTable0x68(MxBool p_add) void LegoCarBuild::Enable(MxBool p_enable)
{ {
// TODO // TODO
} }

2
LEGO1/lego/legoomni/src/common/legostate.cpp
View File

@ -7,7 +7,7 @@ DECOMP_SIZE_ASSERT(LegoState::Shuffle, 0x0c)
MxU32 LegoState::Shuffle::FUN_10014d00() MxU32 LegoState::Shuffle::FUN_10014d00()
{ {
// TODO // TODO
return 0; return m_objectIds[0];
} }
// STUB: LEGO1 0x10014de0 // STUB: LEGO1 0x10014de0

2
LEGO1/lego/legoomni/src/common/legoutil.cpp
View File

@ -118,7 +118,7 @@ MxBool CheckIfEntityExists(MxBool p_enable, const char* p_filename, MxS32 p_enti
LegoWorld* world = FindWorld(MxAtomId(p_filename, e_lowerCase2), p_entityId); LegoWorld* world = FindWorld(MxAtomId(p_filename, e_lowerCase2), p_entityId);
if (world) { if (world) {
world->VTable0x68(p_enable); world->Enable(p_enable);
return TRUE; return TRUE;
} }
else { else {

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

@ -82,7 +82,7 @@ MxLong LegoRace::Notify(MxParam& p_param)
} }
// STUB: LEGO1 0x10015ed0 // STUB: LEGO1 0x10015ed0
void LegoRace::VTable0x68(MxBool p_add) void LegoRace::Enable(MxBool p_enable)
{ {
// TODO // TODO
} }

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

@ -84,7 +84,7 @@ MxResult LegoWorld::Create(MxDSAction& p_dsAction)
if (p_dsAction.GetFlags() & MxDSAction::c_enabled) { if (p_dsAction.GetFlags() & MxDSAction::c_enabled) {
if (CurrentWorld()) { if (CurrentWorld()) {
CurrentWorld()->VTable0x68(0); CurrentWorld()->Enable(0);
} }
SetCurrentWorld(this); SetCurrentWorld(this);
@ -517,13 +517,13 @@ MxCore* LegoWorld::Find(const MxAtomId& p_atom, MxS32 p_entityId)
} }
// FUNCTION: LEGO1 0x10021a70 // FUNCTION: LEGO1 0x10021a70
void LegoWorld::VTable0x68(MxBool p_add) void LegoWorld::Enable(MxBool p_enable)
{ {
if (p_add && !m_set0xd0.empty()) { if (p_enable && !m_set0xd0.empty()) {
if (CurrentWorld() != this) { if (CurrentWorld() != this) {
if (CurrentWorld()) { if (CurrentWorld()) {
AnimationManager()->FUN_10061010(0); AnimationManager()->FUN_10061010(0);
CurrentWorld()->VTable0x68(FALSE); CurrentWorld()->Enable(FALSE);
LegoEntityListCursor cursor(m_entityList); LegoEntityListCursor cursor(m_entityList);
LegoEntity* entity; LegoEntity* entity;
@ -569,7 +569,7 @@ void LegoWorld::VTable0x68(MxBool p_add)
SetIsWorldActive(TRUE); SetIsWorldActive(TRUE);
} }
} }
else if (!p_add && m_set0xd0.empty()) { else if (!p_enable && m_set0xd0.empty()) {
MxPresenter* presenter; MxPresenter* presenter;
LegoPathController* controller; LegoPathController* controller;
IslePathActor* vehicle = CurrentVehicle(); IslePathActor* vehicle = CurrentVehicle();

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

@ -54,7 +54,7 @@ void GasStation::ReadyWorld()
} }
// STUB: LEGO1 0x10005c40 // STUB: LEGO1 0x10005c40
void GasStation::VTable0x68(MxBool p_add) void GasStation::Enable(MxBool p_enable)
{ {
// TODO // TODO
} }

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

@ -58,7 +58,7 @@ void Hospital::ReadyWorld()
} }
// STUB: LEGO1 0x10076220 // STUB: LEGO1 0x10076220
void Hospital::VTable0x68(MxBool p_add) void Hospital::Enable(MxBool p_enable)
{ {
// TODO // TODO
} }

6
LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
View File

@ -116,11 +116,11 @@ MxLong ElevatorBottom::HandleClick(LegoControlManagerEvent& p_param)
} }
// FUNCTION: LEGO1 0x100182c0 // FUNCTION: LEGO1 0x100182c0
void ElevatorBottom::VTable0x68(MxBool p_add) void ElevatorBottom::Enable(MxBool p_enable)
{ {
LegoWorld::VTable0x68(p_add); LegoWorld::Enable(p_enable);
if (p_add) { if (p_enable) {
InputManager()->SetWorld(this); InputManager()->SetWorld(this);
SetIsWorldActive(FALSE); SetIsWorldActive(FALSE);
} }

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

@ -709,11 +709,11 @@ MxLong Infocenter::HandleNotification0(MxNotificationParam& p_param)
} }
// FUNCTION: LEGO1 0x10070aa0 // FUNCTION: LEGO1 0x10070aa0
void Infocenter::VTable0x68(MxBool p_add) void Infocenter::Enable(MxBool p_enable)
{ {
LegoWorld::VTable0x68(p_add); LegoWorld::Enable(p_enable);
if (p_add) { if (p_enable) {
InputManager()->SetWorld(this); InputManager()->SetWorld(this);
SetIsWorldActive(FALSE); SetIsWorldActive(FALSE);
} }

6
LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
View File

@ -140,11 +140,11 @@ MxLong InfocenterDoor::HandleClick(LegoControlManagerEvent& p_param)
} }
// FUNCTION: LEGO1 0x10037c80 // FUNCTION: LEGO1 0x10037c80
void InfocenterDoor::VTable0x68(MxBool p_add) void InfocenterDoor::Enable(MxBool p_enable)
{ {
LegoWorld::VTable0x68(p_add); LegoWorld::Enable(p_enable);
if (p_add) { if (p_enable) {
InputManager()->SetWorld(this); InputManager()->SetWorld(this);
SetIsWorldActive(FALSE); SetIsWorldActive(FALSE);
} }

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

@ -42,7 +42,7 @@ MxResult RegistrationBook::Tickle()
} }
// STUB: LEGO1 0x10078180 // STUB: LEGO1 0x10078180
void RegistrationBook::VTable0x68(MxBool p_add) void RegistrationBook::Enable(MxBool p_enable)
{ {
// TODO // TODO
} }

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

@ -217,11 +217,11 @@ MxLong Score::FUN_100016d0(LegoControlManagerEvent& p_param)
} }
// FUNCTION: LEGO1 0x10001980 // FUNCTION: LEGO1 0x10001980
void Score::VTable0x68(MxBool p_add) void Score::Enable(MxBool p_enable)
{ {
LegoWorld::VTable0x68(p_add); LegoWorld::Enable(p_enable);
if (p_add) { if (p_enable) {
InputManager()->SetWorld(this); InputManager()->SetWorld(this);
SetIsWorldActive(FALSE); SetIsWorldActive(FALSE);
} }

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

@ -135,7 +135,7 @@ MxLong Isle::Notify(MxParam& p_param)
result = HandleType19Notification(p_param); result = HandleType19Notification(p_param);
break; break;
case c_notificationType20: case c_notificationType20:
VTable0x68(TRUE); Enable(TRUE);
break; break;
case c_notificationTransitioned: case c_notificationTransitioned:
result = HandleTransitionEnd(); result = HandleTransitionEnd();
@ -183,10 +183,22 @@ MxLong Isle::HandleType19Notification(MxParam& p_param)
} }
// STUB: LEGO1 0x10031820 // STUB: LEGO1 0x10031820
void Isle::VTable0x68(MxBool p_add) void Isle::Enable(MxBool p_enable)
{ {
LegoWorld::VTable0x68(p_add); if (m_set0xd0.empty() == p_enable)
// TODO return;
LegoWorld::Enable(p_enable);
m_radio.Initialize(p_enable);
if (p_enable) {
// TODO
}
else {
if (InputManager()->GetWorld() == this) {
InputManager()->ClearWorld();
}
}
} }
// STUB: LEGO1 0x10032620 // STUB: LEGO1 0x10032620

2
LEGO1/lego/legoomni/src/isle/jukebox.cpp
View File

@ -41,7 +41,7 @@ void JukeBox::ReadyWorld()
} }
// STUB: LEGO1 0x1005dde0 // STUB: LEGO1 0x1005dde0
void JukeBox::VTable0x68(MxBool p_add) void JukeBox::Enable(MxBool p_enable)
{ {
// TODO // TODO
} }

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

@ -77,7 +77,7 @@ void Police::ReadyWorld()
} }
// STUB: LEGO1 0x1005e740 // STUB: LEGO1 0x1005e740
void Police::VTable0x68(MxBool p_add) void Police::Enable(MxBool p_enable)
{ {
// TODO // TODO
} }