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

Minor consistency adjustments

Browse Source
This commit is contained in:
Christian Semmler 2024-11-30 09:50:30 -07:00
parent 9530c8a67c
commit a5e209f185
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,8 +20,8 @@ class Act3Actor : public LegoAnimActor {
return "Act3Actor"; return "Act3Actor";
} }
MxU32 VTable0x90(float, Matrix4&) override; // vtable+0x90 MxU32 VTable0x90(float p_float, Matrix4& p_transform) override; // vtable+0x90
MxResult VTable0x94(LegoPathActor*, MxBool) override; // vtable+0x94 MxResult VTable0x94(LegoPathActor* p_actor, MxBool p_bool) override; // vtable+0x94
// SYNTHETIC: LEGO1 0x10043330 // SYNTHETIC: LEGO1 0x10043330
// Act3Actor::`scalar deleting destructor' // Act3Actor::`scalar deleting destructor'

23
LEGO1/lego/legoomni/src/actors/act3actors.cpp
View File

@ -21,15 +21,13 @@ MxU32 Act3Actor::VTable0x90(float p_float, Matrix4& p_transform)
switch (m_state & 0xff) { switch (m_state & 0xff) {
case 0: case 0:
case 1: case 1:
return 1; return TRUE;
case 2: case 2:
m_unk0x1c = p_float + 2000.0f; m_unk0x1c = p_float + 2000.0f;
m_state = 3; m_state = 3;
m_actorTime += (p_float - m_lastTime) * m_worldSpeed; m_actorTime += (p_float - m_lastTime) * m_worldSpeed;
m_lastTime = p_float; m_lastTime = p_float;
return 0; return FALSE;
case 3: case 3:
assert(!m_userNavFlag); assert(!m_userNavFlag);
Vector3 positionRef(p_transform[3]); Vector3 positionRef(p_transform[3]);
@ -48,7 +46,7 @@ MxU32 Act3Actor::VTable0x90(float p_float, Matrix4& p_transform)
m_lastTime = p_float; m_lastTime = p_float;
VTable0x74(p_transform); VTable0x74(p_transform);
return 0; return FALSE;
} }
else { else {
m_state = 0; m_state = 0;
@ -57,11 +55,11 @@ MxU32 Act3Actor::VTable0x90(float p_float, Matrix4& p_transform)
((Vector3&) positionRef).Sub(g_unk0x10104ef0); ((Vector3&) positionRef).Sub(g_unk0x10104ef0);
m_roi->FUN_100a58f0(p_transform); m_roi->FUN_100a58f0(p_transform);
m_roi->VTable0x14(); m_roi->VTable0x14();
return 1; return TRUE;
} }
} }
return 0; return FALSE;
} }
// FUNCTION: LEGO1 0x1003fd90 // FUNCTION: LEGO1 0x1003fd90
@ -73,16 +71,17 @@ MxResult Act3Actor::VTable0x94(LegoPathActor* p_actor, MxBool p_bool)
} }
LegoROI* roi = p_actor->GetROI(); LegoROI* roi = p_actor->GetROI();
MxMatrix matr;
matr = roi->GetLocal2World();
Vector3 vector(matr[3]); MxMatrix local2world;
Vector3(matr[3]).Add(g_unk0x10104ef0); local2world = roi->GetLocal2World();
roi->FUN_100a58f0(matr); Vector3(local2world[3]).Add(g_unk0x10104ef0);
roi->FUN_100a58f0(local2world);
roi->VTable0x14(); roi->VTable0x14();
p_actor->SetState(c_bit2 | c_bit9); p_actor->SetState(c_bit2 | c_bit9);
} }
return SUCCESS; return SUCCESS;
} }