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

Rename LegoPathActor::VTable0x70 to UpdateState (#1219)

Browse Source
This commit is contained in:
Christian Semmler
2024-12-13 11:20:03 -07:00
committed by GitHub
parent 263d7d1e4f
commit ce3f71ea0f
44 changed files with 132 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -155,7 +155,7 @@ MxResult Act2Actor::VTable0x9c()
// FUNCTION: LEGO1 0x10018c30
// FUNCTION: BETA10 0x1000cb52
void Act2Actor::VTable0x70(float p_time)
void Act2Actor::UpdateState(float p_time)
{
int dummy1; // for BETA10, not sure what it is being used for
@@ -168,7 +168,7 @@ void Act2Actor::VTable0x70(float p_time)
g_unk0x100f0f1c = p_time;
#endif
LegoAnimActor::VTable0x70(p_time);
LegoAnimActor::UpdateState(p_time);
if (m_unk0x44 != 0.0f && m_unk0x44 < p_time) {
SetWorldSpeed(m_unk0x28);

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

@@ -34,13 +34,13 @@ Act3Actor::Act3Actor()
MxU32 Act3Actor::VTable0x90(float p_time, Matrix4& p_transform)
{
// Note: Code duplication with LegoExtraActor::VTable0x90
switch (m_state & 0xff) {
switch (m_actorFlags & 0xff) {
case 0:
case 1:
return TRUE;
case 2:
m_unk0x1c = p_time + 2000.0f;
m_state = 3;
m_actorFlags = 3;
m_actorTime += (p_time - m_lastTime) * m_worldSpeed;
m_lastTime = p_time;
return FALSE;
@@ -65,7 +65,7 @@ MxU32 Act3Actor::VTable0x90(float p_time, Matrix4& p_transform)
return FALSE;
}
else {
m_state = 0;
m_actorFlags = 0;
m_unk0x1c = 0;
positionRef -= g_unk0x10104ef0;
@@ -82,7 +82,7 @@ MxU32 Act3Actor::VTable0x90(float p_time, Matrix4& p_transform)
MxResult Act3Actor::HitActor(LegoPathActor* p_actor, MxBool p_bool)
{
if (!p_actor->GetUserNavFlag() && p_bool) {
if (p_actor->GetState()) {
if (p_actor->GetActorFlags()) {
return FAILURE;
}
@@ -96,7 +96,7 @@ MxResult Act3Actor::HitActor(LegoPathActor* p_actor, MxBool p_bool)
roi->FUN_100a58f0(local2world);
roi->VTable0x14();
p_actor->SetState(c_bit2 | c_bit9);
p_actor->SetActorFlags(c_bit2 | c_noCollide);
}
return SUCCESS;
@@ -108,7 +108,7 @@ Act3Cop::Act3Cop()
{
m_unk0x20 = -1.0f;
m_world = NULL;
SetState(c_disable);
SetActorFlags(c_disable);
}
// FUNCTION: LEGO1 0x1003ff70
@@ -154,7 +154,7 @@ void Act3Cop::ParseAction(char* p_extra)
}
// STUB: LEGO1 0x100401f0
void Act3Cop::VTable0x70(float p_time)
void Act3Cop::UpdateState(float p_time)
{
// TODO
}
@@ -194,7 +194,7 @@ Act3Brickster::Act3Brickster()
m_unk0x24 = 0.0f;
m_unk0x54 = 0;
SetState(c_disable);
SetActorFlags(c_disable);
m_unk0x58 = 0;
m_unk0x3c.Clear();
@@ -227,7 +227,7 @@ void Act3Brickster::ParseAction(char* p_extra)
}
// STUB: LEGO1 0x10041050
void Act3Brickster::VTable0x70(float p_time)
void Act3Brickster::UpdateState(float p_time)
{
// TODO
}
@@ -315,7 +315,7 @@ MxResult Act3Shark::FUN_10042ce0(Act3Ammo* p_ammo)
}
// STUB: LEGO1 0x10042d40
void Act3Shark::VTable0x70(float p_time)
void Act3Shark::UpdateState(float p_time)
{
// TODO
}

6
LEGO1/lego/legoomni/src/actors/act3ammo.cpp
View File

@@ -159,7 +159,7 @@ MxResult Act3Ammo::FUN_10053cb0(LegoPathController* p_p, LegoPathBoundary* p_bou
m_unk0x19c = p_unk0x19c;
m_unk0x7c = 0.0f;
m_lastTime = -1.0f;
m_state = 1;
m_actorFlags = 1;
return SUCCESS;
}
@@ -186,13 +186,13 @@ MxResult Act3Ammo::FUN_10053d30(LegoPathController* p_p, MxFloat p_unk0x19c)
m_unk0x19c = p_unk0x19c;
m_unk0x7c = 0.0f;
m_lastTime = -1.0f;
m_state = 1;
m_actorFlags = 1;
return SUCCESS;
}
// STUB: LEGO1 0x10054050
// STUB: BETA10 0x1001e362
void Act3Ammo::VTable0x70(float p_time)
void Act3Ammo::UpdateState(float p_time)
{
// TODO
}

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

@@ -87,9 +87,9 @@ MxResult Ambulance::Create(MxDSAction& p_dsAction)
}
// FUNCTION: LEGO1 0x10036300
void Ambulance::VTable0x70(float p_time)
void Ambulance::UpdateState(float p_time)
{
IslePathActor::VTable0x70(p_time);
IslePathActor::UpdateState(p_time);
if (UserActor() == this) {
char buf[200];

6
LEGO1/lego/legoomni/src/actors/doors.cpp
View File

@@ -65,7 +65,7 @@ MxFloat Doors::VTable0xcc(float p_time)
// FUNCTION: LEGO1 0x10066250
// FUNCTION: BETA10 0x10026a45
void Doors::VTable0x70(float p_time)
void Doors::UpdateState(float p_time)
{
assert(m_ltDoor && m_rtDoor);
@@ -75,7 +75,7 @@ void Doors::VTable0x70(float p_time)
switch (m_unk0x154) {
case 0:
m_unk0x154 = 1;
m_state = 0;
m_actorFlags = 0;
break;
case 1:
break;
@@ -108,7 +108,7 @@ void Doors::VTable0x70(float p_time)
m_ltDoor->VTable0x14();
m_rtDoor->VTable0x14();
m_unk0x154 = 1;
m_state = 0;
m_actorFlags = 0;
m_unk0x1f4 = 0;
}
}

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

@@ -48,9 +48,9 @@ MxResult DuneBuggy::Create(MxDSAction& p_dsAction)
}
// FUNCTION: LEGO1 0x10067ec0
void DuneBuggy::VTable0x70(float p_time)
void DuneBuggy::UpdateState(float p_time)
{
IslePathActor::VTable0x70(p_time);
IslePathActor::UpdateState(p_time);
char buf[200];
float speed = abs(m_worldSpeed);

12
LEGO1/lego/legoomni/src/actors/helicopter.cpp
View File

@@ -134,7 +134,7 @@ MxLong Helicopter::HandleClick()
((Isle*) CurrentWorld())->SetDestLocation(LegoGameState::e_copter);
FUN_10015820(TRUE, 0);
TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, TRUE);
SetState(LegoPathActor::c_disable);
SetActorFlags(LegoPathActor::c_disable);
PlayMusic(JukeboxScript::c_Jail_Music);
break;
case LegoGameState::e_act2:
@@ -199,7 +199,7 @@ MxLong Helicopter::HandleControl(LegoControlManagerNotificationParam& p_param)
m_state->m_unk0x08 = 1;
m_world->RemoveActor(this);
InvokeAction(Extra::ActionType::e_start, script, IsleScript::c_HelicopterTakeOff_Anim, NULL);
SetState(0);
SetActorFlags(0);
}
result = 1;
@@ -214,7 +214,7 @@ MxLong Helicopter::HandleControl(LegoControlManagerNotificationParam& p_param)
m_state->m_unk0x08 = 3;
m_world->RemoveActor(this);
InvokeAction(Extra::ActionType::e_start, script, IsleScript::c_HelicopterLand_Anim, NULL);
SetState(LegoPathActor::c_disable);
SetActorFlags(LegoPathActor::c_disable);
}
result = 1;
@@ -382,12 +382,12 @@ void Helicopter::VTable0x74(Matrix4& p_transform)
}
// FUNCTION: LEGO1 0x10003ee0
void Helicopter::VTable0x70(float p_time)
void Helicopter::UpdateState(float p_time)
{
MxU32 state = m_state->GetUnkown8();
switch (state) {
default:
LegoPathActor::VTable0x70(p_time);
LegoPathActor::UpdateState(p_time);
return;
case 4:
case 5:
@@ -419,7 +419,7 @@ void Helicopter::VTable0x70(float p_time)
else {
((Act3*) m_world)->FUN_10073430();
}
LegoPathActor::m_state = 4;
LegoPathActor::m_actorFlags = 4;
}
}
}

