lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ballstuck' into 'master' 

BALL STUCK!! BALL!!!! STUCK!!!!!! (Resolve #374)

Closes #374

See merge request STJr/SRB2Internal!560
This commit is contained in:
MascaraSnake 2019-11-26 17:24:20 -05:00
parent 07afb52a2a 613ae0c9f8
commit 3aa72c5553
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/p_enemy.c
View File

@ -14611,6 +14611,9 @@ void A_RolloutRock(mobj_t *actor)
actor->frame = actor->reactiontime % maxframes; // set frame
if (!actor->tracer || P_MobjWasRemoved(actor->tracer) || !actor->tracer->health)
actor->flags |= MF_PUSHABLE;
if (!(actor->flags & MF_PUSHABLE)) // if being ridden, don't disappear
actor->fuse = 0;
else if (!actor->fuse && actor->movecount == 1) // otherwise if rock has moved, set its fuse