have Z_IsMobjValid2 print an error in console

if mobj pointer is invalid
the callee should handle the behavior

src/blua/ldo.c

@@ -55,8 +55,8 @@ struct lua_longjmp {
 
 void luaD_seterrorobj (lua_State *L, int lerrcode, StkId oldtop) {
   switch (lerrcode) {
-    case LUA_ERRMEM: {
-      setsvalue2s(L, oldtop, luaS_newliteral(L, MEMERRMSG));
+    case LUA_ERRMEM: {  /* memory error? */
+      setsvalue2s(L, oldtop, G(L)->memerrmsg); /* reuse preregistered msg. */
       break;
     }
     case LUA_ERRERR: {

src/blua/lmem.h

@@ -13,8 +13,6 @@
 #include "llimits.h"
 #include "lua.h"
 
-#define MEMERRMSG	"not enough memory"
-
 
 #define luaM_reallocv(L,b,on,n,e) \
 	((cast(size_t, (n)+1) <= MAX_SIZET/(e)) ?  /* +1 to avoid warnings */ \

src/blua/lstate.c

@@ -64,6 +64,9 @@ static void freestack (lua_State *L, lua_State *L1) {
 }
 
 
+#define MEMERRMSG       "not enough memory"
+
+
 /*
 ** open parts that may cause memory-allocation errors
 */
@@ -76,7 +79,9 @@ static void f_luaopen (lua_State *L, void *ud) {
   luaS_resize(L, MINSTRTABSIZE);  /* initial size of string table */
   luaT_init(L);
   luaX_init(L);
-  luaS_fix(luaS_newliteral(L, MEMERRMSG));
+  /* pre-create memory-error message */
+  g->memerrmsg = luaS_newliteral(L, MEMERRMSG);
+  luaS_fix(g->memerrmsg);  /* it should never be collected */
   g->GCthreshold = 4*g->totalbytes;
 }
 

src/blua/lstate.h

@@ -88,6 +88,7 @@ typedef struct global_State {
   lua_CFunction panic;  /* to be called in unprotected errors */
   TValue l_registry;
   struct lua_State *mainthread;
+  TString *memerrmsg;  /* memory-error message */
   UpVal uvhead;  /* head of double-linked list of all open upvalues */
   struct Table *mt[NUM_TAGS];  /* metatables for basic types */
   TString *tmname[TM_N];  /* array with tag-method names */

src/core/memory.cpp

@@ -149,6 +149,30 @@ void PoolAllocator::release()
 	allocated_blocks_ = 0;
 }
 
+bool PoolAllocator::ptrcheck(const void* p) const
+{
+	const uintptr_t paddr = reinterpret_cast<uintptr_t>(p);
+
+	ChunkFooter* next = nullptr;
+	for (ChunkFooter* chunk = first_chunk_; chunk != nullptr; chunk = next)
+	{
+		const uintptr_t blockstart = reinterpret_cast<uintptr_t>(chunk->start);
+		const uintptr_t blockend = blockstart + blocks_ * block_size_;
+
+		//CONS_Printf("mobj ptr %lu, block start %lu end %lu\n", paddr, blockstart, blockend);
+
+		if (paddr >= blockstart && paddr < blockend)
+		{
+			return true;
+		}
+
+		next = chunk->next;
+	}
+
+	return false;
+}
+
+
 static LinearMemory g_frame_memory {4 * 1024 * 1024};
 
 void* Z_Frame_Alloc(size_t size)

src/core/memory.h

@@ -65,6 +65,7 @@ public:
 	constexpr size_t allocated_bytes() const noexcept { return allocated_blocks_ * block_size_; };
 
 	void release();
+	bool ptrcheck(const void* p) const;
 };
 
 } // namespace srb2

src/d_clisrv.c

@@ -3347,6 +3347,7 @@ static void Command_connect(void)
 		return;
 	}
 
+	// StarManiaKG: allow us to join servers from anywhere at any time //
 	if (Playing() || demo.title || demo.playback)
 	{
 		if (demo.title || demo.playback)
@@ -3365,7 +3366,9 @@ static void Command_connect(void)
 		D_StartTitle();
 	}
 	else
+	{
 		M_ClearMenus(true); // close the menus
+	}
 
 	// modified game check: no longer handled
 	// we don't request a restart unless the filelist differs
@@ -3381,37 +3384,52 @@ static void Command_connect(void)
 	}
 	else
 	{
-		// used in menu to connect to a server in the list
-		if (netgame && fasticmp(COM_Argv(1), "node"))
+		// Get the server node.
+		if (netgame)
 		{
-			servernode = (SINT8)atoi(COM_Argv(2));
-		}
-		else if (netgame)
-		{
-			CONS_Printf(M_GetText("You cannot connect while in a game. End this game first.\n"));
-			return;
-		}
-		else if (I_NetOpenSocket)
-		{
-			I_NetOpenSocket();
-			netgame = true;
-			multiplayer = true;
-
-			if (fasticmp(COM_Argv(1), "any"))
-				servernode = BROADCASTADDR;
-			else if (I_NetMakeNodewPort && COM_Argc() >= 3)
-				servernode = I_NetMakeNodewPort(COM_Argv(1), COM_Argv(2));
-			else if (I_NetMakeNodewPort)
-				servernode = I_NetMakeNode(COM_Argv(1));
+			// used in menu to connect to a server in the list
+			if (fasticmp(COM_Argv(1), "node"))
+			{
+				servernode = (SINT8)atoi(COM_Argv(2));
+			}
 			else
 			{
-				CONS_Alert(CONS_ERROR, M_GetText("There is no server identification with this network driver\n"));
-				D_CloseConnection();
-				return;
+				D_QuitNetGame();
+				CL_Reset();
+				D_StartTitle();
 			}
 		}
 		else
-			CONS_Alert(CONS_ERROR, M_GetText("There is no network driver\n"));
+		{
+			// Standard behaviour
+			if (I_NetOpenSocket)
+			{
+				I_NetOpenSocket();
+				netgame = true;
+				multiplayer = true;
+
+				if (fasticmp(COM_Argv(1), "any"))
+					servernode = BROADCASTADDR;
+				else if (I_NetMakeNodewPort)
+				{
+					if (COM_Argc() >= 3) // address AND port
+						servernode = I_NetMakeNodewPort(COM_Argv(1), COM_Argv(2));
+					else // address only, or address:port
+						servernode = I_NetMakeNode(COM_Argv(1));
+				}
+				else
+				{
+					CONS_Alert(CONS_ERROR, M_GetText("There is no server identification with this network driver\n"));
+					D_CloseConnection();
+					return;
+				}
+			}
+			else
+			{
+				CONS_Alert(CONS_ERROR, M_GetText("There is no network driver\n"));
+				return;
+			}
+		}
 
 		// invalid address
 		if (servernode == -1)
@@ -3458,6 +3476,7 @@ static void ResetNode(INT32 node);
 //
 void CL_ClearPlayer(INT32 playernum)
 {
+	// Handle mobj_t pointers.
 	if (players[playernum].mo)
 	{
 		// Don't leave a NiGHTS ghost!
@@ -3466,6 +3485,7 @@ void CL_ClearPlayer(INT32 playernum)
 		P_RemoveMobj(players[playernum].mo);
 	}
 
+	// Wipe the struct.
 	memset(&players[playernum], 0, sizeof(player_t));
 }
 

src/d_player.h

@@ -361,17 +361,11 @@ typedef struct squishdance_s
 {
 	tic_t   countdown; // hold "custom 3" for 2 seconds to engange le dance
 	tic_t   time;
+	fixed_t work;
+	fixed_t ang;
+	fixed_t bounce;    // hehe squishy
 } squishdance_t;
 
-typedef struct salty_s
-{
-	bool ready;
-	bool tapping;
-	fixed_t zoffset;
-	fixed_t momz;
-	bool jump;
-} salty_t;
-
 // ========================================================================
 //                          PLAYER STRUCTURE
 // ========================================================================
@@ -567,9 +561,6 @@ typedef struct player_s
 
 	fixed_t spinoutrot; // When a player spins out, this value increments modulus 360.
 
-	// saltyhop! hardcode edition
-	salty_t salty;
-
 	squishdance_t squishdance;
 
 	fixed_t fovadd; // adjust FOV for hw rendering

src/doomdef.h

@@ -147,7 +147,7 @@ extern char  logfilename[1024];
 #define VERSIONSTRING  CLIENTNAME  " v10.1"
 #define VERSIONSTRINGW CLIENTNAMEW L" v10.1"
 
-//#define SATURN_TESTING // comment out for saturn release builds!
+#define SATURN_TESTING // comment out for saturn release builds!
 
 // Hey! If you change this, add 1 to the MODVERSION below! Otherwise we can't force updates!
 // And change CMakeLists.txt (not src/, but in root), for CMake users!

src/hardware/hw_md2.c

@@ -1146,8 +1146,8 @@ void HWR_DrawMD2(gl_vissprite_t *spr)
 
 	// Look at HWR_ProjectSprite for more
 	{
-		md2_t *md2s = NULL;
-		int skinnum = 0;
+		md2_t *md2s;
+		int skinnum;
 		patch_t *gpatch, *blendgpatch;
 		GLPatch_t *hwrPatch = NULL, *hwrBlendPatch = NULL;
 		INT32 durs = spr->mobj->state->tics;
@@ -1221,7 +1221,7 @@ void HWR_DrawMD2(gl_vissprite_t *spr)
 				skinnum = (skin_t *)spr->mobj->localskin - skins;
 			}
 		}
-		else if (spr->mobj->skin)
+		else
 		{
 			md2s = md2_playermodels;
 			skinnum = (skin_t *)spr->mobj->skin - skins;

src/hardware/r_opengl/r_opengl.c

@@ -3283,7 +3283,7 @@ static void GL_Framebuffer_Generate(void)
 	{
 		pglGenTextures(1, &framebufferobject.tex);
 		pglBindTexture(GL_TEXTURE_2D, framebufferobject.tex);
-		pglTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, screen_width, screen_height, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL);
+		pglTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, screen_width, screen_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
 		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 		Clamp2D(GL_TEXTURE_WRAP_S);

src/k_hud.c

@@ -3829,8 +3829,10 @@ static void K_drawKartMinimap(void)
 				}
 				else
 				{
+					const INT32 skinnum = K_GetMobjLocalSkinNum(mobj->skin, mobj->localskin, mobj->skinlocal);
+
 					// special case if startcolor is not the default (160 / Green)
-					if (K_GetMobjSkin(mobj)->starttranscolor != skins[0].starttranscolor)
+					if (skinnum && skins[skinnum].starttranscolor != skins[0].starttranscolor)
 					{
 						colormap = R_GetTranslationColormap(TC_DEFAULT, mobj->color, GTC_CACHE);
 					}

src/k_kart.c

@@ -71,11 +71,12 @@ consvar_t cv_stairjank = {"stairjank", "Off", CV_SAVE|CV_CALL, CV_OnOff, PDistor
 consvar_t cv_stairjanksfx = {"stairjanksfx", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 //hardcode saltyhop mhhm
-consvar_t cv_saltyhop = {"hardcodehop", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+static void saltyhop_onchange(void);
+consvar_t cv_saltyhop = {"hardcodehop", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, saltyhop_onchange, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_saltyhopsfx = {"hardcodehopsfx", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_saltysquish = {"hardcodehopsquish", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 static CV_PossibleValue_t saltyheight_t[] = {{FRACUNIT/4, "MIN"}, {2*FRACUNIT, "MAX"}, {0, NULL}};
-consvar_t cv_saltyheight = {"hardcodehopheight", "1", CV_FLOAT|CV_SAVE, saltyheight_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_saltyheight = {"hardcodehopheight", "1", CV_FLOAT|CV_SAVE|CV_CALL|CV_NOINIT, saltyheight_t, saltyhop_onchange, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_saltyroll = {"hardcodehoproll", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 consvar_t cv_squishdance = {"squishdance", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -83,6 +84,23 @@ consvar_t cv_squishdance = {"squishdance", "On", CV_SAVE, CV_OnOff, NULL, 0, NUL
 static CV_PossibleValue_t squishdancespeed_cons_t[] = {{20, "MIN"}, {280, "MAX"}, {0, NULL}};
 consvar_t cv_squishdancespeed = {"squishdance_speed", "140", CV_SAVE, squishdancespeed_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
+static void saltyhop_onchange(void)
+{
+	// reset everything when toggling saltyhop
+	if (gamestate != GS_LEVEL)
+		return;
+
+	for (INT32 i = 0; i < MAXPLAYERS; i++)
+	{
+		player_t *player = &players[i];
+
+		if (!player || P_MobjWasRemoved(player->mo))
+			continue;
+
+		memset(&player->mo->salty, 0, sizeof(player->mo->salty));
+	}
+}
+
 // SOME IMPORTANT VARIABLES DEFINED IN DOOMDEF.H:
 // gamespeed is cc (0 for easy, 1 for normal, 2 for hard)
 // franticitems is Frantic Mode items, bool
@@ -2176,7 +2194,7 @@ static void K_GetKartBoostPower(player_t *player)
 
 		// Technically, all mobjs that think can cause desynchs if they are spawned conditionally, so best we can do
 		// is to hide them if you are in saltyhop jump
-		if (dust && player->salty.jump)
+		if (dust && player->mo->salty.jump)
 			dust->flags2 |= MF2_DONTDRAW;
 
 		if (leveltime % 6 == 0)
@@ -3386,92 +3404,88 @@ static void K_SaltySquish(player_t *player)
 
 static void K_QuiteSaltyHop(player_t *player)
 {
-	I_Assert(player != NULL);
-	I_Assert(!P_MobjWasRemoved(player->mo));
+	if (!cv_saltyhop.value)
+		return;
 
 	// what the fuck is this haya
 	mobj_t *pmo = player->mo;
-	salty_t *psalty = &player->salty;
-
-	if (!cv_saltyhop.value)
-	{
-		// reset before we leave
-		psalty->jump = psalty->ready = psalty->tapping = false;
-		psalty->momz = psalty->zoffset = 0;
-		return;
-	}
-
+	salty_t *psalt = &pmo->salty;
 	const boolean onground = P_IsObjectOnGround(pmo);
 
 	// ready?
 	if (!player->kartstuff[k_jmp])
 	{
-		psalty->ready = true;
-		psalty->tapping = false;
+		psalt->ready = true;
+		psalt->tapping = false;
 	}
-	else if (psalty->ready)
+	else if (psalt->ready)
 	{
-		psalty->ready = false;
-		psalty->tapping = true;
+		psalt->ready = false;
+		psalt->tapping = true;
 	}
 	else
 	{
-		psalty->tapping = false;
+		psalt->tapping = false;
 	}
 
 	// GO!
-	if (psalty->jump)
+	if (!psalt->init)
+	{
+		psalt->jump = false;
+		psalt->zoffset = 0;
+		psalt->momz = 0;
+		psalt->init = true;
+	}
+	else if (psalt->jump)
 	{
 		if (pmo->eflags & MFE_JUSTHITFLOOR)
 		{
-			psalty->zoffset = 0;
+			psalt->zoffset = 0;
 		}
 		else if (onground)
 		{
-			psalty->zoffset += psalty->momz;
-			psalty->momz -= (FRACUNIT*3/2);
+			psalt->zoffset += psalt->momz;
+			psalt->momz -= (FRACUNIT*3/2);
 		}
 		else
 		{
-			//psalty->zoffset *= (49/50)*FRACUNIT; // this just rounds down to 0 lol
-			psalty->zoffset = 0;
-			psalty->momz = 0;
+			psalt->zoffset *= (49/50)*FRACUNIT;
+			psalt->momz = 0;
 		}
 
-		if (psalty->zoffset <= 0)
+		if (psalt->zoffset <= 0)
 		{
 			if (cv_saltyhopsfx.value && !(pmo->eflags & MFE_JUSTHITFLOOR) && onground)
 				S_StartSound(pmo, sfx_s268);
-			psalty->jump = false;
-			psalty->zoffset = 0;
-			psalty->momz = 0;
+			psalt->jump = false;
+			psalt->zoffset = 0;
+			psalt->momz = 0;
 			// shlamma damma
 			if (cv_saltysquish.value)
 				pmo->stretchslam += 8*FRACUNIT;
 		}
-		else if (psalty->zoffset > 0)
+		else if (cv_saltysquish.value && psalt->zoffset >= 0)
 		{
-			if (cv_saltysquish.value)
-			{
-				// goofy ahh hack
-				pmo->spriteyscale += (FRACUNIT/8);
-				pmo->spritexscale -= (FRACUNIT/8);
-			}
+			// goofy ahh hack
+			pmo->spriteyscale += (FRACUNIT/8);
+			pmo->spritexscale -= (FRACUNIT/8);
 		}
 
-		pmo->spriteyoffset += FixedMul(psalty->zoffset, cv_saltyheight.value);
+		pmo->spriteyoffset += FixedMul(psalt->zoffset, cv_saltyheight.value);
 
-		// Stop any and all drift sounds when hopping.
-		if (S_SoundPlaying(pmo, sfx_screec))
-			S_StopSoundByID(pmo, sfx_screec);
-		if (S_SoundPlaying(pmo, sfx_drift))
-			S_StopSoundByID(pmo, sfx_drift);
+		if (cv_saltyhopsfx.value)
+		{
+			if (S_SoundPlaying(pmo, sfx_screec))
+				S_StopSoundByID(pmo, sfx_screec);
+			if (S_SoundPlaying(pmo, sfx_drift))
+				S_StopSoundByID(pmo, sfx_drift);
+		}
 	}
-	else if (psalty->tapping && onground && !player->kartstuff[k_spinouttimer] && !player->kartstuff[k_squishedtimer])
+	else if (psalt->tapping && onground && !player->kartstuff[k_spinouttimer] && !player->kartstuff[k_squishedtimer])
 	{
-		psalty->jump = true;
-		psalty->zoffset = 0;
-		psalty->momz = 6*FRACUNIT;
+		psalt->jump = true;
+		psalt->zoffset = 0;
+		psalt->momz = 6*FRACUNIT;
 		if (cv_saltyhopsfx.value)
 			S_StartSound(pmo, sfx_s25a);
 	}
@@ -3498,7 +3512,7 @@ boolean K_ShouldSlopeRoll(mobj_t *mobj)
 		return false;
 
 	// seeing a character rotate mid-hop looks really janky
-	if (!cv_saltyroll.value && mobj->player && mobj->player->salty.jump)
+	if (!cv_saltyroll.value && mobj->player && mobj->player->mo->salty.jump)
 		return false;
 
 	return K_CheckSlopeRollDist(mobj);
@@ -4385,8 +4399,7 @@ void K_KillBananaChain(mobj_t *banana, mobj_t *inflictor, mobj_t *source)
 	mobj_t *cachenext;
 
 killnext:
-
-	if (!banana)
+	if (P_MobjWasRemovedCompat(banana))
 		return;
 
 	cachenext = banana->hnext;
@@ -4425,10 +4438,21 @@ void K_UpdateHnextList(player_t *player, boolean clean)
 		nextwork = work->hnext;
 
 		if (!clean && (!work->movedir || work->movedir <= (UINT16)player->kartstuff[k_itemamount]))
+		{
 			continue;
+		}
 
 		P_RemoveMobj(work);
 	}
+
+#ifdef PHOBOS_BUILD
+	if (P_MobjWasRemoved(player->mo->hnext))
+	{
+		// Like below, try to clean up the pointer if it's NULL.
+		// Maybe this was a cause of the shrink/eggbox fails?
+		P_SetTarget(&player->mo->hnext, NULL);
+	}
+#endif
 }
 
 // For getting hit!
@@ -4493,7 +4517,9 @@ void K_DropHnextList(player_t *player)
 		}
 
 		dropwork = P_SpawnMobj(work->x, work->y, work->z, type);
+
 		P_SetTarget(&dropwork->target, player->mo);
+
 		dropwork->angle = work->angle;
 		dropwork->flags2 = work->flags2;
 		dropwork->flags |= MF_NOCLIPTHING;
@@ -4561,10 +4587,13 @@ void K_DropHnextList(player_t *player)
 
 	// we need this here too because this is done in afterthink - pointers are cleaned up at the START of each tic...
 	P_SetTarget(&player->mo->hnext, NULL);
+
 	player->kartstuff[k_bananadrag] = 0;
 
 	if (player->kartstuff[k_eggmanheld])
+	{
 		player->kartstuff[k_eggmanheld] = 0;
+	}
 	else if (player->kartstuff[k_itemheld]
 		&& (dropall || (--player->kartstuff[k_itemamount] <= 0)))
 	{
@@ -4865,7 +4894,9 @@ static void K_MoveHeldObjects(player_t *player)
 		player->kartstuff[k_bananadrag] = 0;
 
 		if (player->kartstuff[k_eggmanheld])
+		{
 			player->kartstuff[k_eggmanheld] = 0;
+		}
 		else if (player->kartstuff[k_itemheld])
 		{
 			player->kartstuff[k_itemamount] = player->kartstuff[k_itemheld] = 0;
@@ -4882,7 +4913,9 @@ static void K_MoveHeldObjects(player_t *player)
 		player->kartstuff[k_bananadrag] = 0;
 
 		if (player->kartstuff[k_eggmanheld])
+		{
 			player->kartstuff[k_eggmanheld] = 0;
+		}
 		else if (player->kartstuff[k_itemheld])
 		{
 			player->kartstuff[k_itemamount] = player->kartstuff[k_itemheld] = 0;

src/lua_script.c

@@ -62,14 +62,6 @@ static lua_CFunction liblist[] = {
 	NULL
 };
 
-// Lua asks for memory using this.
-static void *LUA_Alloc(void *ud, void *ptr, size_t osize, size_t nsize)
-{
-	(void)ud;
-	(void)osize;
-	return Z_Realloc(ptr, nsize, PU_LUA, NULL);
-}
-
 // Panic function Lua calls when there's an unprotected error.
 // This function cannot return. Lua would kill the application anyway if it did.
 FUNCNORETURN static int LUA_Panic(lua_State *L)
@@ -197,7 +189,7 @@ void LUA_ClearState(void)
 	CONS_Printf(M_GetText("Pardon me while I initialize the Lua scripting interface...\n"));
 
 	// allocate state
-	L = lua_newstate(LUA_Alloc, NULL);
+	L = luaL_newstate();
 	lua_atpanic(L, LUA_Panic);
 
 	// open base libraries
@@ -373,7 +365,7 @@ void LUA_DumpFile(const char *filename)
 
 static void createMathLibState(void)
 {
-	mL = lua_newstate(LUA_Alloc, NULL);
+	mL = luaL_newstate();
 	lua_atpanic(mL, LUA_Panic);
 
 	// open only enum lib
@@ -1465,3 +1457,16 @@ int Lua_CreateFieldTable(lua_State *L, const char *const lst[])
 
 	return luaL_ref(L, LUA_REGISTRYINDEX);
 }
+
+size_t LUA_MemoryUsage(void)
+{
+	size_t usage = 0;
+
+	if (gL)
+		usage += lua_gc(gL, LUA_GCCOUNT, 0);
+
+	if (mL)
+		usage += lua_gc(mL, LUA_GCCOUNT, 0);
+
+	return usage;
+}

src/lua_script.h

@@ -82,6 +82,9 @@ int Lua_optoption(lua_State *L, int narg, int def, int list_ref);
 int Lua_CreateFieldTable(lua_State *L, const char *const lst[]);
 void LUA_HookNetArchive(lua_CFunction archFunc, savebuffer_t *save);
 
+// Returns lua memory usage in kbytes
+size_t LUA_MemoryUsage(void);
+
 // Console wrapper
 void COM_Lua_f(void);
 

src/m_cheat.c

@@ -100,7 +100,7 @@ static UINT8 cheatf_devmode(void)
 	if (menuactive && currentMenu != &MainDef)
 		return 0; // Only on the main menu!
 
-	S_StartSound(NULL, sfx_itemup);
+	S_StartSound(0, sfx_itemup);
 
 	// Just unlock all the things and turn on -debug and console devmode.
 	G_SetGameModified(false, false); // might need to revist the latter later

src/m_menu.c

@@ -9929,7 +9929,6 @@ static void M_DrawLocalSkinMenu(void)
 	V_DrawFill(mx + 220 - (charw/2), my+54, charw, 84, 239);
 #undef charw
 
-	// FIXME: is skins[displayskin.localnum] even correct?
 	UINT8 *colormap = R_GetLocalTranslationColormap(&skins[displayskin.localnum], (displayskin.localskin ? &localskins[displayskin.localnum] : NULL), cv_playercolor.value, GTC_MENUCACHE, displayskin.localskin);
 
 	V_DrawMappedPatch(mx, my+50, 0, (patch_t *)W_CachePatchName(displayskin.facewant, PU_PATCH), colormap);
@@ -9947,7 +9946,7 @@ static void M_DrawLocalSkinMenu(void)
 	my += 120;
 
 #ifdef HWRENDER
-	md2_t *md2 = (displayskin.localskin ? &md2_localplayermodels[displayskin.localnum] : &md2_playermodels[skintodisplay]);
+	md2_t *md2 = (displayskin.localskin ? &md2_localplayermodels[skintodisplay] : &md2_playermodels[skintodisplay]);
 
 	// if we have 3d models enabled and a model exists
 	// try to show it instead of the sprite

src/p_inter.c

@@ -107,6 +107,9 @@ void P_DoNightsScore(player_t *player)
 
 	dummymo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z+player->mo->height/2, MT_NIGHTSCORE);
 
+	if (P_MobjWasRemovedCompat(dummymo))
+		return;
+
 	if (player->bot)
 		player = &players[consoleplayer];
 
@@ -2013,7 +2016,7 @@ static inline void P_NiGHTSDamage(mobj_t *target, mobj_t *source)
 	}
 }
 
-static inline boolean P_TagDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage)
+static boolean P_TagDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage)
 {
 	player_t *player = target->player;
 	(void)damage; //unused parm

src/p_map.c

@@ -2026,7 +2026,7 @@ static boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
 
 	mapcampointer = thiscam;
 
-	if (UNLIKELY(GETSECSPECIAL(newsec->special, 4) == 12))
+	if (newsec->flags & SF_NOCLIPCAMERA)
 	{ // Camera noclip on entire sector.
 		tmfloorz = tmdropoffz = thiscam->z;
 		tmceilingz = tmdrpoffceilz = thiscam->z + thiscam->height;
@@ -2068,7 +2068,7 @@ static boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
 			fixed_t topheight, bottomheight, midheight;
 
 			if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERALL)
-			   || UNLIKELY(GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
+			   || rover->master->frontsector->flags & SF_NOCLIPCAMERA)
 				continue;
 
 			topheight    = P_CameraGetFOFTopZ(thiscam, newsec, rover, x, y, NULL);
@@ -2144,7 +2144,7 @@ static boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
 						// We're inside it! Yess...
 						polysec = po->lines[0]->backsector;
 
-						if (UNLIKELY(GETSECSPECIAL(polysec->special, 4) == 12))
+						if (polysec->flags & SF_NOCLIPCAMERA)
 						{ // Camera noclip polyobj.
 							plink = (polymaplink_t *)(plink->link.next);
 							continue;

src/p_maputl.cpp

@@ -328,7 +328,7 @@ void P_CameraLineOpening(line_t *linedef)
 			{
 				fixed_t topheight, bottomheight, midheight;
 
-				if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_RENDERALL) || !(rover->flags & FF_EXISTS) || UNLIKELY(GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
+				if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_RENDERALL) || !(rover->flags & FF_EXISTS) || (rover->master->frontsector->flags & SF_NOCLIPCAMERA))
 					continue;
 
 				topheight = P_CameraGetFOFTopZ(mapcampointer, front, rover, tmx, tmy, linedef);
@@ -358,7 +358,7 @@ void P_CameraLineOpening(line_t *linedef)
 			{
 				fixed_t topheight, bottomheight, midheight;
 
-				if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_RENDERALL) || !(rover->flags & FF_EXISTS) || UNLIKELY(GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
+				if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_RENDERALL) || !(rover->flags & FF_EXISTS) || (rover->master->frontsector->flags & SF_NOCLIPCAMERA))
 					continue;
 
 				topheight = P_CameraGetFOFTopZ(mapcampointer, back, rover, tmx, tmy, linedef);

src/p_mobj.h

@@ -266,6 +266,15 @@ typedef enum {
 	PCF_THUNK     = 1<<5, // Ran the thinker this tic.
 } precipflag_t;
 
+typedef struct salty_s
+{
+	bool init;
+	bool ready;
+	bool tapping;
+	fixed_t zoffset;
+	fixed_t momz;
+	bool jump;
+} salty_t;
 
 // Map Object definition.
 typedef struct mobj_s
@@ -403,6 +412,9 @@ typedef struct mobj_s
 
 	tic_t slamsoundtimer; // Funni slam sound when landing
 
+	// saltyhop! hardcode edition
+	salty_t salty;
+
 	// WARNING: New fields must be added separately to savegame and Lua.
 	boolean islocal; // BEWARE: islocal does not exist in vanilla, strictly to be used for locally loaded addons to not cause desynchs with the mobj linedef trigger check. DO NOT USE THIS IN ACTUAL ADDONS YOU INTEND TO USE ON YOUR SERVER
 } mobj_t;

src/p_setup.c

@@ -3331,6 +3331,7 @@ static boolean P_CheckSoundReplacements(UINT16 wadnum, char *name, size_t i)
 
 	return false;
 }
+
 //
 // P_CheckReplacMapReplacements
 //

src/p_spec.c

@@ -3394,7 +3394,7 @@ void P_ProcessSpecialSector(player_t *player, sector_t *sector, sector_t *rovers
 			break;
 		case 12: // SRB2kart: Invert Encore Remap
 			break;
-		case 15: // no idea but keep it dont want anything to break
+		case 15: // also Invert Encore Remap....
 			break;
 	}
 DoneSection2:
@@ -5368,6 +5368,11 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate)
 			case 11: // Custom global gravity!
 				gravity = sector->floorheight/1000;
 				break;
+
+			case 12: // SRB2kart: Invert Encore Remap
+			case 15: // NOTE: vanilla kart checks only for this for some reason!
+				sector->flags |= SF_INVERTENCORE;
+				break;
 		}
 
 		// Process Section 4
@@ -5377,6 +5382,10 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate)
 				if (G_RaceGametype())
 					circuitmap = true;
 				break;
+
+			case 12: // Camera noclip
+				sector->flags |= SF_NOCLIPCAMERA;
+				break;
 		}
 	}
 
@@ -5461,11 +5470,11 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate)
 					sectors[s].gravity = &sectors[sec].floorheight; // This allows it to change in realtime!
 
 					if (lines[i].flags & ML_NOCLIMB)
-						sectors[s].verticalflip = true;
+						sectors[s].flags |= SF_GRAVITYFLIP;
 					else
-						sectors[s].verticalflip = false;
+						sectors[s].flags &= ~SF_GRAVITYFLIP;
 
-					CheckForReverseGravity = sectors[s].verticalflip;
+					CheckForReverseGravity = (boolean)(sectors[s].flags & SF_GRAVITYFLIP);
 				}
 				break;
 
@@ -5558,6 +5567,11 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate)
 					sectors[s].cullheight = &lines[i]; // This allows it to change in realtime!
 				break;
 
+			case 13: // Heat wave effect
+				for (s = -1; (s = P_FindSectorFromLineTag(lines + i, s)) >= 0 ;)
+					sectors[s].flags |= SF_HEATWAVE;
+				break;
+
 			case 50: // Insta-Lower Sector
 				EV_DoFloor(&lines[i], instantLower);
 				break;

src/p_user.c

@@ -3561,7 +3561,7 @@ static boolean P_CheckNoclipCameraPosition(player_t *player, camera_t *thiscam,
 			for (rover = newsubsec->sector->ffloors; rover; rover = rover->next)
 			{
 				fixed_t topheight, bottomheight;
-				if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERALL) || UNLIKELY(GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
+				if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERALL) || (rover->master->frontsector->flags & SF_NOCLIPCAMERA))
 					continue;
 
 				topheight = P_CameraGetFOFTopZ(thiscam, newsubsec->sector, rover, midx, midy, NULL);
@@ -3626,7 +3626,7 @@ static boolean P_CheckNoclipCameraPosition(player_t *player, camera_t *thiscam,
 							// We're inside it! Yess...
 							polysec = po->lines[0]->backsector;
 
-							if (UNLIKELY(GETSECSPECIAL(polysec->special, 4) == 12))
+							if (polysec->flags & SF_NOCLIPCAMERA)
 							{ // Camera noclip polyobj.
 								plink = (polymaplink_t *)(plink->link.next);
 								continue;
@@ -3682,7 +3682,8 @@ static boolean P_CheckNoclipCameraPosition(player_t *player, camera_t *thiscam,
 			for (rover = newsubsec->sector->ffloors; rover; rover = rover->next)
 			{
 				fixed_t topheight, bottomheight;
-				if (UNLIKELY((rover->flags & FF_BLOCKOTHERS) && (rover->flags & FF_RENDERALL) && (rover->flags & FF_EXISTS) && GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
+
+				if ((rover->flags & FF_BLOCKOTHERS) && (rover->flags & FF_RENDERALL) && (rover->flags & FF_EXISTS) && (rover->master->frontsector->flags & SF_NOCLIPCAMERA))
 				{
 					topheight = P_CameraGetFOFTopZ(thiscam, newsubsec->sector, rover, midx, midy, NULL);
 					bottomheight = P_CameraGetFOFBottomZ(thiscam, newsubsec->sector, rover, midx, midy, NULL);
@@ -4262,7 +4263,7 @@ boolean P_SpectatorJoinGame(player_t *player)
 
 static boolean P_CameraCheckHeatFirstperson(player_t *player, sector_t *sector, fixed_t pviewheight)
 {
-	if (P_FindSpecialLineFromTag(13, sector->tag, -1) != -1)
+	if (sector->flags & SF_HEATWAVE)
 		return true;
 
 	if (sector->ffloors)
@@ -4280,7 +4281,7 @@ static boolean P_CameraCheckHeatFirstperson(player_t *player, sector_t *sector,
 			if (pviewheight <= P_GetFFloorBottomZAt(rover, player->mo->x, player->mo->y))
 				continue;
 
-			if (P_FindSpecialLineFromTag(13, rover->master->frontsector->tag, -1) != -1)
+			if (rover->master->frontsector->flags & SF_HEATWAVE)
 				return true;
 		}
 	}
@@ -4516,33 +4517,27 @@ static void DoABarrelRoll(player_t *player)
 static void P_DoFunnyDance(player_t *player)
 {
 	fixed_t bpm; // 140bpm ish
-	fixed_t work, ang, bounce; // hehe squishy
 
-	I_Assert(player != NULL);
-	I_Assert(!P_MobjWasRemoved(player->mo));
-
-	if (player->spectator)
+	if (player->spectator || !player->mo || player->kartstuff[k_respawn] || player->mo->salty.jump) // this looks jank as hell during hop
 		return;
 
-	// this looks jank as hell during hop or respawn
-	if (player->kartstuff[k_respawn] || player->salty.jump)
-		return;
+	player->squishdance.bounce = 0;
 
 	// bpm = FixedDiv((60*TICRATE)<<FRACBITS, FLOAT_TO_FIXED(mapmusic.bpm)); << maybe can get the tempo and beat detection lib to work for bpm autodetection
-	bpm = ((60*TICRATE) / (cv_squishdancespeed.value)) << FRACBITS;
+	bpm = FixedDiv((60*TICRATE)<<FRACBITS, FLOAT_TO_FIXED((float)cv_squishdancespeed.value));
 
-	work = (player->squishdance.time << FRACBITS) % bpm;
+	player->squishdance.work = (player->squishdance.time << FRACBITS) % bpm;
 
 	if (player->squishdance.time >= (FRACUNIT >> 1)) // prevent overflow jump - takes about 15 minutes
-		player->squishdance.time = (work >> FRACBITS);
+		player->squishdance.time = (player->squishdance.work >> FRACBITS);
 
-	work = FixedDiv(work*180, bpm);
+	player->squishdance.work = FixedDiv(player->squishdance.work*180, bpm);
 
-	ang = ((FixedAngle(work) >> ANGLETOFINESHIFT) & FINEMASK);
-	bounce = ((FINESINE(ang) - FRACUNIT/2) / 2);
+	player->squishdance.ang = ((FixedAngle(player->squishdance.work) >> ANGLETOFINESHIFT) & FINEMASK);
+	player->squishdance.bounce = ((FINESINE(player->squishdance.ang) - FRACUNIT/2) / 2);
 
-	player->mo->spritexscale -= bounce;
-	player->mo->spriteyscale += bounce;
+	player->mo->spritexscale -= player->squishdance.bounce;
+	player->mo->spriteyscale += player->squishdance.bounce;
 
 	player->squishdance.time++;
 }

src/r_bsp.cpp

@@ -48,8 +48,7 @@ boolean g_walloffscreen = false;
 
 boolean R_NoEncore(sector_t *sector, boolean ceiling)
 {
-	const INT32 invspecial = GETSECSPECIAL(sector->special, 2);
-	boolean invertencore = (invspecial == 12 || invspecial == 15); // keeping this incase its used
+	const boolean invertEncore = (sector->flags & SF_INVERTENCORE);
 
 #if 0 // perfect implementation
 	const INT32 sprnspecial = GETSECSPECIAL(sector->special, 3);
@@ -59,10 +58,10 @@ boolean R_NoEncore(sector_t *sector, boolean ceiling)
 #endif
 		&& GETSECSPECIAL(sector->special, 4) != 6) // sneaker panel
 	{
-		return invertencore;
+		return invertEncore;
 	}
 
-	if (invertencore)
+	if (invertEncore)
 	{
 		return false;
 	}

src/r_defs.h

@@ -307,10 +307,19 @@ typedef struct pslope_s
 
 typedef enum
 {
-	SF_FLIPSPECIAL_FLOOR    =  1,
-	SF_FLIPSPECIAL_CEILING  =  2,
-	SF_FLIPSPECIAL_BOTH     =  3,
-	SF_TRIGGERSPECIAL_TOUCH =  4,
+	// flipspecial - planes with effect
+	SF_FLIPSPECIAL_FLOOR       =  1,
+	SF_FLIPSPECIAL_CEILING     =  1<<1,
+	SF_FLIPSPECIAL_BOTH        =  (SF_FLIPSPECIAL_FLOOR|SF_FLIPSPECIAL_CEILING),
+	// triggerspecial - conditions under which plane touch causes effect
+	SF_TRIGGERSPECIAL_TOUCH    =  1<<2,
+
+	SF_GRAVITYFLIP             =  1<<3,
+	SF_HEATWAVE                =  1<<4,
+	SF_NOCLIPCAMERA            =  1<<5,
+
+	// invert encore color remap status
+	SF_INVERTENCORE            =  1<<6,
 } sectorflags_t;
 
 //
@@ -391,7 +400,6 @@ typedef struct sector_s
 
 	// This points to the master's floorheight, so it can be changed in realtime!
 	fixed_t *gravity; // per-sector gravity
-	boolean verticalflip; // If gravity < 0, then allow flipped physics
 	sectorflags_t flags;
 
 	// Sprite culling feature

src/st_stuff.c

@@ -410,7 +410,7 @@ static void ST_drawDebugInfo(void)
 	}
 
 	if (cv_debug & DBG_MEMORY)
-		V_DrawRightAlignedString(320, height,     V_MONOSPACE, va("Heap used: %7sKB", sizeu1(Z_TagsUsage(0, INT32_MAX)>>10)));
+		V_DrawRightAlignedString(320, height,     V_MONOSPACE, va("Heap used: %7sKB", sizeu1(Z_TotalUsage()>>10)));
 }
 
 static void ST_drawLevelTitle(void)

src/w_wad.c

@@ -396,6 +396,11 @@ FUNCINLINE static ATTRINLINE UINT32 W_HashLumpName(const char *name)
 	return FNV1a_HashLowercaseString(name);
 }
 
+FUNCINLINE static ATTRINLINE UINT32 W_HashLumpNameLen(const char *name, size_t len)
+{
+	return FNV1a_QuickCaseHash(name, len);
+}
+
 /** Detect a file type.
  * \todo Actually detect the wad/pkzip headers and whatnot, instead of just checking the extensions.
  */
@@ -1095,18 +1100,14 @@ const char *W_CheckNameForNum(lumpnum_t lumpnum)
 UINT16 W_CheckNumForNamePwad(const char *name, UINT16 wad, UINT16 startlump)
 {
 	UINT16 i;
-	static char uname[8 + 1];
 	UINT32 hash;
 	size_t namelen;
 
 	if (!TestValidLump(wad, 0))
 		return INT16_MAX;
 
-	memset(uname, 0, sizeof(uname));
-	strncpy(uname, name, sizeof(uname)-1);
-	strupr(uname);
-	namelen = strlen(uname);
-	hash = W_HashLumpName(uname);
+	namelen = strnlen(name, 8); // :chaosleep:
+	hash = W_HashLumpNameLen(name, namelen);
 
 	//
 	// scan forward
@@ -1121,7 +1122,7 @@ UINT16 W_CheckNumForNamePwad(const char *name, UINT16 wad, UINT16 startlump)
 		{
 			if (lump_p->namelength == namelen
 				&& lump_p->hash.name == hash
-				&& !memcmp(lump_p->name, uname, sizeof(uname) - 1))
+				&& !strncasecmp(lump_p->name, name, namelen))
 				return i;
 		}
 	}

src/z_zone.cpp

@@ -75,7 +75,7 @@ typedef struct memblock_s
 #define MEMBLOCK(x) (memblock_t *)((uintptr_t)(x) - ALIGNPAD - sizeof(memblock_t))
 
 // both the head and tail of the zone memory block list
-static memblock_t head;
+static memblock_t headlist[NUM_PURGETAGS];
 
 static constexpr size_t kLevelLargePoolBlockSize = sizeof(mobj_t);
 static constexpr size_t kLevelMedPoolBlockSize = sizeof(precipmobj_t);
@@ -107,10 +107,14 @@ static void Command_Memdump_f(void);
 void Z_Init(void)
 {
 	size_t total, memfree;
+	size_t i;
 
-	memset(&head, 0x00, sizeof(head));
+	memset(&headlist, 0x00, sizeof(headlist));
 
-	head.next = head.prev = &head;
+	for (i = 0; i < NUM_PURGETAGS; i++)
+	{
+		headlist[i].next = headlist[i].prev = &headlist[i];
+	}
 
 	memfree = I_GetFreeMem(&total)>>20;
 
@@ -204,7 +208,7 @@ static void *xm(size_t size)
 	if (p == NULL)
 	{
 		// Oh crumbs: we're out of heap. Try purging the cache and reallocating.
-		Z_FreeTags(PU_PURGELEVEL, INT32_MAX);
+		Z_FreeTags(PU_PURGELEVEL, NUM_PURGETAGS-1);
 		p = malloc(padedsize);
 
 		if (p == NULL)
@@ -245,9 +249,9 @@ void *Z_Malloc(size_t size, INT32 tag, void *user)
 	ptr = MEMORY(block);
 	I_Assert((intptr_t)ptr % alignof (max_align_t) == 0);
 
-	block->next = head.next;
-	block->prev = &head;
-	head.next = block;
+	block->next = headlist[tag].next;
+	block->prev = &headlist[tag];
+	headlist[tag].next = block;
 	block->next->prev = block;
 
 	block->tag = tag;
@@ -411,6 +415,7 @@ void Z_FreeTags(INT32 lowtag, INT32 hightag)
 #endif
 {
 	memblock_t *block, *next;
+	INT32 i;
 
 #ifdef ZDEBUG
 	Z_CheckHeap2(file, line);
@@ -427,11 +432,13 @@ void Z_FreeTags(INT32 lowtag, INT32 hightag)
 		g_level_tiny_pool.release();
 	}
 
-	for (block = head.next; block != &head; block = next)
+	for (i = lowtag; i <= hightag; i++)
 	{
-		next = block->next; // get link before freeing
-		if (block->tag >= lowtag && block->tag <= hightag)
+		for (block = headlist[i].next; block != &headlist[i]; block = next)
+		{
+			next = block->next; // get link before freeing
 			Z_Free(MEMORY(block));
+		}
 	}
 }
 
@@ -444,18 +451,20 @@ void Z_FreeTags(INT32 lowtag, INT32 hightag)
 void Z_IterateTags(INT32 lowtag, INT32 hightag, boolean (*iterfunc)(void *))
 {
 	memblock_t *block, *next;
+	INT32 i;
 
 	if (!iterfunc)
 		I_Error("Z_IterateTags: no iterator function was given");
 
-	for (block = head.next; block != &head; block = next)
+	for (i = lowtag; i <= hightag; i++)
 	{
-		next = block->next; // get link before possibly freeing
-
-		if (block->tag >= lowtag && block->tag <= hightag)
+		for (block = headlist[i].next; block != &headlist[i]; block = next)
 		{
+			next = block->next; // get link before possibly freeing
+
 			void *mem = MEMORY(block);
 			boolean free = iterfunc(mem);
+
 			if (free)
 				Z_Free(mem);
 		}
@@ -486,7 +495,7 @@ void Z_CheckMemCleanup(void)
 	if (nextcleanup-- == 0)
 	{
 		nextcleanup = CLEANUPCOUNT;
-		Z_FreeTags(PU_PURGELEVEL, INT32_MAX);
+		Z_FreeTags(PU_PURGELEVEL, NUM_PURGETAGS-1);
 	}
 }
 
@@ -504,6 +513,7 @@ void Z_CheckHeap(INT32 tag)
 {
 	memblock_t *block;
 	UINT32 blocknumon = 0;
+	size_t j;
 	void *given;
 
 #ifndef ZDEBUG
@@ -520,40 +530,47 @@ void Z_CheckHeap(INT32 tag)
 			blocknumon, block->ownerfile, block->ownerline, msg)
 #endif
 
-	for (block = head.next; block != &head; block = block->next)
+	for (j = 0; j < NUM_PURGETAGS; j++)
 	{
-		blocknumon++;
-		given = MEMORY(block);
+		for (block = headlist[j].next; block != &headlist[j]; block = block->next)
+		{
+			blocknumon++;
+			given = MEMORY(block);
 #ifdef ZDEBUG2
-		CONS_Debug(DBG_MEMORY, "block %u owned by %s:%d\n",
-			blocknumon, block->ownerfile, block->ownerline);
+			CONS_Debug(DBG_MEMORY, "block %u owned by %s:%d\n",
+				blocknumon, block->ownerfile, block->ownerline);
 #endif
 #ifdef HAVE_VALGRIND
-		if (RUNNING_ON_VALGRIND && !VALGRIND_MEMPOOL_EXISTS(block))
-		{
-			HeapError(" should not exist");
-		}
+			if (RUNNING_ON_VALGRIND && !VALGRIND_MEMPOOL_EXISTS(block))
+			{
+				HeapError(" should not exist");
+			}
 #endif
-		if (block->user != NULL && *(block->user) != given)
-		{
-			HeapError(" doesn't have a proper user");
-		}
+			if (block->user != NULL && *(block->user) != given)
+			{
+				HeapError(" doesn't have a proper user");
+			}
 
-		if (block->next->prev != block)
-		{
-			HeapError(" lacks proper backlink");
-		}
+			if (block->next->prev != block)
+			{
+				HeapError(" lacks proper backlink");
+			}
 
-		if (block->prev->next != block)
-		{
-			HeapError(" lacks proper forward link");
-		}
+			if (block->prev->next != block)
+			{
+				HeapError(" lacks proper forward link");
+			}
 #ifdef PARANOIA
-		if (block->id != ZONEID)
-		{
-			HeapError(" has the wrong ID");
-		}
+			if (block->id != ZONEID)
+			{
+				HeapError(" has the wrong ID");
+			}
 #endif
+			if (block->tag != j)
+			{
+				HeapError(va(" block is contained in the wrong headlist (got: %d expected: %s)", block->tag, sizeu1(j)));
+			}
+		}
 	}
 }
 
@@ -590,6 +607,14 @@ void Z_ChangeTag(void *ptr, INT32 tag)
 		I_Error("Internal memory management error: "
 			"tried to make block purgable but it has no owner");
 
+	block->prev->next = block->next;
+	block->next->prev = block->prev;
+
+	block->next = headlist[tag].next;
+	block->prev = &headlist[tag];
+	headlist[tag].next = block;
+	block->next->prev = block;
+
 	block->tag = tag;
 }
 
@@ -640,18 +665,21 @@ void Z_SetUser(void *ptr, void **newuser)
 size_t Z_TagsUsage(INT32 lowtag, INT32 hightag)
 {
 	size_t cnt = 0;
-	memblock_t *rover;
+	memblock_t *head; // why was this called rover before?????
+	INT32 i;
 
-	for (rover = head.next; rover != &head; rover = rover->next)
+	for (i = lowtag; i <= hightag; i++)
 	{
-		if (rover->tag < lowtag || rover->tag > hightag)
-			continue;
-		cnt += rover->size + sizeof(memblock_t);
+		for (head = headlist[i].next; head != &headlist[i]; head = head->next)
+		{
+			cnt += head->size + sizeof *head;
+		}
 	}
 
 	return cnt;
 }
 
+
 // -----------------------
 // Miscellaneous functions
 // -----------------------
@@ -665,8 +693,8 @@ static void Command_Memfree_f(void)
 
 	Z_CheckHeap(-1);
 	CONS_Printf("\x82%s", M_GetText("Memory Info\n"));
-	CONS_Printf(M_GetText("Total heap used        : %7s KB\n"), sizeu1(Z_TotalUsage()>>10));
-	CONS_Printf(M_GetText("Lua                    : %7s KB\n"), sizeu1(Z_TagUsage(PU_LUA)>>10));
+	CONS_Printf(M_GetText("Total heap used        : %7s KB\n"), sizeu1((Z_TotalUsage()>>10) + LUA_MemoryUsage()));
+	CONS_Printf(M_GetText("Lua                    : %7s KB\n"), sizeu1(LUA_MemoryUsage())); // No longer uses z_zone memory but for consistency keep it here
 	CONS_Printf(M_GetText("Static                 : %7s KB\n"), sizeu1(Z_TagUsage(PU_STATIC)>>10));
 	CONS_Printf(M_GetText("Static (sound)         : %7s KB\n"), sizeu1(Z_TagUsage(PU_SOUND)>>10));
 	CONS_Printf(M_GetText("Static (music)         : %7s KB\n"), sizeu1(Z_TagUsage(PU_MUSIC)>>10));
@@ -680,7 +708,7 @@ static void Command_Memfree_f(void)
 	CONS_Printf(M_GetText("Level (pooled)         : %7s KB\n"), sizeu1(Z_LevelPoolUsage()>>10));
 	CONS_Printf(M_GetText("Special thinker        : %7s KB\n"), sizeu1(Z_TagUsage(PU_LEVSPEC)>>10));
 	CONS_Printf(M_GetText("All purgable           : %7s KB\n"),
-		sizeu1(Z_TagsUsage(PU_PURGELEVEL, INT32_MAX)>>10));
+		sizeu1(Z_TagsUsage(PU_PURGELEVEL, NUM_PURGETAGS-1)>>10));
 
 #ifdef HWRENDER
 	if (rendermode == render_opengl)
@@ -709,21 +737,24 @@ static void Command_Memfree_f(void)
 static void Command_Memdump_f(void)
 {
 	memblock_t *block;
-	INT32 mintag = 0, maxtag = INT32_MAX;
+	INT32 mintag = 0, maxtag = NUM_PURGETAGS-1;
+	INT32 check;
 	INT32 i;
 
-	if ((i = COM_CheckParm("-min")))
-		mintag = atoi(COM_Argv(i + 1));
+	if ((check = COM_CheckParm("-min")))
+		mintag = atoi(COM_Argv(check + 1));
 
-	if ((i = COM_CheckParm("-max")))
-		maxtag = atoi(COM_Argv(i + 1));
+	if ((check = COM_CheckParm("-max")))
+		maxtag = atoi(COM_Argv(check + 1));
 
-	for (block = head.next; block != &head; block = block->next)
-		if (block->tag >= mintag && block->tag <= maxtag)
+	for (i = mintag; i <= maxtag; i++)
+	{
+		for (block = headlist[i].next; block != &headlist[i]; block = block->next)
 		{
 			const char *filename = strrchr(block->ownerfile, PATHSEP[0]);
-			CONS_Printf("[%3d] %s (%s) bytes @ %s:%d\n", block->tag, sizeu1(block->size + sizeof(memblock_t)), sizeu2(block->size), filename ? filename + 1 : block->ownerfile, block->ownerline);
+			CONS_Printf("[%3d] %s (%s) bytes @ %s:%d tag: %d (%d)\n", block->tag, sizeu1(block->size + sizeof(memblock_t)), sizeu2(block->size), filename ? filename + 1 : block->ownerfile, block->ownerline, block->tag, i);
 		}
+	}
 }
 #endif
 
@@ -773,6 +804,27 @@ void* Z_LevelPoolMalloc(size_t size)
 	return p;
 }
 
+boolean Z_IsMobjValid2(void *p, const char *file, INT32 line)
+{
+	//(void)file;
+	//(void)line;
+
+	// mobj was removed
+	// no need to worry here
+	if (p == NULL)
+		return false;
+
+	// mobjs reside in the large pool
+	if (!g_level_large_pool.ptrcheck(p))
+	{
+		//I_Error("invalid mobj! at %s:%d", file, line);
+		CONS_Alert(CONS_ERROR, "invalid mobj! at %s:%d", file, line);
+		return false;
+	}
+
+	return true;
+}
+
 void* Z_LevelPoolCalloc(size_t size)
 {
 	void* p = Z_LevelPoolMalloc(size);

src/z_zone.h

@@ -42,39 +42,42 @@ extern "C" {
 enum
 {
 	// Tags < PU_LEVEL are not purged until freed explicitly.
-	PU_STATIC                = 1, // static entire execution time
-	PU_LUA                   = 2, // static entire execution time -- used by lua so it doesn't get caught in loops forever
-	PU_PERFSTATS             = 3, // static between changes to ps_samplesize cvar
+	PU_STATIC                = 0, // static entire execution time
+	PU_LUA, // static entire execution time -- used by lua so it doesn't get caught in loops forever
+	PU_PERFSTATS, // static between changes to ps_samplesize cvar
 
-	PU_SOUND                 = 11, // static while playing
-	PU_MUSIC                 = 12, // static while playing
+	PU_SOUND, // static while playing
+	PU_MUSIC, // static while playing
 
-	PU_PATCH                 = 14, // static entire execution time
-	PU_PATCH_LOWPRIORITY     = 15, // lower priority patch, static until level exited
-	PU_PATCH_ROTATED         = 16, // rotated patch, static entire execution time
-	PU_PATCH_DATA            = 17, // patch data, lifetime depends on the patch that owns it
-	PU_SPRITE                = 18, // sprite patch, static until WAD added
-	PU_HUDGFX                = 19, // HUD patch, static until WAD added
+	PU_PATCH, // static entire execution time
+	PU_PATCH_LOWPRIORITY, // lower priority patch, static until level exited
+	PU_PATCH_ROTATED, // rotated patch, static until level exited or WAD added
+	PU_PATCH_DATA, // patch data, lifetime depends on the patch that owns it
+	PU_SPRITE, // sprite patch, static until WAD added
+	PU_HUDGFX, // HUD patch, static until WAD added
 
-	PU_HWRPATCHINFO          = 21, // Hardware GLPatch_t struct for OpenGL texture cache
-	PU_HWRPATCHCOLMIPMAP     = 22, // Hardware GLMipmap_t struct colormap variation of patch
-	PU_HWRMODELTEXTURE       = 23, // Hardware model texture
+	PU_HWRPATCHINFO, // Hardware GLPatch_t struct for OpenGL texture cache
+	PU_HWRPATCHCOLMIPMAP, // Hardware GLMipmap_t struct colormap variation of patch
+	PU_HWRMODELTEXTURE, // Hardware model texture
 
-	PU_HWRCACHE              = 48, // static until unlocked
-	PU_CACHE                 = 49, // static until unlocked
+	PU_HWRCACHE, // static until unlocked
+	PU_CACHE, // static until unlocked
 
 	// Tags s.t. PU_LEVEL <= tag < PU_PURGELEVEL are purged at level start
-	PU_LEVEL                 = 50, // static until level exited
-	PU_LEVSPEC               = 51, // a special thinker in a level
-	PU_HWRPLANE              = 52, // if ZPLANALLOC is enabled in hw_bsp.c, this is used to alloc polygons for OpenGL
+	PU_LEVEL, // static until level exited
+	PU_LEVSPEC, // a special thinker in a level
+	PU_HWRPLANE, // if ZPLANALLOC is enabled in hw_bsp.c, this is used to alloc polygons for OpenGL
 
 	// Tags >= PU_PURGELEVEL are purgable whenever needed
-	PU_PURGELEVEL            = 100, // Note: this is never actually used as a tag
-	PU_CACHE_UNLOCKED        = 101, // Note: unused
-	PU_HWRCACHE_UNLOCKED     = 102, // 'unlocked' PU_HWRCACHE memory:
+	PU_PURGELEVEL, // Note: this is never actually used as a tag
+	PU_CACHE_UNLOCKED, // Note: unused
+	PU_HWRCACHE_UNLOCKED, // 'unlocked' PU_HWRCACHE memory:
 									// 'second-level' cache for graphics
-                                    // stored in hardware format and downloaded as needed
-	PU_HWRMODELTEXTURE_UNLOCKED = 103, // 'unlocked' PU_HWRMODELTEXTURE memory
+
+									// stored in hardware format and downloaded as needed
+	PU_HWRMODELTEXTURE_UNLOCKED, // 'unlocked' PU_HWRMODELTEXTURE memory
+
+	NUM_PURGETAGS
 };
 
 //
@@ -157,7 +160,7 @@ void Z_SetUser(void *ptr, void **newuser);
 //
 #define Z_TagUsage(tagnum) Z_TagsUsage(tagnum, tagnum)
 size_t Z_TagsUsage(INT32 lowtag, INT32 hightag);
-#define Z_TotalUsage() Z_TagsUsage(0, INT32_MAX)
+#define Z_TotalUsage() Z_TagsUsage(0, NUM_PURGETAGS-1)
 
 //
 // Miscellaneous functions
@@ -170,6 +173,8 @@ char *Z_StrDup(const char *in);
 size_t Z_LevelPoolUsage(void);
 void *Z_LevelPoolMalloc(size_t size);
 void *Z_LevelPoolCalloc(size_t size);
+#define Z_IsMobjValid(p) Z_IsMobjValid2(p, __FILE__, __LINE__)
+boolean Z_IsMobjValid2(void *p, const char *file, INT32 line);
 void Z_LevelPoolFree(void *p, size_t size);
 
 // for use with CLEANUP macro