From d41c94a853ac1ae5eb460dba6888cf8a2e6fd1b7 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Fri, 13 Dec 2024 14:41:03 -0700 Subject: [PATCH] Match --- .github/workflows/build.yml | 2 +- LEGO1/lego/legoomni/src/actors/act3ammo.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5a5b258e..d53dac46 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -139,7 +139,7 @@ jobs: run: | reccmp-reccmp -S CONFIGPROGRESS.SVG --svg-icon assets/config.png --target CONFIG | tee CONFIGPROGRESS.TXT reccmp-reccmp -S ISLEPROGRESS.SVG --svg-icon assets/isle.png --target ISLE | tee ISLEPROGRESS.TXT - reccmp-reccmp -S LEGO1PROGRESS.SVG -T 4332 --svg-icon assets/lego1.png --target LEGO1 | tee LEGO1PROGRESS.TXT + reccmp-reccmp -S LEGO1PROGRESS.SVG -T 4340 --svg-icon assets/lego1.png --target LEGO1 | tee LEGO1PROGRESS.TXT - name: Compare Accuracy With Current Master shell: bash diff --git a/LEGO1/lego/legoomni/src/actors/act3ammo.cpp b/LEGO1/lego/legoomni/src/actors/act3ammo.cpp index 18c2d59e..681d2141 100644 --- a/LEGO1/lego/legoomni/src/actors/act3ammo.cpp +++ b/LEGO1/lego/legoomni/src/actors/act3ammo.cpp @@ -279,7 +279,7 @@ void Act3Ammo::Animate(float p_time) local104.SetIdentity(); MxResult r = FUN_10053db0((m_unk0x7c / m_BADuration) * m_unk0x19c, local104); - assert(r == SUCCESS); + assert(r == 0); // SUCCESS local60.SetIdentity(); @@ -389,6 +389,7 @@ void Act3Ammo::Animate(float p_time) SoundManager()->GetCacheSoundManager()->Play("dnhitpz", NULL, FALSE); m_a3->RemoveDonut(*this); local14 = TRUE; + break; } } } @@ -417,6 +418,7 @@ void Act3Ammo::Animate(float p_time) SoundManager()->GetCacheSoundManager()->Play("pzhitdn", NULL, FALSE); m_a3->RemovePizza(*this); local14 = TRUE; + break; } } }