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

Merge branch 'fix-wallspike-segfault' into 'next'

Browse source 
Fix segfault when destroying wall spike while it moves

See merge request STJr/SRB2!1959
This commit is contained in:
MascaraSnake 2023-04-12 09:19:50 +00:00
commit d6375b1e18
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_mobj.c
View file

@ -10061,6 +10061,8 @@ static boolean P_FuseThink(mobj_t *mobj)
case MT_SPIKE: case MT_SPIKE:
case MT_WALLSPIKE: case MT_WALLSPIKE:
P_SetMobjState(mobj, mobj->state->nextstate); P_SetMobjState(mobj, mobj->state->nextstate);
if (P_MobjWasRemoved(mobj))
return false;
mobj->fuse = mobj->spawnpoint ? mobj->spawnpoint->args[0] : mobj->info->speed; mobj->fuse = mobj->spawnpoint ? mobj->spawnpoint->args[0] : mobj->info->speed;
break; break;
case MT_NIGHTSCORE: case MT_NIGHTSCORE: