stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 09:11:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix segfault when calling P_RemoveMobj from MobjCollide hook

Browse source
This commit is contained in:
Gustaf Alhäll 2023-07-07 21:35:41 +02:00
parent d7a84b967c
commit ecf0c4b45a
No known key found for this signature in database
GPG key ID: 6C1F67D690CDEDFD
1 changed files with 122 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/p_map.c
View file

@ -4005,7 +4005,8 @@ void P_BounceMove(mobj_t *mo)
slidemo = mo; slidemo = mo;
hitcount = 0; hitcount = 0;
retry: do
{
if (++hitcount == 3) if (++hitcount == 3)
goto bounceback; // don't loop forever goto bounceback; // don't loop forever
@ -4082,8 +4083,12 @@ bounceback:
newy = FixedMul(mmomy, bestslidefrac); newy = FixedMul(mmomy, bestslidefrac);
if (!P_TryMove(mo, mo->x + newx, mo->y + newy, true)) if (!P_TryMove(mo, mo->x + newx, mo->y + newy, true))
{
if (P_MobjWasRemoved(mo))
return;
goto bounceback; goto bounceback;
} }
}
// Now continue along the wall. // Now continue along the wall.
// First calculate remainder. // First calculate remainder.
@ -4127,9 +4132,8 @@ bounceback:
mo->player->cmomx = tmxmove; mo->player->cmomx = tmxmove;
mo->player->cmomy = tmymove; mo->player->cmomy = tmymove;
} }
}
if (!P_TryMove(mo, mo->x + tmxmove, mo->y + tmymove, true)) while (!P_TryMove(mo, mo->x + tmxmove, mo->y + tmymove, true) && !P_MobjWasRemoved(mo));
goto retry;
} }
// //