fix merge conflicts texturehashing

port of https://git.do.srb2.org/STJr/SRB2/-/merge_requests/1725#c829d21709a4f5cd81d140271e883bc40dd00b1b

.gitmodules

@@ -1,5 +0,0 @@
-[submodule "libs/bluajit"]
-	path = libs/bluajit
-	url = https://github.com/Indev450/bluajit
-[submodule "libs/bluajit/"]
-	branch = bluajit-install

src/Makefile

@@ -64,10 +64,6 @@
 # DEBUGMODE=1 - Enable various debugging capabilities.
 #               Also disables optimizations.
 #
-# Potentially Unsafe
-# ------------------
-# HAVE_BLUAJIT=1 - Enable compiling with BluaJIT instead of blua, can have potential bugs
-#
 # Development flags:
 #
 # VALGRIND=1 - Enable Valgrind memory debugging support.
@@ -188,14 +184,8 @@ sources+=\
 	$(call List,Sourcefile)\
 	$(call List,core/Sourcefile)
 
-ifndef HAVE_BLUAJIT
-lualib:=
 sources+=\
 	$(call List,blua/Sourcefile)
-else
-opts+=-DLUAJIT_INTONLY
-lualib:=../libs/bluajit/src/libbluajit.a
-endif
 
 depends:=$(basename $(filter %.c %.cpp %.s,$(sources)))
 objects:=$(basename $(filter %.c %.cpp %.s %.nas,$(sources)))
@@ -367,15 +357,10 @@ ifdef UPX
 endif
 
 # original executable with debugging symbols
-$(dbg) : $(objects) $(lualib) | $$(@D)/
+$(dbg) : $(objects) | $$(@D)/
 	$(call Echo,Linking $(@F)...)
 	$(.)$(LD) -o $@ $^ $(libs)
 
-ifdef HAVE_BLUAJIT
-$(lualib) ::
-	@$(MAKE) -C ../libs/bluajit $(MAKECMDGOALS) CC="$(CC)" CCOPT="$(opts)" LDFLAGS="$(LDFLAGS)"
-endif
-
 # disassembly of executable
 $(dbg).txt : $(dbg)
 	$(call Echo,Dumping debugging info...)
@@ -438,13 +423,6 @@ clean :
 distclean :
 	$(call _rm,../bin ../objs ../dep ../make comptime.h)
 
-ifdef HAVE_BLUAJIT
-	$(call _rm,$(objdir)/buildvm* $(objdir)/minilua* $(objdir)/lj_vm*)
-
-cleanjit:
-	$(call _rm,$(objdir)/buildvm* $(objdir)/minilua* $(objdir)/lj_vm* $(ALL_HDRGEN) $(LJVMCORE_O) $(ALL_GEN))
-endif
-
 info:
 ifdef WINDOWSHELL
 	@REM

src/Makefile.d/features.mk

@@ -6,8 +6,7 @@ passthru_opts+=\
 	NOHW NOMD5 NOPOSTPROCESSING\
 	MOBJCONSISTANCY PACKETDROP ZDEBUG\
 	HAVE_MINIUPNPC\
-	HAVE_DISCORDRPC DEVELOP\
-	HAVE_BLUAJIT
+	HAVE_DISCORDRPC DEVELOP
 
 # build with debugging information
 ifdef DEBUGMODE

src/Makefile.d/nix.mk

@@ -26,11 +26,6 @@ ifeq (${DEDICATED},1)
 EXENAME?=lsrb2kartd
 endif
 
-ifdef HAVE_BLUAJIT
-libs+=-L../libs/bluajit/src/ -l:libbluajit.a
-opts+=-I../libs/bluajit/src/
-endif
-
 # In common usage.
 ifdef LINUX
 libs+=-lrt

src/Makefile.d/win32.mk

@@ -69,11 +69,6 @@ LIBOPENMPT_opts:=-I$(lib)/inc
 LIBOPENMPT_libs:=-L$(lib)/lib/$(x86) -lopenmpt
 $(eval $(call _set,LIBOPENMPT))
 
-lib:=../libs/bluajit
-BLUAJIT_opts:=-I$(lib)/src
-BLUAJIT_libs:=-L$(lib)/lib/$(x86) -lbluajit
-$(eval $(call _set,BLUAJIT))
-
 lib:=../libs/SDL2_mixer/$(mingw)
 
 ifdef SDL

src/blua/liolib.c

@@ -17,14 +17,27 @@
 
 #include "lauxlib.h"
 #include "lualib.h"
+#include "../i_system.h"
+#include "../doomdef.h"
+#include "../d_main.h"
+#include "../m_misc.h"
 
 
 
 #define IO_INPUT	1
 #define IO_OUTPUT	2
 
+#define FILELIMIT 1024*1024 // Size limit for reading/writing files
+
 
 static const char *const fnames[] = {"input", "output"};
+static const char *whitelist[] = { // Allow scripters to write files of these types to SRB2's folder
+	".txt",
+	".sav2",
+	".cfg",
+	".png",
+	".bmp"
+};
 
 
 static int pushresult (lua_State *L, int i, const char *filename) {
@@ -146,12 +159,59 @@ static int io_tostring (lua_State *L) {
   return 1;
 }
 
+static int StartsWith(const char *a, const char *b) // this is wolfs being lazy yet again
+{
+   if(strncmp(a, b, strlen(b)) == 0) return 1;
+   return 0;
+}
+
+
 static int io_open (lua_State *L) {
-  const char *filename = luaL_checkstring(L, 1);
-  const char *mode = luaL_optstring(L, 2, "r");
-  FILE **pf = newfile(L);
-  *pf = fopen(filename, mode);
-  return (*pf == NULL) ? pushresult(L, 0, filename) : 1;
+	FILE **pf;
+	const char *filename = luaL_checkstring(L, 1);
+	int pass = 0;
+	size_t i;
+	int length = strlen(filename);
+	char *splitter, *forward, *backward;
+	char *destFilename;
+	const char *mode = luaL_optstring(L, 2, "r");
+
+	for (i = 0; i < (sizeof (whitelist) / sizeof(const char *)); i++)
+	{
+		if (!stricmp(&filename[length - strlen(whitelist[i])], whitelist[i]))
+		{
+			pass = 1;
+			break;
+		}
+	}
+	if (l_unlikely(strstr(filename, "..") || strchr(filename, ':') || StartsWith(filename, "\\")
+		|| StartsWith(filename, "/") || !pass))
+	{
+		luaL_error(L,"access denied to %s", filename);
+		return pushresult(L,0,filename);
+	}
+
+	destFilename = va("%s"PATHSEP"luafiles"PATHSEP"%s", srb2home, filename);
+
+	// Make directories as needed
+	splitter = destFilename;
+
+    forward = strchr(splitter, '/');
+    backward = strchr(splitter, '\\');
+	while ((splitter = (forward && backward) ? min(forward, backward) : (forward ?: backward)))
+	{
+		*splitter = 0;
+		I_mkdir(destFilename, 0755);
+		*splitter = '/';
+		splitter++;
+
+        forward = strchr(splitter, '/');
+        backward = strchr(splitter, '\\');
+	}
+
+	pf = newfile(L);
+	*pf = fopen(destFilename, mode);
+	return (*pf == NULL) ? pushresult(L, 0, filename) : 1;
 }
 
 
@@ -394,6 +454,11 @@ static int g_write (lua_State *L, FILE *f, int arg) {
     else {
       size_t l;
       const char *s = luaL_checklstring(L, arg, &l);
+	  if (l_unlikely(ftell(f) + l > FILELIMIT))
+	  {
+		luaL_error(L,"write limit bypassed in file. Changes have been discarded.");
+		break;
+	  }
       status = status && (fwrite(s, sizeof(char), l, f) == l);
     }
   }

src/d_netcmd.c

@@ -777,10 +777,6 @@ void D_RegisterServerCommands(void)
 	CV_RegisterVar(&cv_netdemosyncquality);
 	CV_RegisterVar(&cv_maxdemosize);
 	CV_RegisterVar(&cv_demochangemap);
-
-#ifdef HAVE_BLUAJIT
-	CV_RegisterVar(&cv_luajit);
-#endif
 }
 
 // =========================================================================

src/k_hud.c

@@ -1138,33 +1138,6 @@ static boolean K_UseColorSpeedo(int speedostyle)
 	}
 }
 
