From 96241866bfaf297ac58b0b52baf7a4c6c473d64a Mon Sep 17 00:00:00 2001 From: Yukita Mayako Date: Fri, 19 Jun 2015 01:55:13 -0400 Subject: [PATCH] Fix Super float anim bug. This commit makes Super floating players break into a normal walk again when they hit the floor, instead of keeping their float animation on the ground. --- src/p_mobj.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index d6ba3866c..31067540f 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -2285,7 +2285,7 @@ static void P_PlayerZMovement(mobj_t *mo) { if (mo->player->speed >= FixedMul(mo->player->runspeed, mo->scale) && mo->player->panim != PA_RUN) P_SetPlayerMobjState(mo, S_PLAY_RUN); - else if ((mo->player->rmomx || mo->player->rmomy) && mo->player->panim != PA_WALK) + else if ((mo->player->rmomx || mo->player->rmomy) && (mo->player->panim != PA_WALK || mo->state-states == S_PLAY_SUPER_FLOAT)) P_SetPlayerMobjState(mo, S_PLAY_WALK); else if (!mo->player->rmomx && !mo->player->rmomy && mo->player->panim != PA_IDLE) P_SetPlayerMobjState(mo, S_PLAY_STND); @@ -2294,7 +2294,7 @@ static void P_PlayerZMovement(mobj_t *mo) { if (mo->player->speed >= FixedMul(mo->player->runspeed, mo->scale) && mo->player->panim != PA_RUN) P_SetPlayerMobjState(mo, S_PLAY_RUN); - else if ((mo->momx || mo->momy) && mo->player->panim != PA_WALK) + else if ((mo->momx || mo->momy) && (mo->player->panim != PA_WALK || mo->state-states == S_PLAY_SUPER_FLOAT)) P_SetPlayerMobjState(mo, S_PLAY_WALK); else if (!mo->momx && !mo->momy && mo->player->panim != PA_IDLE) P_SetPlayerMobjState(mo, S_PLAY_STND);