2
LEGO1/lego/legoomni/src/actors/islepathactor.cpp
View File

@@ -148,7 +148,7 @@ void IslePathActor::Exit()
m_previousActor->SetLocation(GetWorldPosition(), GetWorldDirection(), GetWorldUp(), TRUE);
}
m_previousActor->SetState(0);
m_previousActor->SetActorFlags(0);
GameState()->m_currentArea = LegoGameState::Area::e_unk66;
}

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

@@ -49,9 +49,9 @@ MxResult Jetski::Create(MxDSAction& p_dsAction)
}
// FUNCTION: LEGO1 0x1007e680
void Jetski::VTable0x70(float p_time)
void Jetski::UpdateState(float p_time)
{
IslePathActor::VTable0x70(p_time);
IslePathActor::UpdateState(p_time);
char buf[200];
float speed = abs(m_worldSpeed);

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

@@ -44,9 +44,9 @@ MxResult Motocycle::Create(MxDSAction& p_dsAction)
}
// FUNCTION: LEGO1 0x10035ad0
void Motocycle::VTable0x70(float p_time)
void Motocycle::UpdateState(float p_time)
{
IslePathActor::VTable0x70(p_time);
IslePathActor::UpdateState(p_time);
if (UserActor() == this) {
char buf[200];

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

@@ -202,7 +202,7 @@ void Pizza::FUN_100382b0()
m_act1state->m_unk0x018 = 0;
m_state->m_unk0x0c = 0;
UserActor()->SetState(0);
UserActor()->SetActorFlags(0);
g_isleFlags |= Isle::c_playMusic;
AnimationManager()->EnableCamAnims(TRUE);
AnimationManager()->FUN_1005f6d0(TRUE);
@@ -472,7 +472,7 @@ MxLong Pizza::HandleEndAction(MxEndActionNotificationParam& p_param)
m_state->m_unk0x0c = 4;
m_state->SetUnknown0xb0(IsleScript::c_noneIsle);
UserActor()->SetState(0);
UserActor()->SetActorFlags(0);
m_skateBoard->SetUnknown0x160(TRUE);
m_world->PlaceActor(m_skateBoard, "int37", 2, 0.5, 3, 0.5);

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

@@ -74,9 +74,9 @@ MxResult TowTrack::Create(MxDSAction& p_dsAction)
}
// FUNCTION: LEGO1 0x1004cb10
void TowTrack::VTable0x70(float p_time)
void TowTrack::UpdateState(float p_time)
{
IslePathActor::VTable0x70(p_time);
IslePathActor::UpdateState(p_time);
if (UserActor() == this) {
char buf[200];