stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-02 17:22:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'mobj-spawn-null-fix' into 2210-rc3

Browse source
This commit is contained in:
spherallic 2022-03-02 19:04:04 +01:00
commit 3d78ad07c8
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/p_mobj.c
View file

@ -10477,10 +10477,17 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
if (type == MT_NULL) if (type == MT_NULL)
{ {
#if 0
#ifdef PARANOIA #ifdef PARANOIA
I_Error("Tried to spawn MT_NULL\n"); I_Error("Tried to spawn MT_NULL\n");
#endif #endif
return NULL; return NULL;
#endif
// Hack: Some code assumes that P_SpawnMobj can never return NULL
// So replace MT_NULL with MT_RAY in the meantime
// Remove when dealt properly
CONS_Debug(DBG_GAMELOGIC, "Tried to spawn MT_NULL, using MT_RAY\n");
type = MT_RAY;
} }
mobj = Z_Calloc(sizeof (*mobj), PU_LEVEL, NULL); mobj = Z_Calloc(sizeof (*mobj), PU_LEVEL, NULL);