From c73d3b424496e2f73d047a348758389b9fcee2ea Mon Sep 17 00:00:00 2001
From: SteelT <steeltitanium1@gmail.com>
Date: Wed, 2 Mar 2022 12:35:03 -0500
Subject: [PATCH] Spawn MT_RAY when attempting to spawn MT_NULL

Some code assumes that P_SpawnMobj can never return NULL
So spawn MT_RAY in it's place when attempting to spawn MT_NULL and show a console warning

(cherry picked from commit 34f8464cbfc01adf1650da1311a0751fce5b0678)
---
 src/p_mobj.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/p_mobj.c b/src/p_mobj.c
index e6749e3d8..69c87975e 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -9880,10 +9880,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_Alert(CONS_WARNING, "Tried to spawn MT_NULL, using MT_RAY\n");
+		type = MT_RAY;
 	}
 
 	mobj = Z_Calloc(sizeof (*mobj), PU_LEVEL, NULL);