From 10b71d40b8fb8c3220ef0b1f0e6ff05f718a8ba5 Mon Sep 17 00:00:00 2001
From: lachwright <lachlanwright17@gmail.com>
Date: Tue, 31 Dec 2019 17:26:35 +0800
Subject: [PATCH] Make Metal Sonic's jet fume opaque when re-emerging from
water
---
src/p_user.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/src/p_user.c b/src/p_user.c
index 02dd77668a..bc45897514 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -11250,7 +11250,10 @@ static void P_DoMetalJetFume(player_t *player, mobj_t *fume)
if (panim == PA_WALK)
{
if (stat != fume->info->spawnstate)
+ {
+ fume->threshold = 0;
P_SetMobjState(fume, fume->info->spawnstate);
+ }
return;
}
}
@@ -11281,6 +11284,12 @@ static void P_DoMetalJetFume(player_t *player, mobj_t *fume)
if (underwater)
{
fume->frame = (fume->frame & FF_FRAMEMASK) | FF_ANIMATE | (P_RandomRange(0, 9) * FF_TRANS10);
+ fume->threshold = 1;
+ }
+ else if (fume->threshold)
+ {
+ fume->frame = (fume->frame & FF_FRAMEMASK) | fume->state->frame;
+ fume->threshold = 0;
}
}
--
GitLab