Merge branch 'ballstuck' into 'master'
BALL STUCK!! BALL!!!! STUCK!!!!!! (Resolve #374) Closes #374 See merge request STJr/SRB2Internal!560
This commit is contained in:
commit
3aa72c5553
|
@ -14611,6 +14611,9 @@ void A_RolloutRock(mobj_t *actor)
|
||||||
|
|
||||||
actor->frame = actor->reactiontime % maxframes; // set frame
|
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
|
if (!(actor->flags & MF_PUSHABLE)) // if being ridden, don't disappear
|
||||||
actor->fuse = 0;
|
actor->fuse = 0;
|
||||||
else if (!actor->fuse && actor->movecount == 1) // otherwise if rock has moved, set its fuse
|
else if (!actor->fuse && actor->movecount == 1) // otherwise if rock has moved, set its fuse
|
||||||
|
|
Loading…
Reference in a new issue