-enum
-{
-	GAUGE_DEFAULT = 1,
-	GAUGE_SMALL,
-	GAUGE_BIGNUM,
-	GAUGE_NUMONLY,
-	GAUGE_EXTRA,
-};
-
-static SINT8 K_GetDriftgaugeStyle(void)
-{
-	if (driftgaugegfx)
-	{
-		if (cv_driftgaugestyle.value == 1)
-			return GAUGE_DEFAULT;
-		else if (cv_driftgaugestyle.value == 2)
-			return GAUGE_SMALL;
-		else if (cv_driftgaugestyle.value == 3)
-			return GAUGE_BIGNUM;
-		else if (cv_driftgaugestyle.value == 5 && xtra_speedo3)
-			return GAUGE_EXTRA;
-	}
-
-	// Fallback
-	return GAUGE_NUMONLY; // (cv_driftgaugestyle.value == 4)
-}
-
 static boolean K_IsHighResolution(void)
 {
 	return (vid.width >= 640 && vid.height >= 400);
@@ -1726,7 +1699,7 @@ static void K_drawKartItem(void)
 			switch (stplyr->kartstuff[k_itemblinkmode])
 			{
 				case 2:
-					localcolor = K_RainbowColor();
+					localcolor = (UINT8)(1 + (leveltime % (MAXSKINCOLORS-1)));
 					break;
 				case 1:
 					localcolor = SKINCOLOR_RED;
@@ -3176,7 +3149,7 @@ static void K_drawDriftGauge(void)
 	fixed_t basex, basey;
 	const int dup = vid.dupx;
 	int i;
-	UINT8 *colormap = NULL;
+	UINT8 *cmap;
 
 	static const UINT8 driftcolors[3][4] = {
 		{0, 0, 10, 16},       // no drift
@@ -3222,21 +3195,23 @@ skipcrap:
 	const INT32 driftcharge = min(driftval*4, stplyr->kartstuff[k_driftcharge]);
 	const INT32 driftlevel  = min(driftcharge / driftval, 2);
 	const INT32 drifttrans  = ((cv_driftgaugetrans.value) ? V_LocalTransFlag() : 0);
-	const SINT8 gaugestyle  = K_GetDriftgaugeStyle();
 
 	basex = pos.x>>FRACBITS;
 	basey = pos.y>>FRACBITS;
 
-	switch (gaugestyle)
+	switch (cv_driftgaugestyle.value)
 	{
-		case GAUGE_DEFAULT:
-		case GAUGE_SMALL:
-		case GAUGE_EXTRA:
-		case GAUGE_BIGNUM:
+		case 1:
+		case 2:
+		case 3:
+		case 5:
 			{
-				patch_t *driftpatch = NULL;
+				if (!driftgaugegfx)
+					break;
 
-				if (gaugestyle == GAUGE_DEFAULT || gaugestyle == GAUGE_BIGNUM || gaugestyle == GAUGE_EXTRA)
+				const boolean usescaledpatch = (cv_driftgaugestyle.value == 5 && xtra_speedo3);
+
+				if (cv_driftgaugestyle.value == 1 || cv_driftgaugestyle.value == 3 || usescaledpatch)
 				{
 					barx = basex - dup*23;
 					BAR_WIDTH = dup*47;
@@ -3249,44 +3224,40 @@ skipcrap:
 
 				bary = basey - dup*2;
 
-				if (gaugestyle == GAUGE_EXTRA) // i hate hud code i hate hud code i hate hud code i hate hud code i hate hud code.....
+				if (usescaledpatch) // i hate hud code i hate hud code i hate hud code i hate hud code i hate hud code.....
 				{
-					if (K_UseColorSpeedo(SPEEDO_EXTRA3)) // We reuse the extra speedometer patch hence this check
+					if (K_UseColorSpeedo(SPEEDO_EXTRA3)) // Colourized hud
 					{
-						colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
-						driftpatch = skp_smallstickerclr3;
+						UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
+						V_DrawStretchyFixedPatch((basex - dup*30)<<FRACBITS, ((basey<<FRACBITS) - FixedMul(dup<<FRACBITS, 21*FRACUNIT/10)), XTRA3PSCALE, XTRA3VSCALE, V_NOSCALESTART|V_OFFSET|drifttrans, skp_smallstickerclr3, colormap, 0);
 					}
 					else
-						driftpatch = skp_smallsticker3;
-
-					V_DrawStretchyFixedPatch((basex - dup*30)<<FRACBITS, ((basey<<FRACBITS) - FixedMul(dup<<FRACBITS, 21*FRACUNIT/10)), XTRA3PSCALE, XTRA3VSCALE, V_NOSCALESTART|V_OFFSET|drifttrans, driftpatch, colormap, 0);
+						V_DrawStretchyFixedPatch((basex - dup*30)<<FRACBITS, ((basey<<FRACBITS) - FixedMul(dup<<FRACBITS, 21*FRACUNIT/10)), XTRA3PSCALE, XTRA3VSCALE, V_NOSCALESTART|V_OFFSET|drifttrans, skp_smallsticker3, NULL, 0);
 				}
 				else
 				{
 					if (K_UseColorHud()) // Colourized hud
 					{
-						colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
-						driftpatch = (gaugestyle == GAUGE_SMALL ? driftgaugesmallcolor : driftgaugecolor);
+						UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
+						V_DrawMappedPatch(cv_driftgaugestyle.value == 2 ? basex + dup*11 : basex, basey, V_NOSCALESTART|V_OFFSET|drifttrans, cv_driftgaugestyle.value == 2 ? driftgaugesmallcolor : driftgaugecolor, colormap);
 					}
 					else
-						driftpatch = (gaugestyle == GAUGE_SMALL ? driftgaugesmall : driftgauge);
-
-					V_DrawMappedPatch(gaugestyle == GAUGE_SMALL ? basex + dup*11 : basex, basey, V_NOSCALESTART|V_OFFSET|drifttrans, driftpatch, colormap);
+						V_DrawMappedPatch(cv_driftgaugestyle.value == 2 ? basex + dup*11 : basex, basey, V_NOSCALESTART|V_OFFSET|drifttrans, cv_driftgaugestyle.value == 2 ? driftgaugesmall : driftgauge, NULL);
 				}
 
 				if (driftcharge >= driftval*4) // rainbow sparks
 				{
-					colormap = R_GetTranslationColormap(TC_RAINBOW, K_RainbowColor(), GTC_CACHE);
+					cmap = R_GetTranslationColormap(TC_RAINBOW, 1 + leveltime % (MAXSKINCOLORS-1),GTC_CACHE);
 
 					for (i = 0; i < 4; i++)
-						V_DrawFill(barx, bary+dup*1+dup*i, BAR_WIDTH, dup, (driftrainbow[min((leveltime % 18) + 1, 17)] + i*2) | V_NOSCALESTART|drifttrans);
+						V_DrawFill(barx, bary+dup*1+dup*i, BAR_WIDTH, dup, (driftrainbow[min((leveltime % 18) + 1, 18 - 1)] + i*2) | V_NOSCALESTART|drifttrans);
 				}
 				else // none/blue/red
 				{
 					const INT32 limit = (driftval * (driftcharge >= driftval*2 ? 2 : 1));
 					const INT32 width = ((driftcharge - (driftcharge >= driftval ? limit : 0)) * BAR_WIDTH) / limit;
 
-					colormap = R_GetTranslationColormap(TC_RAINBOW, driftskins[driftlevel], GTC_CACHE);
+					cmap = R_GetTranslationColormap(TC_RAINBOW, driftskins[driftlevel],GTC_CACHE);
 
 					for (i = 0; i < 4; i++)
 					{
@@ -3298,20 +3269,20 @@ skipcrap:
 				}
 
 				// right, also draw a cool number
-				if (gaugestyle == GAUGE_BIGNUM)
-					V_DrawPaddedTallColorNum(basex + (dup*32), basey, V_NOSCALESTART|V_OFFSET|drifttrans, driftcharge*100 / driftval, 3, colormap);
+				if (cv_driftgaugestyle.value == 3)
+					V_DrawPaddedTallColorNum(basex + (dup*32), basey, V_NOSCALESTART|V_OFFSET|drifttrans, driftcharge*100 / driftval, 3, cmap);
 				else
-					V_DrawPingNum((gaugestyle == GAUGE_SMALL ? basex + (dup*22) : basex + (dup*32)), basey, V_NOSCALESTART|V_OFFSET|drifttrans, driftcharge*100 / driftval, colormap);
+					V_DrawPingNum(cv_driftgaugestyle.value == 2 ? basex + (dup*22) : basex + (dup*32), basey, V_NOSCALESTART|V_OFFSET|drifttrans, driftcharge*100 / driftval, cmap);
 			}
 			break;
-		case GAUGE_NUMONLY:
+		case 4:
 			{
 				if (driftcharge >= driftval*4)
-					colormap = R_GetTranslationColormap(TC_RAINBOW, K_RainbowColor(), GTC_CACHE);
+					cmap = R_GetTranslationColormap(TC_RAINBOW, 1 + leveltime % (MAXSKINCOLORS-1),GTC_CACHE);
 				else
-					colormap = R_GetTranslationColormap(TC_RAINBOW, driftskins[driftlevel], GTC_CACHE);
+					cmap = R_GetTranslationColormap(TC_RAINBOW, driftskins[driftlevel],GTC_CACHE);
 
-				V_DrawPaddedTallColorNum(basex + (dup*16), basey, V_NOSCALESTART|V_OFFSET|drifttrans, driftcharge*100 / driftval, 3, colormap);
+				V_DrawPaddedTallColorNum(basex + (dup*16), basey, V_NOSCALESTART|V_OFFSET|drifttrans, driftcharge*100 / driftval, 3, cmap);
 			}
 			break;
 		default:
@@ -3372,7 +3343,6 @@ static void K_drawKartWanted(void)
 	{
 		basex = WANT_X;
 		basey = WANT_Y;
-
 		if (splitscreen == 2)
 		{
 			basey += 16;	// slight adjust for 3P
@@ -4122,23 +4092,17 @@ static void K_drawKartFirstPerson(void)
 				x -= xoffs;
 			else
 				x += xoffs;
-
 			if (!splitscreen)
 				y += yoffs;
 		}
 
-		const INT32 driftcharge = stplyr->kartstuff[k_driftcharge];
-
 		// drift sparks!
-		if ((leveltime & 1) && driftcharge)
-		{
-			if (driftcharge >= dsthree)
-				colmap = R_GetTranslationColormap(TC_RAINBOW, K_RainbowColor(), GTC_CACHE);
-			else if (driftcharge >= dstwo)
-				colmap = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_KETCHUP, GTC_CACHE);
-			else if (driftcharge >= dsone)
-				colmap = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_SAPPHIRE, GTC_CACHE);
-		}
+		if ((leveltime & 1) && (stplyr->kartstuff[k_driftcharge] >= dsthree))
+			colmap = R_GetTranslationColormap(TC_RAINBOW, (UINT8)(1 + (leveltime % (MAXSKINCOLORS-1))), GTC_CACHE);
+		else if ((leveltime & 1) && (stplyr->kartstuff[k_driftcharge] >= dstwo))
+			colmap = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_KETCHUP, GTC_CACHE);
+		else if ((leveltime & 1) && (stplyr->kartstuff[k_driftcharge] >= dsone))
+			colmap = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_SAPPHIRE, GTC_CACHE);
 		else
 #endif
 		// invincibility/grow/shrink!

src/k_kart.c

@@ -484,15 +484,6 @@ UINT8 colortranslations[MAXTRANSLATIONS][16] = {
 	{120, 120,  96,  96,  97,  98,  98,  99,  81,  81,  69,  71,  73,  75,  77,  79}, // SKINCOLOR_CSUPER5
 };
 
-//
-// Gives you a color to use for rainbow effects (like invincibility).
-// Return: Skincolor value.
-//
-UINT8 K_RainbowColor(void)
-{
-	return (UINT8)(1 + (leveltime % (MAXSKINCOLORS-1)));
-}
-
 // Define for getting accurate color brightness readings according to how the human eye sees them.
 // https://en.wikipedia.org/wiki/Relative_luminance
 // 0.2126 to red
@@ -654,46 +645,36 @@ UINT8 K_GetKartColorByName(const char *name)
 	return 0;
 }
 
-//
 // returns the players skinnumber
 // accounts for localskins
-//
 INT32 K_GetSkinNum(player_t *player)
 {
 	return player->localskin ? (player->localskin - 1) : player->skin;
 }
 
-//
 // returns the mobj skinnumber
 // accounts for localskins
-//
 INT32 K_GetMobjSkinNum(const skin_t *skin, boolean local)
 {
 	return skin - K_GetSkinArray(local);
 }
 
-//
 // returns the players skinnumber
 // accounts for localskins
-//
 skin_t *K_GetMobjSkin(const mobj_t *mobj)
 {
 	return mobj->localskin ? mobj->localskin : mobj->skin;
 }
 
-//
 // returns the skin array to use
 // accounts for localskins
-//
 skin_t *K_GetSkinArray(boolean local)
 {
 	return local ? localskins : skins;
 }
 
-//
 // returns the players skin
 // accounts for localskins
-//
 skin_t *K_GetPlayerSkin(player_t *player)
 {
 	return &K_GetSkinArray(player->skinlocal)[K_GetSkinNum(player)];
@@ -3103,7 +3084,7 @@ static UINT16 K_DriftSparkColor(player_t *player, INT32 charge)
 
 	if (charge >= K_GetKartDriftSparkValue(player)*4)
 	{
-		color = K_RainbowColor();
+		color = (UINT8)(1 + (leveltime % (MAXSKINCOLORS-1)));
 	}
 	else if (charge >= K_GetKartDriftSparkValue(player)*2)
 	{
@@ -5390,7 +5371,7 @@ static UINT8 K_GetSpeedLineColor(player_t *player, boolean colorSpeed)
 			else if (player->kartstuff[k_driftboost] <= 50)
 				speedcolor = SKINCOLOR_RASPBERRY;
 			else if (player->kartstuff[k_driftboost] <= 125)
-				speedcolor = K_RainbowColor();
+				speedcolor = (UINT8)(1 + (leveltime % (MAXSKINCOLORS-1)));
 
 			if (cv_coloredspeedlines.value == 2)
 				speedcolor = (leveltime & 1) ? playercolor : speedcolor;

src/k_kart.h

@@ -19,7 +19,6 @@ extern "C" {
 extern UINT8 colortranslations[MAXTRANSLATIONS][16];
 extern const char *KartColor_Names[MAXSKINCOLORS];
 extern const UINT8 KartColor_Opposite[MAXSKINCOLORS*2];
-UINT8 K_RainbowColor(void);
 void K_RainbowColormap(UINT8 *dest_colormap, UINT8 skincolor);
 void K_GenerateKartColormap(UINT8 *dest_colormap, INT32 skinnum, UINT8 color, boolean local);
 UINT8 K_GetKartColorByName(const char *name);

src/lua_baselib.c

@@ -42,123 +42,6 @@ boolean luaL_checkboolean(lua_State *L, int narg) {
 	return lua_toboolean(L, narg);
 }
 
-static int ref_open, ref_iowrite, ref_fwrite; // original versions of io functions
-
-#define FILELIMIT 1024*1024 // Size limit for reading/writing files
-
-static const char *whitelist[] = { // Allow scripters to write files of these types to SRB2's folder
-	".txt",
-	".sav2",
-	".cfg",
-	".png",
-	".bmp"
-};
-
-static int StartsWith(const char *a, const char *b) // this is wolfs being lazy yet again
-{
-	if(strncmp(a, b, strlen(b)) == 0) return 1;
-	return 0;
-};
-
-// Wrapper for opening files
-static int lib_open(lua_State *L)
-{
-	const char *filename = luaL_checkstring(L, 1);
-	int pass = 0;
-	size_t i;
-	int length = strlen(filename);
-	char *splitter, *forward, *backward;
-	char *destFilename;
-
-	for (i = 0; i < (sizeof (whitelist) / sizeof(const char *)); i++)
-	{
-		if (!stricmp(&filename[length - strlen(whitelist[i])], whitelist[i]))
-		{
-			pass = 1;
-			break;
-		}
-	}
-	if (strstr(filename, "..") || strchr(filename, ':') || StartsWith(filename, "\\")
-		|| StartsWith(filename, "/") || !pass)
-	{
-		return luaL_error(L,"access denied to %s", filename);
-	}
-
-	destFilename = va("%s"PATHSEP"luafiles"PATHSEP"%s", srb2home, filename);
-
-	// Make directories as needed
-	splitter = destFilename;
-
-	forward = strchr(splitter, '/');
-	backward = strchr(splitter, '\\');
-	while ((splitter = (forward && backward) ? min(forward, backward) : (forward ?: backward)))
-	{
-		*splitter = 0;
-		I_mkdir(destFilename, 0755);
-		*splitter = '/';
-		splitter++;
-
-		forward = strchr(splitter, '/');
-		backward = strchr(splitter, '\\');
-	}
-
-	// replace the filename string
-	lua_pushstring(L, destFilename);
-	lua_replace(L, 1);
-	// now call the real io.open
-	lua_rawgeti(L, LUA_REGISTRYINDEX, ref_open);
-	lua_insert(L, 1);
-	lua_call(L, lua_gettop(L)-1, LUA_MULTRET);
-	return lua_gettop(L);
-}
-
-// Wrapper for writing to files
-static int lib_write(lua_State *L, int arg)
-{
-	int top = lua_gettop(L);
-	boolean error = true;
-	size_t len, size = 0;
-	int ogref = ref_iowrite;
-
-	if (arg != 1) {
-		ogref = ref_fwrite;
-		FILE *fp = *(FILE **)luaL_checkudata(L, 1, LUA_FILEHANDLE);
-		if (fp == NULL) goto call; // real file:write will throw
-		size = ftell(fp);
-	}
-
-	// check the size of each argument. if there's too much data,
-	// cut off the stack and print an error
-	for (; arg <= top; arg++) {
-		if (lua_tolstring(L, arg, &len) == NULL) goto call;
-		if ((size += len) > FILELIMIT) {
-			// oops! too many bytes!
-			lua_settop(L, arg-1);
-			goto call;
-		}
-	}
-	error = false;
-
-call:
-	lua_rawgeti(L, LUA_REGISTRYINDEX, ogref);
-	lua_insert(L, 1);
-	lua_call(L, lua_gettop(L)-1, LUA_MULTRET);
-
-	if (error)
-		return luaL_error(L,"write limit bypassed in file. Changes have been discarded.");
-	return lua_gettop(L);
-}
-
-static int lib_write_f(lua_State *L)
-{
-	return lib_write(L, 2);
-}
-
-static int lib_write_io(lua_State *L)
-{
-	return lib_write(L, 1);
-}
-
 // String concatination
 static int lib_concat(lua_State *L)
 {
@@ -3465,28 +3348,6 @@ int LUA_BaseLib(lua_State *L)
 	lua_setfield(L,-2,"__add"); // ... store it as mathematical addition
 	lua_pop(L, 2); // pop metatable and dummy string
 
-	// replaces an existing function with another,
-	// saving the original as a reference
-#define REPLACE(name, func, ref) \
-	lua_pushliteral(L, name); \
-	lua_rawget(L, -2); \
-	ref = luaL_ref(L, LUA_REGISTRYINDEX); \
-	lua_pushliteral(L, name); \
-	lua_pushcclosure(L, &func, 0); \
-	lua_rawset(L, -3);
-
-	// replace io.open
-	lua_getglobal(L, "io");
-	REPLACE("open", lib_open, ref_open)
-	REPLACE("write", lib_write_io, ref_iowrite)
-	lua_pop(L, 1);
-
-	// replace file:write
-	luaL_getmetatable(L, LUA_FILEHANDLE);
-	REPLACE("write", lib_write_f, ref_fwrite)
-	lua_pop(L, 1);
-#undef REPLACE
-
 	lua_newtable(L);
 	lua_setfield(L, LUA_REGISTRYINDEX, LREG_EXTVARS);
 

src/lua_consolelib.c

@@ -324,14 +324,13 @@ static int lib_cvRegisterVar(lua_State *L)
 
 	const char* category = NULL;
 	const char* menu_name = NULL;
-	boolean hasfunc = false;
-	int funcref = 0;
 
 	luaL_checktype(L, 1, LUA_TTABLE);
 	lua_settop(L, 1); // Clear out all other possible arguments, leaving only the first one.
 	NOHUD
-	cvar = ZZ_Calloc(sizeof(consvar_t));
-	LUA_PushUserdata(L, cvar, META_CVAR);
+	cvar = lua_newuserdata(L, sizeof(consvar_t));
+	luaL_getmetatable(L, META_CVAR);
+	lua_setmetatable(L, -2);
 
 #define FIELDERROR(f, e) luaL_error(L, "bad value for " LUA_QL(f) " in table passed to " LUA_QL("CV_RegisterVar") " (%s)", e);
 #define TYPEERROR(f, t) FIELDERROR(f, va("%s expected, got %s", lua_typename(L, t), luaL_typename(L, -1)))
@@ -405,38 +404,27 @@ static int lib_cvRegisterVar(lua_State *L)
 				cvpv[i].value = 0;
 				cvpv[i].strvalue = NULL;
 				cvar->PossibleValue = cvpv;
-				// MIN and MAX are expected to be at hardcoded indices apparently
-				// so, sigh, here goes...
-				#define SWAP(from, to) \
-					INT32 val = cvpv[from].value; \
-					const char *strval = cvpv[from].strvalue; \
-					cvpv[from].value = cvpv[to].value; \
-					cvpv[from].strvalue = cvpv[to].strvalue; \
-					cvpv[to].value = val; \
-					cvpv[to].strvalue = strval;
-				for (int j = 0; j < i; j++) {
-					if (!strcmp(cvpv[j].strvalue, "MIN") && j != 0) {
-						SWAP(j, 0)
-					} else if (!strcmp(cvpv[j].strvalue, "MAX") && j != 1) {
-						SWAP(j, 1)
-					}
-				}
 			} else
 				FIELDERROR("PossibleValue", va("%s or CV_PossibleValue_t expected, got %s", lua_typename(L, LUA_TTABLE), luaL_typename(L, -1)))
 		} else if (i == 5 || (k && fasticmp(k, "func"))) {
 			if (!lua_isfunction(L, 4))
 				TYPEERROR("func", LUA_TFUNCTION)
-			if (hasfunc)
-				luaL_unref(L, LUA_REGISTRYINDEX, funcref); // real clever, huh?
-			funcref = luaL_ref(L, LUA_REGISTRYINDEX);
-			hasfunc = true;
-			continue;
+			lua_getfield(L, LUA_REGISTRYINDEX, "CV_OnChange");
+			I_Assert(lua_istable(L, 5));
+			lua_pushvalue(L, 4);
+			lua_setfield(L, 5, cvar->name);
+			lua_pop(L, 1);
+			cvar->func = Lua_OnChange;
 		}
-		else if (i == 6 || (k && fasticmp(k, "category")))
+		else if (((i == 5 && !(cvar->flags & CV_CALL))
+				|| (cvar->flags & CV_CALL && i == 6)) 
+				|| (k && fasticmp(k, "category")))
 		{
 			category = lua_isnoneornil(L, 4) ? NULL : lua_tostring(L, 4);
 		}
-		else if (i == 7 || (k && fasticmp(k, "menuname")))
+		else if (((i == 6 && !(cvar->flags & CV_CALL))
+			|| (cvar->flags & CV_CALL && i == 7))
+			|| (k && fasticmp(k, "menuname")))
 		{
 			menu_name = lua_isnoneornil(L, 4) ? NULL : lua_tostring(L, 4);
 		}
@@ -446,16 +434,6 @@ static int lib_cvRegisterVar(lua_State *L)
 #undef TYPEERROR
 
 	// stack: cvar table, cvar userdata
-	if (hasfunc) {
-		lua_getfield(L, LUA_REGISTRYINDEX, "CV_OnChange");
-		I_Assert(lua_istable(L, 3));
-		lua_rawgeti(L, LUA_REGISTRYINDEX, funcref);
-		lua_setfield(L, 3, cvar->name);
-		lua_pop(L, 1);
-		cvar->func = Lua_OnChange;
-		luaL_unref(L, LUA_REGISTRYINDEX, funcref);
-	}
-
 	lua_getfield(L, LUA_REGISTRYINDEX, "CV_Vars");
 	I_Assert(lua_istable(L, 3));
 
@@ -501,7 +479,15 @@ static int lib_cvFindVar(lua_State *L)
 	consvar_t *cv;
 	if (( cv = CV_FindVar(luaL_checkstring(L,1)) ))
 	{
-		LUA_PushUserdata(L, cv, META_CVAR);
+		lua_settop(L,1);/* We only want one argument in the stack. */
+		lua_pushlightuserdata(L, cv);/* Now the second value on stack. */
+		luaL_getmetatable(L, META_CVAR);
+		/*
+		The metatable is the last value on the stack, so this
+		applies it to the second value, which is the cvar.
+		*/
+		lua_setmetatable(L,2);
+		lua_pushvalue(L,2);
 		return 1;
 	}
 	else
@@ -514,7 +500,7 @@ static int CVarSetFunction
 		void (*Set)(consvar_t *, const char *),
 		void (*SetValue)(consvar_t *, INT32)
 ){
-	consvar_t *cvar = *((consvar_t **)luaL_checkudata(L, 1, META_CVAR));
+	consvar_t *cvar = (consvar_t *)luaL_checkudata(L, 1, META_CVAR);
 
 	switch (lua_type(L, 2))
 	{
@@ -543,7 +529,7 @@ static int lib_cvStealthSet(lua_State *L)
 
 static int lib_cvAddValue(lua_State *L)
 {
-	consvar_t *cvar = *((consvar_t **)luaL_checkudata(L, 1, META_CVAR));
+	consvar_t *cvar = (consvar_t *)luaL_checkudata(L, 1, META_CVAR);
 	CV_AddValue(cvar, (INT32)luaL_checknumber(L, 2));
 	return 0;
 }
@@ -618,7 +604,7 @@ static int cvar_fields_ref = LUA_NOREF;
 
 static int cvar_get(lua_State *L)
 {
-	consvar_t *cvar = *((consvar_t **)luaL_checkudata(L, 1, META_CVAR));
+	consvar_t *cvar = (consvar_t *)luaL_checkudata(L, 1, META_CVAR);
 	enum cvar_e field = Lua_optoption(L, 2, -1, cvar_fields_ref);
 
 	switch (field)

src/lua_hudlib_drawlist.c

@@ -12,11 +12,7 @@
 
 #include "lua_hudlib_drawlist.h"
 #include "lua_hud.h"
-#ifndef HAVE_BLUAJIT
 #include "blua/lstate.h" // shhhhhh
-#else
-#include "lua_script.h"
-#endif
 #include "lua_libs.h"
 
 #include <string.h>
@@ -332,15 +328,8 @@ static UINT64 GetItemId(void)
 	if (!hud_interpolate)
 		return 0;
 
-#ifndef HAVE_BLUAJIT
-	UINT64 id = (uintptr_t)gL->savedpc;
-#else
-	// he who controls the JIT controls the API
-	const void *p = lua_getpc(gL, 1);
-	UINT64 id = (uintptr_t)p;
-#endif
 	// leave bits 0 and 1 free for the string mode
-	id = (id << 32) | (hud_interpcounter << 10) | (hud_interptag << 2);
+	UINT64 id = ((UINT64)(uintptr_t)gL->savedpc << 32) | (hud_interpcounter << 10) | (hud_interptag << 2);
 
 	if (hud_interplatch)
 	{

src/lua_libs.h

@@ -11,12 +11,7 @@
 /// \brief libraries for Lua scripting
 
 #include "doomtype.h"
-
-#ifndef HAVE_BLUAJIT
 #include "blua/lua.h"
-#else
-#include <lua.h>
-#endif
 
 extern lua_State *gL;
 

src/lua_script.c

@@ -35,14 +35,6 @@
 
 #include "doomstat.h"
 
-#ifdef HAVE_BLUAJIT
-#include "d_main.h"
-#include "i_system.h"
-static void LuaJit_OnChange(void);
-static void print_jit_status(boolean verbose);
-consvar_t cv_luajit = {"luajit", "On", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, LuaJit_OnChange, 0, NULL, NULL, 0, 0, NULL};
-#endif
-
 lua_State *gL = NULL;
 
 // Mathlib global state
@@ -69,21 +61,6 @@ static lua_CFunction liblist[] = {
 	NULL
 };
 
-#ifdef HAVE_BLUAJIT
-static void LuaJit_OnChange(void)
-{
-	if (!gL)
-		LUA_ClearState();
-	lua_getfield(gL, LUA_REGISTRYINDEX, "_LOADED");
-	lua_getfield(gL, -1, "jit");
-	lua_remove(gL, -2);
-	lua_getfield(gL, -1, cv_luajit.value ? "on" : "off");
-	lua_remove(gL, -2);
-	lua_call(gL, 0, 0);
-	print_jit_status(false);
-}
-#endif
-
 // Lua asks for memory using this.
 static void *LUA_Alloc(void *ud, void *ptr, size_t osize, size_t nsize)
 {
@@ -208,29 +185,6 @@ static int noglobals(lua_State *L)
 	return luaL_error(L, "Implicit global " LUA_QS " prevented. Create a local variable instead.", csname);
 }
 
-#ifdef HAVE_BLUAJIT
-// print all the ISA extensions because it looks cool!
-// absolutely not stolen from luajit.c
-static void print_jit_status(boolean verbose)
-{
-	int n;
-	const char *s;
-	lua_getfield(gL, LUA_REGISTRYINDEX, "_LOADED");
-	lua_getfield(gL, -1, "jit");  /* Get jit.* module table. */
-	lua_remove(gL, -2);
-	lua_getfield(gL, -1, "status");
-	lua_remove(gL, -2);
-	n = lua_gettop(gL);
-	lua_call(gL, 0, LUA_MULTRET);
-	CONS_Printf(lua_toboolean(gL, n) ? "JIT: ON" : "JIT: OFF");
-	if (verbose)
-		for (n++; (s = lua_tostring(gL, n)); n++)
-			CONS_Printf(" %s", s);
-	CONS_Printf("\n");
-	lua_settop(gL, 0);  /* clear stack */
-}
-#endif
-
 // Clear and create a new Lua state, laddo!
 // There's SCRIPTIN to be had!
 void LUA_ClearState(void)
@@ -273,10 +227,6 @@ void LUA_ClearState(void)
 
 	// lua state is ready!
 	gL = L;
-
-#ifdef HAVE_BLUAJIT
-	print_jit_status(true);
-#endif
 }
 
 #ifdef _DEBUG

src/lua_script.h

@@ -18,19 +18,9 @@
 #include "d_player.h"
 #include "p_saveg.h"
 
-#ifndef HAVE_BLUAJIT
 #include "blua/lua.h"
 #include "blua/lualib.h"
 #include "blua/lauxlib.h"
-#else
-#include "command.h"
-#include <lua.h>
-#include <lualib.h>
-#include <lauxlib.h>
-#define abs_index(L, i)		((i) > 0 || (i) <= LUA_REGISTRYINDEX ? (i) : \
-					lua_gettop(L) + (i) + 1)
-extern consvar_t cv_luajit;
-#endif
 
 #define lua_optboolean(L, i) (!lua_isnoneornil(L, i) && lua_toboolean(L, i))
 #define lua_opttrueboolean(L, i) (lua_isnoneornil(L, i) || lua_toboolean(L, i))

src/p_mobj.c

@@ -6964,7 +6964,7 @@ static boolean P_MobjDeadThink(mobj_t *mobj)
 			if (mobj->flags2 & MF2_AMBUSH)
 			{
 				mobj->colorized = true;
-				mobj->color = K_RainbowColor();
+				mobj->color = (1 + (leveltime % (MAXSKINCOLORS-1)));
 				mobj->frame |= FF_FULLBRIGHT;
 			}
 			else
@@ -7806,7 +7806,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
 				P_SetScale(mobj, (mobj->destscale = mobj->target->scale));
 
 				if (mobj->target->player->kartstuff[k_driftcharge] >= K_GetKartDriftSparkValue(mobj->target->player)*4)
-					mobj->color = K_RainbowColor();
+					mobj->color = (UINT8)(1 + (leveltime % (MAXSKINCOLORS-1)));
 				else if (mobj->target->player->kartstuff[k_driftcharge] >= K_GetKartDriftSparkValue(mobj->target->player)*2)
 					mobj->color = SKINCOLOR_KETCHUP;
 				else if (mobj->target->player->kartstuff[k_driftcharge] >= K_GetKartDriftSparkValue(mobj->target->player))
@@ -8505,7 +8505,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
 			if (mobj->flags2 & MF2_AMBUSH)
 			{
 				mobj->colorized = true;
-				mobj->color = K_RainbowColor();
+				mobj->color = (1 + (leveltime % (MAXSKINCOLORS-1)));
 				mobj->frame |= FF_FULLBRIGHT;
 			}
 			else

src/p_setup.c

@@ -650,27 +650,6 @@ size_t P_PrecacheLevelFlats(void)
 	return flatmem;
 }
 
-// check if our flat contains cyan pixels
-// not sure if this is the best way to do it but it works
-static void P_CheckCyanFlat(levelflat_t *levelflat)
-{
-	// only need this for software
-	if (rendermode != render_soft)
-		return;
-
-	const UINT8 *flat = R_GetFlat(levelflat->lumpnum);
-	const size_t size = W_LumpLength(levelflat->lumpnum);
-
-	for (size_t steppy = 0; steppy < size; steppy++)
-	{
-		if (flat[steppy] == TRANSPARENTPIXEL)
-		{
-			levelflat->cyan = true;
-			break;
-		}
-	}
-}
-
 // help function for P_LoadSectors, find a flat in the active wad files,
 // allocate an id for it, and set the levelflat (to speedup search)
 //
@@ -682,7 +661,7 @@ INT32 P_AddLevelFlat(const char *flatname, levelflat_t *levelflat)
 	//  first scan through the already found flats
 	//
 	for (i = 0; i < numlevelflats; i++, levelflat++)
-		if (strnicmp(levelflat->name, flatname, 8) == 0)
+		if (strnicmp(levelflat->name,flatname,8) == 0)
 			break;
 
 	// that flat was already found in the level, return the id
@@ -696,7 +675,20 @@ INT32 P_AddLevelFlat(const char *flatname, levelflat_t *levelflat)
 		levelflat->lumpnum = R_GetFlatNumForName(flatname);
 		levelflat->baselumpnum = LUMPERROR;
 
-		P_CheckCyanFlat(levelflat);
+		// check if our flat contains cyan pixels
+		// not sure if this is the best way to do it but it works
+		{
+			const UINT8 *flat = (UINT8 *)W_CacheLumpNum(levelflat->lumpnum, PU_LEVEL);
+			size_t size = W_LumpLength(levelflat->lumpnum);
+			for (size_t steppy = 0; steppy < size; steppy++)
+			{
+				if (flat[steppy] == TRANSPARENTPIXEL)
+				{
+					levelflat->cyan = true;
+					break;
+				}
+			}
+		}
 
 #ifndef ZDEBUG
 		CONS_Debug(DBG_SETUP, "flat #%03d: %s\n", atoi(sizeu1(numlevelflats)), levelflat->name);
@@ -743,7 +735,20 @@ INT32 P_AddLevelFlatRuntime(const char *flatname)
 		levelflat->lumpnum = R_GetFlatNumForName(flatname);
 		levelflat->baselumpnum = LUMPERROR;
 
-		P_CheckCyanFlat(levelflat);
+		// check if our flat contains cyan pixels
+		// not sure if this is the best way to do it but it works
+		{
+			const UINT8 *flat = (UINT8 *)W_CacheLumpNum(levelflat->lumpnum, PU_LEVEL);
+			size_t size = W_LumpLength(levelflat->lumpnum);
+			for (size_t steppy = 0; steppy < size; steppy++)
+			{
+				if (flat[steppy] == TRANSPARENTPIXEL)
+				{
+					levelflat->cyan = true;
+					break;
+				}
+			}
+		}
 
 #ifndef ZDEBUG
 		CONS_Debug(DBG_SETUP, "flat #%03d: %s\n", atoi(sizeu1(numlevelflats)), levelflat->name);
@@ -2340,9 +2345,7 @@ static void P_RunLevelScript(const char *scriptname)
 		lumpnum_t lumpnum;
 		char newname[9];
 
-		strncpy(newname, scriptname, 8);
-
-		newname[8] = '\0';
+		strlcpy(newname, scriptname, sizeof(newname));
 
 		lumpnum = W_CheckNumForName(newname);
 
@@ -3309,6 +3312,12 @@ UINT16 P_PartialAddWadFile(const char *wadfilename, boolean local)
 	if (!mapsadded)
 		CONS_Printf(M_GetText("No maps added\n"));
 
+#ifdef HWRENDER
+	// Free GPU textures before freeing patches.
+	if (rendermode == render_opengl && (vid.glstate == VID_GL_LIBRARY_LOADED))
+		HWR_ClearAllTextures();
+#endif
+
 	//
 	// search for sprite replacements
 	//
@@ -3319,7 +3328,7 @@ UINT16 P_PartialAddWadFile(const char *wadfilename, boolean local)
 	// Reload it all anyway, just in case they
 	// added some textures but didn't insert a
 	// TEXTURES/etc. list.
-	//R_LoadTexturesPwad(wadnum);
+	R_LoadTexturesPwad(wadnum);
 
 	// everything from MultiSetupWadFile until ST_Start was here originally
 
@@ -3383,13 +3392,8 @@ boolean P_MultiSetupWadFiles(boolean fullsetup)
 
 	if (partadd_stage == 1)
 	{
-#ifdef HWRENDER
-		// Free GPU textures before freeing patches.
-		if (rendermode == render_opengl && (vid.glstate == VID_GL_LIBRARY_LOADED))
-			HWR_ClearAllTextures();
-#endif
 		// Reload all textures, unconditionally for better or worse.
-		R_LoadTextures();
+		//R_LoadTextures();
 
 		if (fullsetup)
 			++partadd_stage;

src/p_user.c

@@ -1641,7 +1641,7 @@ static void P_CheckInvincibilityTimer(player_t *player)
 	if (!player->powers[pw_invulnerability] && !player->kartstuff[k_invincibilitytimer])
 		return;
 
-	player->mo->color = K_RainbowColor();
+	player->mo->color = (UINT8)(1 + (leveltime % (MAXSKINCOLORS-1)));
 
 	// Resume normal music stuff.
 	if (player->powers[pw_invulnerability] == 1 || player->kartstuff[k_invincibilitytimer] == 1)

src/r_data.c

@@ -235,6 +235,7 @@ UINT32 ASTBlendTexturePixel(RGBA_t background, RGBA_t foreground, int style, UIN
 // Painfully simple texture id cacheing to make maps load faster. :3
 static struct {
 	char name[9];
+	UINT32 hash;
 	INT32 id;
 } *tidcache = NULL;
 static INT32 tidcachelen = 0;
@@ -520,32 +521,151 @@ void R_FlushTextureCache(void)
 int R_CountTexturesInTEXTURESLump(UINT16 wadNum, UINT16 lumpNum);
 void R_ParseTEXTURESLump(UINT16 wadNum, UINT16 lumpNum, INT32 *index);
 
-//
-// R_LoadTextures
-// Initializes the texture list with the textures from the world map.
-//
 #define TX_START "TX_START"
 #define TX_END "TX_END"
-void R_LoadTextures(void)
+
+static INT32
+Rloadtextures (INT32 i, INT32 w)
 {
-	INT32 i, k, w;
 	UINT16 j;
+	INT32 k;
 	UINT16 texstart, texend, texturesLumpPos;
 	softwarepatch_t *patchlump;
 	texpatch_t *patch;
 	texture_t *texture;
 
-	// Free previous memory before numtextures change.
-	if (numtextures)
+	// Get the lump numbers for the markers in the WAD, if they exist.
+	if (W_FileHasFolders(wadfiles[w]))
 	{
-		for (i = 0; i < numtextures; i++)
+		texstart = W_CheckNumForFolderStartPK3("textures/", (UINT16)w, 0);
+		texend = W_CheckNumForFolderEndPK3("textures/", (UINT16)w, texstart);
+		texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", (UINT16)w, 0);
+		while (texturesLumpPos != INT16_MAX)
 		{
-			Z_Free(textures[i]);
-			Z_Free(texturecache[i]);
+			R_ParseTEXTURESLump(w, texturesLumpPos, &i);
+			texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", (UINT16)w, texturesLumpPos + 1);
 		}
-		Z_Free(texturetranslation);
-		Z_Free(textures);
 	}
+	else
+	{
+		texstart = W_CheckNumForMarkerStartPwad(TX_START, (UINT16)w, 0);
+		texend = W_CheckNumForNamePwad(TX_END, (UINT16)w, 0);
+		texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", (UINT16)w, 0);
+		if (texturesLumpPos != INT16_MAX)
+			R_ParseTEXTURESLump(w, texturesLumpPos, &i);
+	}
+
+	if (texstart == INT16_MAX || texend == INT16_MAX)
+		return i;
+
+	// Work through each lump between the markers in the WAD.
+	for (j = 0; j < (texend - texstart); j++)
+	{
+		UINT16 wadnum = (UINT16)w;
+		lumpnum_t lumpnum = texstart + j;
+
+		if (W_FileHasFolders(wadfiles[w]))
+		{
+			if (W_IsLumpFolder(wadnum, lumpnum)) // Check if lump is a folder
+				continue; // If it is then SKIP IT
+		}
+
+		patchlump = (softwarepatch_t *)W_CacheLumpNumPwad(wadnum, lumpnum, PU_STATIC);
+
+		//CONS_Printf("\n\"%s\" is a single patch, dimensions %d x %d",W_CheckNameForNumPwad((wadnum, lumpnum), patchlump->width, patchlump->height);
+		texture = textures[i] = Z_Calloc(sizeof(texture_t) + sizeof(texpatch_t), PU_STATIC, NULL);
+
+		// Set texture properties.
+		M_Memcpy(texture->name, W_CheckNameForNumPwad(wadnum, lumpnum), sizeof(texture->name));
+		texture->hash = quickncasehash(texture->name, 8);
+		texture->width = SHORT(patchlump->width);
+		texture->height = SHORT(patchlump->height);
+		texture->type = TEXTURETYPE_SINGLEPATCH;
+		texture->patchcount = 1;
+		texture->holes = false;
+
+		// Allocate information for the texture's patches.
+		patch = &texture->patches[0];
+
+		patch->originx = patch->originy = 0;
+		patch->wad = wadnum;
+		patch->lump = texstart + j;
+
+		Z_Free(patchlump);
+
+		// determine width power of 2
+#if 1
+        // [WDJ] only need to determine if exact power of 2.
+        k = 1;
+        while (k < texture->width)
+            k<<=1;
+#else
+		// Largest power of 2 that fits within width.
+		k = 1;
+		while (k << 1 <= texture->width)
+			k <<= 1;
+#endif
+		if (k != texture->width)
+		{
+			// Odd width
+			k = 1;  // make texturewidthmask = 0
+		}
+
+		texturewidthmask[i] = k - 1;
+		textureheight[i] = texture->height << FRACBITS;
+		i++;
+	}
+
+	return i;
+}
+
+static INT32
+count_range
+(		const char * marker_start,
+		const char * marker_end,
+		const char * folder,
+		UINT16 wadnum)
+{
+	UINT16 j;
+	UINT16 texstart, texend;
+	INT32 count = 0;
+
+	// Count flats
+	if (W_FileHasFolders(wadfiles[wadnum]))
+	{
+		texstart = W_CheckNumForFolderStartPK3(folder, wadnum, 0);
+		texend = W_CheckNumForFolderEndPK3(folder, wadnum, texstart);
+	}
+	else
+	{
+		texstart = W_CheckNumForMarkerStartPwad(marker_start, wadnum, 0);
+		texend = W_CheckNumForNamePwad(marker_end, wadnum, texstart);
+	}
+
+	if (texstart != INT16_MAX && texend != INT16_MAX)
+	{
+		// PK3s have subfolders, so we can't just make a simple sum
+		if (W_FileHasFolders(wadfiles[wadnum]))
+		{
+			for (j = texstart; j < texend; j++)
+			{
+				if (!W_IsLumpFolder(wadnum, j)) // Check if lump is a folder; if not, then count it
+					count++;
+			}
+		}
+		else // Add all the textures between markers
+		{
+			count += (texend - texstart);
+		}
+	}
+
+	return count;
+}
+
+static INT32 R_CountTextures(UINT16 wadnum)
+{
+	UINT16 texturesLumpPos;
+	INT32 count = 0;
 
 	// Load patches and textures.
 
@@ -554,159 +674,127 @@ void R_LoadTextures(void)
 	// the markers.
 	// This system will allocate memory for all duplicate/patched textures even if it never uses them,
 	// but the alternative is to spend a ton of time checking and re-checking all previous entries just to skip any potentially patched textures.
-	for (w = 0, numtextures = 0; w < numwadfiles; w++)
+
+	// Count the textures from TEXTURES lumps
+	texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", wadnum, 0);
+
+	while (texturesLumpPos != INT16_MAX)
 	{
-		if (W_FileHasFolders(wadfiles[w]))
-		{
-			texstart = W_CheckNumForFolderStartPK3("textures/", (UINT16)w, 0);
-			texend = W_CheckNumForFolderEndPK3("textures/", (UINT16)w, texstart);
-		}
-		else
-		{
-			texstart = W_CheckNumForNamePwad(TX_START, (UINT16)w, 0) + 1;
-			texend = W_CheckNumForNamePwad(TX_END, (UINT16)w, 0);
-		}
-
-		texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", (UINT16)w, 0);
-		while (texturesLumpPos != INT16_MAX)
-		{
-			numtextures += R_CountTexturesInTEXTURESLump((UINT16)w, (UINT16)texturesLumpPos);
-			texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", (UINT16)w, texturesLumpPos + 1);
-		}
-
-		// Add all the textures between TX_START and TX_END
-		if (texstart == INT16_MAX || texend == INT16_MAX)
-			continue;
-
-		// PK3s have subfolders, so we can't just make a simple sum
-		if (W_FileHasFolders(wadfiles[w]))
-		{
-			for (j = texstart; j < texend; j++)
-			{
-				if (W_IsLumpFolder((UINT16)w, j)) // Check if lump is a folder; if not, then count it
-					continue;
-
-				numtextures++;
-			}
-		}
-		else
-		{
-			numtextures += (UINT32)(texend - texstart);
-		}
+		count += R_CountTexturesInTEXTURESLump(wadnum, texturesLumpPos);
+		texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", wadnum, texturesLumpPos + 1);
 	}
 
-	// If no textures found by this point, bomb out
-	if (!numtextures)
-		I_Error("No textures detected in any WADs!\n");
+	// Count single-patch textures
+	count += count_range(TX_START, TX_END, "textures/", wadnum);
+
+	return count;
+}
+
+static void
+recallocuser
+(		void * user,
+		size_t old,
+		size_t new)
+{
+	char *p = Z_Realloc(*(void**)user,
+			new, PU_STATIC, user);
+
+	if (new > old)
+		memset(&p[old], 0, (new - old));
+}
+
+static void R_AllocateTextures(INT32 add)
+{
+	const INT32 newtextures = (numtextures + add);
+	const size_t newsize = newtextures * sizeof (void*);
+	const size_t oldsize = numtextures * sizeof (void*);
+
+	INT32 i;
 
 	// Allocate memory and initialize to 0 for all the textures we are initialising.
-	// There are actually 5 buffers allocated in one for convenience.
-	textures = Z_Calloc((numtextures * sizeof(void *)) * 5, PU_STATIC, NULL);
+	recallocuser(&textures, oldsize, newsize);
 
 	// Allocate texture column offset table.
-	texturecolumnofs = (void *)((UINT8 *)textures + (numtextures * sizeof(void *)));
+	recallocuser(&texturecolumnofs, oldsize, newsize);
 	// Allocate texture referencing cache.
-	texturecache     = (void *)((UINT8 *)textures + ((numtextures * sizeof(void *)) * 2));
-	// Allocate texture width mask table.
-	texturewidthmask = (void *)((UINT8 *)textures + ((numtextures * sizeof(void *)) * 3));
-	// Allocate texture height mask table.
-	textureheight    = (void *)((UINT8 *)textures + ((numtextures * sizeof(void *)) * 4));
+	recallocuser(&texturecache, oldsize, newsize);
+	// Allocate texture width table.
+	recallocuser(&texturewidthmask, oldsize, newsize);
+	// Allocate texture height table.
+	recallocuser(&textureheight, oldsize, newsize);
 	// Create translation table for global animation.
-	texturetranslation = Z_Malloc((numtextures + 1) * sizeof(*texturetranslation), PU_STATIC, NULL);
+	Z_Realloc(texturetranslation, (newtextures + 1) * sizeof(*texturetranslation), PU_STATIC, &texturetranslation);
 
-	for (i = 0; i < numtextures; i++)
-		texturetranslation[i] = i;
-
-	for (i = 0, w = 0; w < numwadfiles; w++)
+	for (i = 0; i < numtextures; ++i)
 	{
-		// Get the lump numbers for the markers in the WAD, if they exist.
-		if (W_FileHasFolders(wadfiles[w]))
-		{
-			texstart = W_CheckNumForFolderStartPK3("textures/", (UINT16)w, 0);
-			texend = W_CheckNumForFolderEndPK3("textures/", (UINT16)w, texstart);
-			texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", (UINT16)w, 0);
-			while (texturesLumpPos != INT16_MAX)
-			{
-				R_ParseTEXTURESLump(w, texturesLumpPos, &i);
-				texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", (UINT16)w, texturesLumpPos + 1);
-			}
-		}
-		else
-		{
-			texstart = W_CheckNumForNamePwad(TX_START, (UINT16)w, 0) + 1;
-			texend = W_CheckNumForNamePwad(TX_END, (UINT16)w, 0);
-			texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", (UINT16)w, 0);
-			if (texturesLumpPos != INT16_MAX)
-				R_ParseTEXTURESLump(w, texturesLumpPos, &i);
-		}
-
-		if (texstart == INT16_MAX || texend == INT16_MAX)
-			continue;
-
-		// Work through each lump between the markers in the WAD.
-		for (j = 0; j < (texend - texstart); j++)
-		{
-			UINT16 wadnum = (UINT16)w;
-			lumpnum_t lumpnum = texstart + j;
-
-			if (W_FileHasFolders(wadfiles[w]))
-			{
-				if (W_IsLumpFolder(wadnum, lumpnum)) // Check if lump is a folder
-					continue; // If it is then SKIP IT
-			}
-
-			patchlump = (softwarepatch_t *)W_CacheLumpNumPwad(wadnum, lumpnum, PU_STATIC);
-
-			//CONS_Printf("\n\"%s\" is a single patch, dimensions %d x %d",W_CheckNameForNumPwad(wadnum, lumpnum), patchlump->width, patchlump->height);
-			texture = textures[i] = Z_Calloc(sizeof(texture_t) + sizeof(texpatch_t), PU_STATIC, NULL);
-
-			// Set texture properties.
-			M_Memcpy(texture->name, W_CheckNameForNumPwad(wadnum, lumpnum), sizeof(texture->name));
-			texture->width = SHORT(patchlump->width);
-			texture->height = SHORT(patchlump->height);
-			texture->type = TEXTURETYPE_SINGLEPATCH;
-			texture->patchcount = 1;
-			texture->holes = false;
-
-			// Allocate information for the texture's patches.
-			patch = &texture->patches[0];
-
-			patch->originx = patch->originy = 0;
-			patch->wad = wadnum;
-			patch->lump = texstart + j;
-
-			Z_Free(patchlump);
-
-			// determine width power of 2
-#if 1
-			// [WDJ] only need to determine if exact power of 2.
-			k = 1;
-			while (k < texture->width)
-				k<<=1;
-#else
-			// Largest power of 2 that fits within width.
-			k = 1;
-			while (k << 1 <= texture->width)
-				k <<= 1;
-#endif
-			if (k != texture->width)
-			{
-				// Odd width
-				k = 1;  // make texturewidthmask = 0
-			}
-
-			texturewidthmask[i] = k - 1;
-			textureheight[i] = texture->height << FRACBITS;
-			i++;
-		}
+		// R_FlushTextureCache relies on the user for
+		// Z_Free, texturecache has been reallocated so the
+		// user is now garbage memory.
+		Z_SetUser(texturecache[i], (void**)&texturecache[i]);
 	}
 
+	while (i < newtextures)
+	{
+		texturetranslation[i] = i;
+		i++;
+	}
+}
+
+static INT32 R_DefineTextures(INT32 i, UINT16 w)
+{
+	return Rloadtextures(i, w);
+}
+
+static void R_FinishLoadingTextures(INT32 add)
+{
+	numtextures += add;
+
 #ifdef HWRENDER
 	if (rendermode == render_opengl)
 		HWR_LoadMapTextures(numtextures);
 #endif
 }
 
+//
+// R_LoadTextures
+// Initializes the texture list with the textures from the world map.
+//
+void R_LoadTextures(void)
+{
+	INT32 i, w;
+	INT32 newtextures = 0;
+
+	for (w = 0; w < numwadfiles; w++)
+	{
+		newtextures += R_CountTextures((UINT16)w);
+	}
+
+	// If no textures found by this point, bomb out
+	if (!newtextures)
+		I_Error("No textures detected in any WADs!\n");
+
+	R_AllocateTextures(newtextures);
+
+	for (i = 0, w = 0; w < numwadfiles; w++)
+	{
+		i = R_DefineTextures(i, w);
+	}
+
+	R_FinishLoadingTextures(i);
+}
+
+void R_LoadTexturesPwad(UINT16 wadnum)
+{
+	INT32 newtextures = R_CountTextures(wadnum);
+
+	if (!newtextures)
+		return;
+
+	R_AllocateTextures(newtextures);
+	newtextures = R_DefineTextures(numtextures, wadnum) - numtextures;
+	R_FinishLoadingTextures(newtextures);
+}
+
 static texpatch_t *R_ParsePatch(boolean actuallyLoadPatch)
 {
 	char *texturesToken;
@@ -958,6 +1046,7 @@ static texture_t *R_ParseTexture(boolean actuallyLoadTexture)
 			// Allocate memory for a zero-patch texture. Obviously, we'll be adding patches momentarily.
 			resultTexture = (texture_t *)Z_Calloc(sizeof(texture_t), PU_STATIC, NULL);
 			M_Memcpy(resultTexture->name, newTextureName, 8);
+			resultTexture->hash = quickncasehash(newTextureName, 8);
 			resultTexture->width = newTextureWidth;
 			resultTexture->height = newTextureHeight;
 			resultTexture->type = TEXTURETYPE_COMPOSITE;
@@ -1741,19 +1830,22 @@ void R_ClearTextureNumCache(boolean btell)
 INT32 R_CheckTextureNumForName(const char *name)
 {
 	INT32 i;
+	UINT32 hash;
 
 	// "NoTexture" marker.
 	if (name[0] == '-')
 		return 0;
 
+	hash = quickncasehash(name, 8);
+
 	for (i = 0; i < tidcachelen; i++)
-		if (!strncasecmp(tidcache[i].name, name, 8))
+		if (tidcache[i].hash == hash && !strncasecmp(tidcache[i].name, name, 8))
 			return tidcache[i].id;
 
 	// Need to parse the list backwards, so textures loaded more recently are used in lieu of ones loaded earlier
 	//for (i = 0; i < numtextures; i++) <- old
 	for (i = (numtextures - 1); i >= 0; i--) // <- new
-		if (!strncasecmp(textures[i]->name, name, 8))
+		if (textures[i]->hash == hash && !strncasecmp(textures[i]->name, name, 8))
 		{
 			tidcachelen++;
 			Z_Realloc(tidcache, tidcachelen * sizeof(*tidcache), PU_STATIC, &tidcache);
@@ -1762,6 +1854,7 @@ INT32 R_CheckTextureNumForName(const char *name)
 #ifndef ZDEBUG
 			CONS_Debug(DBG_SETUP, "texture #%s: %s\n", sizeu1(tidcachelen), tidcache[tidcachelen-1].name);
 #endif
+			tidcache[tidcachelen-1].hash = hash;
 			tidcache[tidcachelen-1].id = i;
 			return i;
 		}

src/r_data.h

@@ -53,6 +53,7 @@ typedef struct
 	// Keep name for switch changing, etc.
 	char name[8];
 	UINT8 type; // TEXTURETYPE_
+	UINT32 hash;
 	INT16 width, height;
 	boolean holes;
 	// All the patches[patchcount] are drawn back to front into the cached texture.
@@ -76,6 +77,7 @@ extern CV_PossibleValue_t Color_cons_t[];
 
 // Load TEXTURE1/TEXTURE2/PNAMES definitions, create lookup tables
 void R_LoadTextures(void);
+void R_LoadTexturesPwad(UINT16 wadnum);
 void R_FlushTextureCache(void);
 
 UINT8 *R_GenerateTexture(size_t texnum);

src/r_plane.cpp

@@ -1182,7 +1182,7 @@ void R_DrawSinglePlane(drawspandata_t* ds, visplane_t *pl, boolean allow_paralle
 	levelflat = &levelflats[pl->picnum];
 
 	// Get the texture
-	ds->source = R_GetFlat(levelflat->lumpnum);
+	ds->source = (UINT8 *)W_CacheLumpNum(levelflat->lumpnum, PU_STATIC); // Stay here until Z_ChangeTag
 
 	if (ds->source == NULL)
 		return;
@@ -1387,6 +1387,8 @@ using the palette colors.
 		}
 	}
 #endif
+
+	Z_ChangeTag(ds->source, PU_CACHE);
 }
 
 void R_PlaneBounds(visplane_t *plane)