mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-24 00:44:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clear unknown parameter in LegoEntity::SetROI (#1688)

Browse Source
This commit is contained in:
Fabian Neundorf
2025-09-21 20:11:04 +02:00
committed by GitHub
parent c06ffe71b5
commit d05d583368
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,8 +25,8 @@ public:
Act2Actor(); Act2Actor();
void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2) override; // vtable+0x24 void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_updateTransform) override; // vtable+0x24
void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30 void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30
// FUNCTION: LEGO1 0x1001a180 // FUNCTION: LEGO1 0x1001a180
MxS32 VTable0x68(Vector3& p_v1, Vector3& p_v2, Vector3& p_v3) override MxS32 VTable0x68(Vector3& p_v1, Vector3& p_v2, Vector3& p_v3) override

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

@@ -40,8 +40,8 @@ public:
return !strcmp(p_name, LegoActor::ClassName()) || LegoEntity::IsA(p_name); return !strcmp(p_name, LegoActor::ClassName()) || LegoEntity::IsA(p_name);
} }
void ParseAction(char* p_extra) override; // vtable+0x20 void ParseAction(char* p_extra) override; // vtable+0x20
void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2) override; // vtable+0x24 void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_updateTransform) override; // vtable+0x24
// FUNCTION: LEGO1 0x10002cc0 // FUNCTION: LEGO1 0x10002cc0
// FUNCTION: BETA10 0x1000f3e0 // FUNCTION: BETA10 0x1000f3e0

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

@@ -53,10 +53,10 @@ public:
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_dsAction); // 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* p_extra); // vtable+0x20 virtual void ParseAction(char* p_extra); // 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_updateTransform); // vtable+0x24
virtual void SetWorldTransform( virtual void SetWorldTransform(
const Vector3& p_location, const Vector3& p_location,
const Vector3& p_direction, const Vector3& p_direction,

4
LEGO1/lego/legoomni/src/actors/act2actor.cpp
View File

@@ -135,9 +135,9 @@ Act2Actor::Act2Actor()
} }
// FUNCTION: LEGO1 0x10018940 // 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); m_roi->SetVisibility(FALSE);
} }

4
LEGO1/lego/legoomni/src/entity/legoactor.cpp
View File

@@ -127,7 +127,7 @@ const char* LegoActor::GetActorName(MxU8 p_id)
// FUNCTION: LEGO1 0x1002d670 // FUNCTION: LEGO1 0x1002d670
// FUNCTION: BETA10 0x1003d65f // 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) { if (p_roi) {
const char* name = p_roi->GetName(); 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 // FUNCTION: LEGO1 0x1002d6e0

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

@@ -124,12 +124,12 @@ void LegoEntity::SetWorld()
// FUNCTION: LEGO1 0x100108a0 // FUNCTION: LEGO1 0x100108a0
// FUNCTION: BETA10 0x1007e724 // 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; m_roi = p_roi;
if (m_roi != NULL) { if (m_roi != NULL) {
if (p_bool2) { if (p_updateTransform) {
MxMatrix mat; MxMatrix mat;
CalcLocalTransform( CalcLocalTransform(
Mx3DPointFloat(m_worldLocation[0], m_worldLocation[1], m_worldLocation[2]), Mx3DPointFloat(m_worldLocation[0], m_worldLocation[1], m_worldLocation[2]),