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

Rename UpdateState to Animate

Browse Source
This commit is contained in:
Christian Semmler 2024-12-13 12:16:47 -07:00
parent 9c9e0b6f7e
commit 60ad242fa2
34 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,7 @@ class Act2Actor : public LegoAnimActor {
void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2) override; // vtable+0x24
void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30
MxS32 VTable0x68(Vector3& p_v1, Vector3& p_v2, Vector3& p_v3) override; // vtable+0x68
void UpdateState(float p_time) override; // vtable+0x70
void Animate(float p_time) override; // vtable+0x70
MxResult HitActor(LegoPathActor*, MxBool) override; // vtable+0x94
MxResult VTable0x9c() override; // vtable+0x9c
MxS32 VTable0xa0() override; // vtable+0xa0

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

@ -50,7 +50,7 @@ class Act3Cop : public Act3Actor {
Act3Cop();
void ParseAction(char* p_extra) override; // vtable+0x20
void UpdateState(float p_time) override; // vtable+0x70
void Animate(float p_time) override; // vtable+0x70
MxResult HitActor(LegoPathActor*, MxBool) override; // vtable+0x94
MxResult VTable0x9c() override; // vtable+0x9c
@ -78,7 +78,7 @@ class Act3Brickster : public Act3Actor {
~Act3Brickster() override;
void ParseAction(char* p_extra) override; // vtable+0x20
void UpdateState(float p_time) override; // vtable+0x70
void Animate(float p_time) override; // vtable+0x70
MxResult HitActor(LegoPathActor* p_actor, MxBool p_bool) override; // vtable+0x94
void SwitchBoundary(
LegoPathBoundary*& p_boundary,
@ -128,8 +128,8 @@ class Act3Shark : public LegoAnimActor {
return "Act3Shark";
}
void ParseAction(char*) override; // vtable+0x20
void UpdateState(float p_time) override; // vtable+0x70
void ParseAction(char*) override; // vtable+0x20
void Animate(float p_time) override; // vtable+0x70
// LegoAnimActor vtable
virtual MxResult FUN_10042ce0(Act3Ammo* p_ammo); // vtable+0x10

2
LEGO1/lego/legoomni/include/act3ammo.h
View File

@ -22,7 +22,7 @@ class Act3Ammo : public LegoPathActor {
~Act3Ammo() override;
void Destroy(MxBool p_fromDestructor) override; // vtable+0x1c
void UpdateState(float p_time) override; // vtable+0x70
void Animate(float p_time) override; // vtable+0x70
// FUNCTION: BETA10 0x10017750
MxU32 IsValid() { return m_ammoFlag & c_valid; }

2
LEGO1/lego/legoomni/include/ambulance.h
View File

@ -124,7 +124,7 @@ class Ambulance : public IslePathActor {
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
void Destroy(MxBool p_fromDestructor) override; // vtable+0x1c
void UpdateState(float p_time) override; // vtable+0x70
void Animate(float p_time) override; // vtable+0x70
MxLong HandleClick() override; // vtable+0xcc
MxLong HandleControl(LegoControlManagerNotificationParam& p_param) override; // vtable+0xd4
MxLong HandlePathStruct(LegoPathStructNotificationParam& p_param) override; // vtable+0xdc

2
LEGO1/lego/legoomni/include/doors.h
View File

@ -25,7 +25,7 @@ class Doors : public LegoPathActor {
}
void ParseAction(char* p_extra) override; // vtable+0x20
void UpdateState(float p_time) override; // vtable+0x70
void Animate(float p_time) override; // vtable+0x70
MxResult HitActor(LegoPathActor* p_actor, MxBool p_bool) override; // vtable+0x94
virtual MxFloat VTable0xcc(float p_time); // vtable+0xcc

2
LEGO1/lego/legoomni/include/dunebuggy.h
View File

@ -24,7 +24,7 @@ class DuneBuggy : public IslePathActor {
}
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
void UpdateState(float p_time) override; // vtable+0x70
void Animate(float p_time) override; // vtable+0x70
MxLong HandleClick() override; // vtable+0xcc
MxLong HandleControl(LegoControlManagerNotificationParam& p_param) override; // vtable+0xd4
MxLong HandlePathStruct(LegoPathStructNotificationParam& p_param) override; // vtable+0xdc

2
LEGO1/lego/legoomni/include/helicopter.h
View File

@ -68,7 +68,7 @@ class Helicopter : public IslePathActor {
}
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
void UpdateState(float p_time) override; // vtable+0x70
void Animate(float p_time) override; // vtable+0x70
void VTable0x74(Matrix4& p_transform) override; // vtable+0x74
MxLong HandleClick() override; // vtable+0xcc
MxLong HandleControl(LegoControlManagerNotificationParam& p_param) override; // vtable+0xd4

2
LEGO1/lego/legoomni/include/jetski.h
View File

@ -26,7 +26,7 @@ class Jetski : public IslePathActor {
}
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
void UpdateState(float p_time) override; // vtable+0x70
void Animate(float p_time) override; // vtable+0x70
MxLong HandleClick() override; // vtable+0xcc
MxLong HandleControl(LegoControlManagerNotificationParam&) override; // vtable+0xd4
void Exit() override; // vtable+0xe4

2
LEGO1/lego/legoomni/include/legoanimactor.h
View File

@ -58,7 +58,7 @@ class LegoAnimActor : public virtual LegoPathActor {
void ParseAction(char* p_extra) override; // vtable+0x20
void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30
void UpdateState(float p_time) override; // vtable+0x70
void Animate(float p_time) override; // vtable+0x70
void VTable0x74(Matrix4& p_transform) override; // vtable+0x74
virtual MxResult FUN_1001c1f0(float& p_und);

2
LEGO1/lego/legoomni/include/legoextraactor.h
View File

@ -43,7 +43,7 @@ class LegoExtraActor : public virtual LegoAnimActor {
float p_f2,
Vector3& p_v3
) override; // vtable+0x6c
void UpdateState(float p_time) override; // vtable+0x70
void Animate(float p_time) override; // vtable+0x70
void VTable0x74(Matrix4& p_transform) override; // vtable+0x74
MxU32 VTable0x90(float p_time, Matrix4& p_matrix) override; // vtable+0x90
MxResult HitActor(LegoPathActor* p_actor, MxBool p_bool) override; // vtable+0x94

2
LEGO1/lego/legoomni/include/legojetskiraceactor.h
View File

@ -39,7 +39,7 @@ class LegoJetskiRaceActor : public virtual LegoCarRaceActor {
float p_f2,
Vector3& p_v3
) override; // vtable+0x6c
void UpdateState(float p_time) override; // vtable+0x70
void Animate(float p_time) override; // vtable+0x70
MxS32 VTable0x1c(LegoPathBoundary* p_boundary, LegoEdge* p_edge) override; // vtable+0x1c
// SYNTHETIC: LEGO1 0x10013a80

2
LEGO1/lego/legoomni/include/legopathactor.h
View File

@ -61,7 +61,7 @@ class LegoPathActor : public LegoActor {
float p_f2,
Vector3& p_v3
); // vtable+0x6c
virtual void UpdateState(float p_time); // vtable+0x70
virtual void Animate(float p_time); // vtable+0x70
virtual void VTable0x74(Matrix4& p_transform); // vtable+0x74
// FUNCTION: LEGO1 0x10002d20

6
LEGO1/lego/legoomni/include/legoracemap.h
View File

@ -21,9 +21,9 @@ class LegoRaceMap : public virtual LegoRaceActor {
~LegoRaceMap() override;
// LegoPathActor vtable
MxLong Notify(MxParam& p_param) override; // vtable+0x04
void ParseAction(char* p_extra) override; // vtable+0x20
void UpdateState(float p_time) override = 0; // vtable+0x70
MxLong Notify(MxParam& p_param) override; // vtable+0x04
void ParseAction(char* p_extra) override; // vtable+0x20
void Animate(float p_time) override = 0; // vtable+0x70
// LegoRaceMap vtable
virtual void FUN_1005d4b0(); // vtable+0x00

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

@ -67,7 +67,7 @@ class LegoRaceCar : public LegoCarRaceActor, public LegoRaceMap {
float p_f2,
Vector3& p_v3
) override; // vtable+0x6c
void UpdateState(float p_time) override; // vtable+0x70
void Animate(float p_time) override; // vtable+0x70
MxResult HitActor(LegoPathActor* p_actor, MxBool p_bool) override; // vtable+0x94
void SwitchBoundary(LegoPathBoundary*& p_boundary, LegoUnknown100db7f4*& p_edge, float& p_unk0xe4)
override; // vtable+0x98
@ -163,7 +163,7 @@ class LegoJetski : public LegoJetskiRaceActor, public LegoRaceMap {
float p_f2,
Vector3& p_v3
) override; // vtable+0x6c
void UpdateState(float p_time) override; // vtable+0x70
void Animate(float p_time) override; // vtable+0x70
MxResult HitActor(LegoPathActor* p_actor, MxBool p_bool) override; // vtable+0x94
void SwitchBoundary(LegoPathBoundary*& p_boundary, LegoUnknown100db7f4*& p_edge, float& p_unk0xe4)
override; // vtable+0x98

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

@ -42,8 +42,8 @@ class LegoCarRaceActor : public virtual LegoRaceActor {
float p_f1,
float p_f2,
Vector3& p_v3
) override; // vtable+0x6c
void UpdateState(float p_time) override; // vtable+0x70
) override; // vtable+0x6c
void Animate(float p_time) override; // vtable+0x70
void SwitchBoundary(LegoPathBoundary*& p_boundary, LegoUnknown100db7f4*& p_edge, float& p_unk0xe4)
override; // vtable+0x98
MxResult VTable0x9c() override; // vtable+0x9c

2
LEGO1/lego/legoomni/include/motorcycle.h
View File

@ -24,7 +24,7 @@ class Motocycle : public IslePathActor {
}
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
void UpdateState(float p_time) override; // vtable+0x70
void Animate(float p_time) override; // vtable+0x70
MxLong HandleClick() override; // vtable+0xcc
MxLong HandleControl(LegoControlManagerNotificationParam& p_param) override; // vtable+0xd4
MxLong HandlePathStruct(LegoPathStructNotificationParam&) override; // vtable+0xdc

2
LEGO1/lego/legoomni/include/towtrack.h
View File

@ -123,7 +123,7 @@ class TowTrack : public IslePathActor {
MxLong Notify(MxParam& p_param) override; // vtable+0x04
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
void UpdateState(float p_time) override; // vtable+0x70
void Animate(float p_time) override; // vtable+0x70
MxLong HandleClick() override; // vtable+0xcc
MxLong HandleControl(LegoControlManagerNotificationParam& p_param) override; // vtable+0xd4
MxLong HandleEndAnim(LegoEndAnimNotificationParam& p_param) override; // vtable+0xd8

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::UpdateState(float p_time)
void Act2Actor::Animate(float p_time)
{
int dummy1; // for BETA10, not sure what it is being used for
@ -168,7 +168,7 @@ void Act2Actor::UpdateState(float p_time)
g_unk0x100f0f1c = p_time;
#endif
LegoAnimActor::UpdateState(p_time);
LegoAnimActor::Animate(p_time);
if (m_unk0x44 != 0.0f && m_unk0x44 < p_time) {
SetWorldSpeed(m_unk0x28);

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

@ -156,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
}
@ -229,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
}
@ -317,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
}

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

@ -192,7 +192,7 @@ MxResult Act3Ammo::FUN_10053d30(LegoPathController* p_p, MxFloat p_unk0x19c)
// STUB: LEGO1 0x10054050
// STUB: BETA10 0x1001e362
void Act3Ammo::UpdateState(float p_time)
void Act3Ammo::Animate(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::UpdateState(float p_time)
void Ambulance::Animate(float p_time)
{
IslePathActor::UpdateState(p_time);
IslePathActor::Animate(p_time);
if (UserActor() == this) {
char buf[200];

2
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::UpdateState(float p_time)
void Doors::Animate(float p_time)
{
assert(m_ltDoor && m_rtDoor);

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::UpdateState(float p_time)
void DuneBuggy::Animate(float p_time)
{
IslePathActor::UpdateState(p_time);
IslePathActor::Animate(p_time);
char buf[200];
float speed = abs(m_worldSpeed);

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

@ -382,12 +382,12 @@ void Helicopter::VTable0x74(Matrix4& p_transform)
}
// FUNCTION: LEGO1 0x10003ee0
void Helicopter::UpdateState(float p_time)
void Helicopter::Animate(float p_time)
{
MxU32 state = m_state->GetUnkown8();
switch (state) {
default:
LegoPathActor::UpdateState(p_time);
LegoPathActor::Animate(p_time);
return;
case 4:
case 5:

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::UpdateState(float p_time)
void Jetski::Animate(float p_time)
{
IslePathActor::UpdateState(p_time);
IslePathActor::Animate(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::UpdateState(float p_time)
void Motocycle::Animate(float p_time)
{
IslePathActor::UpdateState(p_time);
IslePathActor::Animate(p_time);
if (UserActor() == this) {
char buf[200];

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::UpdateState(float p_time)
void TowTrack::Animate(float p_time)
{
IslePathActor::UpdateState(p_time);
IslePathActor::Animate(p_time);
if (UserActor() == this) {
char buf[200];

6
LEGO1/lego/legoomni/src/entity/legojetskiraceactor.cpp
View File

@ -119,7 +119,7 @@ MxS32 LegoJetskiRaceActor::VTable0x1c(LegoPathBoundary* p_boundary, LegoEdge* p_
}
// FUNCTION: LEGO1 0x10081550
void LegoJetskiRaceActor::UpdateState(float p_time)
void LegoJetskiRaceActor::Animate(float p_time)
{
if (m_unk0x0c == 0) {
const LegoChar* raceState = VariableTable()->GetVariable(g_raceState);
@ -129,12 +129,12 @@ void LegoJetskiRaceActor::UpdateState(float p_time)
m_unk0x1c = p_time;
}
else if (!m_userNavFlag) {
LegoAnimActor::UpdateState(m_lastTime + 1.0f);
LegoAnimActor::Animate(m_lastTime + 1.0f);
}
}
if (m_unk0x0c == 1) {
LegoAnimActor::UpdateState(p_time);
LegoAnimActor::Animate(p_time);
}
}

4
LEGO1/lego/legoomni/src/paths/legoanimactor.cpp
View File

@ -71,7 +71,7 @@ void LegoAnimActor::VTable0x74(Matrix4& p_transform)
// FUNCTION: LEGO1 0x1001c290
// FUNCTION: BETA10 0x1003e144
void LegoAnimActor::UpdateState(float p_time)
void LegoAnimActor::Animate(float p_time)
{
assert(m_roi);
@ -90,7 +90,7 @@ void LegoAnimActor::UpdateState(float p_time)
m_lastTime = m_actorTime = p_time;
}
else {
LegoPathActor::UpdateState(p_time);
LegoPathActor::Animate(p_time);
}
}

4
LEGO1/lego/legoomni/src/paths/legoextraactor.cpp
View File

@ -328,13 +328,13 @@ void LegoExtraActor::Restart()
}
// FUNCTION: LEGO1 0x1002b440
void LegoExtraActor::UpdateState(float p_time)
void LegoExtraActor::Animate(float p_time)
{
LegoAnimActorStruct* laas = NULL;
switch (m_whichAnim) {
case 0:
LegoAnimActor::UpdateState(p_time);
LegoAnimActor::Animate(p_time);
break;
case 1:
if (m_scheduledTime < p_time) {

2
LEGO1/lego/legoomni/src/paths/legopathactor.cpp
View File

@ -381,7 +381,7 @@ void LegoPathActor::VTable0x74(Matrix4& p_transform)
// FUNCTION: LEGO1 0x1002e790
// FUNCTION: BETA10 0x100af208
void LegoPathActor::UpdateState(float p_time)
void LegoPathActor::Animate(float p_time)
{
MxMatrix transform;
MxU32 b = FALSE;

2
LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp
View File

@ -367,7 +367,7 @@ void LegoPathController::FUN_10046970()
if (m_actors.find(actor) != m_actors.end()) {
if (!((MxU8) actor->GetActorState() & LegoPathActor::c_disabled)) {
actor->UpdateState(time);
actor->Animate(time);
}
}
}

8
LEGO1/lego/legoomni/src/race/legoracers.cpp
View File

@ -377,14 +377,14 @@ MxU32 LegoRaceCar::HandleSkeletonKicks(float p_param1)
// FUNCTION: LEGO1 0x100131f0
// FUNCTION: BETA10 0x100cb88a
void LegoRaceCar::UpdateState(float p_time)
void LegoRaceCar::Animate(float p_time)
{
if (m_userNavFlag && (m_userState == LEGORACECAR_KICK1 || m_userState == LEGORACECAR_KICK2)) {
FUN_10012ff0(p_time);
return;
}
LegoCarRaceActor::UpdateState(p_time);
LegoCarRaceActor::Animate(p_time);
if (m_userNavFlag && m_userState == LEGORACECAR_UNKNOWN_1) {
if (HandleSkeletonKicks(p_time)) {
@ -587,9 +587,9 @@ void LegoJetski::FUN_100136f0(float p_worldSpeed)
// FUNCTION: LEGO1 0x10013740
// FUNCTION: BETA10 0x100cc0ae
void LegoJetski::UpdateState(float p_time)
void LegoJetski::Animate(float p_time)
{
LegoJetskiRaceActor::UpdateState(p_time);
LegoJetskiRaceActor::Animate(p_time);
if (LegoCarRaceActor::m_unk0x0c == 1) {
FUN_1005d4b0();

4
LEGO1/lego/legoomni/src/race/legoracespecial.cpp
View File

@ -214,7 +214,7 @@ void LegoCarRaceActor::SwitchBoundary(LegoPathBoundary*& p_boundary, LegoUnknown
// FUNCTION: LEGO1 0x10080b70
// FUNCTION: BETA10 0x100cdbae
void LegoCarRaceActor::UpdateState(float p_time)
void LegoCarRaceActor::Animate(float p_time)
{
// m_unk0x0c is not an MxBool, there are places where it is set to 2 or higher
if (m_unk0x0c == 0) {
@ -228,7 +228,7 @@ void LegoCarRaceActor::UpdateState(float p_time)
}
if (m_unk0x0c == 1) {
LegoAnimActor::UpdateState(p_time);
LegoAnimActor::Animate(p_time);
}
}