stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-20 01:43:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'fix-nil-mo-spawnmobj-hook' into 'next'

Browse source 
Fix segfault when trying to access mo->player->mo from SpawnMobj hook

Closes #1189

See merge request STJr/SRB2!2300
This commit is contained in:
sphere 2024-02-10 23:39:37 +00:00
commit 58cf8293e3
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_mobj.c
View file

@ -10865,6 +10865,7 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type, ...)
// when spawning MT_PLAYER, set mobj->player before calling MobjSpawn hook to prevent P_RemoveMobj from succeeding on player mobj.
va_start(args, type);
mobj->player = va_arg(args, player_t *);
mobj->player->mo = mobj;
va_end(args);
}
@ -11783,7 +11784,6 @@ void P_SpawnPlayer(INT32 playernum)
// MT_PLAYER cannot be removed, so this shouldn't be able to return NULL.
mobj = P_SpawnMobj(0, 0, 0, MT_PLAYER, p);
I_Assert(mobj != NULL);
p->mo = mobj;
mobj->angle = 0;