From 11a391dbb564b2240fe650d6597301deebab2577 Mon Sep 17 00:00:00 2001
From: toasterbabe <rollerorbital@gmail.com>
Date: Sat, 12 Nov 2016 15:06:49 +0000
Subject: [PATCH] Making FF_SPR2ENDSTATE consistent between P_SetMobjState and
P_SetPlayerMobjState.
---
src/p_mobj.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 669f8cd1f8..ff805f4db3 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -664,7 +664,7 @@ boolean P_SetPlayerMobjState(mobj_t *mobj, statenum_t state)
{
if (st->frame & FF_SPR2ENDSTATE) // no frame advancement
{
- if (st->var1 == S_NULL)
+ if (st->var1 == mobj->state-states)
frame--;
else
{
@@ -788,8 +788,17 @@ boolean P_SetMobjState(mobj_t *mobj, statenum_t state)
if (frame >= numframes)
{
- if (st->frame & FF_SPR2ENDSTATE)
- return P_SetPlayerMobjState(mobj, st->var1); // Differs from P_SetPlayerMobjState - allows object to be removed via S_NULL
+ if (st->frame & FF_SPR2ENDSTATE) // no frame advancement
+ {
+ if (st->var1 == mobj->state-states)
+ frame--;
+ else
+ {
+ if (mobj->frame & FF_FRAMEMASK)
+ mobj->frame--;
+ return P_SetMobjState(mobj, st->var1);
+ }
+ }
else
frame = 0;
}
--
GitLab