AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-21 03:39:11 +00:00
Code Issues Projects Releases Wiki Activity

Various knockback related fixes, don't call WaitForComplete in CGameaArea

Browse Source
This commit is contained in:
Phillip Stephens
2021-06-13 18:06:29 -07:00
parent ace87397d7
commit 933279ceb6
7 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/MP1/World/CThardus.cpp
View File

@@ -209,7 +209,7 @@ void CThardus::UpdateRockThermalState(float dt, CStateManager& mgr) {
void CThardus::sub801de9f8(CStateManager& mgr) {
float dVar5 = mgr.GetActiveRandom()->Float();
if (!sub801dc2c8() || dVar5 >= 0.3f) {
if (!IsLastRock() || dVar5 >= 0.3f) {
const float local_28 = std::max(0.f, dVar5 - 0.19999999f);
if (local_28 > 0.8f) {
x5c4_ = 2;
@@ -282,7 +282,7 @@ void CThardus::sub801dcfa4(CStateManager& mgr) {
ProcessSoundEvent(x758_, 1.f, 0, 0.1f, 1000.f, 0.16f, 1.f, zeus::skZero3f, GetTranslation(),
mgr.GetNextAreaId(), mgr, true);
if (sub801dc2c8() && !x8f0_) {
if (IsLastRock() && !x8f0_) {
DoDoubleSnap(mgr);
}
sub801dbc40();
@@ -317,7 +317,7 @@ void CThardus::Think(float dt, CStateManager& mgr) {
UpdateRockThermalState(dt, mgr);
if (!sub801dc2c8()) {
if (!IsLastRock()) {
// NOTE: (phil), yes this is what's actually happening
#if 0
if (x648_currentRock < x610_destroyableRocks.size() - 2) {