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

Rename var

Browse Source
This commit is contained in:
Christian Semmler 2024-12-19 12:15:36 -07:00
parent 18c36f8935
commit c9ca75ae7f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,7 +132,7 @@ class Act3Brickster : public Act3Actor {
Mx3DPointFloat m_unk0x3c; // 0x3c Mx3DPointFloat m_unk0x3c; // 0x3c
MxFloat m_unk0x50; // 0x50 MxFloat m_unk0x50; // 0x50
MxFloat m_unk0x54; // 0x54 MxFloat m_unk0x54; // 0x54
MxU8 m_unk0x58; // 0x58 MxU8 m_eatenPizzas; // 0x58
}; };
// VTABLE: LEGO1 0x100d7920 LegoPathActor // VTABLE: LEGO1 0x100d7920 LegoPathActor

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

@ -357,7 +357,7 @@ Act3Brickster::Act3Brickster()
m_unk0x54 = 0.0f; m_unk0x54 = 0.0f;
SetActorState(c_disabled); SetActorState(c_disabled);
m_unk0x58 = 0; m_eatenPizzas = 0;
m_unk0x3c.Clear(); m_unk0x3c.Clear();
} }
@ -410,13 +410,13 @@ void Act3Brickster::Animate(float p_time)
FUN_100417c0(); FUN_100417c0();
break; break;
case 2: case 2:
m_unk0x58++; m_eatenPizzas++;
m_unk0x20 = p_time + 2000.0f; m_unk0x20 = p_time + 2000.0f;
SetWorldSpeed(3.0f); SetWorldSpeed(3.0f);
assert(SoundManager()->GetCacheSoundManager()); assert(SoundManager()->GetCacheSoundManager());
if (m_unk0x58 >= 8) { if (m_eatenPizzas >= 8) {
((Act3*) m_world)->FUN_10072ad0(6); ((Act3*) m_world)->FUN_10072ad0(6);
} }
else { else {
@ -435,7 +435,7 @@ void Act3Brickster::Animate(float p_time)
assert(SoundManager()->GetCacheSoundManager()); assert(SoundManager()->GetCacheSoundManager());
SoundManager()->GetCacheSoundManager()->Play("thpt", NULL, FALSE); SoundManager()->GetCacheSoundManager()->Play("thpt", NULL, FALSE);
m_unk0x58 = 0; m_eatenPizzas = 0;
FUN_100417c0(); FUN_100417c0();
} }
else { else {
@ -471,7 +471,7 @@ void Act3Brickster::Animate(float p_time)
if (m_unk0x50 < p_time) { if (m_unk0x50 < p_time) {
((Act3*) m_world)->FUN_10073a60(); ((Act3*) m_world)->FUN_10073a60();
m_unk0x58 = 0; m_eatenPizzas = 0;
assert(SoundManager()->GetCacheSoundManager()); assert(SoundManager()->GetCacheSoundManager());
SoundManager()->GetCacheSoundManager()->Play("thpt", NULL, FALSE); SoundManager()->GetCacheSoundManager()->Play("thpt", NULL, FALSE);
@ -598,7 +598,7 @@ MxResult Act3Brickster::HitActor(LegoPathActor* p_actor, MxBool p_bool)
// FUNCTION: BETA10 0x1001a3cf // FUNCTION: BETA10 0x1001a3cf
MxResult Act3Brickster::FUN_100417a0(Act3Ammo& p_ammo, const Vector3&) MxResult Act3Brickster::FUN_100417a0(Act3Ammo& p_ammo, const Vector3&)
{ {
if (m_unk0x58 < 8) { if (m_eatenPizzas < 8) {
return FUN_100417c0(); return FUN_100417c0();
} }
@ -619,7 +619,7 @@ MxResult Act3Brickster::FUN_100417c0()
Vector3 local28(local70[3]); Vector3 local28(local70[3]);
Vector3 local20(local70[2]); Vector3 local20(local70[2]);
if (m_unk0x58 < 8 && m_unk0x24 + 5000.0f < m_lastTime) { if (m_eatenPizzas < 8 && m_unk0x24 + 5000.0f < m_lastTime) {
float local18; float local18;
for (MxS32 i = 0; i < MAX_PIZZAS; i++) { for (MxS32 i = 0; i < MAX_PIZZAS; i++) {