stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-06 16:31:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

On second thought, I'll revert the P_TryMove bit to how it was before and just stuff an extra P_MobjWasRemoved check in

Browse source 
this way it won't cause as much conflict with the slopetowall transfer branch
This commit is contained in:
Monster Iestyn 2017-01-24 20:21:50 +00:00
parent e3ded1671c
commit 32562068ba
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/p_mobj.c
View file

@ -2122,15 +2122,12 @@ void P_XYMovement(mobj_t *mo)
if (CheckForBustableBlocks && mo->flags & MF_PUSHABLE) if (CheckForBustableBlocks && mo->flags & MF_PUSHABLE)
P_PushableCheckBustables(mo); P_PushableCheckBustables(mo);
moved = P_TryMove(mo, mo->x + xmove, mo->y + ymove, true); // Move! if (!P_TryMove(mo, mo->x + xmove, mo->y + ymove, true)
&& !(P_MobjWasRemoved(mo) || mo->eflags & MFE_SPRUNG))
if (P_MobjWasRemoved(mo)) // mobj was removed during P_TryMove? don't continue
return;
if (mo->eflags & MFE_SPRUNG) // touching a spring counts as moved
moved = true;
if (!moved) // blocked move
{ {
// blocked move
moved = false;
if (player) { if (player) {
if (player->bot) if (player->bot)
B_MoveBlocked(player); B_MoveBlocked(player);
@ -2246,6 +2243,8 @@ void P_XYMovement(mobj_t *mo)
else else
mo->momx = mo->momy = 0; mo->momx = mo->momy = 0;
} }
else
moved = true;
if (P_MobjWasRemoved(mo)) // MF_SPECIAL touched a player! O_o;; if (P_MobjWasRemoved(mo)) // MF_SPECIAL touched a player! O_o;;
return; return;