stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-31 05:30:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'mobj-spawn-null-fix' into 'next'

Browse source 
Spawn MT_RAY when attempting to spawn MT_NULL

Closes #801 and #800

See merge request STJr/SRB2!1751
This commit is contained in:
sphere 2022-03-06 11:52:44 +00:00
commit 00117476e1
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

@ -10474,10 +10474,17 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
if (type == MT_NULL)
{
#if 0
#ifdef PARANOIA
I_Error("Tried to spawn MT_NULL\n");
#endif
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);