isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-03-21 20:30:06 -04:00
Code Issues Projects Releases Packages Wiki Activity

Create (#289)

Browse source 
* Align name of Create method with known source
Fix name in Score for reccmp

* Also update MxEntity::Vtable0x14
This commit is contained in:
Nathan M Gilbert 2023-11-18 10:08:49 -05:00 committed by GitHub
parent eee80250c0
commit 93eb4dc82d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
LEGO1/helicopter.cpp
View file

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

2
LEGO1/helicopter.h
View file

@ -24,7 +24,7 @@ public:
return !strcmp(name, Helicopter::ClassName()) || IslePathActor::IsA(name); return !strcmp(name, Helicopter::ClassName()) || IslePathActor::IsA(name);
} }
virtual MxResult InitFromMxDSObject(MxDSObject& p_dsObject) override; // vtable+0x18 virtual MxResult Create(MxDSObject& p_dsObject) override; // vtable+0x18
virtual void VTable0xe4() override; virtual void VTable0xe4() override;
// OFFSET: LEGO1 0x10003210 TEMPLATE // OFFSET: LEGO1 0x10003210 TEMPLATE

4
LEGO1/islepathactor.cpp
View file

@ -44,9 +44,9 @@ IslePathActor::IslePathActor()
} }
// OFFSET: LEGO1 0x1001a280 // OFFSET: LEGO1 0x1001a280
MxResult IslePathActor::InitFromMxDSObject(MxDSObject& p_dsObject) MxResult IslePathActor::Create(MxDSObject& p_dsObject)
{ {
return MxEntity::InitFromMxDSObject(p_dsObject); return MxEntity::Create(p_dsObject);
} }
// OFFSET: LEGO1 0x1001a350 STUB // OFFSET: LEGO1 0x1001a350 STUB

20
LEGO1/islepathactor.h
View file

@ -28,16 +28,16 @@ public:
// IslePathActor::`scalar deleting destructor' // IslePathActor::`scalar deleting destructor'
inline virtual ~IslePathActor() override { IslePathActor::Destroy(TRUE); } inline virtual ~IslePathActor() override { IslePathActor::Destroy(TRUE); }
virtual MxResult InitFromMxDSObject(MxDSObject& p_dsObject) override; // vtable+0x18 virtual MxResult Create(MxDSObject& p_dsObject) override; // vtable+0x18
virtual void VTable0xcc(); // vtable+0xcc virtual void VTable0xcc(); // vtable+0xcc
virtual void VTable0xd0(); // vtable+0xd0 virtual void VTable0xd0(); // vtable+0xd0
virtual void VTable0xd4(); // vtable+0xd4 virtual void VTable0xd4(); // vtable+0xd4
virtual void VTable0xd8(); // vtable+0xd8 virtual void VTable0xd8(); // vtable+0xd8
virtual void VTable0xdc(); // vtable+0xdc virtual void VTable0xdc(); // vtable+0xdc
virtual void VTable0xe0(); // vtable+0xe0 virtual void VTable0xe0(); // vtable+0xe0
virtual void VTable0xe4(); // vtable+0xe4 virtual void VTable0xe4(); // vtable+0xe4
virtual void VTable0xe8(MxU32 p_1, MxBool p_2, MxU8 p_3); // vtable+0xe8 virtual void VTable0xe8(MxU32 p_1, MxBool p_2, MxU8 p_3); // vtable+0xe8
virtual void VTable0xec(); // vtable+0xec virtual void VTable0xec(); // vtable+0xec
inline void SetWorld(LegoWorld* p_world) { m_pLegoWorld = p_world; } inline void SetWorld(LegoWorld* p_world) { m_pLegoWorld = p_world; }
inline LegoWorld* GetWorld() { return m_pLegoWorld; } inline LegoWorld* GetWorld() { return m_pLegoWorld; }

2
LEGO1/legoentity.cpp
View file

