diff --git a/LEGO1/lego/legoomni/include/act2actor.h b/LEGO1/lego/legoomni/include/act2actor.h index 58455e90..6b39de3f 100644 --- a/LEGO1/lego/legoomni/include/act2actor.h +++ b/LEGO1/lego/legoomni/include/act2actor.h @@ -25,8 +25,8 @@ public: Act2Actor(); - void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2) override; // vtable+0x24 - void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30 + void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_updateTransform) override; // vtable+0x24 + void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30 // FUNCTION: LEGO1 0x1001a180 MxS32 VTable0x68(Vector3& p_v1, Vector3& p_v2, Vector3& p_v3) override diff --git a/LEGO1/lego/legoomni/include/legoactor.h b/LEGO1/lego/legoomni/include/legoactor.h index a3e68f2e..174ec4e1 100644 --- a/LEGO1/lego/legoomni/include/legoactor.h +++ b/LEGO1/lego/legoomni/include/legoactor.h @@ -40,8 +40,8 @@ public: return !strcmp(p_name, LegoActor::ClassName()) || LegoEntity::IsA(p_name); } - void ParseAction(char* p_extra) override; // vtable+0x20 - void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2) override; // vtable+0x24 + void ParseAction(char* p_extra) override; // vtable+0x20 + void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_updateTransform) override; // vtable+0x24 // FUNCTION: LEGO1 0x10002cc0 // FUNCTION: BETA10 0x1000f3e0 diff --git a/LEGO1/lego/legoomni/include/legoentity.h b/LEGO1/lego/legoomni/include/legoentity.h index ed1dd202..c4f81daf 100644 --- a/LEGO1/lego/legoomni/include/legoentity.h +++ b/LEGO1/lego/legoomni/include/legoentity.h @@ -53,10 +53,10 @@ public: return !strcmp(p_name, LegoEntity::ClassName()) || MxEntity::IsA(p_name); } - virtual MxResult Create(MxDSAction& p_dsAction); // vtable+0x18 - virtual void Destroy(MxBool p_fromDestructor); // vtable+0x1c - virtual void ParseAction(char* p_extra); // vtable+0x20 - virtual void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2); // vtable+0x24 + virtual MxResult Create(MxDSAction& p_dsAction); // vtable+0x18 + virtual void Destroy(MxBool p_fromDestructor); // vtable+0x1c + virtual void ParseAction(char* p_extra); // vtable+0x20 + virtual void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_updateTransform); // vtable+0x24 virtual void SetWorldTransform( const Vector3& p_location, const Vector3& p_direction, diff --git a/LEGO1/lego/legoomni/src/actors/act2actor.cpp b/LEGO1/lego/legoomni/src/actors/act2actor.cpp index 23697c6c..dcd7cb40 100644 --- a/LEGO1/lego/legoomni/src/actors/act2actor.cpp +++ b/LEGO1/lego/legoomni/src/actors/act2actor.cpp @@ -135,9 +135,9 @@ Act2Actor::Act2Actor() } // FUNCTION: LEGO1 0x10018940 -void Act2Actor::SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2) +void Act2Actor::SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_updateTransform) { - LegoAnimActor::SetROI(p_roi, p_bool1, p_bool2); + LegoAnimActor::SetROI(p_roi, p_bool1, p_updateTransform); m_roi->SetVisibility(FALSE); } diff --git a/LEGO1/lego/legoomni/src/entity/legoactor.cpp b/LEGO1/lego/legoomni/src/entity/legoactor.cpp index 4b0428b8..c2196f30 100644 --- a/LEGO1/lego/legoomni/src/entity/legoactor.cpp +++ b/LEGO1/lego/legoomni/src/entity/legoactor.cpp @@ -127,7 +127,7 @@ const char* LegoActor::GetActorName(MxU8 p_id) // FUNCTION: LEGO1 0x1002d670 // FUNCTION: BETA10 0x1003d65f -void LegoActor::SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2) +void LegoActor::SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_updateTransform) { if (p_roi) { const char* name = p_roi->GetName(); @@ -141,7 +141,7 @@ void LegoActor::SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2) } } - LegoEntity::SetROI(p_roi, p_bool1, p_bool2); + LegoEntity::SetROI(p_roi, p_bool1, p_updateTransform); } // FUNCTION: LEGO1 0x1002d6e0 diff --git a/LEGO1/lego/legoomni/src/entity/legoentity.cpp b/LEGO1/lego/legoomni/src/entity/legoentity.cpp index e0f3b810..d02c1c71 100644 --- a/LEGO1/lego/legoomni/src/entity/legoentity.cpp +++ b/LEGO1/lego/legoomni/src/entity/legoentity.cpp @@ -124,12 +124,12 @@ void LegoEntity::SetWorld() // FUNCTION: LEGO1 0x100108a0 // FUNCTION: BETA10 0x1007e724 -void LegoEntity::SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2) +void LegoEntity::SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_updateTransform) { m_roi = p_roi; if (m_roi != NULL) { - if (p_bool2) { + if (p_updateTransform) { MxMatrix mat; CalcLocalTransform( Mx3DPointFloat(m_worldLocation[0], m_worldLocation[1], m_worldLocation[2]),