If the map has an IoS, increase the game zone margin to 32k

info.h

@@ -895,7 +895,7 @@ MT_SPIDER,
 MT_BABY,
 MT_CYBORG,
 MT_BOSSBRAIN,
-MT_BOSSPIT,
+MT_BOSSSPIT,
 MT_BOSSTARGET,
 MT_SPAWNSHOT,
 MT_BARREL,

p_mobj.c

@@ -543,7 +543,7 @@ void P_SpawnMapThing (mapthing_t *mthing, int thingid)
 		if (deathmatch_p < deathmatchstarts + MAXDMSTARTS)
 			D_memcpy (deathmatch_p, mthing, sizeof(*mthing));
 		deathmatch_p++;
-		return;
+		return NULL;
 	}
 
 /* check for players specially */

p_setup.c

@@ -345,7 +345,7 @@ void P_LoadNodes (int lump)
 =================
 */
 
-void P_LoadThings (int lump)
+void P_LoadThings (int lump, boolean *havebossspit)
 {
 	byte			*data;
 	int				i;
@@ -357,6 +357,7 @@ void P_LoadThings (int lump)
 	numthings = W_LumpLength (lump) / sizeof(mapthing_t);
 	numthingsreal = 0;
 	numstaticthings = 0;
+	*havebossspit = false;
 
 	mt = (mapthing_t *)data;
 	for (i=0 ; i<numthings ; i++, mt++)
@@ -390,6 +391,8 @@ void P_LoadThings (int lump)
 			case 0:
 				break;
 			case 1:
+				if (mt->type == mobjinfo[MT_BOSSSPIT].doomednum)
+					*havebossspit = true;
 				numthingsreal++;
 				break;
 			case 2:
@@ -728,6 +731,8 @@ void P_SetupLevel (const char *lumpname, skill_t skill, int skytexture)
 	extern	int	cy;
 	VINT lumpnum, lumps[ML_BLOCKMAP+1];
 	lumpinfo_t li[ML_BLOCKMAP+1];
+	boolean havebossspit = false;
+	int gamezonemargin;
 
 	M_ClearRandom ();
 
@@ -787,7 +792,7 @@ D_printf ("P_SetupLevel(%s,%i)\n",lumpname,skill);
 
 	bodyqueslot = 0;
 	deathmatch_p = deathmatchstarts;
-	P_LoadThings (lumpnum+ML_THINGS);
+	P_LoadThings (lumpnum+ML_THINGS, &havebossspit);
 
 	W_LoadPWAD(PWAD_NONE);
 
@@ -832,7 +837,10 @@ extern byte *debugscreen;
 	skytexturep = R_SkipJagObjHeader(skytexturep, W_LumpLength(skytexture), 256, 128);
 	skycolormaps = (col2sky > 0 && skytexture >= col2sky) ? dc_colormaps2 : dc_colormaps;
 
-	R_SetupLevel();
+	gamezonemargin = DEFAULT_GAME_ZONE_MARGIN;
+	if (havebossspit)
+		gamezonemargin *= 4;
+	R_SetupLevel(gamezonemargin);
 
 	I_SetThreadLocalVar(DOOMTLS_VALIDCOUNT, &validcount[0]);
 

p_sight.c

@@ -358,7 +358,7 @@ static boolean PS_CheckSight2(mobj_t *t1, mobj_t *t2)
 static boolean P_MobjCanSightCheck(mobj_t *mobj)
 {
    // must be killable or be a monster spawner
-   if (!(mobj->flags & MF_COUNTKILL) && (mobj->type != MT_BOSSPIT))
+   if (!(mobj->flags & MF_COUNTKILL) && (mobj->type != MT_BOSSSPIT))
       return false;
 
    // must be about to change states

r_local.h

@@ -276,8 +276,11 @@ void	R_InitData (void);
 void	R_SetViewportSize(int num);
 int		R_DefaultViewportSize(void); // returns the viewport id for fullscreen, low detail mode
 void	R_SetDrawFuncs(void);
-void	R_SetupLevel(void);
-void	R_SetupTextureCaches(void);
+void	R_SetupLevel(int gamezonemargin);
+
+// how much memory should be left free in the main zone after allocating the texture cache
+// can be increased for the Icon of Sin
+#define DEFAULT_GAME_ZONE_MARGIN 8*1024
 
 typedef void (*drawcol_t)(int, int, int, int, fixed_t, fixed_t, inpixel_t*, int);
 typedef void (*drawspan_t)(int, int, int, int, fixed_t, fixed_t, fixed_t, fixed_t, inpixel_t*, int);

r_main.c

@@ -378,13 +378,13 @@ D_printf ("Done\n");
 =
 ==============
 */
-void R_SetupTextureCaches(void)
+void R_SetupTextureCaches(int gamezonemargin)
 {
 	int i, j;
 	int zonefree;
 	int cachezonesize;
 	void *margin;
-	const int zonemargin = 8*1024;
+	const int zonemargin = gamezonemargin;
 	const int flatblocksize = sizeof(memblock_t) + ((sizeof(texcacheblock_t) + 15) & ~15) + 64*64 + 32;
 
 	// reset pointers from previous level
@@ -459,9 +459,9 @@ void R_SetupTextureCaches(void)
 	R_InitTexCacheZone(&r_texcache, 0);
 }
 
-void R_SetupLevel(void)
+void R_SetupLevel(int gamezonemargin)
 {
-	R_SetupTextureCaches();
+	R_SetupTextureCaches(gamezonemargin);
 
 	R_SetViewportSize(viewportNum);