@ -42,7 +42,7 @@ void LegoEntity::SetWorldTransform(MxVector3& p_loc, MxVector3& p_dir, MxVector3
} }
// OFFSET: LEGO1 0x100107e0 // OFFSET: LEGO1 0x100107e0
MxResult LegoEntity::InitFromMxDSObject(MxDSObject& p_dsObject) MxResult LegoEntity::Create(MxDSObject& p_dsObject)
{ {
m_mxEntityId = p_dsObject.GetObjectId(); m_mxEntityId = p_dsObject.GetObjectId();
m_atom = p_dsObject.GetAtomId(); m_atom = p_dsObject.GetAtomId();

2
LEGO1/legoentity.h
View file

@ -32,7 +32,7 @@ public:
return !strcmp(name, LegoEntity::ClassName()) || MxEntity::IsA(name); return !strcmp(name, LegoEntity::ClassName()) || MxEntity::IsA(name);
} }
virtual MxResult InitFromMxDSObject(MxDSObject& p_dsObject); // vtable+0x18 virtual MxResult Create(MxDSObject& p_dsObject); // 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/mxentity.cpp
View file

@ -14,7 +14,7 @@ MxEntity::~MxEntity()
} }
// OFFSET: LEGO1 0x10001070 // OFFSET: LEGO1 0x10001070
MxResult MxEntity::SetEntityId(MxS32 p_id, const MxAtomId& p_atom) MxResult MxEntity::Create(MxS32 p_id, const MxAtomId& p_atom)
{ {
this->m_mxEntityId = p_id; this->m_mxEntityId = p_id;
this->m_atom = p_atom; this->m_atom = p_atom;

4
LEGO1/mxentity.h
View file

@ -27,8 +27,8 @@ public:
return !strcmp(name, MxEntity::ClassName()) || MxCore::IsA(name); return !strcmp(name, MxEntity::ClassName()) || MxCore::IsA(name);
} }
virtual MxResult SetEntityId(MxS32 p_id, const MxAtomId& p_atom); // vtable+0x14 virtual MxResult Create(MxS32 p_id, const MxAtomId& p_atom); // vtable+0x14
inline MxResult InitFromMxDSObject(MxDSObject& p_dsObject) inline MxResult Create(MxDSObject& p_dsObject)
{ {
m_mxEntityId = p_dsObject.GetObjectId(); m_mxEntityId = p_dsObject.GetObjectId();
m_atom = p_dsObject.GetAtomId(); m_atom = p_dsObject.GetAtomId();

2
LEGO1/score.cpp
View file

@ -74,7 +74,7 @@ MxBool Score::VTable0x5c()
} }
// OFFSET: LEGO1 0x100012a0 // OFFSET: LEGO1 0x100012a0
MxResult Score::InitFromMxDSObject(MxDSObject& p_dsObject) MxResult Score::Create(MxDSObject& p_dsObject)
{ {
MxResult result = SetAsCurrentWorld(p_dsObject); MxResult result = SetAsCurrentWorld(p_dsObject);

12
LEGO1/score.h
View file

@ -29,13 +29,13 @@ public:
} }
// OFFSET: LEGO1 0x100011e0 TEMPLATE // OFFSET: LEGO1 0x100011e0 TEMPLATE
// Helicopter::`scalar deleting destructor' // Score::`scalar deleting destructor'
virtual MxResult InitFromMxDSObject(MxDSObject& p_dsObject) override; // vtable+18 virtual MxResult Create(MxDSObject& p_dsObject) override; // vtable+18
virtual void Stop() override; // vtable+50 virtual void Stop() 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
virtual void VTable0x68(MxBool p_add) override; // vtable+68 virtual void VTable0x68(MxBool p_add) override; // vtable+68
void Paint(); void Paint();
MxLong FUN_10001510(MxEndActionNotificationParam& p); MxLong FUN_10001510(MxEndActionNotificationParam& p);