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

Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde

Browse Source
This commit is contained in:
Jack Andersen
2019-06-11 16:05:44 -10:00
parent e218b8aeb5 2f2ab149d4
commit 0e8e3e906c
15 changed files with 1025 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/World/CScriptPlatform.cpp
View File

@@ -40,7 +40,7 @@ CScriptPlatform::CScriptPlatform(
x350_rainGenRate = rainGenRate;
x356_24_dead = false;
;
x356_25_notAnimating = false;
x356_25_controlledAnimation = false;
x356_26_detectCollision = detectCollision;
x356_27_squishedRider = false;
x356_28_rainSplashes = rainSplashes;
@@ -252,7 +252,7 @@ void CScriptPlatform::Think(float dt, CStateManager& mgr) {
return;
if (HasModelData() && GetModelData()->HasAnimData()) {
if (!x356_25_notAnimating)
if (!x356_25_controlledAnimation)
UpdateAnimation(dt, mgr, true);
if (x356_28_rainSplashes && mgr.GetWorld()->GetNeededEnvFx() == EEnvFxType::Rain) {
if (HasModelData() && !GetModelData()->IsNull() && mgr.GetEnvFxManager()->IsSplashActive() &&