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

Refactor actor states, define enum (#1220)

Browse Source 
* Refactor actor states, define enum

* Revert

* Rename `UpdateState` to `Animate`
This commit is contained in:
Christian Semmler
2024-12-13 12:30:50 -07:00
committed by GitHub
parent ce3f71ea0f
commit 6da2faa48c
44 changed files with 161 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,20 +31,21 @@ Act3Actor::Act3Actor()
}
// FUNCTION: LEGO1 0x1003fb70
// FUNCTION: BETA10 0x100180ab
MxU32 Act3Actor::VTable0x90(float p_time, Matrix4& p_transform)
{
// Note: Code duplication with LegoExtraActor::VTable0x90
switch (m_actorFlags & 0xff) {
case 0:
case 1:
switch (m_actorState & c_maxState) {
case c_initial:
case c_one:
return TRUE;
case 2:
case c_two:
m_unk0x1c = p_time + 2000.0f;
m_actorFlags = 3;
m_actorState = c_three;
m_actorTime += (p_time - m_lastTime) * m_worldSpeed;
m_lastTime = p_time;
return FALSE;
case 3:
case c_three:
assert(!m_userNavFlag);
Vector3 positionRef(p_transform[3]);
@@ -65,7 +66,7 @@ MxU32 Act3Actor::VTable0x90(float p_time, Matrix4& p_transform)
return FALSE;
}
else {
m_actorFlags = 0;
m_actorState = c_initial;
m_unk0x1c = 0;
positionRef -= g_unk0x10104ef0;
@@ -79,10 +80,11 @@ MxU32 Act3Actor::VTable0x90(float p_time, Matrix4& p_transform)
}
// FUNCTION: LEGO1 0x1003fd90
// FUNCTION: BETA10 0x10018328
MxResult Act3Actor::HitActor(LegoPathActor* p_actor, MxBool p_bool)
{
if (!p_actor->GetUserNavFlag() && p_bool) {
if (p_actor->GetActorFlags()) {
if (p_actor->GetActorState() != c_initial) {
return FAILURE;
}
@@ -96,7 +98,7 @@ MxResult Act3Actor::HitActor(LegoPathActor* p_actor, MxBool p_bool)
roi->FUN_100a58f0(local2world);
roi->VTable0x14();
p_actor->SetActorFlags(c_bit2 | c_noCollide);
p_actor->SetActorState(c_two | c_noCollide);
}
return SUCCESS;
@@ -108,7 +110,7 @@ Act3Cop::Act3Cop()
{
m_unk0x20 = -1.0f;
m_world = NULL;
SetActorFlags(c_disable);
SetActorState(c_disabled);
}
// FUNCTION: LEGO1 0x1003ff70
@@ -154,7 +156,7 @@ void Act3Cop::ParseAction(char* p_extra)
}
// STUB: LEGO1 0x100401f0
void Act3Cop::UpdateState(float p_time)
void Act3Cop::Animate(float p_time)
{
// TODO
}
@@ -194,7 +196,7 @@ Act3Brickster::Act3Brickster()
m_unk0x24 = 0.0f;
m_unk0x54 = 0;
SetActorFlags(c_disable);
SetActorState(c_disabled);
m_unk0x58 = 0;
m_unk0x3c.Clear();
@@ -227,7 +229,7 @@ void Act3Brickster::ParseAction(char* p_extra)
}
// STUB: LEGO1 0x10041050
void Act3Brickster::UpdateState(float p_time)
void Act3Brickster::Animate(float p_time)
{
// TODO
}
@@ -315,7 +317,7 @@ MxResult Act3Shark::FUN_10042ce0(Act3Ammo* p_ammo)
}
// STUB: LEGO1 0x10042d40
void Act3Shark::UpdateState(float p_time)
void Act3Shark::Animate(float p_time)
{
// TODO
}