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

Browse Source
This commit is contained in:
Christian Semmler 2024-12-13 14:42:53 -07:00
parent 8cc1722f12
commit fe0fb31106
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,13 +120,13 @@ MxResult Act3Cop::HitActor(LegoPathActor* p_actor, MxBool p_bool)
LegoROI* roi = p_actor->GetROI(); LegoROI* roi = p_actor->GetROI();
if (p_bool && !strncmp(roi->GetName(), "dammo", 5)) { if (p_bool && !strncmp(roi->GetName(), "dammo", 5)) {
MxS32 count = -1; MxS32 index = -1;
if (sscanf(roi->GetName(), "dammo%d", &count) != 1) { if (sscanf(roi->GetName(), "dammo%d", &index) != 1) {
assert(0); assert(0);
} }
assert(m_world); assert(m_world);
((Act3*) m_world)->EatDonut(count); ((Act3*) m_world)->EatDonut(index);
m_unk0x20 = m_lastTime + 2000; m_unk0x20 = m_lastTime + 2000;
SetWorldSpeed(6.0); SetWorldSpeed(6.0);
@ -256,15 +256,15 @@ MxResult Act3Brickster::HitActor(LegoPathActor* p_actor, MxBool p_bool)
if (a3->m_cop1->GetROI() != r && a3->m_cop2->GetROI() != r) { if (a3->m_cop1->GetROI() != r && a3->m_cop2->GetROI() != r) {
if (!strncmp(r->GetName(), "pammo", 5)) { if (!strncmp(r->GetName(), "pammo", 5)) {
MxS32 count = -1; MxS32 index = -1;
if (sscanf(r->GetName(), "pammo%d", &count) != 1) { if (sscanf(r->GetName(), "pammo%d", &index) != 1) {
assert(0); assert(0);
} }
assert(m_world); assert(m_world);
if (a3->m_pizzas[count].IsValid() && !a3->m_pizzas[count].IsBit5()) { if (a3->m_pizzas[index].IsValid() && !a3->m_pizzas[index].IsBit5()) {
a3->EatPizza(count); a3->EatPizza(index);
} }
m_unk0x38 = 2; m_unk0x38 = 2;

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

@ -372,15 +372,15 @@ void Act3Ammo::Animate(float p_time)
float radius = r->GetWorldBoundingSphere().Radius(); float radius = r->GetWorldBoundingSphere().Radius();
if (local1b4.LenSquared() <= radius * radius) { if (local1b4.LenSquared() <= radius * radius) {
MxS32 count = -1; MxS32 index = -1;
if (sscanf(r->GetName(), "pammo%d", &count) != 1) { if (sscanf(r->GetName(), "pammo%d", &index) != 1) {
assert(0); assert(0);
} }
assert(m_world); assert(m_world);
if (m_world->m_pizzas[count].IsValid() && !m_world->m_pizzas[count].IsBit5()) { if (m_world->m_pizzas[index].IsValid() && !m_world->m_pizzas[index].IsBit5()) {
m_world->EatPizza(count); m_world->EatPizza(index);
m_world->m_brickster->FUN_100417c0(); m_world->m_brickster->FUN_100417c0();
} }
@ -404,14 +404,14 @@ void Act3Ammo::Animate(float p_time)
float radius = r->GetWorldBoundingSphere().Radius(); float radius = r->GetWorldBoundingSphere().Radius();
if (local1e4.LenSquared() <= radius * radius) { if (local1e4.LenSquared() <= radius * radius) {
MxS32 count = -1; MxS32 index = -1;
if (sscanf(r->GetName(), "dammo%d", &count) != 1) { if (sscanf(r->GetName(), "dammo%d", &index) != 1) {
assert(0); assert(0);
} }
assert(m_world); assert(m_world);
m_world->EatDonut(count); m_world->EatDonut(index);
if (IsPizza()) { if (IsPizza()) {
assert(SoundManager()->GetCacheSoundManager()); assert(SoundManager()->GetCacheSoundManager());