diff --git a/LEGO1/helicopter.cpp b/LEGO1/helicopter.cpp index 005d9b56..6e159a26 100644 --- a/LEGO1/helicopter.cpp +++ b/LEGO1/helicopter.cpp @@ -24,9 +24,9 @@ Helicopter::~Helicopter() } // 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(); SetWorld(world); if (world->IsA("Act3")) { diff --git a/LEGO1/helicopter.h b/LEGO1/helicopter.h index d9de2854..cc47b082 100644 --- a/LEGO1/helicopter.h +++ b/LEGO1/helicopter.h @@ -24,7 +24,7 @@ public: 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; // OFFSET: LEGO1 0x10003210 TEMPLATE diff --git a/LEGO1/islepathactor.cpp b/LEGO1/islepathactor.cpp index 9aca029b..21fca59a 100644 --- a/LEGO1/islepathactor.cpp +++ b/LEGO1/islepathactor.cpp @@ -44,9 +44,9 @@ IslePathActor::IslePathActor() } // 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 diff --git a/LEGO1/islepathactor.h b/LEGO1/islepathactor.h index c0222047..7885fbb2 100644 --- a/LEGO1/islepathactor.h +++ b/LEGO1/islepathactor.h @@ -28,16 +28,16 @@ public: // IslePathActor::`scalar deleting destructor' inline virtual ~IslePathActor() override { IslePathActor::Destroy(TRUE); } - virtual MxResult InitFromMxDSObject(MxDSObject& p_dsObject) override; // vtable+0x18 - virtual void VTable0xcc(); // vtable+0xcc - virtual void VTable0xd0(); // vtable+0xd0 - virtual void VTable0xd4(); // vtable+0xd4 - virtual void VTable0xd8(); // vtable+0xd8 - virtual void VTable0xdc(); // vtable+0xdc - virtual void VTable0xe0(); // vtable+0xe0 - virtual void VTable0xe4(); // vtable+0xe4 - virtual void VTable0xe8(MxU32 p_1, MxBool p_2, MxU8 p_3); // vtable+0xe8 - virtual void VTable0xec(); // vtable+0xec + virtual MxResult Create(MxDSObject& p_dsObject) override; // vtable+0x18 + virtual void VTable0xcc(); // vtable+0xcc + virtual void VTable0xd0(); // vtable+0xd0 + virtual void VTable0xd4(); // vtable+0xd4 + virtual void VTable0xd8(); // vtable+0xd8 + virtual void VTable0xdc(); // vtable+0xdc + virtual void VTable0xe0(); // vtable+0xe0 + virtual void VTable0xe4(); // vtable+0xe4 + virtual void VTable0xe8(MxU32 p_1, MxBool p_2, MxU8 p_3); // vtable+0xe8 + virtual void VTable0xec(); // vtable+0xec inline void SetWorld(LegoWorld* p_world) { m_pLegoWorld = p_world; } inline LegoWorld* GetWorld() { return m_pLegoWorld; } diff --git a/LEGO1/legoentity.cpp b/LEGO1/legoentity.cpp index 2a9b4b76..2ea9cee4 100644 --- a/LEGO1/legoentity.cpp +++ b/LEGO1/legoentity.cpp @@ -42,7 +42,7 @@ void LegoEntity::SetWorldTransform(MxVector3& p_loc, MxVector3& p_dir, MxVector3 } // OFFSET: LEGO1 0x100107e0 -MxResult LegoEntity::InitFromMxDSObject(MxDSObject& p_dsObject) +MxResult LegoEntity::Create(MxDSObject& p_dsObject) { m_mxEntityId = p_dsObject.GetObjectId(); m_atom = p_dsObject.GetAtomId(); diff --git a/LEGO1/legoentity.h b/LEGO1/legoentity.h index c0a16c32..7fe9c59b 100644 --- a/LEGO1/legoentity.h +++ b/LEGO1/legoentity.h @@ -32,7 +32,7 @@ public: 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 ParseAction(char*); // vtable+0x20 virtual void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2); // vtable+0x24 diff --git a/LEGO1/mxentity.cpp b/LEGO1/mxentity.cpp index 27067e37..524bb293 100644 --- a/LEGO1/mxentity.cpp +++ b/LEGO1/mxentity.cpp @@ -14,7 +14,7 @@ MxEntity::~MxEntity() } // 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_atom = p_atom; diff --git a/LEGO1/mxentity.h b/LEGO1/mxentity.h index 4ec82f1c..aa8df045 100644 --- a/LEGO1/mxentity.h +++ b/LEGO1/mxentity.h @@ -27,8 +27,8 @@ public: return !strcmp(name, MxEntity::ClassName()) || MxCore::IsA(name); } - virtual MxResult SetEntityId(MxS32 p_id, const MxAtomId& p_atom); // vtable+0x14 - inline MxResult InitFromMxDSObject(MxDSObject& p_dsObject) + virtual MxResult Create(MxS32 p_id, const MxAtomId& p_atom); // vtable+0x14 + inline MxResult Create(MxDSObject& p_dsObject) { m_mxEntityId = p_dsObject.GetObjectId(); m_atom = p_dsObject.GetAtomId(); diff --git a/LEGO1/score.cpp b/LEGO1/score.cpp index 1c122482..2b7f2d95 100644 --- a/LEGO1/score.cpp +++ b/LEGO1/score.cpp @@ -74,7 +74,7 @@ MxBool Score::VTable0x5c() } // OFFSET: LEGO1 0x100012a0 -MxResult Score::InitFromMxDSObject(MxDSObject& p_dsObject) +MxResult Score::Create(MxDSObject& p_dsObject) { MxResult result = SetAsCurrentWorld(p_dsObject); diff --git a/LEGO1/score.h b/LEGO1/score.h index 612bba4c..756ba089 100644 --- a/LEGO1/score.h +++ b/LEGO1/score.h @@ -29,13 +29,13 @@ public: } // OFFSET: LEGO1 0x100011e0 TEMPLATE - // Helicopter::`scalar deleting destructor' + // Score::`scalar deleting destructor' - virtual MxResult InitFromMxDSObject(MxDSObject& p_dsObject) override; // vtable+18 - virtual void Stop() override; // vtable+50 - virtual MxBool VTable0x5c() override; // vtable+5c - virtual MxBool VTable0x64() override; // vtable+64 - virtual void VTable0x68(MxBool p_add) override; // vtable+68 + virtual MxResult Create(MxDSObject& p_dsObject) override; // vtable+18 + virtual void Stop() override; // vtable+50 + virtual MxBool VTable0x5c() override; // vtable+5c + virtual MxBool VTable0x64() override; // vtable+64 + virtual void VTable0x68(MxBool p_add) override; // vtable+68 void Paint(); MxLong FUN_10001510(MxEndActionNotificationParam& p);