AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-16 20:57:01 +00:00
Code Issues Projects Releases Wiki Activity

Minor CPhazonPool fixes

Browse Source
This commit is contained in:
Phillip Stephens
2021-04-13 19:09:55 -07:00
parent 4e38cf3574
commit 1039424737
2 changed files with 38 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Runtime/MP1/World/CPhazonPool.cpp
View File

@@ -153,25 +153,25 @@ void CPhazonPool::Think(float dt, CStateManager& mgr) {
x1c4_ = 0.f;
dVar5 = dt;
}
x1a0_ -= x1bc_ * (dt * x1cc_) + dVar5;
x1a4_ = x1a0_ / x19c_;
if (x1a4_ < 0.001f) {
if (x1e0_24_) {
shouldFree = true;
} else {
SetCallTouch(false);
if (x1e0_25_) {
x1dc_ = 0;
SetActive(false);
} else {
x1dc_ = 3;
x1d0_ = x1c8_;
}
}
SetEmitParticles(false);
}
x1cc_ = 0.f;
}
x1a0_ -= x1bc_ * (dt * x1cc_) + dVar5;
x1a4_ = x1a0_ / x19c_;
if (x1a4_ < 0.001f) {
if (x1e0_24_) {
shouldFree = true;
} else {
SetCallTouch(false);
if (x1e0_25_) {
x1dc_ = 0;
SetActive(false);
} else {
x1dc_ = 3;
x1d0_ = x1c8_;
}
}
SetEmitParticles(false);
}
x1cc_ = 0.f;
} else if (x1dc_ == 3) {
x1d0_ -= dt;
if (x1d0_ <= 0.f) {
@@ -180,6 +180,7 @@ void CPhazonPool::Think(float dt, CStateManager& mgr) {
}
}
if (shouldFree) {
fmt::print(FMT_STRING("Freeing myself! ({})"), GetUniqueId());
mgr.FreeScriptObject(GetUniqueId());
}
}