0xffff moment

lmao oops didnt pay attention at all

src/Makefile

@@ -246,25 +246,13 @@ debug_opts=-DNDEBUG
 opts+=-O3
 ifdef USELTO
 # compile with LTO
-ifdef MINGW
-opts+=-flto=auto -g
-libs+=-flto=auto -g
-else
 opts+=-flto=auto
 libs+=-flto=auto
 endif
 endif
-endif
 
 ifdef USEASAN
 # compile with asan
-ifdef MINGW
-opts+=-fsanitize=address -g
-libs+=-fsanitize=address -g
-else
-opts+=-fsanitize=address
-libs+=-fsanitize=address
-endif
 opts+=-fsanitize=address
 libs+=-fsanitize=address
 endif
@@ -274,11 +262,8 @@ opts+=$(debug_opts)
 
 opts+=$(foreach v,$(passthru_opts),$(if $($(v)),-D$(v)))
 
-CXXFLAGS+=-std=c++17 # force c17 for c++ since most vpss run older ubuntu versions with old compilers
-
-opts+=$(WFLAGS) $(CFLAGS)
-cxxopts:=$(opts) $(CXXFLAGS)
-opts+=$(CWFLAGS) # warning flags that shouldnt be passed to c++ compiler
+opts+=$(WFLAGS) $(CPPFLAGS) $(CFLAGS)
+cxxopts:=$(opts) $(CXXFLAGS) -std=c++17
 
 libs+=$(LDFLAGS) -lstdc++ -lpthread
 asflags:=$(ASFLAGS) -x assembler-with-cpp
@@ -390,12 +375,12 @@ ifdef Echo_name
 	@printf '%-20.20s\r' $$<
 endif
 endif
-	$(.)$(2) -MM -MF $$@ -MT $(objdir)/$$*.o $(3) $$<
+	$(.)$(cc) -MM -MF $$@ -MT $(objdir)/$$*.o $(2) $$<
 endef
 
-$(eval $(call _recipe,c,$(cc)))
-$(eval $(call _recipe,cpp,$(cxx)))
-$(eval $(call _recipe,s,$(cc),$(asflags)))
+$(eval $(call _recipe,c))
+$(eval $(call _recipe,cpp))
+$(eval $(call _recipe,s,$(asflags)))
 
 # compiling recipe template
 # 1: target file suffix

src/Makefile.d/features.mk

@@ -6,7 +6,8 @@ passthru_opts+=\
 	NOHW NOMD5 NOPOSTPROCESSING\
 	MOBJCONSISTANCY PACKETDROP ZDEBUG\
 	HAVE_MINIUPNPC\
-	HAVE_DISCORDRPC DEVELOP
+	HAVE_DISCORDRPC DEVELOP\
+	NOBLUAJIT
 
 # build with debugging information
 ifdef DEBUGMODE
@@ -97,7 +98,7 @@ opts+=-DHAVE_VALGRIND
 endif
 
 default_packages:=\
-	LIBGME/libgme/LIBGME\
+	GME/libgme/LIBGME\
 	OPENMPT/libopenmpt/LIBOPENMPT\
 	ZLIB/zlib\
 

src/Makefile.d/versions.mk

@@ -20,6 +20,10 @@ $(foreach v,$(join $(wordlist 2,$(_n),- $(gcc_versions)),\
 CXXFLAGS+= -Wno-aggregate-return
 
 # -W -Wno-unused
+
+ifdef GCC150
+ opts+=-std=gnu17
+endif
 WFLAGS:=-Wall -Wno-trigraphs
 ifndef GCC295
 #WFLAGS+=-Wno-packed
@@ -41,8 +45,7 @@ ifdef GCC41
  WFLAGS+=-Wshadow
 endif
 #WFLAGS+=-Wlarger-than-%len%
- WFLAGS+=-Wpointer-arith
- CWFLAGS+=-Wbad-function-cast
+ WFLAGS+=-Wpointer-arith -Wbad-function-cast
 ifdef GCC45
 #WFLAGS+=-Wc++-compat
 endif
@@ -72,10 +75,9 @@ endif
 endif
 #WFLAGS+=-Wstrict-prototypes
 ifdef GCC40
- CWFLAGS+=-Wold-style-definition
+ WFLAGS+=-Wold-style-definition
 endif
- WFLAGS+=-Wmissing-declarations
- CWFLAGS+=-Wmissing-prototypes
+ WFLAGS+=-Wmissing-prototypes -Wmissing-declarations
 ifdef GCC40
  WFLAGS+=-Wmissing-field-initializers
 endif
@@ -86,7 +88,7 @@ endif
 #WFLAGS+=-Wpacked
 #WFLAGS+=-Wpadded
 #WFLAGS+=-Wredundant-decls
- CWFLAGS+=-Wnested-externs
+ WFLAGS+=-Wnested-externs
 #WFLAGS+=-Wunreachable-code
  WFLAGS+=-Winline
 ifdef DEBUGMODE

src/Makefile.d/win32.mk

@@ -66,7 +66,7 @@ $(eval $(call _set,LIBGME))
 
 lib:=../libs/libopenmpt
 LIBOPENMPT_opts:=-I$(lib)/inc
-LIBOPENMPT_libs:=-L$(lib)/lib/$(x86) -lopenmpt
+LIBOPENMPT_libs:=-L$(lib)/lib/$(x86)/mingw -lopenmpt
 $(eval $(call _set,LIBOPENMPT))
 
 lib:=../libs/SDL2_mixer/$(mingw)

src/Sourcefile

@@ -29,7 +29,6 @@ m_cond.c
 m_fixed.c
 m_menu.c
 m_textinput.c
-m_emotes.cpp
 m_misc.c
 m_perfstats.c
 m_queue.c

src/am_map.c

@@ -324,7 +324,6 @@ static void AM_initVariables(void)
 		m_x = (plr->mo->x >> FRACTOMAPBITS) - m_w/2;
 		m_y = (plr->mo->y >> FRACTOMAPBITS) - m_h/2;
 	}
-
 	AM_changeWindowLoc();
 
 	// for saving & restoring

src/blua/lauxlib.h

@@ -36,26 +36,6 @@ LUALIB_API void (luaL_setn) (lua_State *L, int t, int n);
 /* extra error code for `luaL_load' */
 #define LUA_ERRFILE     (LUA_ERRERR+1)
 
-/* Compiler-specific attributes and other macros */
-
-#ifdef __GNUC__ // __attribute__ ((X))
-
-	#if ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) && defined (__MINGW32__) // MinGW, >= GCC 4.1
-		#if 0 //defined  (__USE_MINGW_ANSI_STDIO) && __USE_MINGW_ANSI_STDIO > 0
-			#define FUNCREPORT  __attribute__ ((format(gnu_printf, 2, 3)))
-		#elif (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) // >= GCC 4.4
-			#define FUNCREPORT  __attribute__ ((format(ms_printf, 2, 3)))
-		#else
-			#define FUNCREPORT  __attribute__ ((format(printf, 2, 3)))
-		#endif
-	#else
-		#define FUNCREPORT  __attribute__ ((format(printf, 2, 3)))
-	#endif
-#endif
-
-#ifndef FUNCREPORT
-#define FUNCREPORT
-#endif
 
 typedef struct luaL_Reg {
   const char *name;
@@ -90,7 +70,7 @@ LUALIB_API int   (luaL_newmetatable) (lua_State *L, const char *tname);
 LUALIB_API void *(luaL_checkudata) (lua_State *L, int ud, const char *tname);
 
 LUALIB_API void (luaL_where) (lua_State *L, int lvl);
-LUALIB_API FUNCREPORT int (luaL_error) (lua_State *L, const char *fmt, ...);
+LUALIB_API int (luaL_error) (lua_State *L, const char *fmt, ...);
 
 LUALIB_API int (luaL_checkoption) (lua_State *L, int narg, const char *def,
                                    const char *const lst[]);

src/d_clisrv.h

@@ -42,8 +42,8 @@ applications may follow different packet versions.
 #define VANILLA_GT_MATCH 3
 
 // Networking and tick handling related.
-#define BACKUPTICS 512 // more than enough for most timeouts....
-#define CLIENTBACKUPTICS 32
+#define BACKUPTICS 32
+#define TICQUEUE 512 // more than enough for most timeouts....
 #define MAXTEXTCMD 256
 
 // No. of tics your controls can be delayed by.
@@ -533,6 +533,7 @@ extern UINT32 serverlistultimatecount;
 extern INT32 mapchangepending;
 
 // Points inside doomcom
+extern doomdata_t *netbuffer;
 extern consvar_t cv_stunserver;
 extern consvar_t cv_httpsource;
 extern consvar_t cv_kicktime;

src/d_main.c

@@ -40,7 +40,6 @@
 #include "g_game.h"
 #include "g_input.h"
 #include "hu_stuff.h"
-#include "m_emotes.h"
 #include "i_sound.h"
 #include "i_system.h"
 #include "i_time.h"
@@ -153,8 +152,6 @@ boolean dedicated = false;
 
 boolean loaded_config = false; // true once config.cfg loaded AND executed
 
-static void D_CleanFile(char **filearray);
-
 //
 // D_PostEvent
 // Called by the I/O functions when input is detected
@@ -899,24 +896,9 @@ void D_SRB2Loop(void)
 			rendertimefrac_unpaused = FRACUNIT;
 		}
 
-		if (interp || doDisplay)
+		if ((interp || doDisplay) && !frameskip)
 		{
-			if (!frameskip)
-			{
-				ranwipe = D_Display();
-			}
-			else if (!dedicated)
-			{
-				// always update console and hud
-				// otherwise it may take minutes to open it
-				CON_Drawer();
-
-				if (gamestate == GS_LEVEL)
-				{
-					ST_Drawer();
-					HU_Drawer();
-				}
-			}
+			ranwipe = D_Display();
 		}
 
 		// Only take screenshots after drawing.
@@ -928,7 +910,7 @@ void D_SRB2Loop(void)
 		// consoleplayer -> displayplayers (hear sounds from viewpoint)
 		S_UpdateSounds(); // move positional sounds
 
-		//LUA_Step();
+		LUA_Step();
 
 #ifdef HAVE_DISCORDRPC
 		if (!dedicated && renderisnewtic)
@@ -1233,7 +1215,7 @@ void D_AddPostloadFiles(void)
 	postautoloaded = true;
 }
 
-static void D_CleanFile(char **filearray)
+void D_CleanFile(char **filearray)
 {
 	size_t pnumwadfiles;
 	for (pnumwadfiles = 0; filearray[pnumwadfiles]; pnumwadfiles++)
@@ -2037,8 +2019,6 @@ void D_SRB2Main(void)
 
 	S_InitMusicDefs();
 
-	M_InitEmotes();
-
 	CONS_Printf("ST_Init(): Init status bar.\n");
 	ST_Init();
 

src/d_main.h

@@ -85,6 +85,8 @@ void D_PostEvent(const event_t *ev);
 
 void D_ProcessEvents(void);
 
+void D_CleanFile(char **filearray);
+
 const char *D_Home(void);
 
 //

src/d_net.c

@@ -48,6 +48,12 @@ tic_t connectiontimeout = (10*TICRATE);
 
 /// \brief network packet
 doomcom_t *doomcom = NULL;
+/// \brief network packet data, points inside doomcom
+doomdata_t *netbuffer = NULL;
+/// \brief hole punching packet, also points inside doomcom
+#ifdef HOLEPUNCH
+holepunch_t *holepunchpacket = NULL;
+#endif
 
 #ifdef DEBUGFILE
 FILE *debugfile = NULL; // put some net info in a file during the game
@@ -203,9 +209,13 @@ static node_t nodes[MAXNETNODES];
 //         0 if a = n (mod 256)
 //        >0 if a > b (mod 256)
 // mnemonic: to use it compare to 0: cmpack(a,b)<0 is "a < b" ...
-FUNCMATH static inline INT32 cmpack(UINT8 a, UINT8 b)
+FUNCMATH static INT32 cmpack(UINT8 a, UINT8 b)
 {
-	return (SINT8)(a - b);
+	register INT32 d = a - b;
+
+	if (d >= 127 || d < -128)
+		return -d;
+	return d;
 }
 
 /** Sets freeack to a free acknum and copies the netbuffer in the ackpak table
@@ -219,8 +229,6 @@ static boolean GetFreeAcknum(UINT8 *freeack)
 	node_t *node = &nodes[doomcom->remotenode];
 	INT32 i, numfreeslot = 0;
 
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
-
 	if (cmpack((UINT8)((node->remotefirstack + MAXACKTOSEND) % 256), node->nextacknum) < 0)
 	{
 		DEBFILE(va("too fast %d %d\n",node->remotefirstack,node->nextacknum));
@@ -290,7 +298,6 @@ static boolean Processackpak(void)
 	INT32 i;
 	boolean goodpacket = true;
 	node_t *node = &nodes[doomcom->remotenode];
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 
 	// Received an ack return, so remove the ack in the list
 	if (netbuffer->ackreturn && cmpack(node->remotefirstack, netbuffer->ackreturn) < 0)
@@ -300,7 +307,7 @@ static boolean Processackpak(void)
 		// Search the ackbuffer and free it
 		for (i = 0; i < MAXACKPACKETS; i++)
 		{
-			if (ackpak[i].acknum && ackpak[i].destinationnode == doomcom->remotenode
+			if (ackpak[i].acknum && ackpak[i].destinationnode == node - nodes
 				&& cmpack(ackpak[i].acknum, netbuffer->ackreturn) <= 0)
 			{
 				RemoveAck(i);
@@ -416,7 +423,6 @@ void Net_SendAcks(INT32 node)
 #ifdef NONET
 	(void)node;
 #else
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 	netbuffer->packettype = PT_NOTHING;
 	M_Memcpy(netbuffer->u.textcmd, nodes[node].acktosend, MAXACKTOSEND);
 	HSendPacket(node, false, 0, MAXACKTOSEND);
@@ -428,8 +434,6 @@ static void GotAcks(void)
 {
 	INT32 i, j;
 
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
-
 	for (j = 0; j < MAXACKTOSEND; j++)
 	{
 		if (netbuffer->u.textcmd[j])
@@ -483,8 +487,6 @@ void Net_AckTicker(void)
 #ifndef NONET
 	INT32 i;
 
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
-
 	for (i = 0; i < MAXACKPACKETS; i++)
 	{
 		const INT32 nodei = ackpak[i].destinationnode;
@@ -540,7 +542,6 @@ void Net_UnAcknowledgePacket(INT32 node)
 #ifdef NONET
 	(void)node;
 #else
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 	INT32 hm1 = (nodes[node].acktosend_head-1+MAXACKTOSEND) % MAXACKTOSEND;
 	DEBFILE(va("UnAcknowledge node %d\n", node));
 
@@ -735,7 +736,6 @@ void Net_CloseConnection(INT32 node)
 //
 static UINT32 NetbufferChecksum(void)
 {
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 	UINT32 c = 0x1234567;
 	const INT32 l = doomcom->datalength - 4;
 	const UINT8 *buf = (UINT8 *)netbuffer + 4;
@@ -852,8 +852,6 @@ const char *Net_GetPacketName(UINT8 packettype)
 
 static void DebugPrintpacket(const char *header)
 {
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
-
 	fprintf(debugfile, "%-12s (node %d,ack %d,ackret %d,size %d) type(%d) : %s\n",
 		header, doomcom->remotenode, netbuffer->ack, netbuffer->ackreturn, doomcom->datalength,
 		netbuffer->packettype, Net_GetPacketName(netbuffer->packettype));
@@ -1023,7 +1021,6 @@ void Command_Droprate(void)
 #ifndef NONET
 static boolean ShouldDropPacket(void)
 {
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 	return (packetdropquantity[netbuffer->packettype])
 		|| (packetdroprate != 0 && rand() < (((double)RAND_MAX) * (packetdroprate / 100.f))) || packetdroprate == 100;
 }
@@ -1035,7 +1032,6 @@ static boolean ShouldDropPacket(void)
 //
 boolean HSendPacket(INT32 node, boolean reliable, UINT8 acknum, size_t packetlength)
 {
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 	doomcom->datalength = (INT16)(packetlength + BASEPACKETSIZE);
 
 	if (node == 0) // Packet is to go back to us
@@ -1136,7 +1132,7 @@ boolean HSendPacket(INT32 node, boolean reliable, UINT8 acknum, size_t packetlen
 //
 boolean HGetPacket(void)
 {
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+	//boolean nodejustjoined;
 
 	// Get a packet from self
 	if (rebound_tail != rebound_head)
@@ -1224,18 +1220,6 @@ static void Internal_FreeNodenum(INT32 nodenum)
 	(void)nodenum;
 }
 
-static char *I_NetSplitAddress(char *host, char **port)
-{
-	boolean v4 = (host[0] != '[');
-
-	host = strtok(host, v4 ? ":" : "[]");
-
-	if (port)
-		*port = strtok(NULL, ":");
-
-	return host;
-}
-
 SINT8 I_NetMakeNode(const char *hostname)
 {
 	SINT8 newnode = -1;
@@ -1243,14 +1227,20 @@ SINT8 I_NetMakeNode(const char *hostname)
 	if (I_NetMakeNodewPort)
 	{
 		char *localhostname = strdup(hostname);
-		char *port;
+		char  *t = localhostname;
+		const char *port;
 		if (!localhostname)
 			return newnode;
-
 		// retrieve portnum from address!
-		hostname = I_NetSplitAddress(localhostname, &port);
+		strtok(localhostname, ":");
+		port = strtok(NULL, ":");
 
-		newnode = I_NetMakeNodewPort(hostname, port);
+		// remove the port in the hostname as we've it already
+		while ((*t != ':') && (*t != '\0'))
+			t++;
+		*t = '\0';
+
+		newnode = I_NetMakeNodewPort(localhostname, port);
 		free(localhostname);
 	}
 	return newnode;
@@ -1342,6 +1332,11 @@ boolean D_CheckNetGame(void)
 	if (doomcom->numnodes > MAXNETNODES)
 		I_Error("Too many nodes (%d), max:%d", doomcom->numnodes, MAXNETNODES);
 
+	netbuffer = (doomdata_t *)(void *)&doomcom->data;
+#ifdef HOLEPUNCH
+	holepunchpacket = (holepunch_t *)(void *)&doomcom->data;
+#endif
+
 #ifdef DEBUGFILE
 	if (M_CheckParm("-debugfile"))
 	{

src/d_netcmd.c

@@ -21,7 +21,6 @@
 #include "i_system.h"
 #include "g_game.h"
 #include "hu_stuff.h"
-#include "m_emotes.h"
 #include "g_input.h"
 #include "m_menu.h"
 #include "r_local.h"
@@ -913,8 +912,6 @@ void D_RegisterClientCommands(void)
 
 	CV_RegisterVar(&cv_keyboardlayout);
 
-	CV_RegisterVar(&cv_emotes);
-
 	// time attack ghost options are also saved to config
 	CV_RegisterVar(&cv_ghost_besttime);
 	CV_RegisterVar(&cv_ghost_bestlap);
@@ -2113,18 +2110,14 @@ INT32 D_LookupPlayer(const char *s)
 static INT32 FindPlayerByPlace(INT32 place)
 {
 	INT32 playernum;
-
 	for (playernum = 0; playernum < MAXPLAYERS; ++playernum)
+		if (playeringame[playernum])
 	{
-		if (!playeringame[playernum])
-			continue;
-
 		if (players[playernum].kartstuff[k_position] == place)
 		{
 			return playernum;
 		}
 	}
-
 	return -1;
 }
 
@@ -5681,7 +5674,7 @@ static void Command_Archivetest_f(void)
 	// assign mobjnum
 	i = 1;
 	for (th = thinkercap.next; th != &thinkercap; th = th->next)
-		if (th->function == (actionf_p1)P_MobjThinker)
+		if (th->function.acp1 == (actionf_p1)P_MobjThinker)
 			((mobj_t *)th)->mobjnum = i++;
 
 	// allocate buffer

src/d_netfil.c

@@ -142,7 +142,6 @@ UINT8 *PutFileNeeded(UINT16 firstfile)
 {
 	size_t i;
 	UINT8 count = 0;
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 	UINT8 *p_start = netbuffer->packettype == PT_MOREFILESNEEDED ? netbuffer->u.filesneededcfg.files : netbuffer->u.serverinfo.fileneeded;
 	UINT8 *p = p_start;
 	char wadfilename[MAX_WADPATH] = "";
@@ -324,7 +323,6 @@ boolean CL_SendRequestFile(void)
 #ifdef MORELEGACYDOWNLOADER
 	boolean firstloop = true;
 #endif
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 
 #ifdef PARANOIA
 	if (M_CheckParm("-nodownload"))
@@ -453,11 +451,9 @@ tryagain:
 // returns false if a requested file was not found or cannot be sent
 boolean Got_RequestFilePak(INT32 node)
 {
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 	char wad[MAX_WADPATH+1];
 	UINT8 *p = netbuffer->u.textcmd;
 	UINT8 id;
-
 	while (p < netbuffer->u.textcmd + MAXTEXTCMD) // Don't allow hacked client to overflow
 	{
 		id = READUINT8(p);
@@ -821,7 +817,6 @@ void SV_FileSendTicker(void)
 	size_t size;
 	filetx_t *f;
 	INT32 packetsent, ram, i, j;
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 
 	if (!filestosend) // No file to send
 		return;
@@ -950,7 +945,6 @@ void SV_FileSendTicker(void)
 
 void Got_Filetxpak(void)
 {
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 	INT32 filenum = netbuffer->u.filetxpak.fileid;
 	fileneeded_t *file = &fileneeded[filenum];
 	char *filename = file->filename;
@@ -1191,18 +1185,6 @@ filestatus_t findfile(char *filename, const UINT8 *wantedmd5sum, boolean complet
 		badmd5 = true;
 	// if not found at all, just move on without doing anything
 
-	if (cv_addons_option.value == 3 && *cv_addons_folder.string != '\0')
-	{
-		// next, check any custom directory if specified
-		homecheck = filesearch(filename, cv_addons_folder.string, wantedmd5sum, completepath, 10);
-
-		if (homecheck == FS_FOUND) // we found the file, so return that we have :)
-			return FS_FOUND;
-		else if (homecheck == FS_MD5SUMBAD) // file has a bad md5; move on and look for a file with the right md5
-			badmd5 = true;
-		// if not found at all, just move on without doing anything
-	}
-
 	// finally check "." directory
 	homecheck = filesearch(filename, ".", wantedmd5sum, completepath, 10);
 

src/d_think.h

@@ -28,11 +28,18 @@
 // To compile this as "ANSI C with classes" we will need to handle the various
 //  action functions cleanly.
 //
+typedef void (*actionf_v)();
 typedef void (*actionf_p1)(void *);
 
+typedef union
+{
+	actionf_v acv;
+	actionf_p1 acp1;
+} actionf_t;
+
 // Historically, "think_t" is yet another function pointer to a routine
 // to handle an actor.
-typedef actionf_p1 think_t;
+typedef actionf_t think_t;
 
 // Doubly linked list of actors.
 typedef struct thinker_s

src/dedicated/i_video.c

@@ -152,8 +152,3 @@ boolean I_UseNativeKeyboard(void)
 {
 	return false;
 }
-
-void I_SetBorderlessWindow(void) 
-{
-
-}

src/dehacked.c

@@ -1416,211 +1416,211 @@ static void readhuditem(MYFILE *f, INT32 num)
 // DO NOT FORGET TO SYNC THIS LIST WITH THE ACTIONNUM ENUM IN INFO.H
 actionpointer_t actionpointers[] =
 {
-	{A_Explode,              "A_EXPLODE"},
-	{A_Pain,                 "A_PAIN"},
-	{A_Fall,                 "A_FALL"},
-	{A_MonitorPop,           "A_MONITORPOP"},
-	{A_Look,                 "A_LOOK"},
-	{A_Chase,                "A_CHASE"},
-	{A_FaceStabChase,        "A_FACESTABCHASE"},
-	{A_FaceTarget,           "A_FACETARGET"},
-	{A_FaceTracer,           "A_FACETRACER"},
-	{A_Scream,               "A_SCREAM"},
-	{A_BossDeath,            "A_BOSSDEATH"},
-	{A_CustomPower,          "A_CUSTOMPOWER"},
-	{A_GiveWeapon,           "A_GIVEWEAPON"},
-	{A_RingShield,           "A_RINGSHIELD"},
-	{A_RingBox,              "A_RINGBOX"},
-	{A_Invincibility,        "A_INVINCIBILITY"},
-	{A_SuperSneakers,        "A_SUPERSNEAKERS"},
-	{A_BunnyHop,             "A_BUNNYHOP"},
-	{A_BubbleSpawn,          "A_BUBBLESPAWN"},
-	{A_FanBubbleSpawn,       "A_FANBUBBLESPAWN"},
-	{A_BubbleRise,           "A_BUBBLERISE"},
-	{A_BubbleCheck,          "A_BUBBLECHECK"},
-	{A_AwardScore,           "A_AWARDSCORE"},
-	{A_ExtraLife,            "A_EXTRALIFE"},
-	{A_BombShield,           "A_BOMBSHIELD"},
-	{A_JumpShield,           "A_JUMPSHIELD"},
-	{A_WaterShield,          "A_WATERSHIELD"},
-	{A_ForceShield,          "A_FORCESHIELD"},
-	{A_PityShield,           "A_PITYSHIELD"},
-	{A_GravityBox,           "A_GRAVITYBOX"},
-	{A_ScoreRise,            "A_SCORERISE"},
-	{A_ParticleSpawn,        "A_PARTICLESPAWN"},
-	{A_AttractChase,         "A_ATTRACTCHASE"},
-	{A_DropMine,             "A_DROPMINE"},
-	{A_FishJump,             "A_FISHJUMP"},
-	{A_ThrownRing,           "A_THROWNRING"},
-	{A_GrenadeRing,          "A_GRENADERING"}, // SRB2kart
-	{A_SetSolidSteam,        "A_SETSOLIDSTEAM"},
-	{A_UnsetSolidSteam,      "A_UNSETSOLIDSTEAM"},
-	{A_SignPlayer,           "A_SIGNPLAYER"},
-	{A_OverlayThink,         "A_OVERLAYTHINK"},
-	{A_JetChase,             "A_JETCHASE"},
-	{A_JetbThink,            "A_JETBTHINK"},
-	{A_JetgThink,            "A_JETGTHINK"},
-	{A_JetgShoot,            "A_JETGSHOOT"},
-	{A_ShootBullet,          "A_SHOOTBULLET"},
-	{A_MinusDigging,         "A_MINUSDIGGING"},
-	{A_MinusPopup,           "A_MINUSPOPUP"},
-	{A_MinusCheck,           "A_MINUSCHECK"},
-	{A_ChickenCheck,         "A_CHICKENCHECK"},
-	{A_MouseThink,           "A_MOUSETHINK"},
-	{A_DetonChase,           "A_DETONCHASE"},
-	{A_CapeChase,            "A_CAPECHASE"},
-	{A_RotateSpikeBall,      "A_ROTATESPIKEBALL"},
-	{A_SlingAppear,          "A_SLINGAPPEAR"},
-	{A_MaceRotate,           "A_MACEROTATE"},
-	{A_UnidusBall,           "A_UNIDUSBALL"},
-	{A_RockSpawn,            "A_ROCKSPAWN"},
-	{A_SetFuse,              "A_SETFUSE"},
-	{A_CrawlaCommanderThink, "A_CRAWLACOMMANDERTHINK"},
-	{A_SmokeTrailer,         "A_SMOKETRAILER"},
-	{A_RingExplode,          "A_RINGEXPLODE"},
-	{A_OldRingExplode,       "A_OLDRINGEXPLODE"},
-	{A_MixUp,                "A_MIXUP"},
-	{A_RecyclePowers,        "A_RECYCLEPOWERS"},
-	{A_Boss1Chase,           "A_BOSS1CHASE"},
-	{A_FocusTarget,          "A_FOCUSTARGET"},
-	{A_Boss2Chase,           "A_BOSS2CHASE"},
-	{A_Boss2Pogo,            "A_BOSS2POGO"},
-	{A_BossZoom,             "A_BOSSZOOM"},
-	{A_BossScream,           "A_BOSSSCREAM"},
-	{A_Boss2TakeDamage,      "A_BOSS2TAKEDAMAGE"},
-	{A_Boss7Chase,           "A_BOSS7CHASE"},
-	{A_GoopSplat,            "A_GOOPSPLAT"},
-	{A_Boss2PogoSFX,         "A_BOSS2POGOSFX"},
-	{A_Boss2PogoTarget,      "A_BOSS2POGOTARGET"},
-	{A_BossJetFume,          "A_BOSSJETFUME"},
-	{A_EggmanBox,            "A_EGGMANBOX"},
-	{A_TurretFire,           "A_TURRETFIRE"},
-	{A_SuperTurretFire,      "A_SUPERTURRETFIRE"},
-	{A_TurretStop,           "A_TURRETSTOP"},
-	{A_JetJawRoam,           "A_JETJAWROAM"},
-	{A_JetJawChomp,          "A_JETJAWCHOMP"},
-	{A_PointyThink,          "A_POINTYTHINK"},
-	{A_CheckBuddy,           "A_CHECKBUDDY"},
-	{A_HoodThink,            "A_HOODTHINK"},
-	{A_ArrowCheck,           "A_ARROWCHECK"},
-	{A_SnailerThink,         "A_SNAILERTHINK"},
-	{A_SharpChase,           "A_SHARPCHASE"},
-	{A_SharpSpin,            "A_SHARPSPIN"},
-	{A_VultureVtol,          "A_VULTUREVTOL"},
-	{A_VultureCheck,         "A_VULTURECHECK"},
-	{A_SkimChase,            "A_SKIMCHASE"},
-	{A_1upThinker,           "A_1UPTHINKER"},
-	{A_SkullAttack,          "A_SKULLATTACK"},
-	{A_LobShot,              "A_LOBSHOT"},
-	{A_FireShot,             "A_FIRESHOT"},
-	{A_SuperFireShot,        "A_SUPERFIRESHOT"},
-	{A_BossFireShot,         "A_BOSSFIRESHOT"},
-	{A_Boss7FireMissiles,    "A_BOSS7FIREMISSILES"},
-	{A_Boss1Laser,           "A_BOSS1LASER"},
-	{A_Boss4Reverse,         "A_BOSS4REVERSE"},
-	{A_Boss4SpeedUp,         "A_BOSS4SPEEDUP"},
-	{A_Boss4Raise,           "A_BOSS4RAISE"},
-	{A_SparkFollow,          "A_SPARKFOLLOW"},
-	{A_BuzzFly,              "A_BUZZFLY"},
-	{A_GuardChase,           "A_GUARDCHASE"},
-	{A_EggShield,            "A_EGGSHIELD"},
-	{A_SetReactionTime,      "A_SETREACTIONTIME"},
-	{A_Boss1Spikeballs,      "A_BOSS1SPIKEBALLS"},
-	{A_Boss3TakeDamage,      "A_BOSS3TAKEDAMAGE"},
-	{A_Boss3Path,            "A_BOSS3PATH"},
-	{A_LinedefExecute,       "A_LINEDEFEXECUTE"},
-	{A_PlaySeeSound,         "A_PLAYSEESOUND"},
-	{A_PlayAttackSound,      "A_PLAYATTACKSOUND"},
-	{A_PlayActiveSound,      "A_PLAYACTIVESOUND"},
-	{A_SpawnObjectAbsolute,  "A_SPAWNOBJECTABSOLUTE"},
-	{A_SpawnObjectRelative,  "A_SPAWNOBJECTRELATIVE"},
-	{A_ChangeAngleRelative,  "A_CHANGEANGLERELATIVE"},
-	{A_ChangeAngleAbsolute,  "A_CHANGEANGLEABSOLUTE"},
-	{A_PlaySound,            "A_PLAYSOUND"},
-	{A_FindTarget,           "A_FINDTARGET"},
-	{A_FindTracer,           "A_FINDTRACER"},
-	{A_SetTics,              "A_SETTICS"},
-	{A_SetRandomTics,        "A_SETRANDOMTICS"},
-	{A_ChangeColorRelative,  "A_CHANGECOLORRELATIVE"},
-	{A_ChangeColorAbsolute,  "A_CHANGECOLORABSOLUTE"},
-	{A_MoveRelative,         "A_MOVERELATIVE"},
-	{A_MoveAbsolute,         "A_MOVEABSOLUTE"},
-	{A_Thrust,               "A_THRUST"},
-	{A_ZThrust,              "A_ZTHRUST"},
-	{A_SetTargetsTarget,     "A_SETTARGETSTARGET"},
-	{A_SetObjectFlags,       "A_SETOBJECTFLAGS"},
-	{A_SetObjectFlags2,      "A_SETOBJECTFLAGS2"},
-	{A_RandomState,          "A_RANDOMSTATE"},
-	{A_RandomStateRange,     "A_RANDOMSTATERANGE"},
-	{A_DualAction,           "A_DUALACTION"},
-	{A_RemoteAction,         "A_REMOTEACTION"},
-	{A_ToggleFlameJet,       "A_TOGGLEFLAMEJET"},
-	{A_ItemPop,              "A_ITEMPOP"},       // SRB2kart
-	{A_JawzChase,            "A_JAWZCHASE"}, // SRB2kart
-	{A_JawzExplode,          "A_JAWZEXPLODE"}, // SRB2kart
-	{A_SPBChase,             "A_SPBCHASE"}, // SRB2kart
-	{A_MineExplode,          "A_MINEEXPLODE"}, // SRB2kart
-	{A_BallhogExplode,       "A_BALLHOGEXPLODE"}, // SRB2kart
-	{A_LightningFollowPlayer,"A_LIGHTNINGFOLLOWPLAYER"}, //SRB2kart
-	{A_FZBoomFlash,          "A_FZBOOMFLASH"}, //SRB2kart
-	{A_FZBoomSmoke,          "A_FZBOOMSMOKE"}, //SRB2kart
-	{A_RandomShadowFrame,    "A_RANDOMSHADOWFRAME"}, //SRB2kart
-	{A_RoamingShadowThinker, "A_ROAMINGSHADOWTHINKER"}, //SRB2kart
-	{A_MayonakaArrow,        "A_MAYONAKAARROW"}, //SRB2kart
-	{A_ReaperThinker,        "A_REAPERTHINKER"}, //SRB2kart
-	{A_MementosTPParticles,  "A_MEMENTOSTPPARTICLES"}, //SRB2kart
-	{A_FlameParticle,        "A_FLAMEPARTICLE"}, // SRB2kart
-	{A_OrbitNights,          "A_ORBITNIGHTS"},
-	{A_GhostMe,              "A_GHOSTME"},
-	{A_SetObjectState,       "A_SETOBJECTSTATE"},
-	{A_SetObjectTypeState,   "A_SETOBJECTTYPESTATE"},
-	{A_KnockBack,            "A_KNOCKBACK"},
-	{A_PushAway,             "A_PUSHAWAY"},
-	{A_RingDrain,            "A_RINGDRAIN"},
-	{A_SplitShot,            "A_SPLITSHOT"},
-	{A_MissileSplit,         "A_MISSILESPLIT"},
-	{A_MultiShot,            "A_MULTISHOT"},
-	{A_InstaLoop,            "A_INSTALOOP"},
-	{A_Custom3DRotate,       "A_CUSTOM3DROTATE"},
-	{A_SearchForPlayers,     "A_SEARCHFORPLAYERS"},
-	{A_CheckRandom,          "A_CHECKRANDOM"},
-	{A_CheckTargetRings,     "A_CHECKTARGETRINGS"},
-	{A_CheckRings,           "A_CHECKRINGS"},
-	{A_CheckTotalRings,      "A_CHECKTOTALRINGS"},
-	{A_CheckHealth,          "A_CHECKHEALTH"},
-	{A_CheckRange,           "A_CHECKRANGE"},
-	{A_CheckHeight,          "A_CHECKHEIGHT"},
-	{A_CheckTrueRange,       "A_CHECKTRUERANGE"},
-	{A_CheckThingCount,      "A_CHECKTHINGCOUNT"},
-	{A_CheckAmbush,          "A_CHECKAMBUSH"},
-	{A_CheckCustomValue,     "A_CHECKCUSTOMVALUE"},
-	{A_CheckCusValMemo,      "A_CHECKCUSVALMEMO"},
-	{A_SetCustomValue,       "A_SETCUSTOMVALUE"},
-	{A_UseCusValMemo,        "A_USECUSVALMEMO"},
-	{A_RelayCustomValue,     "A_RELAYCUSTOMVALUE"},
-	{A_CusValAction,         "A_CUSVALACTION"},
-	{A_ForceStop,            "A_FORCESTOP"},
-	{A_ForceWin,             "A_FORCEWIN"},
-	{A_SpikeRetract,         "A_SPIKERETRACT"},
-	{A_InfoState,            "A_INFOSTATE"},
-	{A_Repeat,               "A_REPEAT"},
-	{A_SetScale,             "A_SETSCALE"},
-	{A_RemoteDamage,         "A_REMOTEDAMAGE"},
-	{A_HomingChase,          "A_HOMINGCHASE"},
-	{A_TrapShot,             "A_TRAPSHOT"},
-	{A_VileTarget,           "A_VILETARGET"},
-	{A_VileAttack,           "A_VILEATTACK"},
-	{A_VileFire,             "A_VILEFIRE"},
-	{A_BrakChase,            "A_BRAKCHASE"},
-	{A_BrakFireShot,         "A_BRAKFIRESHOT"},
-	{A_BrakLobShot,          "A_BRAKLOBSHOT"},
-	{A_NapalmScatter,        "A_NAPALMSCATTER"},
-	{A_SpawnFreshCopy,       "A_SPAWNFRESHCOPY"},
+	{{A_Explode},              "A_EXPLODE"},
+	{{A_Pain},                 "A_PAIN"},
+	{{A_Fall},                 "A_FALL"},
+	{{A_MonitorPop},           "A_MONITORPOP"},
+	{{A_Look},                 "A_LOOK"},
+	{{A_Chase},                "A_CHASE"},
+	{{A_FaceStabChase},        "A_FACESTABCHASE"},
+	{{A_FaceTarget},           "A_FACETARGET"},
+	{{A_FaceTracer},           "A_FACETRACER"},
+	{{A_Scream},               "A_SCREAM"},
+	{{A_BossDeath},            "A_BOSSDEATH"},
+	{{A_CustomPower},          "A_CUSTOMPOWER"},
+	{{A_GiveWeapon},           "A_GIVEWEAPON"},
+	{{A_RingShield},           "A_RINGSHIELD"},
+	{{A_RingBox},              "A_RINGBOX"},
+	{{A_Invincibility},        "A_INVINCIBILITY"},
+	{{A_SuperSneakers},        "A_SUPERSNEAKERS"},
+	{{A_BunnyHop},             "A_BUNNYHOP"},
+	{{A_BubbleSpawn},          "A_BUBBLESPAWN"},
+	{{A_FanBubbleSpawn},       "A_FANBUBBLESPAWN"},
+	{{A_BubbleRise},           "A_BUBBLERISE"},
+	{{A_BubbleCheck},          "A_BUBBLECHECK"},
+	{{A_AwardScore},           "A_AWARDSCORE"},
+	{{A_ExtraLife},            "A_EXTRALIFE"},
+	{{A_BombShield},           "A_BOMBSHIELD"},
+	{{A_JumpShield},           "A_JUMPSHIELD"},
+	{{A_WaterShield},          "A_WATERSHIELD"},
+	{{A_ForceShield},          "A_FORCESHIELD"},
+	{{A_PityShield},           "A_PITYSHIELD"},
+	{{A_GravityBox},           "A_GRAVITYBOX"},
+	{{A_ScoreRise},            "A_SCORERISE"},
+	{{A_ParticleSpawn},        "A_PARTICLESPAWN"},
+	{{A_AttractChase},         "A_ATTRACTCHASE"},
+	{{A_DropMine},             "A_DROPMINE"},
+	{{A_FishJump},             "A_FISHJUMP"},
+	{{A_ThrownRing},           "A_THROWNRING"},
+	{{A_GrenadeRing},          "A_GRENADERING"}, // SRB2kart
+	{{A_SetSolidSteam},        "A_SETSOLIDSTEAM"},
+	{{A_UnsetSolidSteam},      "A_UNSETSOLIDSTEAM"},
+	{{A_SignPlayer},           "A_SIGNPLAYER"},
+	{{A_OverlayThink},         "A_OVERLAYTHINK"},
+	{{A_JetChase},             "A_JETCHASE"},
+	{{A_JetbThink},            "A_JETBTHINK"},
+	{{A_JetgThink},            "A_JETGTHINK"},
+	{{A_JetgShoot},            "A_JETGSHOOT"},
+	{{A_ShootBullet},          "A_SHOOTBULLET"},
+	{{A_MinusDigging},         "A_MINUSDIGGING"},
+	{{A_MinusPopup},           "A_MINUSPOPUP"},
+	{{A_MinusCheck},           "A_MINUSCHECK"},
+	{{A_ChickenCheck},         "A_CHICKENCHECK"},
+	{{A_MouseThink},           "A_MOUSETHINK"},
+	{{A_DetonChase},           "A_DETONCHASE"},
+	{{A_CapeChase},            "A_CAPECHASE"},
+	{{A_RotateSpikeBall},      "A_ROTATESPIKEBALL"},
+	{{A_SlingAppear},          "A_SLINGAPPEAR"},
+	{{A_MaceRotate},           "A_MACEROTATE"},
+	{{A_UnidusBall},           "A_UNIDUSBALL"},
+	{{A_RockSpawn},            "A_ROCKSPAWN"},
+	{{A_SetFuse},              "A_SETFUSE"},
+	{{A_CrawlaCommanderThink}, "A_CRAWLACOMMANDERTHINK"},
+	{{A_SmokeTrailer},         "A_SMOKETRAILER"},
+	{{A_RingExplode},          "A_RINGEXPLODE"},
+	{{A_OldRingExplode},       "A_OLDRINGEXPLODE"},
+	{{A_MixUp},                "A_MIXUP"},
+	{{A_RecyclePowers},        "A_RECYCLEPOWERS"},
+	{{A_Boss1Chase},           "A_BOSS1CHASE"},
+	{{A_FocusTarget},          "A_FOCUSTARGET"},
+	{{A_Boss2Chase},           "A_BOSS2CHASE"},
+	{{A_Boss2Pogo},            "A_BOSS2POGO"},
+	{{A_BossZoom},             "A_BOSSZOOM"},
+	{{A_BossScream},           "A_BOSSSCREAM"},
+	{{A_Boss2TakeDamage},      "A_BOSS2TAKEDAMAGE"},
+	{{A_Boss7Chase},           "A_BOSS7CHASE"},
+	{{A_GoopSplat},            "A_GOOPSPLAT"},
+	{{A_Boss2PogoSFX},         "A_BOSS2POGOSFX"},
+	{{A_Boss2PogoTarget},      "A_BOSS2POGOTARGET"},
+	{{A_BossJetFume},          "A_BOSSJETFUME"},
+	{{A_EggmanBox},            "A_EGGMANBOX"},
+	{{A_TurretFire},           "A_TURRETFIRE"},
+	{{A_SuperTurretFire},      "A_SUPERTURRETFIRE"},
+	{{A_TurretStop},           "A_TURRETSTOP"},
+	{{A_JetJawRoam},           "A_JETJAWROAM"},
+	{{A_JetJawChomp},          "A_JETJAWCHOMP"},
+	{{A_PointyThink},          "A_POINTYTHINK"},
+	{{A_CheckBuddy},           "A_CHECKBUDDY"},
+	{{A_HoodThink},            "A_HOODTHINK"},
+	{{A_ArrowCheck},           "A_ARROWCHECK"},
+	{{A_SnailerThink},         "A_SNAILERTHINK"},
+	{{A_SharpChase},           "A_SHARPCHASE"},
+	{{A_SharpSpin},            "A_SHARPSPIN"},
+	{{A_VultureVtol},          "A_VULTUREVTOL"},
+	{{A_VultureCheck},         "A_VULTURECHECK"},
+	{{A_SkimChase},            "A_SKIMCHASE"},
+	{{A_1upThinker},           "A_1UPTHINKER"},
+	{{A_SkullAttack},          "A_SKULLATTACK"},
+	{{A_LobShot},              "A_LOBSHOT"},
+	{{A_FireShot},             "A_FIRESHOT"},
+	{{A_SuperFireShot},        "A_SUPERFIRESHOT"},
+	{{A_BossFireShot},         "A_BOSSFIRESHOT"},
+	{{A_Boss7FireMissiles},    "A_BOSS7FIREMISSILES"},
+	{{A_Boss1Laser},           "A_BOSS1LASER"},
+	{{A_Boss4Reverse},         "A_BOSS4REVERSE"},
+	{{A_Boss4SpeedUp},         "A_BOSS4SPEEDUP"},
+	{{A_Boss4Raise},           "A_BOSS4RAISE"},
+	{{A_SparkFollow},          "A_SPARKFOLLOW"},
+	{{A_BuzzFly},              "A_BUZZFLY"},
+	{{A_GuardChase},           "A_GUARDCHASE"},
+	{{A_EggShield},            "A_EGGSHIELD"},
+	{{A_SetReactionTime},      "A_SETREACTIONTIME"},
+	{{A_Boss1Spikeballs},      "A_BOSS1SPIKEBALLS"},
+	{{A_Boss3TakeDamage},      "A_BOSS3TAKEDAMAGE"},
+	{{A_Boss3Path},            "A_BOSS3PATH"},
+	{{A_LinedefExecute},       "A_LINEDEFEXECUTE"},
+	{{A_PlaySeeSound},         "A_PLAYSEESOUND"},
+	{{A_PlayAttackSound},      "A_PLAYATTACKSOUND"},
+	{{A_PlayActiveSound},      "A_PLAYACTIVESOUND"},
+	{{A_SpawnObjectAbsolute},  "A_SPAWNOBJECTABSOLUTE"},
+	{{A_SpawnObjectRelative},  "A_SPAWNOBJECTRELATIVE"},
+	{{A_ChangeAngleRelative},  "A_CHANGEANGLERELATIVE"},
+	{{A_ChangeAngleAbsolute},  "A_CHANGEANGLEABSOLUTE"},
+	{{A_PlaySound},            "A_PLAYSOUND"},
+	{{A_FindTarget},           "A_FINDTARGET"},
+	{{A_FindTracer},           "A_FINDTRACER"},
+	{{A_SetTics},              "A_SETTICS"},
+	{{A_SetRandomTics},        "A_SETRANDOMTICS"},
+	{{A_ChangeColorRelative},  "A_CHANGECOLORRELATIVE"},
+	{{A_ChangeColorAbsolute},  "A_CHANGECOLORABSOLUTE"},
+	{{A_MoveRelative},         "A_MOVERELATIVE"},
+	{{A_MoveAbsolute},         "A_MOVEABSOLUTE"},
+	{{A_Thrust},               "A_THRUST"},
+	{{A_ZThrust},              "A_ZTHRUST"},
+	{{A_SetTargetsTarget},     "A_SETTARGETSTARGET"},
+	{{A_SetObjectFlags},       "A_SETOBJECTFLAGS"},
+	{{A_SetObjectFlags2},      "A_SETOBJECTFLAGS2"},
+	{{A_RandomState},          "A_RANDOMSTATE"},
+	{{A_RandomStateRange},     "A_RANDOMSTATERANGE"},
+	{{A_DualAction},           "A_DUALACTION"},
+	{{A_RemoteAction},         "A_REMOTEACTION"},
+	{{A_ToggleFlameJet},       "A_TOGGLEFLAMEJET"},
+	{{A_ItemPop},              "A_ITEMPOP"},       // SRB2kart
+	{{A_JawzChase},            "A_JAWZCHASE"}, // SRB2kart
+	{{A_JawzExplode},          "A_JAWZEXPLODE"}, // SRB2kart
+	{{A_SPBChase},             "A_SPBCHASE"}, // SRB2kart
+	{{A_MineExplode},          "A_MINEEXPLODE"}, // SRB2kart
+	{{A_BallhogExplode},       "A_BALLHOGEXPLODE"}, // SRB2kart
+	{{A_LightningFollowPlayer},"A_LIGHTNINGFOLLOWPLAYER"}, //SRB2kart
+	{{A_FZBoomFlash},          "A_FZBOOMFLASH"}, //SRB2kart
+	{{A_FZBoomSmoke},          "A_FZBOOMSMOKE"}, //SRB2kart
+	{{A_RandomShadowFrame},	   "A_RANDOMSHADOWFRAME"}, //SRB2kart
+	{{A_RoamingShadowThinker}, "A_ROAMINGSHADOWTHINKER"}, //SRB2kart
+	{{A_MayonakaArrow}, 	   "A_MAYONAKAARROW"}, //SRB2kart
+	{{A_ReaperThinker}, 	   "A_REAPERTHINKER"}, //SRB2kart
+	{{A_MementosTPParticles},  "A_MEMENTOSTPPARTICLES"}, //SRB2kart
+	{{A_FlameParticle},        "A_FLAMEPARTICLE"}, // SRB2kart
+	{{A_OrbitNights},          "A_ORBITNIGHTS"},
+	{{A_GhostMe},              "A_GHOSTME"},
+	{{A_SetObjectState},       "A_SETOBJECTSTATE"},
+	{{A_SetObjectTypeState},   "A_SETOBJECTTYPESTATE"},
+	{{A_KnockBack},            "A_KNOCKBACK"},
+	{{A_PushAway},             "A_PUSHAWAY"},
+	{{A_RingDrain},            "A_RINGDRAIN"},
+	{{A_SplitShot},            "A_SPLITSHOT"},
+	{{A_MissileSplit},         "A_MISSILESPLIT"},
+	{{A_MultiShot},            "A_MULTISHOT"},
+	{{A_InstaLoop},            "A_INSTALOOP"},
+	{{A_Custom3DRotate},       "A_CUSTOM3DROTATE"},
+	{{A_SearchForPlayers},     "A_SEARCHFORPLAYERS"},
+	{{A_CheckRandom},          "A_CHECKRANDOM"},
+	{{A_CheckTargetRings},     "A_CHECKTARGETRINGS"},
+	{{A_CheckRings},           "A_CHECKRINGS"},
+	{{A_CheckTotalRings},      "A_CHECKTOTALRINGS"},
+	{{A_CheckHealth},          "A_CHECKHEALTH"},
+	{{A_CheckRange},           "A_CHECKRANGE"},
+	{{A_CheckHeight},          "A_CHECKHEIGHT"},
+	{{A_CheckTrueRange},       "A_CHECKTRUERANGE"},
+	{{A_CheckThingCount},      "A_CHECKTHINGCOUNT"},
+	{{A_CheckAmbush},          "A_CHECKAMBUSH"},
+	{{A_CheckCustomValue},     "A_CHECKCUSTOMVALUE"},
+	{{A_CheckCusValMemo},      "A_CHECKCUSVALMEMO"},
+	{{A_SetCustomValue},       "A_SETCUSTOMVALUE"},
+	{{A_UseCusValMemo},        "A_USECUSVALMEMO"},
+	{{A_RelayCustomValue},     "A_RELAYCUSTOMVALUE"},
+	{{A_CusValAction},         "A_CUSVALACTION"},
+	{{A_ForceStop},            "A_FORCESTOP"},
+	{{A_ForceWin},             "A_FORCEWIN"},
+	{{A_SpikeRetract},         "A_SPIKERETRACT"},
+	{{A_InfoState},            "A_INFOSTATE"},
+	{{A_Repeat},               "A_REPEAT"},
+	{{A_SetScale},             "A_SETSCALE"},
+	{{A_RemoteDamage},         "A_REMOTEDAMAGE"},
+	{{A_HomingChase},          "A_HOMINGCHASE"},
+	{{A_TrapShot},             "A_TRAPSHOT"},
+	{{A_VileTarget},           "A_VILETARGET"},
+	{{A_VileAttack},           "A_VILEATTACK"},
+	{{A_VileFire},             "A_VILEFIRE"},
+	{{A_BrakChase},            "A_BRAKCHASE"},
+	{{A_BrakFireShot},         "A_BRAKFIRESHOT"},
+	{{A_BrakLobShot},          "A_BRAKLOBSHOT"},
+	{{A_NapalmScatter},        "A_NAPALMSCATTER"},
+	{{A_SpawnFreshCopy},       "A_SPAWNFRESHCOPY"},
 
-	{NULL,                   "NONE"},
+	{{NULL},                   "NONE"},
 
 	// This NULL entry must be the last in the list
-	{NULL,                   NULL},
+	{{NULL},                   NULL},
 };
 
 static void readframe(MYFILE *f, INT32 num)
@@ -1702,7 +1702,7 @@ static void readframe(MYFILE *f, INT32 num)
 
 				for (z = 0; actionpointers[z].name; z++)
 				{
-					if (actionpointers[z].action == states[num].action)
+					if (actionpointers[z].action.acv == states[num].action.acv)
 					{
 						break;
 					}
@@ -1711,17 +1711,17 @@ static void readframe(MYFILE *f, INT32 num)
 				z = 0;
 				found = LUA_SetLuaAction(&states[num], actiontocompare);
 				if (!found)
+				while (actionpointers[z].name)
 				{
-					while (actionpointers[z].name)
+					if (fastcmp(actiontocompare, actionpointers[z].name))
 					{
-						if (fastcmp(actiontocompare, actionpointers[z].name))
-						{
-							states[num].action = actionpointers[z].action;
-							found = true;
-							break;
-						}
-						z++;
+						states[num].action = actionpointers[z].action;
+						states[num].action.acv = actionpointers[z].action.acv; // assign
+						states[num].action.acp1 = actionpointers[z].action.acp1;
+						found = true;
+						break;
 					}
+					z++;
 				}
 
 				if (!found)
@@ -8524,13 +8524,13 @@ static inline int lib_freeslot(lua_State *L)
 // Arguments: mobj_t actor, int var1, int var2
 static inline int lib_action(lua_State *L)
 {
-	actionf_p1 *action = lua_touserdata(L,lua_upvalueindex(1));
+	actionf_t *action = lua_touserdata(L,lua_upvalueindex(1));
 	mobj_t *actor = *((mobj_t **)luaL_checkudata(L,1,META_MOBJ));
 	var1 = (INT32)luaL_optinteger(L,2,0);
 	var2 = (INT32)luaL_optinteger(L,3,0);
 	if (!actor)
 		return LUA_ErrInvalid(L, "mobj_t");
-	(*action)(actor);
+	action->acp1(actor);
 	return 0;
 }
 
@@ -9344,15 +9344,13 @@ int LUA_SOCLib(lua_State *L)
 
 const char *LUA_GetActionName(void *action)
 {
-	actionf_p1 *act = (actionf_p1 *)action;
+	actionf_t *act = (actionf_t *)action;
 	size_t z;
-
 	for (z = 0; actionpointers[z].name; z++)
 	{
-		if (actionpointers[z].action == *act)
+		if (actionpointers[z].action.acv == act->acv)
 			return actionpointers[z].name;
 	}
-
 	return NULL;
 }
 
@@ -9365,6 +9363,8 @@ void LUA_SetActionByName(void *state, const char *actiontocompare)
 		if (fasticmp(actiontocompare, actionpointers[z].name))
 		{
 			st->action = actionpointers[z].action;
+			st->action.acv = actionpointers[z].action.acv; // assign
+			st->action.acp1 = actionpointers[z].action.acp1;
 			return;
 		}
 	}

src/doomdef.h

@@ -70,11 +70,7 @@ extern "C" {
 #include <string.h>
 
 #define _USE_MATH_DEFINES // fixes M_PI errors in r_plane.c for Visual Studio
-#ifdef __cplusplus
-#include <cmath>
-#else
 #include <math.h>
-#endif
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -115,8 +111,8 @@ extern char  logfilename[1024];
 #else
 #define VERSION    1 // Game version
 #define SUBVERSION 6 // more precise version number
-#define VERSIONSTRING "Saturn v8.3"
-#define VERSIONSTRINGW L"Saturn v8.3"
+#define VERSIONSTRING "Saturn v8.2"
+#define VERSIONSTRINGW L"Saturn v8.2"
 // 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!
 // AND appveyor.yml, for the build bots!

src/doomstat.h

@@ -575,7 +575,7 @@ extern consvar_t cv_downloading; // allow clients to downloading WADs.
 extern consvar_t cv_nettimeout; // SRB2Kart: Advanced server options menu
 extern consvar_t cv_jointimeout;
 extern consvar_t cv_maxping;
-extern ticcmd_t netcmds[BACKUPTICS][MAXPLAYERS];
+extern ticcmd_t netcmds[TICQUEUE][MAXPLAYERS];
 extern INT32 serverplayer;
 extern INT32 adminplayers[MAXPLAYERS];
 

src/filesrch.c

@@ -365,8 +365,8 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
 	char searchpath[1024];
 	size_t *searchpathindex;
 
-	dirhandle = (DIR**) malloc(maxsearchdepth * sizeof(DIR*));
-	searchpathindex = (size_t *) malloc(maxsearchdepth * sizeof(size_t));
+	dirhandle = (DIR**) malloc(maxsearchdepth * sizeof (DIR*));
+	searchpathindex = (size_t *) malloc(maxsearchdepth * sizeof (size_t));
 
 	strcpy(searchpath,startpath);
 	searchpathindex[--depthleft] = strlen(searchpath) + 1;
@@ -410,14 +410,14 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
 		}
 
 		// okay, now we actually want searchpath to incorporate d_name
-		strcpy(&searchpath[searchpathindex[depthleft]], dent->d_name);
+		strcpy(&searchpath[searchpathindex[depthleft]],dent->d_name);
 
 #if defined(__linux__) || defined(__FreeBSD__)
-		if (dent->d_type == DT_UNKNOWN && lstat(searchpath, &fsstat) == 0)
+		if (dent->d_type == DT_UNKNOWN && lstat(searchpath,&fsstat) == 0)
 		{
 			if (S_ISDIR(fsstat.st_mode))
 				dent->d_type = DT_DIR;
-			else if (S_ISLNK(fsstat.st_mode))
+            else if (S_ISLNK(fsstat.st_mode))
 				dent->d_type = DT_LNK;
 		}
 
@@ -439,12 +439,11 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
 		{
 			searchpathindex[--depthleft] = strlen(searchpath) + 1;
 			dirhandle[depthleft] = opendir(searchpath);
-
 			if (!dirhandle[depthleft])
 			{
-				// can't open it... maybe no read-permissions
-				// go back to previous dir
-				depthleft++;
+					// can't open it... maybe no read-permissions
+					// go back to previous dir
+					depthleft++;
 			}
 
 			searchpath[searchpathindex[depthleft]-1] = PATHSEP[0];
@@ -456,9 +455,9 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
 			{
 				case FS_FOUND:
 					if (completepath)
-						strcpy(filename, searchpath);
+						strcpy(filename,searchpath);
 					else
-						strcpy(filename, dent->d_name);
+						strcpy(filename,dent->d_name);
 					retval = FS_FOUND;
 					found = 1;
 					break;

src/g_demo.c

@@ -1051,7 +1051,7 @@ void G_ConsGhostTic(INT32 playernum)
 				mobj = NULL;
 				for (th = thinkercap.next; th != &thinkercap; th = th->next)
 				{
-					if (th->function != (actionf_p1)P_MobjThinker)
+					if (th->function.acp1 != (actionf_p1)P_MobjThinker)
 						continue;
 					mobj = (mobj_t *)th;
 					if (mobj->type == (mobjtype_t)type && mobj->x == x && mobj->y == y && mobj->z == z)
@@ -3701,7 +3701,7 @@ void G_DoPlayMetal(void)
 	// find metal sonic
 	for (th = thinkercap.next; th != &thinkercap; th = th->next)
 	{
-		if (th->function != (actionf_p1)P_MobjThinker)
+		if (th->function.acp1 != (actionf_p1)P_MobjThinker)
 			continue;
 
 		mo = (mobj_t *)th;

src/g_game.c

@@ -109,7 +109,7 @@ boolean addedtogame;
 player_t players[MAXPLAYERS];
 
 INT32 consoleplayer; // player taking events and displaying
-INT32 displayplayers[MAXSPLITSCREENPLAYERS] = {0}; // view being displayed
+INT32 displayplayers[MAXSPLITSCREENPLAYERS]; // view being displayed
 
 tic_t gametic;
 tic_t levelstarttic; // gametic at level start
@@ -681,49 +681,47 @@ INT32 JoyAxis(axis_input_e axissel, UINT8 player)
 	INT32 axisval;
 	boolean flp = false;
 
-	UINT8 pnum = player-1;
-
 	//find what axis to get
 	switch (axissel)
 	{
 		case AXISTURN:
-			axisval = cv_turnaxis[pnum].value;
+			axisval = cv_turnaxis[player-1].value;
 			break;
 		case AXISMOVE:
-			axisval = cv_moveaxis[pnum].value;
+			axisval = cv_moveaxis[player-1].value;
 			break;
 		case AXISCAMTURN:
-			axisval = cv_camturnaxis[pnum].value;
+			axisval = cv_camturnaxis[player-1].value;
 			break;
 		case AXISCAMSTRAFE:
-			axisval = cv_camstrafeaxis[pnum].value;
+			axisval = cv_camstrafeaxis[player-1].value;
 			break;
 		case AXISBRAKE:
-			axisval = cv_brakeaxis[pnum].value;
+			axisval = cv_brakeaxis[player-1].value;
 			break;
 		case AXISAIM:
-			axisval = cv_aimaxis[pnum].value;
+			axisval = cv_aimaxis[player-1].value;
 			break;
 		case AXISLOOK:
-			axisval = cv_lookaxis[pnum].value;
+			axisval = cv_lookaxis[player-1].value;
 			break;
 		case AXISFIRE:
-			axisval = cv_fireaxis[pnum].value;
+			axisval = cv_fireaxis[player-1].value;
 			break;
 		case AXISDRIFT:
-			axisval = cv_driftaxis[pnum].value;
+			axisval = cv_driftaxis[player-1].value;
 			break;
 		case AXISLOOKBACK:
-			axisval = cv_lookbackaxis[pnum].value;
+			axisval = cv_lookbackaxis[player-1].value;
 			break;
 		case AXISCUSTOM1:
-			axisval = cv_custom1axis[pnum].value;
+			axisval = cv_custom1axis[player-1].value;
 			break;
 		case AXISCUSTOM2:
-			axisval = cv_custom2axis[pnum].value;
+			axisval = cv_custom2axis[player-1].value;
 			break;
 		case AXISCUSTOM3:
-			axisval = cv_custom3axis[pnum].value;
+			axisval = cv_custom3axis[player-1].value;
 			break;
 		default:
 			return 0;
@@ -734,51 +732,44 @@ INT32 JoyAxis(axis_input_e axissel, UINT8 player)
 		axisval = -axisval;
 		flp = true;
 	}
-
 	if (axisval > JOYAXISSET*2 || axisval == 0) //not there in array or None
 		return 0;
 
-	if (axisval % 2)
+	if (axisval%2)
 	{
 		axisval /= 2;
-		retaxis = joyxmove[pnum][axisval];
+		retaxis = joyxmove[axisval];
 
 		if (retaxis < (-JOYAXISRANGE))
 			retaxis = -JOYAXISRANGE;
 		if (retaxis > (+JOYAXISRANGE))
 			retaxis = +JOYAXISRANGE;
-		if (!Joystick[pnum].bGamepadStyle && axissel < AXISDEAD)
+		if (!Joystick[player-1].bGamepadStyle && axissel < AXISDEAD)
 		{
-			const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_xdeadzone[pnum].value) >> FRACBITS;
+			const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_xdeadzone[player-1].value) >> FRACBITS;
 			if (abs(retaxis) <= jdeadzone)
 				return 0;
 		}
-
-		if (flp)
-			retaxis = -retaxis; // flip it around
-
+		if (flp) retaxis = -retaxis; //flip it around
 		return retaxis;
 	}
 	else
 	{
 		axisval--;
 		axisval /= 2;
-		retaxis = joyymove[pnum][axisval];
+		retaxis = joyymove[axisval];
 
 		if (retaxis < (-JOYAXISRANGE))
 			retaxis = -JOYAXISRANGE;
 		if (retaxis > (+JOYAXISRANGE))
 			retaxis = +JOYAXISRANGE;
-		if (!Joystick[pnum].bGamepadStyle && axissel < AXISDEAD)
+		if (!Joystick[player-1].bGamepadStyle && axissel < AXISDEAD)
 		{
-			const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_ydeadzone[pnum].value) >> FRACBITS;
+			const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_ydeadzone[player-1].value) >> FRACBITS;
 			if (abs(retaxis) <= jdeadzone)
 				return 0;
 		}
-
-		if (flp)
-			retaxis = -retaxis; // flip it around
-
+		if (flp) retaxis = -retaxis; //flip it around
 		return retaxis;
 	}
 }
@@ -1225,9 +1216,15 @@ static void G_DoLoadLevel(boolean resetplayer)
 	}
 
 	// clear cmd building stuff
-	memset(gamekeydown, 0, sizeof(gamekeydown));
-	memset(joyxmove, 0, sizeof(joyxmove));
-	memset(joyymove, 0, sizeof(joyymove));
+	memset(gamekeydown, 0, sizeof (gamekeydown));
+
+	for (i = 0; i < JOYAXISSET; i++)
+	{
+		joyxmove[i]  = joyymove[i]  = 0;
+		joy2xmove[i] = joy2ymove[i] = 0;
+		joy3xmove[i] = joy3ymove[i] = 0;
+		joy4xmove[i] = joy4ymove[i] = 0;
+	}
 	mousex = mousey = 0;
 
 	// clear hud messages remains (usually from game startup)
@@ -1787,7 +1784,7 @@ void G_Ticker(boolean run)
 		}
 	}
 
-	buf = gametic % BACKUPTICS;
+	buf = gametic % TICQUEUE;
 
 	if (!demo.playback)
 	{
@@ -2562,7 +2559,7 @@ void G_ChangePlayerReferences(mobj_t *oldmo, mobj_t *newmo)
 	// scan all thinkers
 	for (th = thinkercap.next; th != &thinkercap; th = th->next)
 	{
-		if (th->function != (actionf_p1)P_MobjThinker)
+		if (th->function.acp1 != (actionf_p1)P_MobjThinker)
 			continue;
 
 		mo2 = (mobj_t *)th;

src/g_input.c

@@ -114,7 +114,8 @@ INT32 mousex, mousey;
 INT32 mlooky; // like mousey but with a custom sensitivity for mlook
 
 // joystick values are repeated
-INT32 joyxmove[MAXSPLITSCREENPLAYERS][JOYAXISSET], joyymove[MAXSPLITSCREENPLAYERS][JOYAXISSET];
+INT32 joyxmove[JOYAXISSET], joyymove[JOYAXISSET], joy2xmove[JOYAXISSET], joy2ymove[JOYAXISSET],
+joy3xmove[JOYAXISSET], joy3ymove[JOYAXISSET], joy4xmove[JOYAXISSET], joy4ymove[JOYAXISSET];
 
 // current state of the keys: true if pushed
 UINT8 gamekeydown[NUMINPUTS];
@@ -186,32 +187,32 @@ void G_MapEventsToControls(event_t *ev)
 			i = ev->data1;
 			if (i >= JOYAXISSET || menuactive || CON_Ready() || chat_on)
 				break;
-			if (ev->data2 != INT32_MAX) joyxmove[0][i] = ev->data2;
-			if (ev->data3 != INT32_MAX) joyymove[0][i] = ev->data3;
+			if (ev->data2 != INT32_MAX) joyxmove[i] = ev->data2;
+			if (ev->data3 != INT32_MAX) joyymove[i] = ev->data3;
 			break;
 
 		case ev_joystick2: // buttons are virtual keys
 			i = ev->data1;
 			if (i >= JOYAXISSET || menuactive)
 				break;
-			if (ev->data2 != INT32_MAX) joyxmove[1][i] = ev->data2;
-			if (ev->data3 != INT32_MAX) joyymove[1][i] = ev->data3;
+			if (ev->data2 != INT32_MAX) joy2xmove[i] = ev->data2;
+			if (ev->data3 != INT32_MAX) joy2ymove[i] = ev->data3;
 			break;
 
 		case ev_joystick3:
 			i = ev->data1;
 			if (i >= JOYAXISSET)
 				break;
-			if (ev->data2 != INT32_MAX) joyxmove[2][i] = ev->data2;
-			if (ev->data3 != INT32_MAX) joyymove[2][i] = ev->data3;
+			if (ev->data2 != INT32_MAX) joy3xmove[i] = ev->data2;
+			if (ev->data3 != INT32_MAX) joy3ymove[i] = ev->data3;
 			break;
 
 		case ev_joystick4:
 			i = ev->data1;
 			if (i >= JOYAXISSET)
 				break;
-			if (ev->data2 != INT32_MAX) joyxmove[3][i] = ev->data2;
-			if (ev->data3 != INT32_MAX) joyymove[3][i] = ev->data3;
+			if (ev->data2 != INT32_MAX) joy4xmove[i] = ev->data2;
+			if (ev->data3 != INT32_MAX) joy4ymove[i] = ev->data3;
 			break;
 
 		default:
@@ -257,6 +258,15 @@ void G_ResetControls(void)
 	memset(joyxmove, 0, sizeof(joyxmove));
 	memset(joyymove, 0, sizeof(joyymove));
 
+	memset(joy2xmove, 0, sizeof(joy2xmove));
+	memset(joy2ymove, 0, sizeof(joy2ymove));
+
+	memset(joy3xmove, 0, sizeof(joy3xmove));
+	memset(joy3ymove, 0, sizeof(joy3ymove));
+
+	memset(joy4xmove, 0, sizeof(joy4xmove));
+	memset(joy4ymove, 0, sizeof(joy4ymove));
+
 	// reset those just in case the game missed the keyup event
 	memset(dpadscrollstate, false, sizeof(dpadscrollstate));
 }

src/g_input.h

@@ -41,12 +41,10 @@ typedef enum
 	KEY_DBLJOY1 = KEY_DBLMOUSE1 + MOUSEBUTTONS,
 	KEY_DBLHAT1 = KEY_DBLJOY1 + JOYBUTTONS,
 
-	KEY_2MOUSE1 = KEY_DBLHAT1 + JOYHATS*4,
-	KEY_2JOY1 = KEY_2MOUSE1 + MOUSEBUTTONS,
+	KEY_2JOY1 = KEY_DBLHAT1 + MOUSEBUTTONS,
 	KEY_2HAT1 = KEY_2JOY1 + JOYBUTTONS,
 
-	KEY_DBL2MOUSE1 = KEY_2HAT1 + JOYHATS*4,
-	KEY_DBL2JOY1 = KEY_DBL2MOUSE1 + MOUSEBUTTONS,
+	KEY_DBL2JOY1 = KEY_2HAT1 + MOUSEBUTTONS,
 	KEY_DBL2HAT1 = KEY_DBL2JOY1 + JOYBUTTONS,
 
 	KEY_3JOY1 = KEY_DBL2HAT1 + JOYHATS*4,
@@ -63,10 +61,8 @@ typedef enum
 
 	KEY_MOUSEWHEELUP = KEY_DBL4HAT1 + JOYHATS*4,
 	KEY_MOUSEWHEELDOWN = KEY_MOUSEWHEELUP + 1,
-	KEY_2MOUSEWHEELUP = KEY_MOUSEWHEELDOWN + 1,
-	KEY_2MOUSEWHEELDOWN = KEY_2MOUSEWHEELUP + 1,
 
-	NUMINPUTS = KEY_2MOUSEWHEELDOWN + 1, // FIXME: all the mouse 2 stuff should be removed, but it screws up mappings somehow
+	NUMINPUTS = KEY_MOUSEWHEELDOWN + 1,
 } key_input_e;
 
 typedef enum
@@ -117,7 +113,8 @@ extern consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS];
 extern INT32 mousex, mousey;
 extern INT32 mlooky; //mousey with mlookSensitivity
 
-extern INT32 joyxmove[MAXSPLITSCREENPLAYERS][JOYAXISSET], joyymove[MAXSPLITSCREENPLAYERS][JOYAXISSET];
+extern INT32 joyxmove[JOYAXISSET], joyymove[JOYAXISSET], joy2xmove[JOYAXISSET], joy2ymove[JOYAXISSET],
+	joy3xmove[JOYAXISSET], joy3ymove[JOYAXISSET], joy4xmove[JOYAXISSET], joy4ymove[JOYAXISSET];
 
 // current state of the keys: true if pushed
 extern UINT8 gamekeydown[NUMINPUTS];

src/hardware/hw_batching.h

@@ -21,6 +21,8 @@ extern "C" {
 #include "hw_data.h"
 #include "hw_gl.h"
 
+extern boolean currently_batching;
+
 typedef struct
 {
 	FSurfaceInfo surf;// surf also has its own polyflags for some reason, but it seems unused

src/hardware/hw_cache.c

@@ -38,6 +38,12 @@ INT32 textureformat = GL_TEXFMT_P_8; // use chromakey for hole
 
 RGBA_t mapPalette[256] = {0}; // the palette for the currently loaded level or menu etc.
 
+// Returns a pointer to the palette which should be used for caching textures.
+RGBA_t *HWR_GetTexturePalette(void)
+{
+	return HWR_ShouldUsePaletteRendering() ? mapPalette : pLocalPalette;
+}
+
 static INT32 format2bpp(GLTextureFormat_t format)
 {
 	switch (format)
@@ -786,7 +792,7 @@ static void HWR_PrecacheLevelSprites(void)
 
 	for (th = thinkercap.next; th != &thinkercap; th = th->next)
 	{
-		if (th->function != (actionf_p1)P_MobjThinker)
+		if (th->function.acp1 != (actionf_p1)P_MobjThinker)
 			continue;
 
 		mo = (mobj_t *)th;

src/hardware/hw_defs.h

@@ -119,7 +119,7 @@ typedef struct
 typedef struct
 {
 	poly_t *planepoly;  // the generated convex polygon
-} extrasubsector_t;
+} poly_subsector_t;
 
 // Vanilla features
 //#define USE_MODEL_NEXTFRAME

src/hardware/hw_draw.c

@@ -610,7 +610,7 @@ void HWR_FadeScreenMenuBack(UINT16 color, UINT8 strength)
 	}
 	else // Do TRANSMAP** fade.
 	{
-		const RGBA_t *palette = HWR_GetTexturePalette();
+		RGBA_t *palette = HWR_GetTexturePalette();
 		Surf.PolyColor.rgba = palette[color&0xFF].rgba;
 
 		if (HWR_ShouldUsePaletteRendering())
@@ -794,7 +794,7 @@ void HWR_drawAMline(const fline_t *fl, INT32 color)
 {
 	F2DCoord v1, v2;
 	RGBA_t color_rgba;
-	const RGBA_t *palette = HWR_GetTexturePalette();
+	RGBA_t *palette = HWR_GetTexturePalette();
 
 	color_rgba = palette[color&0xFF];
 
@@ -815,7 +815,7 @@ void HWR_DrawDiag(INT32 x, INT32 y, INT32 wh, INT32 color)
 	FOutVector v[4];
 	FSurfaceInfo Surf;
 	float fx, fy, fw, fh, fwait = 0;
-	RGBA_t *palette;
+	RGBA_t *palette = HWR_GetTexturePalette();
 
 	if (wh < 0)
 		return; // consistency w/ software
@@ -860,13 +860,11 @@ void HWR_DrawDiag(INT32 x, INT32 y, INT32 wh, INT32 color)
 
 	if (fx >= vid.width || fy >= vid.height)
 		return;
-
 	if (fx < 0)
 	{
 		fw += fx;
 		fx = 0;
 	}
-
 	if (fy < 0)
 	{
 		fh += fy;
@@ -875,13 +873,11 @@ void HWR_DrawDiag(INT32 x, INT32 y, INT32 wh, INT32 color)
 
 	if (fw <= 0 || fh <= 0)
 		return;
-
 	if (fx + fw > vid.width)
 	{
 		fwait = fw - (fvw- fx);
 		fw = fvw - fx;
 	}
-
 	if (fy + fh > vid.height)
 		fh = fvh - fy;
 
@@ -903,8 +899,6 @@ void HWR_DrawDiag(INT32 x, INT32 y, INT32 wh, INT32 color)
 	v[0].t = v[1].t = 0.0f;
 	v[2].t = v[3].t = 1.0f;
 
-	palette = HWR_GetTexturePalette();
-
 	Surf.PolyColor = palette[color&0xFF];
 
 	GL_DrawPolygon(&Surf, v, 4,
@@ -919,6 +913,7 @@ void HWR_DrawConsoleFill(INT32 x, INT32 y, INT32 w, INT32 h, UINT32 color, INT32
 	FOutVector v[4];
 	FSurfaceInfo Surf;
 	float fx, fy, fw, fh;
+	RGBA_t *palette = HWR_GetTexturePalette();
 
 	if (w < 0 || h < 0)
 		return; // consistency w/ software
@@ -942,7 +937,6 @@ void HWR_DrawConsoleFill(INT32 x, INT32 y, INT32 w, INT32 h, UINT32 color, INT32
 
 		if (x == 0 && y == 0 && w == BASEVIDWIDTH && h == BASEVIDHEIGHT)
 		{
-			RGBA_t *palette = HWR_GetTexturePalette();
 			RGBA_t rgbaColour = palette[color&0xFF];
 			FRGBAFloat clearColour;
 			clearColour.red = (float)rgbaColour.s.red / 255;
@@ -973,7 +967,6 @@ void HWR_DrawConsoleFill(INT32 x, INT32 y, INT32 w, INT32 h, UINT32 color, INT32
 			else if (!(options & V_SNAPTOTOP))
 				fy += (fvh - (FLOATBASEVIDHEIGHT * dupy)) / 2;
 		}
-
 		if (options & V_SPLITSCREEN)
 			fy += (FLOATBASEVIDHEIGHT * dupy)/2;
 		if (options & V_HORZSCREEN)
@@ -983,13 +976,11 @@ void HWR_DrawConsoleFill(INT32 x, INT32 y, INT32 w, INT32 h, UINT32 color, INT32
 
 	if (fx >= vid.width || fy >= vid.height)
 		return;
-
 	if (fx < 0)
 	{
 		fw += fx;
 		fx = 0;
 	}
-
 	if (fy < 0)
 	{
 		fh += fy;
@@ -998,10 +989,8 @@ void HWR_DrawConsoleFill(INT32 x, INT32 y, INT32 w, INT32 h, UINT32 color, INT32
 
 	if (fw <= 0 || fh <= 0)
 		return;
-
 	if (fx + fw > vid.width)
 		fw = fvw - fx;
-
 	if (fy + fh > vid.height)
 		fh = fvh - fy;
 
@@ -1037,13 +1026,12 @@ void HWR_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color)
 	FOutVector v[4];
 	FSurfaceInfo Surf;
 	float fx, fy, fw, fh;
+	UINT8 alphalevel = ((color & V_ALPHAMASK) >> V_ALPHASHIFT);
+	RGBA_t *palette = HWR_GetTexturePalette();
 
 	if (w < 0 || h < 0)
 		return; // consistency w/ software
 
-	const UINT8 alphalevel = ((color & V_ALPHAMASK) >> V_ALPHASHIFT);
-	const RGBA_t *palette = HWR_GetTexturePalette();
-
 //  3--2
 //  | /|
 //  |/ |

src/hardware/hw_glob.h

@@ -52,17 +52,15 @@ void HWR_ObjectLightLevelPost(gl_vissprite_t *spr, const sector_t *sector, INT32
 // --------
 // hw_bsp.c
 // --------
-extern extrasubsector_t *extrasubsectors;
-extern size_t addsubsector;
+extern poly_subsector_t *poly_subsectors;
+extern size_t num_poly_subsector;
 
-void HWR_FreeExtraSubsectors(void);
+void HWR_Init_PolyPool(void);
+void HWR_Free_PolyPool(void);
 
 // --------
 // hw_cache.c
 // --------
-
-extern RGBA_t mapPalette[256];
-
 void HWR_InitMapTextures(void);
 void HWR_LoadMapTextures(size_t pnumtextures);
 void HWR_FreeMapTextures(void);
@@ -88,6 +86,7 @@ void HWR_ClearAllTextures(void);
 void HWR_FreeColormapCache(void);
 void HWR_UnlockCachedPatch(GLPatch_t *gpatch);
 
+RGBA_t *HWR_GetTexturePalette(void);
 void HWR_SetPalette(RGBA_t *palette);
 void HWR_SetMapPalette(void);
 UINT32 HWR_CreateLightTable(UINT8 *lighttable);

src/hardware/hw_main.cpp

@@ -14,6 +14,8 @@
 #ifdef HWRENDER
 
 #include <algorithm>
+#define _USE_MATH_DEFINES
+#include <cmath>
 
 #include "../doomstat.h"
 #include "../doomdef.h"
@@ -97,6 +99,8 @@ line_t *gl_linedef;
 sector_t *gl_frontsector;
 sector_t *gl_backsector;
 
+static boolean gl_maphashorizonlines = false;
+
 // values for the far clipping plane
 static constexpr float clipping_distances[] = {1024.0f, 2048.0f, 4096.0f, 6144.0f, 8192.0f, 12288.0f, 16384.0f};
 // values for bsp culling
@@ -124,21 +128,11 @@ ps_metric_t ps_hw_batchdrawtime = {};
 static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum, boolean noencore, FSurfaceInfo* Surf, INT32 cutflag, ffloor_t *pfloor, FBITFIELD polyflags);
 static void HWR_RenderWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, FBITFIELD blend, boolean fogwall, INT32 lightlevel, extracolormap_t *wallcolormap);
 
-static void HWR_AddTransparentFloor(lumpnum_t lumpnum, extrasubsector_t *xsub, boolean isceiling, fixed_t fixedheight, INT32 lightlevel, INT32 alpha, sector_t *FOFSector, FBITFIELD blend, boolean fogplane, extracolormap_t *planecolormap);
+static void HWR_AddTransparentFloor(lumpnum_t lumpnum, poly_subsector_t *xsub, boolean isceiling, fixed_t fixedheight, INT32 lightlevel, INT32 alpha, sector_t *FOFSector, FBITFIELD blend, boolean fogplane, extracolormap_t *planecolormap);
 static void HWR_AddTransparentWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, INT32 texnum, boolean noencore, FBITFIELD blend, boolean fogwall, INT32 lightlevel, extracolormap_t *wallcolormap);
 static void HWR_AddTransparentPolyobjectFloor(lumpnum_t lumpnum, polyobj_t *polysector, boolean isceiling, fixed_t fixedheight, INT32 lightlevel, INT32 alpha, sector_t *FOFSector, FBITFIELD blend, extracolormap_t *planecolormap);
 
-namespace
-{
-	enum class AddSpritesType
-	{
-		kNoLimitDist,
-		kLimitDist,
-	};
-
-	template<AddSpritesType> static void HWR_AddSprites(sector_t *);
-}
-
+static void HWR_AddSprites(sector_t *sec);
 static void HWR_ProjectSprite(mobj_t *thing);
 static void HWR_AddPrecipitationSprites(void);
 static void HWR_ProjectPrecipitationSprite(precipmobj_t *thing);
@@ -180,6 +174,7 @@ static void CV_glpalettedepth_OnChange(void);
 static CV_PossibleValue_t glscreentextures_cons_t[] = {{0, "Off"}, {1, "Wipes Only"}, {2, "All"}, {0, NULL}};
 static CV_PossibleValue_t glfakecontrast_cons_t[] = {{0, "Off"}, {1, "Standard"}, {2, "Smooth"}, {0, NULL}};
 static CV_PossibleValue_t glshaders_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "Ignore custom shaders"}, {0, NULL}};
+static CV_PossibleValue_t secbright_cons_t[] = {{0, "MIN"}, {255, "MAX"}, {0, NULL}};
 
 static CV_PossibleValue_t glfiltermode_cons_t[]= {{HWD_SET_TEXTUREFILTER_POINTSAMPLED, "Nearest"},
 	{HWD_SET_TEXTUREFILTER_BILINEAR, "Bilinear"}, {HWD_SET_TEXTUREFILTER_TRILINEAR, "Trilinear"},
@@ -224,12 +219,24 @@ consvar_t cv_glslopecontrast = {"gr_slopecontrast", "Off", CV_SAVE, CV_OnOff, NU
 consvar_t cv_glshaders = {"gr_shaders", "On", CV_CALL|CV_SAVE, glshaders_cons_t, CV_glshaders_OnChange, 0, NULL, NULL, 0, 0, NULL};
 
 consvar_t cv_gllightdither = {"gr_lightdithering", "Off", CV_CALL|CV_SAVE, CV_OnOff, CV_gllightdithering_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_glsecbright = {"secbright", "0", CV_SAVE, secbright_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 consvar_t cv_glfiltermode = {"gr_filtermode", "Nearest", CV_CALL|CV_SAVE, glfiltermode_cons_t, CV_filtermode_OnChange, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_glanisotropicmode = {"gr_anisotropicmode", "1", CV_CALL|CV_SAVE, glanisotropicmode_cons_t, CV_anisotropic_OnChange, 0, NULL, NULL, 0, 0, NULL};
 
 consvar_t cv_glsolvetjoin = {"gr_solvetjoin", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
+consvar_t cv_glpolytile = {"gr_polytile", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+CV_PossibleValue_t grpolyshape_cons_t[] = {
+	{0, "Subsector"},
+	{1, "Fat"},
+	{2, "Trim"},
+	{3, "NotConvex"},
+	{0, NULL}
+};
+consvar_t cv_glpolyshape = {"gr_polygon_shape", "Trim", CV_SAVE, grpolyshape_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+
 consvar_t cv_glbatching = {"gr_batching", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 consvar_t cv_glwireframe = {"gr_wireframe", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -413,9 +420,6 @@ void HWR_Lighting(FSurfaceInfo *Surface, INT32 light_level, extracolormap_t *col
 	tint_color.rgba = (colormap != NULL) ? (UINT32)colormap->rgba : GL_DEFAULTMIX;
 	fade_color.rgba = (colormap != NULL) ? (UINT32)colormap->fadergba : GL_DEFAULTFOG;
 
-	// Clamp the light level, since it can sometimes go out of the 0-255 range from animations
-	light_level = CLAMP(SOFTLIGHT(light_level), cv_secbright.value, 255);
-
 	// Crappy backup coloring if you can't do shaders
 	if (!HWR_UseShader())
 	{
@@ -453,6 +457,9 @@ void HWR_Lighting(FSurfaceInfo *Surface, INT32 light_level, extracolormap_t *col
 		poly_color.s.blue  = (UINT8)blue;
 	}
 
+	// Clamp the light level, since it can sometimes go out of the 0-255 range from animations
+	light_level = CLAMP(SOFTLIGHT(light_level), cv_glsecbright.value, 255);
+
 	// in palette rendering mode, this is not needed since it properly takes the changes to the palette itself
 	if (!HWR_ShouldUsePaletteRendering())
 	{
@@ -536,7 +543,7 @@ static FUINT HWR_CalcSlopeLight(FUINT lightnum, pslope_t *slope, const sector_t
 
 // HWR_RenderPlane
 // Render a floor or ceiling convex polygon
-static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, boolean isceiling, fixed_t fixedheight, FBITFIELD PolyFlags, INT32 lightlevel, lumpnum_t lumpnum, sector_t *FOFsector, UINT8 alpha, extracolormap_t *planecolormap)
+static void HWR_RenderPlane(subsector_t *subsector, poly_subsector_t *xsub, boolean isceiling, fixed_t fixedheight, FBITFIELD PolyFlags, INT32 lightlevel, lumpnum_t lumpnum, sector_t *FOFsector, UINT8 alpha, extracolormap_t *planecolormap)
 {
 	FSurfaceInfo Surf;
 	FOutVector *v3d;
@@ -708,8 +715,7 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
 	for (i = 0, v3d = planeVerts; i < (INT32)nrPlaneVerts; i++,v3d++,pv++)
 		SETUP3DVERT(v3d, pv->x, pv->y);
 
-	if (slope)
-		lightlevel = HWR_CalcSlopeLight(lightlevel, slope, gl_frontsector, (FOFsector != NULL));
+	lightlevel = HWR_CalcSlopeLight(lightlevel, slope, gl_frontsector, (FOFsector != NULL));
 
 	HWR_Lighting(&Surf, lightlevel, planecolormap, P_SectorUsesDirectionalLighting(gl_frontsector));
 
@@ -2765,7 +2771,7 @@ static void HWR_AddPolyObjectPlanes(void)
 	sector_t *polyobjsector;
 	INT32 light = 0;
 
-	// Polyobject Planes need their own function for drawing because they don't have extrasubsectors by themselves
+	// Polyobject Planes need their own function for drawing because they don't have poly_subsectors by themselves
 	// It should be okay because polyobjects should always be convex anyway
 
 	for (i  = 0; i < numpolys; i++)
@@ -2895,9 +2901,9 @@ static void HWR_Subsector(size_t num)
 	ffloor_t *rover;
 
 #ifdef PARANOIA //no risk while developing, enough debugging nights!
-	if (num >= addsubsector)
+	if (num >= num_poly_subsector)
 		I_Error("HWR_Subsector: ss %s with numss = %s, addss = %s\n",
-			sizeu1(num), sizeu2(numsubsectors), sizeu3(addsubsector));
+			sizeu1(num), sizeu2(numsubsectors), sizeu3(num_poly_subsector));
 #endif
 
 	if (num < numsubsectors)
@@ -2991,7 +2997,7 @@ static void HWR_Subsector(size_t num)
 			if (sub->validcount != validcount)
 			{
 				HWR_GetFlat(levelflats[gl_frontsector->floorpic].lumpnum, R_NoEncore(gl_frontsector, false));
-				HWR_RenderPlane(sub, &extrasubsectors[num], false,
+				HWR_RenderPlane(sub, &poly_subsectors[num], false,
 					// Hack to make things continue to work around slopes.
 					locFloorHeight == cullFloorHeight ? locFloorHeight : gl_frontsector->floorheight,
 					// We now return you to your regularly scheduled rendering.
@@ -3007,7 +3013,7 @@ static void HWR_Subsector(size_t num)
 			if (sub->validcount != validcount)
 			{
 				HWR_GetFlat(levelflats[gl_frontsector->ceilingpic].lumpnum, R_NoEncore(gl_frontsector, true));
-				HWR_RenderPlane(sub, &extrasubsectors[num], true,
+				HWR_RenderPlane(sub, &poly_subsectors[num], true,
 					// Hack to make things continue to work around slopes.
 					locCeilingHeight == cullCeilingHeight ? locCeilingHeight : gl_frontsector->ceilingheight,
 					// We now return you to your regularly scheduled rendering.
@@ -3031,7 +3037,7 @@ static void HWR_Subsector(size_t num)
 			// rendering heights for bottom and top planes
 			// yes there were functions for this stuff, no idea why it wasnt used but bleh
 			bottomCullHeight = P_GetFFloorBottomZAt(rover, viewx, viewy);
-			topCullHeight    = P_GetFFloorTopZAt(rover, viewx, viewy);
+			topCullHeight = P_GetFFloorTopZAt(rover, viewx, viewy);
 
 			if (gl_frontsector->cullheight)
 			{
@@ -3055,7 +3061,7 @@ static void HWR_Subsector(size_t num)
 					alpha = HWR_FogBlockAlpha(*gl_frontsector->lightlist[light].lightlevel, rover->master->frontsector->extra_colormap);
 
 					HWR_AddTransparentFloor(0,
-											&extrasubsectors[num],
+											&poly_subsectors[num],
 											false,
 											*rover->bottomheight,
 											*gl_frontsector->lightlist[light].lightlevel,
@@ -3067,7 +3073,7 @@ static void HWR_Subsector(size_t num)
 					light = R_GetPlaneLight(gl_frontsector, centerHeight, (viewz < bottomCullHeight));
 
 					HWR_AddTransparentFloor(levelflats[*rover->bottompic].lumpnum,
-											&extrasubsectors[num],
+											&poly_subsectors[num],
 											false,
 											*rover->bottomheight,
 											*gl_frontsector->lightlist[light].lightlevel,
@@ -3079,7 +3085,7 @@ static void HWR_Subsector(size_t num)
 					HWR_GetFlat(levelflats[*rover->bottompic].lumpnum, R_NoEncore(gl_frontsector, false));
 					light = R_GetPlaneLight(gl_frontsector, centerHeight, (viewz < bottomCullHeight));
 
-					HWR_RenderPlane(sub, &extrasubsectors[num], false, *rover->bottomheight, HWR_RippleBlend(gl_frontsector, rover, false)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, levelflats[*rover->bottompic].lumpnum,
+					HWR_RenderPlane(sub, &poly_subsectors[num], false, *rover->bottomheight, HWR_RippleBlend(gl_frontsector, rover, false)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, levelflats[*rover->bottompic].lumpnum,
 									rover->master->frontsector, 255, gl_frontsector->lightlist[light].extra_colormap);
 				}
 			}
@@ -3101,7 +3107,7 @@ static void HWR_Subsector(size_t num)
 					alpha = HWR_FogBlockAlpha(*gl_frontsector->lightlist[light].lightlevel, rover->master->frontsector->extra_colormap);
 
 					HWR_AddTransparentFloor(0,
-											&extrasubsectors[num],
+											&poly_subsectors[num],
 											true,
 											*rover->topheight,
 											*gl_frontsector->lightlist[light].lightlevel,
@@ -3113,7 +3119,7 @@ static void HWR_Subsector(size_t num)
 					light = R_GetPlaneLight(gl_frontsector, centerHeight, (viewz < topCullHeight));
 
 					HWR_AddTransparentFloor(levelflats[*rover->toppic].lumpnum,
-											&extrasubsectors[num],
+											&poly_subsectors[num],
 											true,
 											*rover->topheight,
 											*gl_frontsector->lightlist[light].lightlevel,
@@ -3125,7 +3131,7 @@ static void HWR_Subsector(size_t num)
 					HWR_GetFlat(levelflats[*rover->toppic].lumpnum, R_NoEncore(gl_frontsector, true));
 					light = R_GetPlaneLight(gl_frontsector, centerHeight, (viewz < topCullHeight));
 
-					HWR_RenderPlane(sub, &extrasubsectors[num], true, *rover->topheight, HWR_RippleBlend(gl_frontsector, rover, false)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, levelflats[*rover->toppic].lumpnum,
+					HWR_RenderPlane(sub, &poly_subsectors[num], true, *rover->topheight, HWR_RippleBlend(gl_frontsector, rover, false)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, levelflats[*rover->toppic].lumpnum,
 									rover->master->frontsector, 255, gl_frontsector->lightlist[light].extra_colormap);
 				}
 			}
@@ -3171,10 +3177,7 @@ doaddline:
 	{
 		// draw sprites first, coz they are clipped to the solidsegs of
 		// subsectors more 'in front'
-		if (cv_drawdist.value || current_bsp_culling_distance)
-			HWR_AddSprites<AddSpritesType::kLimitDist>(gl_frontsector);
-		else
-			HWR_AddSprites<AddSpritesType::kNoLimitDist>(gl_frontsector);
+		HWR_AddSprites(gl_frontsector);
 
 		//Hurdler: at this point validcount must be the same, but is not because
 		//         gl_frontsector doesn't point anymore to sub->sector due to
@@ -3530,7 +3533,7 @@ static void HWR_DrawSpriteShadow(gl_vissprite_t *spr, patch_t *gpatch, GLPatch_t
 // This is expecting a pointer to an array containing 4 wallVerts for a sprite
 static void HWR_RotateSpritePolyToAim(gl_vissprite_t *spr, FOutVector *wallVerts, const boolean precip, const boolean papersprite)
 {
-	if (!cv_glspritebillboarding.value || papersprite)
+	if (!cv_glspritebillboarding.value || !spr || !spr->mobj || !wallVerts || papersprite)
 	{
 		return;
 	}
@@ -3770,7 +3773,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite)
 			continue;
 
 		if (!lightset)
-			lightlevel = static_cast<INT32>(*list[i-1].lightlevel);
+			lightlevel = static_cast<INT32>(CLAMP(*list[i-1].lightlevel, 0, 255));
 
 		colormap = list[i-1].extra_colormap;
 		break;
@@ -3789,7 +3792,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite)
 		{
 			if (!lightset)
 			{
-				lightlevel = static_cast<INT32>(*list[i].lightlevel);
+				lightlevel = static_cast<INT32>(CLAMP(*list[i].lightlevel, 0, 255));
 				HWR_ObjectLightLevelPost(spr, sector, &lightlevel, false);
 			}
 
@@ -3996,7 +3999,7 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
 
 	if (!lightset)
 	{
-		lightlevel = static_cast<INT32>(sector->lightlevel);
+		lightlevel = static_cast<INT32>(CLAMP(sector->lightlevel, 0, 255));
 		HWR_ObjectLightLevelPost(spr, sector, &lightlevel, false);
 	}
 
@@ -4097,7 +4100,7 @@ static void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr)
 
 	// colormap test
 	sector_t *sector = sprmo->subsector->sector;
-	INT32 lightlevel = 255;
+	UINT8 lightlevel = 255;
 	extracolormap_t *colormap = sector->extra_colormap;
 
 	if (sector->numlights)
@@ -4107,7 +4110,7 @@ static void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr)
 		light = R_GetPlaneLight(sector, sprmo->z + sprmo->height, false); // Always use the light at the top instead of whatever I was doing before
 
 		if (!(sprmo->frame & FF_FULLBRIGHT))
-			lightlevel = static_cast<INT32>(*sector->lightlist[light].lightlevel);
+			lightlevel = static_cast<UINT8>(CLAMP(*sector->lightlist[light].lightlevel, 0, 255));
 
 		if (sector->lightlist[light].extra_colormap)
 			colormap = sector->lightlist[light].extra_colormap;
@@ -4115,7 +4118,7 @@ static void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr)
 	else
 	{
 		if (!(sprmo->frame & FF_FULLBRIGHT))
-			lightlevel = static_cast<INT32>(sector->lightlevel);
+			lightlevel = static_cast<UINT8>(CLAMP(sector->lightlevel, 0, 255));
 
 		if (sector->extra_colormap)
 			colormap = sector->extra_colormap;
@@ -4208,7 +4211,7 @@ typedef struct
 
 typedef struct
 {
-	extrasubsector_t *xsub;
+	poly_subsector_t *xsub;
 	boolean isceiling;
 	fixed_t fixedheight;
 	INT32 lightlevel;
@@ -4301,7 +4304,7 @@ static void HWR_AddTransparentWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, I
 	wallinfo->wallcolormap = wallcolormap;
 }
 
-static void HWR_AddTransparentFloor(lumpnum_t lumpnum, extrasubsector_t *xsub, boolean isceiling, fixed_t fixedheight, INT32 lightlevel, INT32 alpha, sector_t *FOFSector, FBITFIELD blend, boolean fogplane, extracolormap_t *planecolormap)
+static void HWR_AddTransparentFloor(lumpnum_t lumpnum, poly_subsector_t *xsub, boolean isceiling, fixed_t fixedheight, INT32 lightlevel, INT32 alpha, sector_t *FOFSector, FBITFIELD blend, boolean fogplane, extracolormap_t *planecolormap)
 {
 	planeinfo_t *planeinfo = static_cast<planeinfo_t*>(HWR_CreateDrawNode(DRAWNODE_PLANE));
 
@@ -4536,10 +4539,6 @@ static void HWR_DrawSprites(void)
 // HWR_AddSprites
 // During BSP traversal, this adds sprites by sector.
 // --------------------------------------------------------------------------
-
-namespace
-{
-template <AddSpritesType Type>
 static void HWR_AddSprites(sector_t *sec)
 {
 	mobj_t *thing;
@@ -4555,29 +4554,22 @@ static void HWR_AddSprites(sector_t *sec)
 	// Well, now it will be done.
 	sec->validcount = validcount;
 
-	if constexpr (Type == AddSpritesType::kLimitDist)
-	{
-		limit_dist = cv_drawdist.value;
+	limit_dist = cv_drawdist.value;
 
-		if (current_bsp_culling_distance)
-		{
-			// Use the smaller setting
-			if (limit_dist)
-				limit_dist = std::min(current_bsp_culling_distance/mapobjectscale, limit_dist);
-			else
-				limit_dist = current_bsp_culling_distance/mapobjectscale;
-		}
+	if (current_bsp_culling_distance)
+	{
+		// Use the smaller setting
+		if (limit_dist)
+			limit_dist = std::min(current_bsp_culling_distance/mapobjectscale, limit_dist);
+		else
+			limit_dist = current_bsp_culling_distance/mapobjectscale;
 	}
 
 	// Handle all things in sector.
 	for (thing = sec->thinglist; thing; thing = thing->snext)
 	{
-		// reduce branching in this rather tight loop
-		if constexpr (Type == AddSpritesType::kLimitDist)
-		{
-			if (!R_ThingWithinDist(thing, limit_dist))
-				continue;
-		}
+		if (!R_ThingWithinDist(thing, limit_dist))
+			continue;
 
 		if (!R_ThingVisible(thing))
 			continue;
@@ -4585,7 +4577,6 @@ static void HWR_AddSprites(sector_t *sec)
 		HWR_ProjectSprite(thing);
 	}
 }
-}
 
 // --------------------------------------------------------------------------
 // HWR_AddPrecipitationSprites
@@ -4969,24 +4960,24 @@ static void HWR_ProjectSprite(mobj_t *thing)
 	vis->mobj = thing;
 
 	//Hurdler: 25/04/2000: now support colormap in hardware mode
-	if (UNLIKELY((vis->mobj->flags & MF_BOSS) && (vis->mobj->flags2 & MF2_FRET) && (leveltime & 1))) // Bosses "flash"
+	if ((vis->mobj->flags & MF_BOSS) && (vis->mobj->flags2 & MF2_FRET) && (leveltime & 1)) // Bosses "flash"
 	{
 		if (vis->mobj->type == MT_CYBRAKDEMON)
-			vis->colormap = R_GetTranslationColormap(TC_ALLWHITE, SKINCOLOR_NONE, GTC_CACHE);
+			vis->colormap = static_cast<UINT8*>(R_GetTranslationColormap(TC_ALLWHITE, SKINCOLOR_NONE, GTC_CACHE));
 		else if (vis->mobj->type == MT_METALSONIC_BATTLE)
-			vis->colormap = R_GetTranslationColormap(TC_METALSONIC, SKINCOLOR_NONE, GTC_CACHE);
+			vis->colormap = static_cast<UINT8*>(R_GetTranslationColormap(TC_METALSONIC, SKINCOLOR_NONE, GTC_CACHE));
 		else
-			vis->colormap = R_GetTranslationColormap(TC_BOSS, SKINCOLOR_NONE, GTC_CACHE);
+			vis->colormap = static_cast<UINT8*>(R_GetTranslationColormap(TC_BOSS, SKINCOLOR_NONE, GTC_CACHE));
 	}
 	else if (thing->color)
 	{
 		// New colormap stuff for skins Tails 06-07-2002
 		if (thing->colorized)
-			vis->colormap = R_GetTranslationColormap(TC_RAINBOW, static_cast<skincolors_t>(thing->color), GTC_CACHE);
+			vis->colormap = static_cast<UINT8*>(R_GetTranslationColormap(TC_RAINBOW, static_cast<skincolors_t>(thing->color), GTC_CACHE));
 		else if (thing->skin && thing->sprite == SPR_PLAY) // This thing is a player!
-			vis->colormap = R_GetLocalTranslationColormap(static_cast<skin_t*>(thing->skin), static_cast<skin_t*>(thing->localskin), static_cast<skincolors_t>(thing->color), GTC_CACHE, thing->skinlocal);
+			vis->colormap = static_cast<UINT8*>(R_GetLocalTranslationColormap(static_cast<skin_t*>(thing->skin), static_cast<skin_t*>(thing->localskin), static_cast<skincolors_t>(thing->color), GTC_CACHE, thing->skinlocal));
 		else
-			vis->colormap = R_GetTranslationColormap(TC_DEFAULT, static_cast<skincolors_t>(thing->color), GTC_CACHE);
+			vis->colormap = static_cast<UINT8*>(R_GetTranslationColormap(TC_DEFAULT, static_cast<skincolors_t>(thing->color), GTC_CACHE));
 	}
 	else
 	{
@@ -5745,7 +5736,42 @@ void HWR_RenderPlayerView(void)
 	HWR_RenderFrame(player, false);
 }
 
-void HWR_LoadLevel(void)
+// Determine on mapload if current map has any Horizonlines present
+// so we can avoid rather hot checks in HWR_Subsector
+static void HWR_CheckForHorizonLines(void)
+{
+	size_t i;
+	INT32 h;
+
+	gl_maphashorizonlines = false;
+
+	if (!cv_glhorizonlines.value)
+		return;
+
+	for (i = 0; i < numsubsectors; i++)
+	{
+		subsector_t *subsec = &subsectors[i];
+
+		// sector checked already?
+		if (subsec->validcount == validcount)
+			continue;
+
+		subsec->validcount = validcount;
+
+		seg_t *line = &segs[subsec->firstline];
+
+		for (h = 0; h < subsec->numlines; h++, line++)
+		{
+			if (line->linedef->special != HORIZONSPECIAL)
+				continue;
+
+			gl_maphashorizonlines = true;
+			break;
+		}
+	}
+}
+
+void HWR_LoadLevel(boolean reloadinggamestate)
 {
 	HWR_CreatePlanePolygons((INT32)numnodes - 1);
 
@@ -5753,6 +5779,9 @@ void HWR_LoadLevel(void)
 	HWR_ClearSkyDome();
 	HWR_BuildSkyDome();
 
+	if (!reloadinggamestate)
+		HWR_CheckForHorizonLines();
+
 	if (HWR_ShouldUsePaletteRendering())
 		HWR_SetMapPalette();
 }
@@ -5826,11 +5855,14 @@ void HWR_AddCommands(void)
 	CV_RegisterVar(&cv_glshaders);
 
 	CV_RegisterVar(&cv_gllightdither);
+	CV_RegisterVar(&cv_glsecbright);
 
 	CV_RegisterVar(&cv_glfiltermode);
 	CV_RegisterVar(&cv_glanisotropicmode);
 
 	CV_RegisterVar(&cv_glsolvetjoin);
+	CV_RegisterVar(&cv_glpolytile);
+	CV_RegisterVar(&cv_glpolyshape);
 
 	CV_RegisterVar(&cv_glbatching);
 
@@ -5859,6 +5891,8 @@ void HWR_Startup(void)
 		CONS_Printf("HWR_Startup()...\n");
 		textureformat = patchformat = GL_TEXFMT_RGBA;
 
+		HWR_Init_PolyPool();
+
 		HWR_InitMapTextures();
 		HWR_InitMD2();
 
@@ -5950,7 +5984,7 @@ static void COM_HWR_glinfo(void)
 void HWR_Shutdown(void)
 {
 	CONS_Printf("HWR_Shutdown()\n");
-	HWR_FreeExtraSubsectors();
+	HWR_Free_PolyPool();
 	HWR_FreeMapTextures();
 	GL_FlushScreenTextures();
 #ifdef USE_FBO_OGL
@@ -6021,8 +6055,6 @@ static void HWR_DoPostProcessor(player_t *player)
 
 		Surf.PolyColor.s.alpha = 0xc0; // match software mode
 
-		V_CubeApply(&Surf.PolyColor.s.red, &Surf.PolyColor.s.green, &Surf.PolyColor.s.blue);
-
 		GL_DrawPolygon(&Surf, v, 4, PF_Modulated|PF_Translucent|PF_NoTexture|PF_NoDepthTest);
 	}
 

src/hardware/hw_main.h

@@ -175,7 +175,6 @@ void HWR_ProcessSeg(void); // Sort of like GLWall::Process in GZDoom
 // hw_bsp.c
 void HWR_CreatePlanePolygons(INT32 bspnum);
 extern boolean gl_maphasportals;
-extern boolean gl_maphashorizonlines;
 
 // Console variables
 extern CV_PossibleValue_t glanisotropicmode_cons_t[];
@@ -199,11 +198,12 @@ extern consvar_t cv_glslopecontrast;
 extern consvar_t cv_glshaders;
 
 extern consvar_t cv_gllightdither;
+extern consvar_t cv_glsecbright;
 
 extern consvar_t cv_glfiltermode;
 extern consvar_t cv_glanisotropicmode;
 
-extern consvar_t cv_glsolvetjoin;
+extern consvar_t cv_glsolvetjoin, cv_glpolytile, cv_glpolyshape;
 
 extern consvar_t cv_glbatching;
 
@@ -233,12 +233,6 @@ FUNCINLINE static ATTRINLINE boolean HWR_PalRenderFlashpal(void)
 	return (cv_glflashpal.value && HWR_ShouldUsePaletteRendering());
 }
 
-// Returns a pointer to the palette which should be used for caching textures.
-FUNCINLINE static ATTRINLINE RGBA_t *HWR_GetTexturePalette(void)
-{
-	return HWR_ShouldUsePaletteRendering() ? mapPalette : pLocalPalette;
-}
-
 #ifdef __cplusplus
 }// extern "C"
 #endif

src/hardware/hw_md2.c

@@ -695,7 +695,6 @@ static void HWR_CreateBlendedTexture(patch_t *gpatch, patch_t *blendgpatch, GLMi
 	UINT16 w = gpatch->width, h = gpatch->height;
 	UINT32 size = w*h;
 	RGBA_t *image, *blendimage, *cur, blendcolor;
-	RGBA_t *palette = HWR_GetTexturePalette();
 	UINT8 translation[17]; // First the color index
 	UINT8 cutoff[17]; // Brightness cutoff before using the next color
 	UINT8 translen = 0;
@@ -703,7 +702,7 @@ static void HWR_CreateBlendedTexture(patch_t *gpatch, patch_t *blendgpatch, GLMi
 	UINT8 colorbrightnesses[17];
 	UINT8 color_match_lookup[256]; // optimization attempt
 
-	blendcolor = palette[0]; // initialize
+	blendcolor = V_GetColor(0); // initialize
 	memset(translation, 0, sizeof(translation));
 	memset(cutoff, 0, sizeof(cutoff));
 
@@ -782,7 +781,7 @@ static void HWR_CreateBlendedTexture(patch_t *gpatch, patch_t *blendgpatch, GLMi
 
 		for (i = 0; i < translen; i++) // moved from inside the loop to here
 		{
-			RGBA_t tempc = palette[translation[i]];
+			RGBA_t tempc = V_GetColor(translation[i]);
 			SETBRIGHTNESS(colorbrightnesses[i], tempc.s.red, tempc.s.green, tempc.s.blue); // store brightnesses for comparison
 		}
 		// generate lookup table for color brightness matching
@@ -959,11 +958,11 @@ static void HWR_CreateBlendedTexture(patch_t *gpatch, patch_t *blendgpatch, GLMi
 					mul = cutoff[firsti] - brightness;
 				}
 
-				blendcolor = palette[translation[firsti]];
+				blendcolor = V_GetColor(translation[firsti]);
 
 				if (mul > 0) // If it's 0, then we only need the first color.
 				{
-					nextcolor = palette[translation[secondi]];
+					nextcolor = V_GetColor(translation[secondi]);
 
 					// Find difference between points
 					r = (INT32)(nextcolor.s.red - blendcolor.s.red);
@@ -1151,7 +1150,7 @@ void HWR_DrawMD2(gl_vissprite_t *spr)
 			light = R_GetPlaneLight(sector, spr->mobj->z + spr->mobj->height, false); // Always use the light at the top instead of whatever I was doing before
 
 			if (!(spr->mobj->frame & FF_FULLBRIGHT))
-				lightlevel = *sector->lightlist[light].lightlevel;
+				lightlevel = *sector->lightlist[light].lightlevel > 255 ? 255 : *sector->lightlist[light].lightlevel;
 
 			if (sector->lightlist[light].extra_colormap)
 				colormap = sector->lightlist[light].extra_colormap;
@@ -1159,7 +1158,7 @@ void HWR_DrawMD2(gl_vissprite_t *spr)
 		else
 		{
 			if (!(spr->mobj->frame & FF_FULLBRIGHT))
-				lightlevel = sector->lightlevel;
+				lightlevel = sector->lightlevel > 255 ? 255 : sector->lightlevel;
 
 			if (sector->extra_colormap)
 				colormap = sector->extra_colormap;

src/hardware/r_opengl/r_opengl.c

@@ -2031,7 +2031,8 @@ void GL_SetTexture(GLMipmap_t *pTexInfo)
 	{
 		if (pTexInfo->downloaded != tex_downloaded)
 		{
-			pglBindTexture(GL_TEXTURE_2D, pTexInfo->downloaded);
+			if (!currently_batching)
+				pglBindTexture(GL_TEXTURE_2D, pTexInfo->downloaded);
 			tex_downloaded = pTexInfo->downloaded;
 		}
 	}

src/http-mserv.c

@@ -110,21 +110,13 @@ HMS_on_read (char *s, size_t _1, size_t n, void *userdata)
 
 	buffer = userdata;
 
-	while (n >= (size_t)( buffer->end - buffer->needle ))
+	if (n >= (size_t)( buffer->end - buffer->needle ))
 	{
 		/* resize to next multiple of buffer size */
 		blocks = ( n / DEFAULT_BUFFER_SIZE + 1 );
 		buffer->end += ( blocks * DEFAULT_BUFFER_SIZE );
 
-		void *tmp = realloc(buffer->buffer, buffer->end);
-		if (tmp == NULL)
-		{
-			// not enough memory to read it, bail
-			free(buffer->buffer);
-			buffer->buffer = NULL;
-			return 0;
-		}
-		buffer->buffer = tmp;
+		buffer->buffer = realloc(buffer->buffer, buffer->end);
 	}
 
 	memcpy(&buffer->buffer[buffer->needle], s, n);
@@ -228,11 +220,7 @@ HMS_connect (const char *format, ...)
 
 	curl_easy_setopt(curl, CURLOPT_URL, url);
 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
-
-#ifdef HAVE_IPV6
-	if (!M_CheckParm("-ipv6"))
-#endif
-		curl_easy_setopt(curl, CURLOPT_IPRESOLVE, (long)CURL_IPRESOLVE_V4);
+	curl_easy_setopt(curl, CURLOPT_IPRESOLVE, (long)CURL_IPRESOLVE_V4);
 
 	curl_easy_setopt(curl, CURLOPT_TIMEOUT, (long)cv_masterserver_timeout.value);
 	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, HMS_on_read);

src/hu_stuff.c

@@ -17,7 +17,6 @@
 
 #include "m_menu.h" // gametype_cons_t
 #include "m_cond.h" // emblems
-#include "m_emotes.h"
 
 #include "d_clisrv.h"
 
@@ -95,9 +94,6 @@ static textinput_t w_chat;
 static boolean headsupactive = false;
 boolean hu_showscores; // draw rankings
 static char hu_tick;
-static tic_t hu_emoteanim = 0;
-#define MAXEMOTESUGGESTIONS 8
-static emote_t *emote_suggestions[MAXEMOTESUGGESTIONS] = {0};
 
 static huddrawlist_h luahuddrawlist_scores;
 
@@ -314,7 +310,7 @@ void HU_LoadGraphics(void)
 	lt_font[0] = (patch_t *)W_CachePatchName("LTFNT039", PU_HUDGFX); /// \note fake start hack
 
 	// Number support
-	lt_font[9]  = (patch_t *)W_CachePatchName("LTFNT048", PU_HUDGFX);
+	lt_font[9] = (patch_t *)W_CachePatchName("LTFNT048", PU_HUDGFX);
 	lt_font[10] = (patch_t *)W_CachePatchName("LTFNT049", PU_HUDGFX);
 	lt_font[11] = (patch_t *)W_CachePatchName("LTFNT050", PU_HUDGFX);
 	lt_font[12] = (patch_t *)W_CachePatchName("LTFNT051", PU_HUDGFX);
@@ -751,7 +747,7 @@ static void Command_CSay_f(void)
 		return;
 	}
 
-	if (!server && !IsPlayerAdmin(consoleplayer))
+	if(!server && !IsPlayerAdmin(consoleplayer))
 	{
 		CONS_Alert(CONS_NOTICE, M_GetText("Only servers and admins can use csay.\n"));
 		return;
@@ -1110,7 +1106,6 @@ void HU_Ticker(void)
 		return;
 
 	hu_tick++;
-	hu_emoteanim++;
 	hu_tick &= 7; // currently only to blink chat input cursor
 
 	if (PLAYER1INPUTDOWN(gc_scores))
@@ -1404,7 +1399,7 @@ boolean HU_Responder(event_t *ev)
 		&& ev->data1 != gamecontrol[0][gc_talkkey][1]))
 			return false;
 
-		M_TextInputHandleEmotes(&w_chat, c, emote_suggestions, MAXEMOTESUGGESTIONS);
+		M_TextInputHandle(&w_chat, c);
 
 		if (c == KEY_ENTER)
 		{
@@ -1444,8 +1439,6 @@ boolean HU_Responder(event_t *ev)
 
 #ifndef NONET
 
-#define HU_DrawEmote(x, y, emote, flags) M_DrawEmote((x), (y), (emote), hu_emoteanim, (flags))
-
 // Precompile a wordwrapped string to any given width.
 // This is a muuuch better method than V_WORDWRAP.
 // again stolen and modified a bit from video.c, don't mind me, will need to rearrange this one day.
@@ -1457,8 +1450,6 @@ static char *CHAT_WordWrap(INT32 x, INT32 w, INT32 option, const char *string)
 	size_t slen;
 	char *newstring = Z_StrDup(string);
 	INT32 spacewidth = (vid.width < 640) ? 8 : 4, charwidth = (vid.width < 640) ? 8 : 4;
-	emote_t *emote = NULL;
-	int emotelen = 0;
 
 	slen = strlen(string);
 	x = 0;
@@ -1480,12 +1471,7 @@ static char *CHAT_WordWrap(INT32 x, INT32 w, INT32 option, const char *string)
 			c = toupper(c);
 		c -= HU_FONTSTART;
 
-		if ((emote = M_VerifyEmote(string+i, &emotelen)))
-		{
-			chw = EMOTEWIDTH;
-			i += emotelen-1; // Will be incremented on next loop iteration, hence -1
-		}
-		else if (c < 0 || c >= HU_FONTSIZE || !hu_font[c])
+		if (c < 0 || c >= HU_FONTSIZE || !hu_font[c])
 		{
 			chw = spacewidth;
 			lastusablespace = i;
@@ -1507,6 +1493,7 @@ static char *CHAT_WordWrap(INT32 x, INT32 w, INT32 option, const char *string)
 	return newstring;
 }
 
+
 // 30/7/18: chaty is now the distance at which the lowest point of the chat will be drawn if that makes any sense.
 
 INT16 chatx = 13, chaty = 169; // let's use this as our coordinates, shh
@@ -1539,8 +1526,6 @@ static void HU_drawMiniChat(void)
 		char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, chat_mini[i-1]);
 		size_t j = 0;
 		INT32 linescount = 0;
-		emote_t *emote = NULL;
-		int emotelen = 0;
 
 		while(msg[j]) // iterate through msg
 		{
@@ -1565,11 +1550,6 @@ static void HU_drawMiniChat(void)
 
 				++j;
 			}
-			else if ((emote = M_VerifyEmote(msg+j, &emotelen)))
-			{
-				dx += EMOTEWIDTH - charwidth;
-				j += emotelen;
-			}
 			else
 			{
 				j++;
@@ -1615,8 +1595,6 @@ static void HU_drawMiniChat(void)
 		size_t j = 0;
 		char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, chat_mini[i]); // get the current message, and word wrap it.
 		UINT8 *colormap = NULL;
-		emote_t *emote = NULL;
-		int emotelen = 0;
 
 		while(msg[j]) // iterate through msg
 		{
@@ -1643,16 +1621,6 @@ static void HU_drawMiniChat(void)
 
 				++j;
 			}
-			else if ((emote = M_VerifyEmote(msg+j, &emotelen)))
-			{
-				if (cv_chatbacktint.value) // on request of wolfy
-					V_DrawFillConsoleMap(x + dx + 2, y+dy, EMOTEWIDTH, charheight, 239|V_SNAPTOBOTTOM|V_SNAPTOLEFT);
-
-				HU_DrawEmote(x+dx+2, y+dy, emote, V_SNAPTOBOTTOM|V_SNAPTOLEFT|transflag);
-				dx += EMOTEWIDTH - charwidth;
-
-				j += emotelen;
-			}
 			else
 			{
 				if (cv_chatbacktint.value) // on request of wolfy
@@ -1730,9 +1698,6 @@ static void HU_drawChatLog(INT32 offset)
 		INT32 j = 0;
 		char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, chat_log[i]); // get the current message, and word wrap it.
 		UINT8 *colormap = NULL;
-		emote_t *emote = NULL;
-		int emotelen = 0;
-
 		while(msg[j]) // iterate through msg
 		{
 			if (msg[j] < HU_FONTSTART) // don't draw
@@ -1754,15 +1719,6 @@ static void HU_drawChatLog(INT32 offset)
 
 				++j;
 			}
-			else if ((emote = M_VerifyEmote(msg+j, &emotelen)))
-			{
-				if ((y+dy+2 >= chat_topy) && (y+dy < (chat_bottomy)))
-				{
-					HU_DrawEmote(x+dx+2, y+dy, emote, V_SNAPTOBOTTOM|V_SNAPTOLEFT);
-					dx += EMOTEWIDTH - charwidth;
-				}
-				j += emotelen;
-			}
 			else
 			{
 				if ((y+dy+2 >= chat_topy) && (y+dy < (chat_bottomy)))
@@ -1888,7 +1844,7 @@ static void HU_DrawChat(void)
 	typelines = 1;
 
 	if ((w_chat.cursor == 0 || w_chat.length == 0) && hu_tick < 4)
-		V_DrawChatCharacter(chatx+2+c, y+1, '_'|V_SNAPTOBOTTOM|V_SNAPTOLEFT|t, !cv_allcaps.value, NULL);
+		V_DrawChatCharacter(chatx+2+c+charwidth*w_chat.cursor, y+1, '_'|V_SNAPTOBOTTOM|V_SNAPTOLEFT|t, !cv_allcaps.value, NULL);
 
 	if (w_chat.select != w_chat.cursor)
 	{
@@ -1899,40 +1855,30 @@ static void HU_DrawChat(void)
 	while (w_chat_buf[i])
 	{
 		boolean skippedline = false;
-		emote_t *emote = NULL;
-		int emotelen = 0;
-		int drawwidth = charwidth; // if we've drawn emote, selection needs to account for that
-
-		if ((emote = M_VerifyEmote(w_chat_buf+i, &emotelen)))
-		{
-			HU_DrawEmote(chatx + c + 2, y-1, emote, V_SNAPTOBOTTOM|V_SNAPTOLEFT|t);
-			c += EMOTEWIDTH - charwidth;
-			i += emotelen-1;
-			drawwidth = EMOTEWIDTH;
-		}
-		else if (w_chat_buf[i] >= HU_FONTSTART) //Hurdler: isn't it better like that?
-			V_DrawChatCharacter(chatx + c + 2, y, w_chat_buf[i] | V_SNAPTOBOTTOM|V_SNAPTOLEFT | t, !cv_allcaps.value, NULL);
-
-		// Draw selection
-		if (i >= select_start && i < select_end)
-			V_DrawFill(chatx + c + 2 - (drawwidth-charwidth), y-1, drawwidth, charheight, 103|V_TRANSLUCENT|V_SNAPTOBOTTOM|V_SNAPTOLEFT|t);
-
-		++i;
-
-		if (w_chat.cursor == i)
+		if (w_chat.cursor == (i+1))
 		{
 			INT32 cursorx = (c+charwidth < boxw-charwidth) ? (chatx + 2 + c+charwidth) : (chatx+1); // we may have to go down.
 			INT32 cursory = (cursorx != chatx+1) ? (y) : (y+charheight);
 			if (hu_tick < 4)
 				V_DrawChatCharacter(cursorx, cursory+1, '_' |V_SNAPTOBOTTOM|V_SNAPTOLEFT|t, !cv_allcaps.value, NULL);
 
-			if (cursorx == chatx+1 && saylen == i-1) // a weirdo hack
+			if (cursorx == chatx+1 && saylen == i) // a weirdo hack
 			{
 				typelines += 1;
 				skippedline = true;
 			}
 		}
 
+		//Hurdler: isn't it better like that?
+		if (w_chat_buf[i] >= HU_FONTSTART)
+			V_DrawChatCharacter(chatx + c + 2, y, w_chat_buf[i] | V_SNAPTOBOTTOM|V_SNAPTOLEFT | t, !cv_allcaps.value, NULL);
+
+		// Draw selection
+		if (i >= select_start && i < select_end)
+			V_DrawFill(chatx + c + 2, y-1, charwidth, charheight, 103|V_TRANSLUCENT|V_SNAPTOBOTTOM|V_SNAPTOLEFT|t);
+
+		++i;
+
 		c += charwidth;
 		if (c > boxw-(charwidth*2) && !skippedline)
 		{
@@ -1942,36 +1888,6 @@ static void HU_DrawChat(void)
 		}
 	}
 
-	if (emote_suggestions[0])
-	{
-		// A bit of copy-paste from /pm code :p
-		INT32 suggesty = chaty - charheight - 1;
-		size_t longest_suggestion_length = 0;
-
-		for (i = 0; i < MAXEMOTESUGGESTIONS && emote_suggestions[i]; ++i)
-		{
-			longest_suggestion_length = max(longest_suggestion_length, strlen(emote_suggestions[i]->name));
-		}
-
-#ifdef NETSPLITSCREEN
-		if (splitscreen)
-		{
-			suggesty -= BASEVIDHEIGHT/2;
-			if (splitscreen > 1)
-				suggesty += 16;
-		}
-		else
-#endif
-			suggesty -= (cv_kartspeedometer.value ? 16 : 0);
-
-		for (i = 0; i < MAXEMOTESUGGESTIONS && emote_suggestions[i]; ++i)
-		{
-			V_DrawFillConsoleMap(chatx + boxw + 2, suggesty - (7*i), (longest_suggestion_length+2)*4 + EMOTEWIDTH, 6, 239|V_SNAPTOBOTTOM|V_SNAPTOLEFT);
-			V_DrawSmallString(chatx + boxw + 4 + EMOTEWIDTH, suggesty - (7*i), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, va(":%s:", emote_suggestions[i]->name));
-			HU_DrawEmote(chatx + boxw + 2, suggesty - i*7, emote_suggestions[i], V_SNAPTOBOTTOM|V_SNAPTOLEFT);
-		}
-	}
-
 	// handle /pm list. It's messy, horrible and I don't care.
 	if (strnicmp(w_chat_buf, "/pm", 3) == 0 && vid.width >= 400 && !teamtalk) // 320x200 unsupported kthxbai
 	{
@@ -2965,11 +2881,13 @@ void HU_DoCEcho(const char *msg)
 				*p = '\n';
 
 		CONS_Printf("%s\n", temp);
-
 		return;
 	}
-	else if (cv_cechotoggle.value)
-		cechotimer = cechoduration;
 
-	I_OutputMsg("%s\n", msg); // ALWAYS print to log
+	I_OutputMsg("%s\n", msg); // print to log
+
+	if (!cv_cechotoggle.value)
+		return;
+
+	cechotimer = cechoduration;
 }

src/i_net.h

@@ -82,8 +82,6 @@ typedef struct
 	char data[MAXPACKETLENGTH];
 } ATTRPACK doomcom_t;
 
-#define DOOMCOM_DATA(d) (doomdata_t *)&(d)->data
-
 #ifdef HOLEPUNCH
 typedef struct
 {
@@ -91,8 +89,6 @@ typedef struct
 	INT32 addr;
 	INT16 port;
 } ATTRPACK holepunch_t;
-
-#define HOLEPUNCH_DATA(d) (holepunch_t *)&(d)->data
 #endif
 
 #if defined(_MSC_VER)
@@ -101,6 +97,10 @@ typedef struct
 
 extern doomcom_t *doomcom;
 
+#ifdef HOLEPUNCH
+extern holepunch_t *holepunchpacket;
+#endif
+
 /**	\brief return packet in doomcom struct
 */
 extern boolean (*I_NetGet)(void);

src/i_sound.h

@@ -43,9 +43,8 @@ extern UINT8 sound_started;
 
 /**	\brief info of samplerate
 */
-#if defined(HAVE_SDL) && SOUND==SOUND_SDL
 extern consvar_t cv_samplerate;
-#endif
+//extern consvar_t cv_rndsoundpitch;
 
 /**	\brief	The I_GetSfx function
 
@@ -84,7 +83,7 @@ void I_ShutdownSound(void);
 
 	\return	sfx handle
 */
-INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, INT32 channel);
+INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority, INT32 channel);
 
 /**	\brief	Stops a sound channel.
 
@@ -115,7 +114,7 @@ boolean I_SoundIsPlaying(INT32 handle);
 
 	\return	void
 */
-void I_UpdateSoundParams(INT32 handle, UINT8 vol, UINT8 sep);
+void I_UpdateSoundParams(INT32 handle, UINT8 vol, UINT8 sep, UINT8 pitch);
 
 /**	\brief	The I_SetSfxVolume function
 

src/i_tcp.c

@@ -371,16 +371,8 @@ static inline void I_UPnP_rem(const char *port, const char * servicetype)
 
 static const char *SOCK_AddrToStr(mysockaddr_t *sk)
 {
-	static char s[64]; // 255.255.255.255:65535 or
-	// [ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]:65535
-
+	static char s[64]; // 255.255.255.255:65535 or IPv6:65535
 #ifdef HAVE_NTOP
-#ifdef HAVE_IPV6
-	int v6 = (sk->any.sa_family == AF_INET6);
-#else
-	int v6 = 0;
-#endif
-
 	void *addr;
 	int e = 0; // save error code so it can't be modified later code and avoid calling WSAGetLastError() more then once
 
@@ -395,20 +387,14 @@ static const char *SOCK_AddrToStr(mysockaddr_t *sk)
 
 	if(addr == NULL)
 		sprintf(s, "No address");
-	else if(inet_ntop(sk->any.sa_family, addr, &s[v6], sizeof (s) - v6) == NULL)
+	else if(inet_ntop(sk->any.sa_family, addr, s, sizeof (s)) == NULL)
 	{
 		e = errno;
 		sprintf(s, "Unknown family type, error #%u: %s", e, strerror(e));
 	}
 #ifdef HAVE_IPV6
-	else if(sk->any.sa_family == AF_INET6)
-	{
-		s[0] = '[';
-		strcat(s, "]");
-
-		if (sk->ip6.sin6_port != 0)
-			strcat(s, va(":%d", ntohs(sk->ip6.sin6_port)));
-	}
+	else if(sk->any.sa_family == AF_INET6 && sk->ip6.sin6_port != 0)
+		strcat(s, va(":%d", ntohs(sk->ip6.sin6_port)));
 #endif
 	else if(sk->any.sa_family == AF_INET  && sk->ip4.sin_port  != 0)
 		strcat(s, va(":%d", ntohs(sk->ip4.sin_port)));
@@ -500,30 +486,10 @@ static time_t SOCK_GetUnbanTime(size_t ban)
 }
 
 #ifndef NONET
-
-#ifdef HAVE_IPV6
-static boolean SOCK_cmpipv6(mysockaddr_t *a, mysockaddr_t *b, UINT8 mask)
-{
-	UINT8 bitmask;
-	I_Assert(mask <= 128);
-	if (mask == 0)
-		mask = 128;
-	if (memcmp(&a->ip6.sin6_addr.s6_addr, &b->ip6.sin6_addr.s6_addr, mask / 8) != 0)
-		return false;
-	if (mask % 8 == 0)
-		return true;
-	bitmask = 255 << (mask % 8);
-	return (a->ip6.sin6_addr.s6_addr[mask / 8] & bitmask) == (b->ip6.sin6_addr.s6_addr[mask / 8] & bitmask);
-}
-#endif
-
 static boolean SOCK_cmpaddr(mysockaddr_t *a, mysockaddr_t *b, UINT8 mask)
 {
 	UINT32 bitmask = INADDR_NONE;
 
-	if (a->any.sa_family != b->any.sa_family)
-		return false;
-
 	if (mask && mask < 32)
 		bitmask = htonl((UINT32)(-1) << (32 - mask));
 
@@ -532,14 +498,13 @@ static boolean SOCK_cmpaddr(mysockaddr_t *a, mysockaddr_t *b, UINT8 mask)
 			&& (b->ip4.sin_port == 0 || (a->ip4.sin_port == b->ip4.sin_port));
 #ifdef HAVE_IPV6
 	else if (b->any.sa_family == AF_INET6)
-		return SOCK_cmpipv6(a, b, mask)
+		return memcmp(&a->ip6.sin6_addr, &b->ip6.sin6_addr, sizeof(b->ip6.sin6_addr))
 			&& (b->ip6.sin6_port == 0 || (a->ip6.sin6_port == b->ip6.sin6_port));
 #endif
 	else
 		return false;
 }
 
-
 // This is a hack. For some reason, nodes aren't being freed properly.
 // This goes through and cleans up what nodes were supposed to be freed.
 /** \warning This function causes the file downloading to stop if someone joins.
@@ -655,7 +620,6 @@ is_external_address (UINT32 p)
 
 static boolean hole_punch(ssize_t c)
 {
-	holepunch_t *holepunchpacket = HOLEPUNCH_DATA(doomcom);
 
 	/* See ../doc/Holepunch-Protocol.txt */
 	if (cv_rendezvousserver.string[0] &&
@@ -695,7 +659,6 @@ static boolean SOCK_Get(void)
 		fromlen = (socklen_t)sizeof(fromaddress);
 		c = recvfrom(mysockets[n], (char *)&doomcom->data, MAXPACKETLENGTH, 0,
 			(void *)&fromaddress, &fromlen);
-
 		if (c > 0)
 		{
 #ifdef USE_STUN
@@ -905,11 +868,11 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
 	unsigned long trueval = true;
 #endif
 	mysockaddr_t straddr;
-	socklen_t len = sizeof(straddr);
+	struct sockaddr_in sin;
+	socklen_t len = sizeof(sin);
 
 	if (s == (SOCKET_TYPE)ERRSOCKET)
 		return (SOCKET_TYPE)ERRSOCKET;
-
 #ifdef USE_WINSOCK
 	{ // Alam_GBC: disable the new UDP connection reset behavior for Win2k and up
 #ifdef USE_WINSOCK2
@@ -929,12 +892,14 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
 	}
 #endif
 
-	memcpy(&straddr, addr, addrlen);
+	straddr.any = *addr;
 	I_OutputMsg("Binding to %s\n", SOCK_AddrToStr(&straddr));
 
 	if (family == AF_INET)
 	{
-		if (straddr.ip4.sin_addr.s_addr == htonl(INADDR_ANY))
+		mysockaddr_t tmpaddr;
+		tmpaddr.any = *addr ;
+		if (tmpaddr.ip4.sin_addr.s_addr == htonl(INADDR_ANY))
 		{
 			opt = true;
 			opts = (socklen_t)sizeof(opt);
@@ -959,7 +924,7 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
 #ifdef HAVE_IPV6
 	else if (family == AF_INET6)
 	{
-		if (memcmp(&straddr.ip6.sin6_addr, &in6addr_any, sizeof(in6addr_any)) == 0) //IN6_ARE_ADDR_EQUAL
+		if (memcmp(addr, &in6addr_any, sizeof(in6addr_any)) == 0) //IN6_ARE_ADDR_EQUAL
 		{
 			opt = true;
 			opts = (socklen_t)sizeof(opt);
@@ -974,7 +939,7 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
 		// make it IPv6 ony
 		opt = true;
 		opts = (socklen_t)sizeof(opt);
-		rc = setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, (char *)&opt, opts);
+		rc = setsockopt(s, SOL_SOCKET, IPV6_V6ONLY, (char *)&opt, opts);
 		if (rc <= -1)
 		{
 			e = errno;
@@ -1004,7 +969,7 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
 
 			inet_pton(AF_INET6, IPV6_MULTICAST_ADDRESS, &maddr.ipv6mr_multiaddr);
 			maddr.ipv6mr_interface = 0;
-			rc = setsockopt(s, IPPROTO_IPV6, IPV6_JOIN_GROUP, (const char *)&maddr, sizeof(maddr));
+			rc = setsockopt(s, SOL_SOCKET, IPV6_JOIN_GROUP, (const char *)&maddr, sizeof(maddr));
 			if (rc <= -1)
 			{
 				e = errno;
@@ -1067,7 +1032,7 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
 			CONS_Printf(M_GetText("Network system buffer set to: %dKb\n"), opt>>10);
 	}
 
-	rc = getsockname(s, &straddr.any, &len);
+	rc = getsockname(s, (struct sockaddr *)&sin, &len);
 	if (rc != 0)
 	{
 		e = errno;
@@ -1075,14 +1040,7 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
 		I_OutputMsg("getsockname failed: #%u, %s\n", e, strerror(e));
 	}
 	else
-	{
-		if (family == AF_INET)
-			current_port = (UINT16)ntohs(straddr.ip4.sin_port);
-#ifdef HAVE_IPV6
-		else if (family == AF_INET6)
-			current_port = (UINT16)ntohs(straddr.ip6.sin6_port);
-#endif
-	}
+		current_port = (UINT16)ntohs(sin.sin_port);
 
 	return s;
 }
@@ -1163,7 +1121,6 @@ static boolean UDP_Socket(void)
 			I_freeaddrinfo(ai);
 		}
 	}
-
 #ifdef HAVE_IPV6
 	if (b_ipv6)
 	{
@@ -1362,13 +1319,12 @@ static boolean SOCK_GetAddr(struct sockaddr_in *sin, const char *address, const
 {
 	struct my_addrinfo *ai = NULL, *runp, hints;
 	int gaie;
-	size_t i;
 
 	if (!port || !port[0])
 		port = DEFAULTPORT;
 
 	memset (&hints, 0x00, sizeof (hints));
-	hints.ai_flags = AI_ADDRCONFIG;
+	hints.ai_flags = 0;
 	hints.ai_family = AF_UNSPEC;
 	hints.ai_socktype = SOCK_DGRAM;
 	hints.ai_protocol = IPPROTO_UDP;
@@ -1387,19 +1343,10 @@ static boolean SOCK_GetAddr(struct sockaddr_in *sin, const char *address, const
 	{
 		while (runp != NULL)
 		{
-			// test ip address of server
-			for (i = 0; i < mysocketses; ++i)
-			{
-				if (runp->ai_addr->sa_family == myfamily[i])
-				{
-					break;
-				}
-			}
-
-			if (i >= mysocketses)
-				runp = runp->ai_next;
-			else
+			if (sendto(mysockets[0], NULL, 0, 0, runp->ai_addr, runp->ai_addrlen) == 0)
 				break;
+
+			runp = runp->ai_next;
 		}
 	}
 
@@ -1443,8 +1390,6 @@ static void rendezvous(int size)
 
 	tic_t tic = I_GetTime();
 
-	holepunch_t *holepunchpacket = HOLEPUNCH_DATA(doomcom);
-
 	if (tic != refreshtic)
 	{
 		if (SOCK_GetAddr(&rzv.ip4, host, (port ? port : "7777"), false))
@@ -1470,7 +1415,6 @@ static void rendezvous(int size)
 static void SOCK_RequestHolePunch(INT32 node)
 {
 	mysockaddr_t * addr = &clientaddress[node];
-	holepunch_t *holepunchpacket = HOLEPUNCH_DATA(doomcom);
 
 	holepunchpacket->addr = addr->ip4.sin_addr.s_addr;
 	holepunchpacket->port = addr->ip4.sin_port;
@@ -1792,7 +1736,7 @@ boolean I_InitTcpNetwork(void)
 
 		// server address only in ip
 		if (serverhostname[0])
-		{
+		{			
 			CONS_Printf("SERVERNAME: %s\n", serverhostname);
 			COM_BufAddText("connect \"");
 			COM_BufAddText(serverhostname);

src/i_video.h

@@ -145,8 +145,6 @@ boolean I_UseNativeKeyboard(void);
 
 boolean I_CheckNativeRes(void);
 
-void I_SetBorderlessWindow(void);
-
 #ifdef USE_FBO_OGL
 
 void RefreshOGLSDLSurface(void);

src/info.h

@@ -26,7 +26,7 @@
   */
 typedef struct
 {
-	actionf_p1 action; ///< Function pointer corresponding to the actual action.
+	actionf_t action; ///< Function pointer corresponding to the actual action.
 	const char *name; ///< Name of the action in ALL CAPS.
 } actionpointer_t;
 
@@ -246,206 +246,209 @@ struct mobj_s;
 
 // IMPORTANT NOTE: If you add/remove from this list of action
 // functions, don't forget to update them in dehacked.c!
-void A_Explode(void *actor);
-void A_Pain(void *actor);
-void A_Fall(void *actor);
-void A_MonitorPop(void *actor);
-void A_Look(void *actor);
-void A_Chase(void *actor);
-void A_FaceStabChase(void *actor);
-void A_FaceTarget(void *actor);
-void A_FaceTracer(void *actor);
-void A_Scream(void *actor);
-void A_BossDeath(void *actor);
-void A_CustomPower(void *actor); // Use this for a custom power
-void A_GiveWeapon(void *actor); // Gives the player weapon(s)
-void A_JumpShield(void *actor); // Obtained Jump Shield
-void A_RingShield(void *actor); // Obtained Ring Shield
-void A_RingBox(void *actor); // Obtained Ring Box Tails
-void A_Invincibility(void *actor); // Obtained Invincibility Box
-void A_SuperSneakers(void *actor); // Obtained Super Sneakers Box
-void A_BunnyHop(void *actor); // have bunny hop tails
-void A_BubbleSpawn(void *actor); // Randomly spawn bubbles
-void A_FanBubbleSpawn(void *actor);
-void A_BubbleRise(void *actor); // Bubbles float to surface
-void A_BubbleCheck(void *actor); // Don't draw if not underwater
-void A_AwardScore(void *actor);
-void A_ExtraLife(void *actor); // Extra Life
-void A_BombShield(void *actor); // Obtained Bomb Shield
-void A_WaterShield(void *actor); // Obtained Water Shield
-void A_ForceShield(void *actor); // Obtained Force Shield
-void A_PityShield(void *actor); // Obtained Pity Shield. We're... sorry.
-void A_GravityBox(void *actor);
-void A_ScoreRise(void *actor); // Rise the score logo
-void A_ParticleSpawn(void *actor);
-void A_AttractChase(void *actor); // Ring Chase
-void A_DropMine(void *actor); // Drop Mine from Skim or Jetty-Syn Bomber
-void A_FishJump(void *actor); // Fish Jump
-void A_ThrownRing(void *actor); // Sparkle trail for red ring
-void A_GrenadeRing(void *actor); // SRB2kart
-void A_SetSolidSteam(void *actor);
-void A_UnsetSolidSteam(void *actor);
-void A_SignPlayer(void *actor);
-void A_OverlayThink(void *actor);
-void A_JetChase(void *actor);
-void A_JetbThink(void *actor); // Jetty-Syn Bomber Thinker
-void A_JetgThink(void *actor); // Jetty-Syn Gunner Thinker
-void A_JetgShoot(void *actor); // Jetty-Syn Shoot Function
-void A_ShootBullet(void *actor); // JetgShoot without reactiontime setting
-void A_MinusDigging(void *actor);
-void A_MinusPopup(void *actor);
-void A_MinusCheck(void *actor);
-void A_ChickenCheck(void *actor);
-void A_MouseThink(void *actor); // Mouse Thinker
-void A_DetonChase(void *actor); // Deton Chaser
-void A_CapeChase(void *actor); // Fake little Super Sonic cape
-void A_RotateSpikeBall(void *actor); // Spike ball rotation
-void A_SlingAppear(void *actor);
-void A_MaceRotate(void *actor);
-void A_UnidusBall(void *actor);
-void A_RockSpawn(void *actor);
-void A_SetFuse(void *actor);
-void A_CrawlaCommanderThink(void *actor); // Crawla Commander
-void A_SmokeTrailer(void *actor);
-void A_RingExplode(void *actor);
-void A_OldRingExplode(void *actor);
-void A_MixUp(void *actor);
-void A_RecyclePowers(void *actor);
-void A_BossScream(void *actor);
-void A_Boss2TakeDamage(void *actor);
-void A_GoopSplat(void *actor);
-void A_Boss2PogoSFX(void *actor);
-void A_Boss2PogoTarget(void *actor);
-void A_EggmanBox(void *actor);
-void A_TurretFire(void *actor);
-void A_SuperTurretFire(void *actor);
-void A_TurretStop(void *actor);
-void A_JetJawRoam(void *actor);
-void A_JetJawChomp(void *actor);
-void A_PointyThink(void *actor);
-void A_CheckBuddy(void *actor);
-void A_HoodThink(void *actor);
-void A_ArrowCheck(void *actor);
-void A_SnailerThink(void *actor);
-void A_SharpChase(void *actor);
-void A_SharpSpin(void *actor);
-void A_VultureVtol(void *actor);
-void A_VultureCheck(void *actor);
-void A_SkimChase(void *actor);
-void A_SkullAttack(void *actor);
-void A_LobShot(void *actor);
-void A_FireShot(void *actor);
-void A_SuperFireShot(void *actor);
-void A_BossFireShot(void *actor);
-void A_Boss7FireMissiles(void *actor);
-void A_Boss1Laser(void *actor);
-void A_FocusTarget(void *actor);
-void A_Boss4Reverse(void *actor);
-void A_Boss4SpeedUp(void *actor);
-void A_Boss4Raise(void *actor);
-void A_SparkFollow(void *actor);
-void A_BuzzFly(void *actor);
-void A_GuardChase(void *actor);
-void A_EggShield(void *actor);
-void A_SetReactionTime(void *actor);
-void A_Boss1Spikeballs(void *actor);
-void A_Boss3TakeDamage(void *actor);
-void A_Boss3Path(void *actor);
-void A_LinedefExecute(void *actor);
-void A_PlaySeeSound(void *actor);
-void A_PlayAttackSound(void *actor);
-void A_PlayActiveSound(void *actor);
-void A_1upThinker(void *actor);
-void A_BossZoom(void *actor); //Unused
-void A_Boss1Chase(void *actor);
-void A_Boss2Chase(void *actor);
-void A_Boss2Pogo(void *actor);
-void A_Boss7Chase(void *actor);
-void A_BossJetFume(void *actor);
-void A_SpawnObjectAbsolute(void *actor);
-void A_SpawnObjectRelative(void *actor);
-void A_ChangeAngleRelative(void *actor);
-void A_ChangeAngleAbsolute(void *actor);
-void A_PlaySound(void *actor);
-void A_FindTarget(void *actor);
-void A_FindTracer(void *actor);
-void A_SetTics(void *actor);
-void A_SetRandomTics(void *actor);
-void A_ChangeColorRelative(void *actor);
-void A_ChangeColorAbsolute(void *actor);
-void A_MoveRelative(void *actor);
-void A_MoveAbsolute(void *actor);
-void A_Thrust(void *actor);
-void A_ZThrust(void *actor);
-void A_SetTargetsTarget(void *actor);
-void A_SetObjectFlags(void *actor);
-void A_SetObjectFlags2(void *actor);
-void A_RandomState(void *actor);
-void A_RandomStateRange(void *actor);
-void A_DualAction(void *actor);
-void A_RemoteAction(void *actor);
-void A_ToggleFlameJet(void *actor);
-void A_ItemPop(void *actor); // SRB2kart
-void A_JawzChase(void *actor); // SRB2kart
-void A_JawzExplode(void *actor); // SRB2kart
-void A_SPBChase(void *actor); // SRB2kart
-void A_MineExplode(void *actor); // SRB2kart
-void A_BallhogExplode(void *actor); // SRB2kart
-void A_LightningFollowPlayer(void *actor);	// SRB2kart: Lightning shield effect player chasing
-void A_FZBoomFlash(void *actor); // SRB2kart
-void A_FZBoomSmoke(void *actor); // SRB2kart
-void A_RandomShadowFrame(void *actor);	//SRB2kart: Shadow spawner frame randomizer
-void A_RoamingShadowThinker(void *actor);	// SRB2kart: Roaming Shadow moving + attacking players.
-void A_MayonakaArrow(void *actor);	//SRB2kart: midnight channel arrow sign
-void A_ReaperThinker(void *actor);	//SRB2kart: mementos reaper
-void A_MementosTPParticles(void *actor);	//SRB2kart: mementos teleporter particles. Man that's a lot of actions for my shite.
-void A_FlameParticle(void *actor); // SRB2kart
-void A_OrbitNights(void *actor);
-void A_GhostMe(void *actor);
-void A_SetObjectState(void *actor);
-void A_SetObjectTypeState(void *actor);
-void A_KnockBack(void *actor);
-void A_PushAway(void *actor);
-void A_RingDrain(void *actor);
-void A_SplitShot(void *actor);
-void A_MissileSplit(void *actor);
-void A_MultiShot(void *actor);
-void A_InstaLoop(void *actor);
-void A_Custom3DRotate(void *actor);
-void A_SearchForPlayers(void *actor);
-void A_CheckRandom(void *actor);
-void A_CheckTargetRings(void *actor);
-void A_CheckRings(void *actor);
-void A_CheckTotalRings(void *actor);
-void A_CheckHealth(void *actor);
-void A_CheckRange(void *actor);
-void A_CheckHeight(void *actor);
-void A_CheckTrueRange(void *actor);
-void A_CheckThingCount(void *actor);
-void A_CheckAmbush(void *actor);
-void A_CheckCustomValue(void *actor);
-void A_CheckCusValMemo(void *actor);
-void A_SetCustomValue(void *actor);
-void A_UseCusValMemo(void *actor);
-void A_RelayCustomValue(void *actor);
-void A_CusValAction(void *actor);
-void A_ForceStop(void *actor);
-void A_ForceWin(void *actor);
-void A_SpikeRetract(void *actor);
-void A_InfoState(void *actor);
-void A_Repeat(void *actor);
-void A_SetScale(void *actor);
-void A_RemoteDamage(void *actor);
-void A_HomingChase(void *actor);
-void A_TrapShot(void *actor);
-void A_VileTarget(void *actor);
-void A_VileAttack(void *actor);
-void A_VileFire(void *actor);
-void A_BrakChase(void *actor);
-void A_BrakFireShot(void *actor);
-void A_BrakLobShot(void *actor);
-void A_NapalmScatter(void *actor);
-void A_SpawnFreshCopy(void *actor);
+void A_Explode(struct mobj_s *actor);
+void A_Pain(struct mobj_s *actor);
+void A_Fall(struct mobj_s *actor);
+void A_MonitorPop(struct mobj_s *actor);
+void A_Look(struct mobj_s *actor);
+void A_Chase(struct mobj_s *actor);
+void A_FaceStabChase(struct mobj_s *actor);
+void A_FaceTarget(struct mobj_s *actor);
+void A_FaceTracer(struct mobj_s *actor);
+void A_Scream(struct mobj_s *actor);
+void A_BossDeath(struct mobj_s *actor);
+void A_CustomPower(struct mobj_s *actor); // Use this for a custom power
+void A_GiveWeapon(struct mobj_s *actor); // Gives the player weapon(s)
+void A_JumpShield(struct mobj_s *actor); // Obtained Jump Shield
+void A_RingShield(struct mobj_s *actor); // Obtained Ring Shield
+void A_RingBox(struct mobj_s *actor); // Obtained Ring Box Tails
+void A_Invincibility(struct mobj_s *actor); // Obtained Invincibility Box
+void A_SuperSneakers(struct mobj_s *actor); // Obtained Super Sneakers Box
+void A_BunnyHop(struct mobj_s *actor); // have bunny hop tails
+void A_BubbleSpawn(struct mobj_s *actor); // Randomly spawn bubbles
+void A_FanBubbleSpawn(struct mobj_s *actor);
+void A_BubbleRise(struct mobj_s *actor); // Bubbles float to surface
+void A_BubbleCheck(struct mobj_s *actor); // Don't draw if not underwater
+void A_AwardScore(struct mobj_s *actor);
+void A_ExtraLife(struct mobj_s *actor); // Extra Life
+void A_BombShield(struct mobj_s *actor); // Obtained Bomb Shield
+void A_WaterShield(struct mobj_s *actor); // Obtained Water Shield
+void A_ForceShield(struct mobj_s *actor); // Obtained Force Shield
+void A_PityShield(struct mobj_s *actor); // Obtained Pity Shield. We're... sorry.
+void A_GravityBox(struct mobj_s *actor);
+void A_ScoreRise(struct mobj_s *actor); // Rise the score logo
+void A_ParticleSpawn(struct mobj_s *actor);
+void A_AttractChase(struct mobj_s *actor); // Ring Chase
+void A_DropMine(struct mobj_s *actor); // Drop Mine from Skim or Jetty-Syn Bomber
+void A_FishJump(struct mobj_s *actor); // Fish Jump
+void A_ThrownRing(struct mobj_s *actor); // Sparkle trail for red ring
+void A_GrenadeRing(struct mobj_s *actor); // SRB2kart
+void A_SetSolidSteam(struct mobj_s *actor);
+void A_UnsetSolidSteam(struct mobj_s *actor);
+void A_SignPlayer(struct mobj_s *actor);
+void A_OverlayThink(struct mobj_s *actor);
+void A_JetChase(struct mobj_s *actor);
+void A_JetbThink(struct mobj_s *actor); // Jetty-Syn Bomber Thinker
+void A_JetgThink(struct mobj_s *actor); // Jetty-Syn Gunner Thinker
+void A_JetgShoot(struct mobj_s *actor); // Jetty-Syn Shoot Function
+void A_ShootBullet(struct mobj_s *actor); // JetgShoot without reactiontime setting
+void A_MinusDigging(struct mobj_s *actor);
+void A_MinusPopup(struct mobj_s *actor);
+void A_MinusCheck(struct mobj_s *actor);
+void A_ChickenCheck(struct mobj_s *actor);
+void A_MouseThink(struct mobj_s *actor); // Mouse Thinker
+void A_DetonChase(struct mobj_s *actor); // Deton Chaser
+void A_CapeChase(struct mobj_s *actor); // Fake little Super Sonic cape
+void A_RotateSpikeBall(struct mobj_s *actor); // Spike ball rotation
+void A_SlingAppear(struct mobj_s *actor);
+void A_MaceRotate(struct mobj_s *actor);
+void A_UnidusBall(struct mobj_s *actor);
+void A_RockSpawn(struct mobj_s *actor);
+void A_SetFuse(struct mobj_s *actor);
+void A_CrawlaCommanderThink(struct mobj_s *actor); // Crawla Commander
+void A_SmokeTrailer(struct mobj_s *actor);
+void A_RingExplode(struct mobj_s *actor);
+void A_OldRingExplode(struct mobj_s *actor);
+void A_MixUp(struct mobj_s *actor);
+void A_RecyclePowers(struct mobj_s *actor);
+void A_BossScream(struct mobj_s *actor);
+void A_Boss2TakeDamage(struct mobj_s *actor);
+void A_GoopSplat(struct mobj_s *actor);
+void A_Boss2PogoSFX(struct mobj_s *actor);
+void A_Boss2PogoTarget(struct mobj_s *actor);
+void A_EggmanBox(struct mobj_s *actor);
+void A_TurretFire(struct mobj_s *actor);
+void A_SuperTurretFire(struct mobj_s *actor);
+void A_TurretStop(struct mobj_s *actor);
+void A_JetJawRoam(struct mobj_s *actor);
+void A_JetJawChomp(struct mobj_s *actor);
+void A_PointyThink(struct mobj_s *actor);
+void A_CheckBuddy(struct mobj_s *actor);
+void A_HoodThink(struct mobj_s *actor);
+void A_ArrowCheck(struct mobj_s *actor);
+void A_SnailerThink(struct mobj_s *actor);
+void A_SharpChase(struct mobj_s *actor);
+void A_SharpSpin(struct mobj_s *actor);
+void A_VultureVtol(struct mobj_s *actor);
+void A_VultureCheck(struct mobj_s *actor);
+void A_SkimChase(struct mobj_s *actor);
+void A_SkullAttack(struct mobj_s *actor);
+void A_LobShot(struct mobj_s *actor);
+void A_FireShot(struct mobj_s *actor);
+void A_SuperFireShot(struct mobj_s *actor);
+void A_BossFireShot(struct mobj_s *actor);
+void A_Boss7FireMissiles(struct mobj_s *actor);
+void A_Boss1Laser(struct mobj_s *actor);
+void A_FocusTarget(struct mobj_s *actor);
+void A_Boss4Reverse(struct mobj_s *actor);
+void A_Boss4SpeedUp(struct mobj_s *actor);
+void A_Boss4Raise(struct mobj_s *actor);
+void A_SparkFollow(struct mobj_s *actor);
+void A_BuzzFly(struct mobj_s *actor);
+void A_GuardChase(struct mobj_s *actor);
+void A_EggShield(struct mobj_s *actor);
+void A_SetReactionTime(struct mobj_s *actor);
+void A_Boss1Spikeballs(struct mobj_s *actor);
+void A_Boss3TakeDamage(struct mobj_s *actor);
+void A_Boss3Path(struct mobj_s *actor);
+void A_LinedefExecute(struct mobj_s *actor);
+void A_PlaySeeSound(struct mobj_s *actor);
+void A_PlayAttackSound(struct mobj_s *actor);
+void A_PlayActiveSound(struct mobj_s *actor);
+void A_1upThinker(struct mobj_s *actor);
+void A_BossZoom(struct mobj_s *actor); //Unused
+void A_Boss1Chase(struct mobj_s *actor);
+void A_Boss2Chase(struct mobj_s *actor);
+void A_Boss2Pogo(struct mobj_s *actor);
+void A_Boss7Chase(struct mobj_s *actor);
+void A_BossJetFume(struct mobj_s *actor);
+void A_SpawnObjectAbsolute(struct mobj_s *actor);
+void A_SpawnObjectRelative(struct mobj_s *actor);
+void A_ChangeAngleRelative(struct mobj_s *actor);
+void A_ChangeAngleAbsolute(struct mobj_s *actor);
+void A_RollAngle(struct mobj_s *actor);
+void A_ChangeRollAngleRelative(struct mobj_s *actor);
+void A_ChangeRollAngleAbsolute(struct mobj_s *actor);
+void A_PlaySound(struct mobj_s *actor);
+void A_FindTarget(struct mobj_s *actor);
+void A_FindTracer(struct mobj_s *actor);
+void A_SetTics(struct mobj_s *actor);
+void A_SetRandomTics(struct mobj_s *actor);
+void A_ChangeColorRelative(struct mobj_s *actor);
+void A_ChangeColorAbsolute(struct mobj_s *actor);
+void A_MoveRelative(struct mobj_s *actor);
+void A_MoveAbsolute(struct mobj_s *actor);
+void A_Thrust(struct mobj_s *actor);
+void A_ZThrust(struct mobj_s *actor);
+void A_SetTargetsTarget(struct mobj_s *actor);
+void A_SetObjectFlags(struct mobj_s *actor);
+void A_SetObjectFlags2(struct mobj_s *actor);
+void A_RandomState(struct mobj_s *actor);
+void A_RandomStateRange(struct mobj_s *actor);
+void A_DualAction(struct mobj_s *actor);
+void A_RemoteAction(struct mobj_s *actor);
+void A_ToggleFlameJet(struct mobj_s *actor);
+void A_ItemPop(struct mobj_s *actor); // SRB2kart
+void A_JawzChase(struct mobj_s *actor); // SRB2kart
+void A_JawzExplode(struct mobj_s *actor); // SRB2kart
+void A_SPBChase(struct mobj_s *actor); // SRB2kart
+void A_MineExplode(struct mobj_s *actor); // SRB2kart
+void A_BallhogExplode(struct mobj_s *actor); // SRB2kart
+void A_LightningFollowPlayer(struct mobj_s *actor);	// SRB2kart: Lightning shield effect player chasing
+void A_FZBoomFlash(struct mobj_s *actor); // SRB2kart
+void A_FZBoomSmoke(struct mobj_s *actor); // SRB2kart
+void A_RandomShadowFrame(struct mobj_s *actor);	//SRB2kart: Shadow spawner frame randomizer
+void A_RoamingShadowThinker(struct mobj_s *actor);	// SRB2kart: Roaming Shadow moving + attacking players.
+void A_MayonakaArrow(struct mobj_s *actor);	//SRB2kart: midnight channel arrow sign
+void A_ReaperThinker(struct mobj_s *actor);	//SRB2kart: mementos reaper
+void A_MementosTPParticles(struct mobj_s *actor);	//SRB2kart: mementos teleporter particles. Man that's a lot of actions for my shite.
+void A_FlameParticle(struct mobj_s *actor); // SRB2kart
+void A_OrbitNights(struct mobj_s *actor);
+void A_GhostMe(struct mobj_s *actor);
+void A_SetObjectState(struct mobj_s *actor);
+void A_SetObjectTypeState(struct mobj_s *actor);
+void A_KnockBack(struct mobj_s *actor);
+void A_PushAway(struct mobj_s *actor);
+void A_RingDrain(struct mobj_s *actor);
+void A_SplitShot(struct mobj_s *actor);
+void A_MissileSplit(struct mobj_s *actor);
+void A_MultiShot(struct mobj_s *actor);
+void A_InstaLoop(struct mobj_s *actor);
+void A_Custom3DRotate(struct mobj_s *actor);
+void A_SearchForPlayers(struct mobj_s *actor);
+void A_CheckRandom(struct mobj_s *actor);
+void A_CheckTargetRings(struct mobj_s *actor);
+void A_CheckRings(struct mobj_s *actor);
+void A_CheckTotalRings(struct mobj_s *actor);
+void A_CheckHealth(struct mobj_s *actor);
+void A_CheckRange(struct mobj_s *actor);
+void A_CheckHeight(struct mobj_s *actor);
+void A_CheckTrueRange(struct mobj_s *actor);
+void A_CheckThingCount(struct mobj_s *actor);
+void A_CheckAmbush(struct mobj_s *actor);
+void A_CheckCustomValue(struct mobj_s *actor);
+void A_CheckCusValMemo(struct mobj_s *actor);
+void A_SetCustomValue(struct mobj_s *actor);
+void A_UseCusValMemo(struct mobj_s *actor);
+void A_RelayCustomValue(struct mobj_s *actor);
+void A_CusValAction(struct mobj_s *actor);
+void A_ForceStop(struct mobj_s *actor);
+void A_ForceWin(struct mobj_s *actor);
+void A_SpikeRetract(struct mobj_s *actor);
+void A_InfoState(struct mobj_s *actor);
+void A_Repeat(struct mobj_s *actor);
+void A_SetScale(struct mobj_s *actor);
+void A_RemoteDamage(struct mobj_s *actor);
+void A_HomingChase(struct mobj_s *actor);
+void A_TrapShot(struct mobj_s *actor);
+void A_VileTarget(struct mobj_s *actor);
+void A_VileAttack(struct mobj_s *actor);
+void A_VileFire(struct mobj_s *actor);
+void A_BrakChase(struct mobj_s *actor);
+void A_BrakFireShot(struct mobj_s *actor);
+void A_BrakLobShot(struct mobj_s *actor);
+void A_NapalmScatter(struct mobj_s *actor);
+void A_SpawnFreshCopy(struct mobj_s *actor);
 
 extern boolean actionsoverridden[NUMACTIONS];
 
@@ -4309,7 +4312,7 @@ typedef struct
 	spritenum_t sprite;
 	UINT32 frame; // we use the upper 16 bits for translucency and other shade effects
 	INT32 tics;
-	actionf_p1 action;
+	actionf_t action;
 	INT32 var1;
 	INT32 var2;
 	statenum_t nextstate;

src/k_hud.c

@@ -1315,6 +1315,14 @@ static void K_drawKartStats(void)
 
 	flags = V_SNAPTOBOTTOM|V_SNAPTOLEFT;
 
+	UINT8 splitnum = 0;
+
+	for (; splitnum < MAXSPLITSCREENPLAYERS; ++splitnum)
+	{
+		if (stplyrnum == splitnum)
+			break;
+	}
+
 	if (!LUA_HudEnabled(hud_statdisplay))
 		return;
 
@@ -1354,7 +1362,7 @@ static void K_drawKartStats(void)
 
 		// If we are in 2-player splitscreen, for player 1 we move hud to up and remove snapping
 		// to bottom
-		if (stplyrnum == 0)
+		if (splitnum == 0)
 		{
 			y /= 2;
 			flags = V_SNAPTOLEFT;
@@ -1367,28 +1375,28 @@ static void K_drawKartStats(void)
 	}
 	else
 	{
-		if (stplyrnum == 0 || stplyrnum == 2) // If we are P1 or P3...
+		if (splitnum == 0 || splitnum == 2) // If we are P1 or P3...
 		{
 			// ye i just align it to position number lol
 			x = POSI_X + 19;
 			y = POSI_Y - 6;
-			flags = V_SNAPTOLEFT|((stplyrnum == 2) ? V_SPLITSCREEN|V_SNAPTOBOTTOM : 0);	// flip P3 to the bottom.
+			flags = V_SNAPTOLEFT|((splitnum == 2) ? V_SPLITSCREEN|V_SNAPTOBOTTOM : 0);	// flip P3 to the bottom.
 		}
 		else // else, that means we're P2 or P4.
 		{
 			x = POSI2_X - 75;
 			y = POSI2_Y - 6;
-			flags = V_SNAPTORIGHT|((stplyrnum == 3) ? V_SPLITSCREEN|V_SNAPTOBOTTOM : 0);	// flip P4 to the bottom
+			flags = V_SNAPTORIGHT|((splitnum == 3) ? V_SPLITSCREEN|V_SNAPTOBOTTOM : 0);	// flip P4 to the bottom
 		}
 	}
 
 	flags |= V_HUDTRANS;
 
+	skin_t *fakeskin;
+	fakeskin = K_GetPlayerSkin(stplyr);
+
 	if (!splitscreen)
 	{
-		skin_t *fakeskin;
-		fakeskin = K_GetPlayerSkin(stplyr);
-
 		// Skin name
 		if (K_IsHighResolution()) // V_DrawSmallString becomes a mess at low resolutions lel
 		{
@@ -1804,7 +1812,6 @@ void K_drawKartTimestamp(tic_t drawtime, INT32 TX, INT32 TY, INT16 emblemmap, UI
 	if (!mode)
 	{
 		splitflags = V_HUDTRANS|K_calcSplitFlags(V_SNAPTOTOP|V_SNAPTORIGHT);
-
 		if (cv_timelimit.value && timelimitintics > 0)
 		{
 			if (drawtime >= timelimitintics)
@@ -2168,7 +2175,9 @@ static boolean K_drawKartPositionFaces(void)
 
 		if (!playeringame[rankplayer[i]])
 			continue;
-		if (player->spectator || !player->mo)
+		if (player->spectator)
+			continue;
+		if (!player->mo)
 			continue;
 
 		const UINT8 mocolor = player->mo->color;
@@ -2177,10 +2186,9 @@ static boolean K_drawKartPositionFaces(void)
 
 		if (mocolor)
 		{
+			colormap = R_GetTranslationColormap(player->skin, mocolor, GTC_CACHE);
 			if (player->mo->colorized)
 				colormap = R_GetTranslationColormap(TC_RAINBOW, mocolor, GTC_CACHE);
-			else
-				colormap = R_GetTranslationColormap(player->skin, mocolor, GTC_CACHE);
 
 			if (K_UseHighResPortraits())
 				V_DrawSmallMappedPatch(FACE_X, Y, V_HUDTRANS|V_SNAPTOLEFT, R_GetSkinFaceWant(player), colormap);
@@ -2209,10 +2217,8 @@ static boolean K_drawKartPositionFaces(void)
 		else
 		{
 			INT32 pos = player->kartstuff[k_position];
-
 			if (pos < 0 || pos > MAXPLAYERS)
 				pos = 0;
-
 			// Draws the little number over the face
 			V_DrawScaledPatch(FACE_X-5, Y+10, V_HUDTRANS|V_SNAPTOLEFT, kp_facenum[pos]);
 		}
@@ -2238,7 +2244,6 @@ void HU_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, I
 	//I_Assert(scorelines <= 9); -- not today bitch, kart fixed it up
 
 	V_DrawFill(1-duptweak, 26, dupadjust-2, 1, 0); // Draw a horizontal line because it looks nice!
-
 	if (scorelines > 8)
 	{
 		V_DrawFill(160, 26, 1, 147, 0); // Draw a vertical line to separate the two sides.
@@ -3163,7 +3168,7 @@ static void K_drawDriftGauge(void)
 		SKINCOLOR_SALMON,
 	};
 
-	static const UINT8 driftrainbow[18] = {
+	static UINT8 driftrainbow[18] = {
 		0, 31, 47, 63, 79, 95, 111, 119, 127, 143, 159, 175, 183, 191, 199, 207, 223, 247
 	};
 
@@ -3269,6 +3274,7 @@ skipcrap:
 				}
 
 				// right, also draw a cool number
+				//SG_DrawPaddedNum(v, basex + (dup*32), basey, driftcharge*100 / driftval, 3, "PINGN", V_NOSCALESTART|V_OFFSET|drifttrans, cmap)
 				if (cv_driftgaugestyle.value == 3)
 					V_DrawPaddedTallColorNum(basex + (dup*32), basey, V_NOSCALESTART|V_OFFSET|drifttrans, driftcharge*100 / driftval, 3, cmap);
 				else
@@ -3277,10 +3283,10 @@ skipcrap:
 			break;
 		case 4:
 			{
+				cmap = R_GetTranslationColormap(TC_RAINBOW, driftskins[driftlevel],GTC_CACHE);
+
 				if (driftcharge >= driftval*4)
 					cmap = R_GetTranslationColormap(TC_RAINBOW, 1 + leveltime % (MAXSKINCOLORS-1),GTC_CACHE);
-				else
-					cmap = R_GetTranslationColormap(TC_RAINBOW, driftskins[driftlevel],GTC_CACHE);
 
 				V_DrawPaddedTallColorNum(basex + (dup*16), basey, V_NOSCALESTART|V_OFFSET|drifttrans, driftcharge*100 / driftval, 3, cmap);
 			}
@@ -3299,7 +3305,6 @@ static fixed_t K_FindCheckX(fixed_t px, fixed_t py, angle_t ang, fixed_t mx, fix
 	range *= gamespeed+1;
 
 	dist = abs(R_PointToDist2(px, py, mx, my));
-
 	if (dist > range)
 		return -BASEVIDWIDTH;
 
@@ -3399,14 +3404,17 @@ static void K_drawKartPlayerCheck(void)
 	UINT8 *colormap;
 	INT32 x;
 
-	if (!stplyr->mo || stplyr->spectator || stplyr->awayviewtics)
+	const INT32 splitflags = K_calcSplitFlags(V_SNAPTOBOTTOM);
+
+	if (!stplyr->mo || stplyr->spectator)
+		return;
+
+	if (stplyr->awayviewtics)
 		return;
 
 	if (camspin[0])
 		return;
 
-	const INT32 splitflags = K_calcSplitFlags(V_SNAPTOBOTTOM);
-
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
 		UINT8 pnum = 0;
@@ -3524,7 +3532,7 @@ static void K_drawKartMinimapHead(mobj_t *mo, INT32 x, INT32 y, INT32 flags)
 	skin = K_GetMobjSkin(mo);
 	minimaphead = (skinlocal ? localfacemmapprefix : facemmapprefix)[K_GetMobjSkinNum(skin, skinlocal)];
 
-	amnumxpos =  (FixedMul(lerp(mo->old_x, mo->x), minimapinfo.zoom) - minimapinfo.offs_x);
+	amnumxpos = (FixedMul(lerp(mo->old_x, mo->x), minimapinfo.zoom) - minimapinfo.offs_x);
 	amnumypos = -(FixedMul(lerp(mo->old_y, mo->y), minimapinfo.zoom) - minimapinfo.offs_y);
 
 	if (encoremode)
@@ -3957,7 +3965,7 @@ static void K_drawBattleFullscreen(void)
 		}
 	}
 
-	if (netgame && cv_showfreeplay.value && !stplyr->spectator && timeinmap > 113) // FREE PLAY?
+	if (netgame && !stplyr->spectator && timeinmap > 113) // FREE PLAY?
 	{
 		UINT8 i;
 
@@ -4378,6 +4386,10 @@ static void K_drawLapStartAnim(void)
 void K_drawKartFreePlay(UINT32 flashtime)
 {
 	// no splitscreen support because it's not FREE PLAY if you have more than one player in-game
+
+	if (!cv_showfreeplay.value)
+		return;
+
 	if ((flashtime % TICRATE) < TICRATE/2)
 		return;
 
@@ -4491,7 +4503,6 @@ static void K_drawCheckpointDebugger(void)
 		V_DrawString(8, 184, 0, va("Checkpoint: %d / %d (Can finish)", stplyr->starpostnum, numstarposts));
 	else
 		V_DrawString(8, 184, 0, va("Checkpoint: %d / %d (Skip: %d)", stplyr->starpostnum, numstarposts, ((numstarposts/2) + stplyr->starpostnum)));
-
 	V_DrawString(8, 192, 0, va("Waypoint dist: Prev %d, Next %d", stplyr->kartstuff[k_prevcheck], stplyr->kartstuff[k_nextcheck]));
 }
 
@@ -4754,7 +4765,7 @@ void K_drawKartHUD(void)
 		V_DrawScaledPatch(BASEVIDWIDTH/2 - (kp_yougotem->width/2), 32, V_HUDTRANS, kp_yougotem);
 
 	// Draw FREE PLAY.
-	if (isfreeplay && cv_showfreeplay.value && !stplyr->spectator && timeinmap > 113)
+	if (isfreeplay && !stplyr->spectator && timeinmap > 113)
 	{
 		if (LUA_HudEnabled(hud_freeplay))
 			K_drawKartFreePlay(leveltime);

src/k_kart.c

@@ -522,7 +522,6 @@ void K_RainbowColormap(UINT8 *dest_colormap, UINT8 skincolor)
 			dest_colormap[i] = (UINT8)i;
 			continue;
 		}
-
 		color = V_GetColor(i);
 		SETBRIGHTNESS(brightness, color.s.red, color.s.green, color.s.blue);
 		brightdif = 256;
@@ -551,40 +550,25 @@ void K_RainbowColormap(UINT8 *dest_colormap, UINT8 skincolor)
 */
 void K_GenerateKartColormap(UINT8 *dest_colormap, INT32 skinnum, UINT8 color, boolean local)
 {
-	INT32 i, starttranscolor;
+	INT32 i;
+	INT32 starttranscolor;
 
 	// Handle a couple of simple special cases
-	if (skinnum < TC_DEFAULT)
+	if (skinnum == TC_BOSS
+		|| skinnum == TC_ALLWHITE
+		|| skinnum == TC_METALSONIC
+		|| skinnum == TC_BLINK
+		|| color == SKINCOLOR_NONE)
 	{
-		switch (skinnum)
-		{
-			case TC_ALLWHITE:
-				memset(dest_colormap, 0, NUM_PALETTE_ENTRIES * sizeof(UINT8));
-				return;
-			case TC_RAINBOW:
-				if (color >= MAXTRANSLATIONS)
-					I_Error("Invalid skin color #%hu.", (UINT16)color);
-				if (color != SKINCOLOR_NONE)
-				{
-					K_RainbowColormap(dest_colormap, color);
-					return;
-				}
-				break;
-			case TC_BLINK:
-				if (color >= MAXTRANSLATIONS)
-					I_Error("Invalid skin color #%hu.", (UINT16)color);
-				if (color != SKINCOLOR_NONE)
-				{
-					memset(dest_colormap, colortranslations[color][3], NUM_PALETTE_ENTRIES * sizeof(UINT8));
-					return;
-				}
-				break;
-			default:
-				break;
-		}
-
 		for (i = 0; i < NUM_PALETTE_ENTRIES; i++)
-			dest_colormap[i] = (UINT8)i;
+		{
+			if (skinnum == TC_ALLWHITE)
+				dest_colormap[i] = 0;
+			else if (skinnum == TC_BLINK)
+				dest_colormap[i] = colortranslations[color][3];
+			else
+				dest_colormap[i] = (UINT8)i;
+		}
 
 		// White!
 		if (skinnum == TC_BOSS)
@@ -594,25 +578,14 @@ void K_GenerateKartColormap(UINT8 *dest_colormap, INT32 skinnum, UINT8 color, bo
 
 		return;
 	}
-	else if (color == SKINCOLOR_NONE)
+	else if (skinnum == TC_RAINBOW)
 	{
-		for (i = 0; i < NUM_PALETTE_ENTRIES; i++)
-			dest_colormap[i] = (UINT8)i;
-
+		K_RainbowColormap(dest_colormap, color);
 		return;
 	}
 
-	if (color >= MAXTRANSLATIONS)
-		I_Error("Invalid skin color #%hu.", (UINT16)color);
-
-	if (skinnum < 0 && skinnum > TC_DEFAULT)
-		I_Error("Invalid translation colormap index %d.", skinnum);
-
 	starttranscolor = (skinnum != TC_DEFAULT) ? K_GetSkinArray(local)[skinnum].starttranscolor : DEFAULT_STARTTRANSCOLOR;
 
-	if (starttranscolor >= NUM_PALETTE_ENTRIES)
-		I_Error("Invalid startcolor #%d.", starttranscolor);
-
 	// Fill in the entries of the palette that are fixed
 	for (i = 0; i < starttranscolor; i++)
 		dest_colormap[i] = (UINT8)i;
@@ -1612,7 +1585,7 @@ static UINT8 K_CheckOffroadCollide(mobj_t *mo)
 
 			// we will do essentially the same checks as above instead of bothering with top/bottom height of the FOF.
 			// Reminder that an FOF's floor is its bottom, silly!
-			if (   ((s2->flags & SF_FLIPSPECIAL_FLOOR) && mo->z == cel)	// "floor" check
+			if ( ((s2->flags & SF_FLIPSPECIAL_FLOOR) && mo->z == cel)	// "floor" check
 				|| ((s2->flags & SF_FLIPSPECIAL_CEILING) && (mo->z + mo->height) == flr) )	// "ceiling" check.
 
 				for (i = 2; i < 5; i++)	// check for sector special
@@ -1696,10 +1669,10 @@ static void K_SpawnDashDustRelease(player_t *player)
 	I_Assert(player->mo != NULL);
 	I_Assert(!P_MobjWasRemoved(player->mo));
 
-	if (!player->speed && !player->kartstuff[k_startboost])
+	if (!P_IsObjectOnGround(player->mo))
 		return;
 
-	if (!P_IsObjectOnGround(player->mo))
+	if (!player->speed && !player->kartstuff[k_startboost])
 		return;
 
 	travelangle = player->mo->angle;
@@ -1929,11 +1902,11 @@ static void K_PlayGenericCombatSound(mobj_t *source, mobj_t *other, sfxenum_t sf
 
 	boolean alwaysHear = false;
 
-	if (cv_kartvoices.value && !P_MobjWasRemoved(other) && other->player != NULL)
-	{
+	if (other != NULL && P_MobjWasRemoved(other) == false && other->player != NULL)
 		alwaysHear = P_IsDisplayPlayer(other->player);
+
+	if (cv_kartvoices.value)
 		S_StartSound(alwaysHear ? NULL : source, skin->soundsid[S_sfx[sfx_id].skinsound]);
-	}
 
 	K_RegularVoiceTimers(source->player);
 }
@@ -1955,7 +1928,7 @@ void K_PlayAttackTaunt(mobj_t *source)
 void K_PlayBoostTaunt(mobj_t *source)
 {
 	sfxenum_t pick = P_RandomKey(2); // Gotta roll the RNG every time this is called for sync reasons
-	const boolean tasteful = (!source->player || !source->player->kartstuff[k_tauntvoices]);
+	boolean tasteful = (!source->player || !source->player->kartstuff[k_tauntvoices]);
 
 	if (cv_kartvoices.value && (tasteful || cv_kartvoices.value == 2))
 		S_StartSound(source, sfx_kbost1+pick);
@@ -1968,6 +1941,8 @@ void K_PlayBoostTaunt(mobj_t *source)
 
 void K_PlayOvertakeSound(mobj_t *source)
 {
+	boolean tasteful = (!source->player || !source->player->kartstuff[k_voices]);
+
 	if (!G_RaceGametype()) // Only in race
 		return;
 
@@ -1975,8 +1950,6 @@ void K_PlayOvertakeSound(mobj_t *source)
 	if (leveltime < starttime+(10*TICRATE))
 		return;
 
-	const boolean tasteful = (!source->player || !source->player->kartstuff[k_voices]);
-
 	if (cv_kartvoices.value && (tasteful || cv_kartvoices.value == 2))
 		S_StartSound(source, sfx_kslow);
 
@@ -2212,7 +2185,6 @@ fixed_t K_GetKartSpeed(player_t *player, boolean doboostpower)
 
 	if (doboostpower)
 		return FixedMul(finalspeed, player->kartstuff[k_boostpower]+player->kartstuff[k_speedboost]);
-
 	return finalspeed;
 }
 
@@ -2249,14 +2221,10 @@ fixed_t K_3dKartMovement(player_t *player, boolean onground, fixed_t forwardmove
 {
 	fixed_t accelmax = 4000;
 	fixed_t newspeed, oldspeed, finalspeed;
-	fixed_t p_speed, p_accel;
+	fixed_t p_speed = K_GetKartSpeed(player, true);
+	fixed_t p_accel = K_GetKartAccel(player);
 
-	// If the player isn't on the ground, there is no change in speed
-	if (!onground)
-		return 0;
-
-	p_speed = K_GetKartSpeed(player, true);
-	p_accel = K_GetKartAccel(player);
+	if (!onground) return 0; // If the player isn't on the ground, there is no change in speed
 
 	// ACCELCODE!!!1!11!
 	oldspeed = R_PointToDist2(0, 0, player->rmomx, player->rmomy); // FixedMul(P_AproxDistance(player->rmomx, player->rmomy), player->mo->scale);
@@ -2360,7 +2328,6 @@ void K_SpinPlayer(player_t *player, mobj_t *source, INT32 type, mobj_t *inflicto
 
 	if (P_MobjWasRemoved(player->mo))
 		return; // mobj was removed (in theory that shouldn't happen)
-
 	if (shouldForce == 1)
 		force = true;
 	else if (shouldForce == 2)
@@ -2473,7 +2440,7 @@ void K_SpinPlayer(player_t *player, mobj_t *source, INT32 type, mobj_t *inflicto
 
 static void K_RemoveGrowShrink(player_t *player)
 {
-	if (!P_MobjWasRemoved(player->mo))
+	if (player->mo && !P_MobjWasRemoved(player->mo))
 	{
 		if (player->kartstuff[k_growshrinktimer] > 0) // Play Shrink noise
 			S_StartSound(player->mo, sfx_kc59);
@@ -2501,10 +2468,8 @@ void K_SquishPlayer(player_t *player, mobj_t *source, mobj_t *inflictor)
 	// PS: Inflictor is unused for all purposes here and is actually only ever relevant to Lua. It may be nil too.
 	boolean force = false;	// Used to check if Lua ShouldSquish should get us damaged reguardless of flashtics or heck knows what.
 	UINT8 shouldForce = LUA_HookShouldSquish(player, inflictor, source);
-
 	if (P_MobjWasRemoved(player->mo))
 		return; // mobj was removed (in theory that shouldn't happen)
-
 	if (shouldForce == 1)
 		force = true;
 	else if (shouldForce == 2)
@@ -2617,7 +2582,6 @@ void K_ExplodePlayer(player_t *player, mobj_t *source, mobj_t *inflictor) // A b
 
 	if (P_MobjWasRemoved(player->mo))
 		return; // mobj was removed (in theory that shouldn't happen)
-
 	if (shouldForce == 1)
 		force = true;
 	else if (shouldForce == 2)
@@ -2703,7 +2667,6 @@ void K_ExplodePlayer(player_t *player, mobj_t *source, mobj_t *inflictor) // A b
 	player->powers[pw_flashing] = K_GetKartFlashing(player);
 
 	upgoer = (18*mapobjectscale*P_MobjFlip(player->mo));
-
 	if (player->mo->eflags & MFE_UNDERWATER)
 		upgoer = (117 * upgoer) / 200;
 
@@ -2890,7 +2853,7 @@ void K_SpawnKartExplosion(fixed_t x, fixed_t y, fixed_t z, fixed_t radius, INT32
 		mobj->momy = FixedMul(FixedDiv(mobjy - y, dist), FixedDiv(dist, 6*FRACUNIT));
 		mobj->momz = FixedMul(FixedDiv(mobjz - z, dist), FixedDiv(dist, 6*FRACUNIT));
 
-		if (!P_MobjWasRemoved(source))
+		if (source && !P_MobjWasRemoved(source))
 			P_SetTarget(&mobj->target, source);
 	}
 }
@@ -3118,12 +3081,14 @@ static void K_SpawnDriftSparks(player_t *player)
 	if (leveltime % 2 == 1)
 		return;
 
-	const boolean onground = P_IsObjectOnGround(player->mo);
+	if (cv_airsparks.value)
+		goto skipground;
 
-	// kinda sketchy
-	if (!cv_airsparks.value && !onground)
+	if (!P_IsObjectOnGround(player->mo))
 		return;
 
+skipground: // idk im sleepy
+
 	if (!player->kartstuff[k_drift] || player->kartstuff[k_driftcharge] < K_GetKartDriftSparkValue(player))
 		return;
 
@@ -3140,8 +3105,6 @@ static void K_SpawnDriftSparks(player_t *player)
 		newy = player->mo->y + P_ReturnThrustY(player->mo, thrustangle, smolscale);
 		spark = P_SpawnMobj(newx, newy, player->mo->z, MT_DRIFTSPARK);
 
-		spark->islocal = cv_airsparks.value && !onground;
-
 		P_SetTarget(&spark->target, player->mo);
 		spark->angle = travelangle-(ANGLE_45/5)*player->kartstuff[k_drift];
 
@@ -3576,14 +3539,11 @@ void K_SpawnSparkleTrail(mobj_t *mo)
 		fixed_t newz = mo->z + mo->momz + (P_RandomRange(0, mo->height>>FRACBITS)<<FRACBITS);
 
 		sparkle = P_SpawnMobj(newx, newy, newz, MT_SPARKLETRAIL);
-
 		K_FlipFromObject(sparkle, mo);
 
 		P_SetTarget(&sparkle->target, mo);
-
 		sparkle->destscale = mo->destscale;
 		P_SetScale(sparkle, mo->scale);
-
 		sparkle->color = mo->color;
 
 		if (cv_playerblendeffects.value && mo->player && K_SpeedLinesShouldBlend(mo->player))
@@ -3642,6 +3602,7 @@ void K_SpawnWipeoutTrail(mobj_t *mo, boolean translucent)
 void K_DriftDustHandling(mobj_t *spawner)
 {
 	angle_t anglediff;
+	const INT16 spawnrange = spawner->radius>>FRACBITS;
 
 	if (!P_IsObjectOnGround(spawner) || leveltime % 2 != 0)
 		return;
@@ -3678,8 +3639,6 @@ void K_DriftDustHandling(mobj_t *spawner)
 	if (anglediff > ANGLE_180)
 		anglediff = InvAngle(anglediff);
 
-	const INT16 spawnrange = spawner->radius>>FRACBITS;
-
 	if (anglediff > ANG10*4) // Trying to turn further than 40 degrees
 	{
 		fixed_t spawnx = P_RandomRange(-spawnrange, spawnrange)<<FRACBITS;
@@ -3707,7 +3666,7 @@ static mobj_t *K_FindLastTrailMobj(player_t *player)
 	if (!player || !(trail = player->mo) || !player->mo->hnext || !player->mo->hnext->health)
 		return NULL;
 
-	while (!P_MobjWasRemoved(trail->hnext) && trail->hnext->health)
+	while (trail->hnext && !P_MobjWasRemoved(trail->hnext) && trail->hnext->health)
 	{
 		trail = trail->hnext;
 	}
@@ -3939,11 +3898,12 @@ static mobj_t *K_ThrowKartItem(player_t *player, boolean missile, mobjtype_t map
 
 void K_PuntMine(mobj_t *thismine, mobj_t *punter)
 {
-	angle_t fa;
-	fixed_t z, spd;
+	angle_t fa = R_PointToAngle2(0, 0, punter->momx, punter->momy) >> ANGLETOFINESHIFT;
+	fixed_t z = 30*mapobjectscale + punter->momz;
+	fixed_t spd;
 	mobj_t *mine;
 
-	if (P_MobjWasRemoved(thismine))
+	if (!thismine || P_MobjWasRemoved(thismine))
 		return;
 
 	//This guarantees you hit a mine being dragged
@@ -3972,12 +3932,9 @@ void K_PuntMine(mobj_t *thismine, mobj_t *punter)
 	else
 		mine = thismine;
 
-	if (P_MobjWasRemoved(mine))
+	if (!mine || P_MobjWasRemoved(mine))
 		return;
 
-	fa = R_PointToAngle2(0, 0, punter->momx, punter->momy) >> ANGLETOFINESHIFT;
-	z = 30*mapobjectscale + punter->momz;
-
 	spd = K_GetProjectileSpeed();
 
 	mine->flags |= MF_NOCLIPTHING;
@@ -4142,8 +4099,7 @@ void K_DoSneaker(player_t *player, INT32 type)
 			if (player->mo->hnext)
 			{
 				mobj_t *cur = player->mo->hnext;
-
-				while (!P_MobjWasRemoved(cur))
+				while (cur && !P_MobjWasRemoved(cur))
 				{
 					if (!cur->tracer)
 					{
@@ -4189,10 +4145,8 @@ static void K_DoShrink(player_t *user)
 	{
 		if (!playeringame[i] || players[i].spectator || !players[i].mo)
 			continue;
-
 		if (&players[i] == user)
 			continue;
-
 		if (players[i].kartstuff[k_position] < user->kartstuff[k_position])
 		{
 			//P_FlashPal(&players[i], PAL_NUKE, 10);
@@ -4209,7 +4163,7 @@ static void K_DoShrink(player_t *user)
 				K_DropItems(&players[i]);
 				players[i].kartstuff[k_growshrinktimer] = -(20*TICRATE);
 
-				if (!P_MobjWasRemoved(players[i].mo))
+				if (players[i].mo && !P_MobjWasRemoved(players[i].mo))
 				{
 					players[i].mo->scalespeed = mapobjectscale/TICRATE;
 					players[i].mo->destscale = (6*mapobjectscale)/8;
@@ -4339,7 +4293,7 @@ void K_DropHnextList(player_t *player)
 	mobjtype_t type;
 	boolean orbit, ponground, dropall = true;
 
-	if (P_MobjWasRemoved(work))
+	if (!work || P_MobjWasRemoved(work))
 		return;
 
 	flip = P_MobjFlip(player->mo);
@@ -4478,7 +4432,7 @@ void K_DropItems(player_t *player)
 
 	K_DropHnextList(player);
 
-	if (!P_MobjWasRemoved(player->mo) && player->kartstuff[k_itemamount])
+	if (player->mo && !P_MobjWasRemoved(player->mo) && player->kartstuff[k_itemamount])
 	{
 		mobj_t *drop = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z + player->mo->height/2, MT_FLOATINGITEM);
 		P_SetScale(drop, drop->scale>>4);
@@ -4507,7 +4461,7 @@ void K_DropRocketSneaker(player_t *player)
 	fixed_t flingangle;
 	boolean leftshoe = true; //left shoe is first
 
-	if (!(!P_MobjWasRemoved(player->mo) && player->mo->hnext && !P_MobjWasRemoved(player->mo->hnext)))
+	if (!(player->mo && !P_MobjWasRemoved(player->mo) && player->mo->hnext && !P_MobjWasRemoved(player->mo->hnext)))
 		return;
 
 	while ((shoe = shoe->hnext) && !P_MobjWasRemoved(shoe))
@@ -4546,7 +4500,7 @@ void K_DropRocketSneaker(player_t *player)
 
 void K_DropKitchenSink(player_t *player)
 {
-	if (!(!P_MobjWasRemoved(player->mo) && player->mo->hnext && !P_MobjWasRemoved(player->mo->hnext)))
+	if (!(player->mo && !P_MobjWasRemoved(player->mo) && player->mo->hnext && !P_MobjWasRemoved(player->mo->hnext)))
 		return;
 
 	if (player->mo->hnext->type != MT_SINK_SHIELD)
@@ -4563,13 +4517,13 @@ void K_RepairOrbitChain(mobj_t *orbit)
 	mobj_t *cachenext = orbit->hnext;
 
 	// First, repair the chain
-	if (!P_MobjWasRemoved(orbit->hnext) && orbit->hnext->health)
+	if (orbit->hnext && orbit->hnext->health && !P_MobjWasRemoved(orbit->hnext))
 	{
 		P_SetTarget(&orbit->hnext->hprev, orbit->hprev);
 		P_SetTarget(&orbit->hnext, NULL);
 	}
 
-	if (!P_MobjWasRemoved(orbit->hprev) && orbit->hprev->health)
+	if (orbit->hprev && orbit->hprev->health && !P_MobjWasRemoved(orbit->hprev))
 	{
 		P_SetTarget(&orbit->hprev->hnext, cachenext);
 		P_SetTarget(&orbit->hprev, NULL);
@@ -4584,7 +4538,7 @@ void K_RepairOrbitChain(mobj_t *orbit)
 		mobj_t *cur = orbit->target->hnext;
 		mobj_t *prev = NULL;
 
-		while (!P_MobjWasRemoved(cur))
+		while (cur && !P_MobjWasRemoved(cur))
 		{
 			prev = cur;
 			cur = cur->hnext;
@@ -4784,7 +4738,7 @@ static void K_MoveHeldObjects(player_t *player)
 
 				player->kartstuff[k_bananadrag] = 0; // Just to make sure
 
-				while (!P_MobjWasRemoved(cur))
+				while (cur && !P_MobjWasRemoved(cur))
 				{
 					const fixed_t radius = FixedHypot(player->mo->radius, player->mo->radius) + FixedHypot(cur->radius, cur->radius); // mobj's distance from its Target, or Radius.
 					fixed_t z;
@@ -4862,7 +4816,7 @@ static void K_MoveHeldObjects(player_t *player)
 				if (P_IsObjectOnGround(player->mo) && player->speed > 0)
 					player->kartstuff[k_bananadrag]++;
 
-				while (!P_MobjWasRemoved(cur))
+				while (cur && !P_MobjWasRemoved(cur))
 				{
 					const fixed_t radius = FixedHypot(targ->radius, targ->radius) + FixedHypot(cur->radius, cur->radius);
 					angle_t ang;
@@ -4890,7 +4844,7 @@ static void K_MoveHeldObjects(player_t *player)
 					else
 						dist = cur->extravalue1/2;
 
-					if (P_MobjWasRemoved(targ))
+					if (!targ || P_MobjWasRemoved(targ))
 						continue;
 
 					// Shrink your items if the player shrunk too.
@@ -4948,7 +4902,7 @@ static void K_MoveHeldObjects(player_t *player)
 				mobj_t *cur = player->mo->hnext;
 				INT32 num = 0;
 
-				while (!P_MobjWasRemoved(cur))
+				while (cur && !P_MobjWasRemoved(cur))
 				{
 					const fixed_t radius = FixedHypot(player->mo->radius, player->mo->radius) + FixedHypot(cur->radius, cur->radius);
 					boolean vibrate = ((leveltime & 1) && !cur->tracer);
@@ -5013,7 +4967,7 @@ static void K_MoveHeldObjects(player_t *player)
 
 					}
 
-					if (!P_MobjWasRemoved(cur->tracer))
+					if (cur->tracer && !P_MobjWasRemoved(cur->tracer))
 					{
 						fixed_t diffx, diffy, diffz;
 
@@ -5077,7 +5031,6 @@ player_t *K_FindJawzTarget(mobj_t *actor, player_t *source)
 
 		// Find the angle, see who's got the best.
 		thisang = actor->angle - R_PointToAngle2(actor->x, actor->y, player->mo->x, player->mo->y);
-
 		if (thisang > ANGLE_180)
 			thisang = InvAngle(thisang);
 
@@ -5274,11 +5227,10 @@ static void K_UpdateEngineSounds(player_t *player, ticcmd_t *cmd)
 static void K_UpdateInvincibilitySounds(player_t *player)
 {
 	INT32 sfxnum = sfx_None;
+	const boolean localplayer = P_IsLocalPlayer(player);
 
 	if (player->mo->health > 0)
 	{
-		const boolean localplayer = P_IsLocalPlayer(player);
-
 		if (player->kartstuff[k_growshrinktimer] > 0 && (!localplayer || cv_growmusic.value == 2)) // Prioritize Grow
 			sfxnum = cv_kartinvinsfx.value ? sfx_alarmg : sfx_kgrow;
 		else if (player->kartstuff[k_invincibilitytimer] > 0 && (!localplayer || cv_supermusic.value == 2))
@@ -5409,7 +5361,6 @@ FUNCINLINE static ATTRINLINE void K_SpawnNormalSpeedLines(player_t *player, bool
 	fast->momx = 3*player->mo->momx/4;
 	fast->momy = 3*player->mo->momy/4;
 	fast->momz = 3*player->mo->momz/4;
-	fast->islocal = !synched;
 	P_SetTarget(&fast->target, player->mo); // easier lua access
 
 	K_MatchGenericExtraFlags(fast, player->mo);
@@ -5756,7 +5707,7 @@ void K_KartPlayerAfterThink(player_t *player)
 		else
 			targ = K_FindJawzTarget(player->mo, player);
 
-		if (!targ || P_MobjWasRemoved(targ->mo))
+		if (!targ || !targ->mo || P_MobjWasRemoved(targ->mo))
 		{
 			player->kartstuff[k_lastjawztarget] = -1;
 			player->kartstuff[k_jawztargetdelay] = 0;
@@ -5818,7 +5769,7 @@ boolean K_CheckPlayersRespawnColliding(INT32 playernum, fixed_t x, fixed_t y)
 static INT16 K_GetKartDriftValue(player_t *player, fixed_t countersteer)
 {
 	INT16 basedrift, driftangle;
-	fixed_t driftweight;
+	fixed_t driftweight = player->kartweight*14; // 12
 
 	// If they aren't drifting or on the ground this doesn't apply
 	if (player->kartstuff[k_drift] == 0 || !P_IsObjectOnGround(player->mo))
@@ -5829,8 +5780,6 @@ static INT16 K_GetKartDriftValue(player_t *player, fixed_t countersteer)
 		return -266*player->kartstuff[k_drift]; // Drift has ended and we are tweaking their angle back a bit
 	}
 
-	driftweight = player->kartweight*14; // 12
-
 	//basedrift = 90*player->kartstuff[k_drift]; // 450
 	//basedrift = 93*player->kartstuff[k_drift] - driftweight*3*player->kartstuff[k_drift]/10; // 447 - 303
 	basedrift = 83*player->kartstuff[k_drift] - (driftweight - 14)*player->kartstuff[k_drift]/5; // 415 - 303
@@ -5841,9 +5790,6 @@ static INT16 K_GetKartDriftValue(player_t *player, fixed_t countersteer)
 
 INT16 K_GetKartTurnValue(player_t *player, INT16 turnvalue)
 {
-	fixed_t p_topspeed, p_curspeed, p_maxspeed;
-	fixed_t adjustangle;
-
 	if (player->spectator)
 		return turnvalue;
 
@@ -5862,10 +5808,10 @@ INT16 K_GetKartTurnValue(player_t *player, INT16 turnvalue)
 		return turnvalue;
 	}
 
-	p_topspeed  = K_GetKartSpeed(player, false);
-	p_curspeed  = min(player->speed, p_topspeed * 2);
-	p_maxspeed  = p_topspeed * 3;
-	adjustangle = FixedDiv((p_maxspeed>>16) - (p_curspeed>>16), (p_maxspeed>>16) + player->kartweight);
+	fixed_t p_topspeed  = K_GetKartSpeed(player, false);
+	fixed_t p_curspeed  = min(player->speed, p_topspeed * 2);
+	fixed_t p_maxspeed  = p_topspeed * 3;
+	fixed_t adjustangle = FixedDiv((p_maxspeed>>16) - (p_curspeed>>16), (p_maxspeed>>16) + player->kartweight);
 
 	turnvalue = FixedMul(turnvalue, adjustangle); // Weight has a small effect on turning
 
@@ -6267,7 +6213,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 
 	K_KartUpdatePosition(player);
 
-	if (LIKELY(!player->exiting))
+	if (!player->exiting)
 	{
 		if (player->kartstuff[k_oldposition] < player->kartstuff[k_position]) // But first, if you lost a place,
 		{
@@ -6847,9 +6793,10 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 
 	K_KartDrift(player, onground);
 
-	if (player->sliproll && ((!player->kartstuff[k_aizdriftstrat]) || (!P_IsObjectOnGround(player->mo)) || (player->kartstuff[k_drift])))
+	if ((!player->kartstuff[k_aizdriftstrat]) || (!P_IsObjectOnGround(player->mo)) || (player->kartstuff[k_drift]))
 	{
-		player->sliproll -= (4*ANG1);
+		if (player->sliproll && (player->sliproll > 0))
+			player->sliproll -= (4*ANG1);
 	}
 
 	// funneh Saturn sprite stuff

src/lua_hooklib.c

@@ -393,16 +393,6 @@ FUNCINLINE static ATTRINLINE boolean prepare_string_hook
 		return false;
 }
 
-static boolean prepare_hud_hook
-(
-		Hook_State * hook,
-		int hook_type
-){
-	return init_hook_type(hook, 0,
-			hook_type, 0, NULL,
-			hudHookIds[hook_type].numHooks);
-}
-
 FUNCINLINE static ATTRINLINE void init_hook_call
 (
 		Hook_State * hook,
@@ -673,16 +663,20 @@ int LUA_HookTiccmd(player_t *player, ticcmd_t *cmd, int hook_type)
 
 void LUA_HookHUD(int hook_type, huddrawlist_h list)
 {
+	const hook_t * map = &hudHookIds[hook_type];
 	Hook_State hook;
-	if (prepare_hud_hook(&hook, hook_type))
+	if (map->numHooks > 0)
 	{
+		start_hook_stack();
+		begin_hook_values(&hook);
+
 		LUA_SetHudHook(hook_type, list);
 
 		hud_running = true; // local hook
 		hud_interpcounter = 0;
 		hud_interpolate = hud_interpstring = hud_interplatch = false;
 		init_hook_call(&hook, 1, res_hud);
-		call_mapped(&hook, &hudHookIds[hook_type]);
+		call_mapped(&hook, map);
 		lua_settop(gL, 0); // destroy le stack!! >:3
 		hud_running = false;
 

src/lua_infolib.c

@@ -181,7 +181,7 @@ static int lib_setState(lua_State *L)
 			switch(lua_type(L, 3))
 			{
 			case LUA_TNIL: // Null? Set the action to nothing, then.
-				state->action = NULL;
+				state->action.acp1 = NULL;
 				break;
 			case LUA_TSTRING: // It's a string, expect the name of a built-in action
 				LUA_SetActionByName(state, lua_tostring(L, 3));
@@ -193,7 +193,7 @@ static int lib_setState(lua_State *L)
 				lua_pushvalue(L, 3); // Bring it to the top of the stack
 				lua_rawset(L, -3); // Set it in the registry
 				lua_pop(L, 1); // pop LREG_STATEACTION
-				state->action = (actionf_p1)A_Lua; // Set the action for the userdata.
+				state->action.acp1 = (actionf_p1)A_Lua; // Set the action for the userdata.
 				break;
 			default: // ?!
 				return luaL_typerror(L, 3, "function");
@@ -251,7 +251,7 @@ boolean LUA_SetLuaAction(void *stv, const char *action)
 	lua_pop(gL, 1); // pop LREG_STATEACTION
 
 	lua_pop(gL, 2); // pop the function and LREG_ACTIONS
-	st->action = (actionf_p1)A_Lua; // Set the action for the userdata.
+	st->action.acp1 = (actionf_p1)A_Lua; // Set the action for the userdata.
 	return true; // action successfully set.
 }
 
@@ -350,9 +350,9 @@ static int state_get(lua_State *L)
 		case state_action:
 		{
 			const char *name;
-			if (!st->action) // Action is NULL.
+			if (!st->action.acp1) // Action is NULL.
 				return 0; // return nil.
-			if (st->action == (actionf_p1)A_Lua) { // This is a Lua function?
+			if (st->action.acp1 == (actionf_p1)A_Lua) { // This is a Lua function?
 				lua_getfield(L, LUA_REGISTRYINDEX, LREG_STATEACTION);
 				I_Assert(lua_istable(L, -1));
 				lua_pushlightuserdata(L, st); // Push the state pointer and
@@ -428,7 +428,7 @@ static int state_set(lua_State *L)
 		switch(lua_type(L, 3))
 		{
 		case LUA_TNIL: // Null? Set the action to nothing, then.
-			st->action = NULL;
+			st->action.acp1 = NULL;
 			break;
 		case LUA_TSTRING: // It's a string, expect the name of a built-in action
 			LUA_SetActionByName(st, lua_tostring(L, 3));
@@ -440,7 +440,7 @@ static int state_set(lua_State *L)
 			lua_pushvalue(L, 3); // Bring it to the top of the stack
 			lua_rawset(L, -3); // Set it in the registry
 			lua_pop(L, 1); // pop LREG_STATEACTION
-			st->action = (actionf_p1)A_Lua; // Set the action for the userdata.
+			st->action.acp1 = (actionf_p1)A_Lua; // Set the action for the userdata.
 			break;
 		default: // ?!
 			return luaL_typerror(L, 3, "function");

src/lua_mathlib.c

@@ -227,4 +227,4 @@ int LUA_MathLib(lua_State *L)
 	lua_pushvalue(L, LUA_GLOBALSINDEX);
 	luaL_register(L, NULL, lib);
 	return 0;
-}
+}

src/lua_mobjlib.c

@@ -150,8 +150,7 @@ static const udata_field_t mobj_fields[] = {
     FIELD(mobj_t, cvmem,               udatalib_getter_int32,      udatalib_setter_int32),
     FIELD(mobj_t, standingslope,       udatalib_getter_slope,      mobj_standingslope_noset),
     FIELD(mobj_t, colorized,           udatalib_getter_boolean,    udatalib_setter_boolean),
-	FIELD(mobj_t, mirrored,            udatalib_getter_boolean,    udatalib_setter_boolean),
-	FIELD(mobj_t, islocal,             udatalib_getter_boolean,    udatalib_setter_boolean),
+	FIELD(mobj_t, mirrored,           udatalib_getter_boolean,    udatalib_setter_boolean),
     { NULL, 0, NULL, NULL },
 };
 #undef FIELD

src/lua_script.c

@@ -1189,7 +1189,7 @@ static void UnArchiveTables(UINT8 **p, boolean network)
 	}
 }
 
-/*void LUA_Step(void)
+void LUA_Step(void)
 {
 	if (!gL)
 		return;
@@ -1200,7 +1200,7 @@ static void UnArchiveTables(UINT8 **p, boolean network)
 		lua_settop(gL, 0);
 		lua_gc(gL, LUA_GCSTEP, 1);
 	}
-}*/
+}
 
 void LUA_Archive(savebuffer_t *save, boolean network)
 {
@@ -1212,7 +1212,7 @@ void LUA_Archive(savebuffer_t *save, boolean network)
 
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
-		if (!playeringame[i] && i > 0) // NEVER skip player 0, this is for dedi servs.
+		if (!playeringame[i] && i > 0)	// NEVER skip player 0, this is for dedi servs.
 			continue;
 		// all players in game will be archived, even if they just add a 0.
 		ArchiveExtVars(&save->p, &players[i], "player");
@@ -1224,7 +1224,7 @@ void LUA_Archive(savebuffer_t *save, boolean network)
 		{
 			for (th = thinkercap.next; th != &thinkercap; th = th->next)
 			{
-				if (th->function != (actionf_p1)P_MobjThinker)
+				if (th->function.acp1 != (actionf_p1)P_MobjThinker)
 					continue;
 
 				// archive function will determine when to skip mobjs,
@@ -1264,18 +1264,15 @@ void LUA_UnArchive(savebuffer_t *save, boolean network)
 	{
 		do {
 			mobjnum = READUINT32(save->p); // read a mobjnum
-
 			for (th = thinkercap.next; th != &thinkercap; th = th->next)
 			{
-				if (th->function != (actionf_p1)P_MobjThinker)
+				if (th->function.acp1 != (actionf_p1)P_MobjThinker)
 					continue;
 
-				if (((mobj_t *)th)->mobjnum != mobjnum) // find matching mobj
-					continue;
-				UnArchiveExtVars(&save->p, th, network); // apply variables
+				if (((mobj_t *)th)->mobjnum == mobjnum) // find matching mobj
+					UnArchiveExtVars(&save->p, th, network); // apply variables
 			}
-
-		} while (mobjnum != UINT32_MAX); // repeat until end of mobjs marker.
+		} while(mobjnum != UINT32_MAX); // repeat until end of mobjs marker.
 
 		LUA_HookNetArchive(NetUnArchive, save); // call the NetArchive hook in unarchive mode
 	}

src/lua_script.h

@@ -10,9 +10,6 @@
 /// \file  lua_script.h
 /// \brief Lua scripting basics
 
-#ifndef LUA_SCRIPT_H
-#define LUA_SCRIPT_H
-
 #include "m_fixed.h"
 #include "doomtype.h"
 #include "d_player.h"
@@ -58,7 +55,7 @@ void LUA_InvalidateUserdata(void *data);
 void LUA_InvalidateLevel(void);
 void LUA_InvalidateMapthings(void);
 void LUA_InvalidatePlayer(player_t *player);
-//void LUA_Step(void);
+void LUA_Step(void);
 void LUA_Archive(savebuffer_t *save, boolean network);
 void LUA_UnArchive(savebuffer_t *save, boolean network);
 
@@ -78,7 +75,7 @@ void COM_Lua_f(void);
 #define LUA_Deprecated(L,this_func,use_instead)\
 {\
 	static UINT8 seen = 0;\
-	if (UNLIKELY(!seen)) {\
+	if (!seen) {\
 		seen = 1;\
 		CONS_Alert(CONS_WARNING,"\"%s\" is deprecated and will be removed.\nUse \"%s\" instead.\n", this_func, use_instead);\
 	}\
@@ -87,7 +84,7 @@ void COM_Lua_f(void);
 #define LUA_LogDeprecated(L,this_func,use_instead)\
 {\
 	static UINT8 seen = 0;\
-	if (UNLIKELY(!seen)) {\
+	if (!seen) {\
 		seen = 1;\
 		CON_LogMessage(va("\"%s\" is deprecated and will be removed.\nUse \"%s\" instead.\n", this_func, use_instead));\
 	}\
@@ -98,10 +95,8 @@ void COM_Lua_f(void);
 #define LUA_UsageWarning(L, warningmsg)\
 {\
 	static UINT8 seen = 0;\
-	if (UNLIKELY(!seen)) {\
+	if (!seen) {\
 		seen = 1;\
 		CONS_Alert(CONS_WARNING,"%s\n", warningmsg);\
 	}\
 }
-
-#endif/*LUA_SCRIPT_H*/

src/lua_thinkerlib.c

@@ -32,7 +32,7 @@ struct iterationState {
 	int next;
 };
 
-FUNCINLINE static ATTRINLINE int iterationState_gc(lua_State *L)
+static int iterationState_gc(lua_State *L)
 {
 	struct iterationState *it = luaL_checkudata(L, -1, META_ITERATIONSTATE);
 	if (it->next != LUA_REFNIL)
@@ -44,7 +44,7 @@ FUNCINLINE static ATTRINLINE int iterationState_gc(lua_State *L)
 }
 
 #define push_thinker(th) {\
-	if ((th)->function == (actionf_p1)P_MobjThinker) \
+	if ((th)->function.acp1 == (actionf_p1)P_MobjThinker) \
 		LUA_PushUserdata(L, (th), META_MOBJ); \
 	else \
 		lua_pushlightuserdata(L, (th)); \
@@ -88,7 +88,7 @@ static int lib_iterateThinkers(lua_State *L)
 		return luaL_error(L, "next thinker invalidated during iteration");
 
 	for (; next != &thinkercap; next = next->next)
-		if (!it->filter || next->function == it->filter)
+		if (!it->filter || next->function.acp1 == it->filter)
 		{
 			push_thinker(next);
 			if (next->next != &thinkercap)
@@ -130,4 +130,4 @@ int LUA_ThinkerLib(lua_State *L)
 		lua_setfield(L, -2, "iterate");
 	lua_setglobal(L, "thinkers");
 	return 0;
-}
+}

src/m_aatree.c

@@ -20,17 +20,17 @@
 
 typedef struct aatree_node_s
 {
-	INT32 key;
-	INT32 depth;
-	void *value;
+	INT32	level;
+	INT32	key;
+	void*	value;
 
 	struct aatree_node_s *left, *right;
 } aatree_node_t;
 
 struct aatree_s
 {
-	aatree_node_t *root;
-	UINT32 flags;
+	aatree_node_t	*root;
+	UINT32		flags;
 };
 
 aatree_t *M_AATreeAlloc(UINT32 flags)
@@ -56,48 +56,40 @@ void M_AATreeFree(aatree_t *aatree)
 	Z_Free(aatree);
 }
 
-static aatree_node_t *M_AATreeRotateRight(aatree_node_t *node)
+static aatree_node_t *M_AATreeSkew(aatree_node_t *node)
 {
-	aatree_node_t *newnode = node->left;
-	aatree_node_t *tmp = newnode->right;
-	newnode->right = node;
-	node->left = tmp;
-	return newnode;
+	if (node && node->left && node->left->level == node->level)
+	{
+		// Not allowed: horizontal left-link. Reverse the
+		// horizontal link and hook the orphan back in.
+		aatree_node_t *oldleft = node->left;
+		node->left = oldleft->right;
+		oldleft->right = node;
+
+		return oldleft;
+	}
+
+	// No change needed.
+	return node;
 }
 
-static aatree_node_t *M_AATreeRotateLeft(aatree_node_t *node)
+static aatree_node_t *M_AATreeSplit(aatree_node_t *node)
 {
-	aatree_node_t *newnode = node->right;
-	aatree_node_t *tmp = newnode->left;
-	newnode->left = node;
-	node->right = tmp;
-	return newnode;
-}
-
-static aatree_node_t *M_AATreeRebalance(aatree_node_t *node)
-{
-	INT32 balance;
-	if (node->left == NULL && node->right == NULL)
-		return node;
-	if (node->left == NULL)
-		balance = -node->right->depth;
-	else if (node->right == NULL)
-		balance = node->left->depth;
-	else
+	if (node && node->right && node->right->right && node->level == node->right->right->level)
 	{
-		I_Assert(node->left->key < node->right->key);
-		balance = node->left->depth - node->right->depth;
-	}
+		// Not allowed: two consecutive horizontal right-links.
+		// The middle one becomes the new root at this point,
+		// with suitable adjustments below.
 
-	if (balance > 1)
-	{
-		return M_AATreeRotateRight(node);
-	}
-	else if (balance < -1)
-	{
-		return M_AATreeRotateLeft(node);
+		aatree_node_t *oldright = node->right;
+		node->right = oldright->left;
+		oldright->left = node;
+		oldright->level++;
+
+		return oldright;
 	}
 
+	// No change needed.
 	return node;
 }
 
@@ -107,11 +99,11 @@ static aatree_node_t *M_AATreeSet_Node(aatree_node_t *node, UINT32 flags, INT32
 	{
 		// Nothing here, so just add where we are
 		node = Z_Malloc(sizeof (aatree_node_t), PU_STATIC, NULL);
+		node->level = 1;
 		node->key = key;
 		if (value && (flags & AATREE_ZUSER)) Z_SetUser(value, &node->value);
 		else node->value = value;
 		node->left = node->right = NULL;
-		node->depth = 1;
 	}
 	else
 	{
@@ -125,17 +117,8 @@ static aatree_node_t *M_AATreeSet_Node(aatree_node_t *node, UINT32 flags, INT32
 			else node->value = value;
 		}
 
-		node = M_AATreeRebalance(node);
-		if (node->left == NULL && node->right == NULL)
-			node->depth = 1;
-		else if (node->left == NULL)
-			node->depth = node->right->depth + 1;
-		else if (node->right == NULL)
-			node->depth = node->left->depth + 1;
-		else if (node->left->depth > node->right->depth)
-			node->depth = node->left->depth + 1;
-		else
-			node->depth = node->right->depth + 1;
+		node = M_AATreeSkew(node);
+		node = M_AATreeSplit(node);
 	}
 
 	return node;

src/m_cheat.c

@@ -732,7 +732,7 @@ static mapthing_t *OP_CreateNewMapThing(player_t *player, UINT16 type, boolean c
 
 		for (th = thinkercap.next; th != &thinkercap; th = th->next)
 		{
-			if (th->function != (actionf_p1)P_MobjThinker)
+			if (th->function.acp1 != (actionf_p1)P_MobjThinker)
 				continue;
 
 			mo = (mobj_t *)th;

src/m_emotes.cpp

@@ -1,262 +0,0 @@
-#include <map>
-#include <string>
-#include <sstream>
-#include <cstring>
-
-#include "m_emotes.h"
-
-extern "C" {
-#include "w_wad.h"
-#include "z_zone.h"
-#include "hu_stuff.h"
-#include "v_video.h"
-}
-
-consvar_t cv_emotes = {"emotes", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};;
-
-static std::map<std::string, emote_t> emotes;
-
-// TODO - Would be really nice to generalize soc-like file parsing and not reimplement it 100 times :)))))
-void M_LoadEmotes(UINT16 wadnum)
-{
-	UINT16 lumpnum = W_CheckNumForNamePwad("EMOTES", wadnum, 0);
-
-	if (lumpnum == INT16_MAX)
-		return;
-
-	char *lump = static_cast<char*>(W_CacheLumpNumPwad(wadnum, lumpnum, PU_CACHE));
-	size_t size = W_LumpLengthPwad(wadnum, lumpnum);
-
-	std::istringstream file(std::string(lump, size));
-	std::string line;
-
-	emote_t *emote = nullptr;
-	std::string emote_name;
-
-	// Just smol lambda to remove all the trailing chars we might not want
-	auto trim = [](std::string &str) {
-		str.erase(0, str.find_first_not_of(" \t\n\r\f\v"));
-		str.erase(str.find_last_not_of(" \t\n\r\f\v")+1);
-	};
-
-	int numemotes = 0;
-	int linenum = 0;
-
-	while (std::getline(file, line))
-	{
-		++linenum;
-
-		trim(line);
-
-		if (line.empty())
-			continue;
-
-		size_t split = line.find('=');
-
-		// Didn't find the =, means we're about to parse `Emote <name>`
-		if (split == line.npos)
-		{
-			split = line.find(' ');
-
-			if (split == line.npos)
-			{
-				CONS_Alert(CONS_WARNING, "EMOTES: Unrecognized line. (file %s, line %d)\n", wadfiles[wadnum]->filename, linenum);
-				continue;
-			}
-
-			if (strnicmp(line.c_str(), "emote", 5))
-			{
-				CONS_Alert(CONS_WARNING, "EMOTES: 'Emote' expected. (file %s, line %d)\n", wadfiles[wadnum]->filename, linenum);
-				continue;
-			}
-
-			emote_name = line.substr(split+1);
-
-			if (emote_name.find_first_of(" \t\n\r\f\v:") != emote_name.npos)
-			{
-				CONS_Alert(CONS_WARNING, "EMOTES: Emote name cannot contain spaces or ':' symbols. (file %s, line %d)\n", wadfiles[wadnum]->filename, linenum);
-				continue;
-			}
-
-			if (emote_name.size() > MAXEMOTENAME)
-			{
-				CONS_Alert(CONS_WARNING, "EMOTES: Emote name is too long, truncating. (file %s, line %d)\n", wadfiles[wadnum]->filename, linenum);
-				emote_name = emote_name.substr(0, MAXEMOTENAME);
-			}
-
-			emote = &emotes[emote_name];
-			strlcpy(emote->name, emote_name.c_str(), MAXEMOTENAME);
-
-			emote->timeperframe = 1;
-			emote->numframes = 0;
-			std::memset(emote->frames, 0, sizeof(emote->frames));
-
-			++numemotes;
-		}
-		else if (emote)
-		{
-			std::string field = line.substr(0, split);
-			std::string value = line.substr(split+1);
-
-			trim(field);
-			trim(value);
-
-			if (stricmp(field.c_str(), "frames") == 0)
-			{
-				UINT8 numframes = 0;
-
-				auto copy_frame = [&] {
-					if (numframes == MAXEMOTEFRAMES)
-					{
-						CONS_Alert(CONS_WARNING, "EMOTES: Too many frames. (file %s, line %d)", wadfiles[wadnum]->filename, linenum);
-						return false;
-					}
-
-					size_t list_split = value.find(',');
-					std::string framelumpname = value.substr(0, list_split);
-					trim(framelumpname);
-
-					if (list_split == value.npos)
-						value = "";
-					else
-						value = value.substr(list_split+1, value.npos);
-
-					// End of list of frames
-					if (framelumpname.size() == 0)
-						return false;
-
-					if (framelumpname.size() > 8)
-					{
-						CONS_Alert(CONS_WARNING, "EMOTES: Frame %d name is too long. (file %s, line %d)", numframes, wadfiles[wadnum]->filename, linenum);
-						framelumpname = framelumpname.substr(0, 8);
-					}
-
-					std::strncpy(emote->frames[numframes], framelumpname.c_str(), framelumpname.size()+1);
-
-					++numframes;
-
-					return true;
-				};
-
-				while (copy_frame()) {}
-
-				if (numframes == 0)
-				{
-					CONS_Alert(CONS_WARNING, "EMOTES: Expected list of frames. (file %s, line %d)", wadfiles[wadnum]->filename, linenum);
-				}
-
-				emote->numframes = numframes;
-			}
-			else if (stricmp(field.c_str(), "timeperframe") == 0)
-			{
-				emote->timeperframe = std::stoi(value);
-
-				if (emote->timeperframe <= 0)
-				{
-					emote->timeperframe = 1;
-					CONS_Alert(CONS_WARNING, "EMOTES: Bad value for 'timeperframe'. (file %s, line %d)", wadfiles[wadnum]->filename, linenum);
-				}
-			}
-			else
-			{
-				CONS_Alert(CONS_WARNING, "EMOTES: Unrecognized field '%s'. (file %s, line %d)", field.c_str(), wadfiles[wadnum]->filename, linenum);
-			}
-		}
-		else
-		{
-			CONS_Alert(CONS_WARNING, "EMOTES: Unrecognized line. (file %s, line %d)\n", wadfiles[wadnum]->filename, linenum);
-		}
-	}
-
-	CONS_Printf("Added %d emotes\n", numemotes);
-}
-
-void M_InitEmotes(void)
-{
-	UINT16 i;
-	for (i = 0; i < numwadfiles; i++)
-		M_LoadEmotes(i);
-}
-
-emote_t *M_FindEmote(const char *name, int len, int skip)
-{
-	if (!cv_emotes.value)
-		return nullptr;
-
-	char query[MAXEMOTENAME+1] = {0};
-	std::strncpy(query, name, std::min(len, MAXEMOTENAME));
-
-	for (auto &pair: emotes)
-	{
-		if (pair.first.rfind(query, 0, std::min(len, MAXEMOTENAME)) != 0)
-			continue;
-
-		if (skip > 0)
-		{
-			--skip;
-			continue;
-		}
-
-		return &pair.second;
-	}
-
-	return nullptr;
-}
-
-emote_t *M_VerifyEmote(const char *name, int *emotelen)
-{
-	if (*name != ':')
-		return nullptr;
-
-	if (!cv_emotes.value)
-		return nullptr;
-
-	const char *p = name+1; // skip ':'
-	emote_t *match = nullptr;
-
-	while (*p && (p - name) < MAXEMOTENAME)
-	{
-		if (*p == ':')
-		{
-			std::string checkname = std::string(name+1, (p-name)-1);
-			auto it = emotes.find(checkname);
-
-			if (it != emotes.end())
-				match = &it->second;
-
-			break;
-		}
-
-		++p;
-	}
-
-	if (match && emotelen)
-		*emotelen = p-name+1;
-
-	return match;
-}
-
-void M_DrawEmote(INT32 x, INT32 y, emote_t *emote, tic_t anim, INT32 flags)
-{
-	if (emote->numframes == 0)
-		return;
-
-	const char *lumpname = emote->frames[(anim/emote->timeperframe) % emote->numframes];
-	patch_t *emotepatch = (patch_t*)W_CachePatchName(lumpname, PU_CACHE);
-
-	const int CHARHEIGHT = 6;
-
-	fixed_t scale = FRACUNIT;
-
-	x *= FRACUNIT;
-	y *= FRACUNIT;
-
-	if (emotepatch->width > EMOTEWIDTH)
-		scale = (FRACUNIT/emotepatch->width)*EMOTEWIDTH;
-	else if (emotepatch->width < EMOTEWIDTH)
-		x += (EMOTEWIDTH-emotepatch->width)*FRACUNIT/2;
-
-	y -= (scale*emotepatch->height-CHARHEIGHT*FRACUNIT)/2;
-
-	V_DrawFixedPatch(x, y, scale, flags, emotepatch, NULL);
-}

src/m_emotes.h

@@ -1,48 +0,0 @@
-#ifndef __M_EMOTES__
-#define __M_EMOTES__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "doomdef.h"
-#include "command.h"
-
-extern consvar_t cv_emotes;
-
-#define MAXEMOTENAME 32
-#define MAXEMOTEFRAMES 32
-#define EMOTEWIDTH 6
-
-typedef struct emote_s {
-	char name[MAXEMOTENAME+1];
-	char frames[MAXEMOTEFRAMES][9];
-	UINT8 numframes;
-	tic_t timeperframe;
-} emote_t;
-
-// Reads and adds emotes from EMOTES lump, with syntax similar to soc
-void M_LoadEmotes(UINT16 wadnum);
-
-// Load emotes from all base wads
-void M_InitEmotes(void);
-
-// Finds first matching emote, ignoring first few matches
-emote_t *M_FindEmote(const char *name, int len, int skips);
-
-// If first character is not ':', instantly returns null
-// Starts from ':' character, goes until it finds ':' or end of string
-// If end of string is found, or closing ':' is found but resulting emote name doesn't exist,
-// it returns null, otherwise it returns emote and stores into *emotelen how much characters
-// needs to be skipped to get past emote name
-emote_t *M_VerifyEmote(const char *name, int *emotelen);
-
-// Draw the emote, anim should be some kind of timer ticking every game tic
-// for animated emotes
-void M_DrawEmote(INT32 x, INT32 y, emote_t *emote, tic_t anim, INT32 flags);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
-#endif // __M_EMOTES__

src/m_misc.c

@@ -2294,50 +2294,6 @@ void M_MkdirEach(const char *path, int start, int mode)
 	M_MkdirEachUntil(path, start, -1, mode);
 }
 
-// Hashes some message using FNV-1a
-#define FNV1A_OFFSET_BASIS 0x811C9DC5
-#define FNV1A_PRIME        0x01000193
-
-UINT32 FNV1a_Hash(const char *message, size_t size)
-{
-	UINT32 hash = FNV1A_OFFSET_BASIS;
-
-	for (size_t i = 0; i < size; i++)
-	{
-		hash ^= message[i];
-		hash *= FNV1A_PRIME;
-	}
-
-	return hash;
-}
-
-UINT32 FNV1a_HashString(const char *message)
-{
-	UINT32 hash = FNV1A_OFFSET_BASIS;
-
-	while (*message)
-	{
-		hash ^= *message;
-		hash *= FNV1A_PRIME;
-		message++;
-	}
-
-	return hash;
-}
-
-UINT32 FNV1a_HashLowercaseString(const char *message)
-{
-	UINT32 hash = FNV1A_OFFSET_BASIS;
-
-	while (*message)
-	{
-		hash ^= tolower(*message);
-		hash *= FNV1A_PRIME;
-		message++;
-	}
-
-	return hash;
-}
 
 #ifdef __cplusplus
 } // extern "C"

src/m_misc.h

@@ -124,11 +124,6 @@ const char * M_Ftrim (double);
 // counting bits, for weapon ammo code, usually
 FUNCMATH UINT8 M_CountBits(UINT32 num, UINT8 size);
 
-// Hashes some message using FNV-1a
-UINT32 FNV1a_Hash(const char *message, size_t size);
-UINT32 FNV1a_HashString(const char *message);
-UINT32 FNV1a_HashLowercaseString(const char *message);
-
 #include "w_wad.h"
 extern char configfile[MAX_WADPATH];
 

src/m_perfstats.c

@@ -590,9 +590,9 @@ static void PS_CountThinkers(void)
 	{
 		ps_thinkercount.value.i++;
 
-		if (thinker->function == (actionf_p1)P_RemoveThinkerDelayed)
+		if (thinker->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
 			ps_removecount.value.i++;
-		else if (thinker->function == (actionf_p1)P_MobjThinker)
+		else if (thinker->function.acp1 == (actionf_p1)P_MobjThinker)
 		{
 			mobj_t *mobj = (mobj_t*)thinker;
 			ps_mobjcount.value.i++;
@@ -609,7 +609,7 @@ static void PS_CountThinkers(void)
 
 	for (thinker = precipcap.next; thinker != &precipcap; thinker = thinker->next)
 	{
-		if (thinker->function != (actionf_p1)P_NullPrecipThinker)
+		if (thinker->function.acp1 != (actionf_p1)P_NullPrecipThinker)
 			continue; // not a precipmobj thinker
 
 		ps_precipcount.value.i++;
@@ -620,7 +620,7 @@ static void PS_CountThinkers(void)
 		for (thinker = thlist[i].next; thinker != &thlist[i]; thinker = thinker->next)
 		{
 			ps_thinkercount.value.i++;
-			if (thinker->function == (actionf_p1)P_RemoveThinkerDelayed)
+			if (thinker->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
 				ps_removecount.value.i++;
 			else if (i == THINK_POLYOBJ)
 				ps_polythcount.value.i++;
@@ -628,7 +628,7 @@ static void PS_CountThinkers(void)
 				ps_mainthcount.value.i++;
 			else if (i == THINK_MOBJ)
 			{
-				if (thinker->function == (actionf_p1)P_MobjThinker)
+				if (thinker->function.acp1 == (actionf_p1)P_MobjThinker)
 				{
 					mobj_t *mobj = (mobj_t*)thinker;
 					ps_mobjcount.value.i++;
@@ -739,7 +739,7 @@ static void PS_DrawDescriptorHeader(void)
 		int samples_left = max(ps_frame_samples_left, ps_tick_samples_left);
 		int x, y;
 
-		if (cv_perfstats.value >= 3)
+		if (cv_perfstats.value >= 3)		
 		{
 			x = 2;
 			y = 0;
@@ -892,7 +892,7 @@ static void draw_think_frame_stats(int hook_length, ps_hookinfo_t *hook)
 
 	PS_DrawDescriptorHeader();
 
-	for (i = 0; i < hook_length; i++)
+	for (i = 0; i < hook_length; i++)	
 	{
 #define NEXT_ROW() y += HEIGHT;
 
@@ -1010,7 +1010,7 @@ void M_DrawPerfStats(void)
 		// tics when frame skips happen
 		PS_DrawGameLogicStats();
 	}
-	else if (cv_perfstats.value >= 3) // lua thinkframe
+	else if (cv_perfstats.value >= 3) // lua thinkframe	
 	{
 		if (!PS_IsLevelActive())
 			return;

src/m_textinput.c

@@ -130,82 +130,6 @@ static void M_TextInputPaste(textinput_t *input)
 		M_TextInputAddString(input, paste);
 }
 
-static void M_TextInputLeft(textinput_t *input, boolean emotes)
-{
-	// Just do it simple way if possible
-	if (!emotes || input->cursor < 2 || input->buffer[input->cursor-1] != ':')
-	{
-		if (input->cursor != 0)
-			--input->cursor;
-		return;
-	}
-
-	// Otherwise we need to check if we have to skip emote
-	size_t start = input->cursor-2;
-
-	while (input->buffer[start] != ':')
-	{
-		// We reached start of string and didn't find ':' symbol, thats definitely not an emote
-		// so just do it simple way
-		if (start == 0)
-		{
-			M_TextInputLeft(input, false);
-			return;
-		}
-
-		--start;
-	}
-
-	int emotelen = 0;
-	if (M_VerifyEmote(input->buffer+start, &emotelen))
-		input->cursor -= emotelen; // also skip the :
-	else
-		M_TextInputLeft(input, false); // Not a valid emote, do the simple thing
-}
-
-static void M_TextInputRight(textinput_t *input, boolean emotes)
-{
-	// Just do it simple way if possible
-	if (!emotes || input->cursor == input->length || input->buffer[input->cursor] != ':')
-	{
-		if (input->cursor < input->length)
-			++input->cursor;
-		return;
-	}
-
-	int emotelen = 0;
-	if (M_VerifyEmote(input->buffer+input->cursor, &emotelen))
-		input->cursor += emotelen; // Also skip the :
-	else
-		M_TextInputRight(input, false); // Not a valid emote, do the simple thing
-}
-
-// Check if we're inside a valid emote
-static boolean M_TextInputCheckEmote(textinput_t *input)
-{
-	int start = input->cursor;
-
-	// Definitely not an emote
-	if (start == 0)
-		return false;
-
-	// Might be closing :, need to skip it just in case
-	if (input->buffer[start] == ':')
-		--start;
-
-	while (input->buffer[start] != ':')
-	{
-		// No ':' found, definitely not inside emote
-		if (start == 0)
-			return false;
-
-		--start;
-	}
-
-	// Found what may be emote start, now we can check
-	return M_VerifyEmote(input->buffer+start, NULL) != NULL;
-}
-
 void M_TextInputInit(textinput_t *input, char *buffer, size_t buffer_size)
 {
 	input->buffer = buffer;
@@ -232,7 +156,7 @@ void M_TextInputSetString(textinput_t *input, const char *c)
 	input->cursor = input->select = input->length = strlen(c);
 }
 
-static boolean M_TextInputHandleBase(textinput_t *input, INT32 key, boolean emotes)
+boolean M_TextInputHandle(textinput_t *input, INT32 key)
 {
 	if (key == KEY_LSHIFT || key == KEY_RSHIFT
 	 || key == KEY_LCTRL || key == KEY_RCTRL
@@ -317,14 +241,16 @@ static boolean M_TextInputHandleBase(textinput_t *input, INT32 key, boolean emot
 
 	if (key == KEY_LEFTARROW)
 	{
-		M_TextInputLeft(input, emotes);
+		if (input->cursor != 0)
+			--input->cursor;
 		if (!shiftdown)
 			input->select = input->cursor;
 		return true;
 	}
 	else if (key == KEY_RIGHTARROW)
 	{
-		M_TextInputRight(input, emotes);
+		if (input->cursor < input->length)
+			++input->cursor;
 		if (!shiftdown)
 			input->select = input->cursor;
 		return true;
@@ -394,96 +320,6 @@ static boolean M_TextInputHandleBase(textinput_t *input, INT32 key, boolean emot
 	return true;
 }
 
-// Just an alias, more or less
-boolean M_TextInputHandle(textinput_t *input, INT32 key)
-{
-	return M_TextInputHandleBase(input, key, false);
-}
-
-boolean M_TextInputHandleEmotes(textinput_t *input, INT32 key, emote_t *suggestions[], int maxsuggestions)
-{
-	boolean ret = M_TextInputHandleBase(input, key, true);
-
-	// After this handled key we ended up inside an emote, lets fix that
-	if (M_TextInputCheckEmote(input))
-		M_TextInputToWordEnd(input, !shiftdown);
-
-	// Always clear the first entry
-	suggestions[0] = NULL;
-
-	// For autocomplete
-	int emotestart = 0;
-
-	// Try find suggestions for emote names
-	for (int i = input->cursor-1; i >= 0 && input->cursor-i <= MAXEMOTENAME; --i)
-	{
-		// Space can't be part of emote name
-		if (isspace(input->buffer[i]))
-			break;
-
-		// Found a :, try suggest emotes
-		if (input->buffer[i] == ':')
-		{
-			emotestart = i+1;
-			// ...But only if we typed at least something
-			if ((int)input->cursor-(i-1) < 3)
-				break;
-
-			for (int skip = 0; skip < maxsuggestions; ++skip)
-			{
-				suggestions[skip] = M_FindEmote(input->buffer+i+1, input->cursor-i-1, skip);
-
-				// No more suggestions
-				if (!suggestions[skip])
-					break;
-			}
-
-			// In any case, we found what we wanted, can exit the loop now
-			break;
-		}
-	}
-
-	// If we suggest emotes, try autocomplete
-	if (key == '\t' && suggestions[0])
-	{
-		int pos = (input->cursor-emotestart);
-		boolean autocomplete = true;
-
-		while (autocomplete)
-		{
-			// Check if current character matches for all suggestions
-			char c = suggestions[0]->name[pos];
-
-			// End of string reached
-			if (!c)
-				break;
-
-			for (int i = 1; i < maxsuggestions && suggestions[i]; ++i)
-			{
-				if (suggestions[i]->name[pos] != c)
-				{
-					autocomplete = false;
-					break;
-				}
-			}
-
-			++pos;
-
-			if (autocomplete)
-				M_TextInputAddChar(input, c);
-		}
-
-		// This was the only suggestion, finish autocomplete with a ':' and clear suggestions
-		if (maxsuggestions == 1 || !suggestions[1])
-		{
-			M_TextInputAddChar(input, ':');
-			suggestions[0] = NULL;
-		}
-	}
-
-	return ret;
-}
-
 void M_DrawTextInputScroll(INT32 x, INT32 y, textinput_t *input, INT32 flags, INT32 MAXINPUTWIDTH)
 {
 	if (renderisnewtic)

src/m_textinput.h

@@ -2,7 +2,6 @@
 #define __M_TEXTINPUT__
 
 #include "doomtype.h"
-#include "m_emotes.h" // M_VerifyEmote, M_FindEmote
 
 typedef struct textinput_s {
 	size_t cursor;
@@ -23,10 +22,6 @@ void M_TextInputSetString(textinput_t *input, const char *c);
 
 boolean M_TextInputHandle(textinput_t *input, INT32 key);
 
-// Does everything same as M_TextInputHandle, but also handles emotes in input string
-// If currently typing something that looks like an existing emote, return suggestions for it
-boolean M_TextInputHandleEmotes(textinput_t *input, INT32 key, emote_t *suggestions[], int maxsuggestions);
-
 #define M_DrawTextInput(x, y, input, flags) M_DrawTextInputScroll((x), (y), (input), (flags), ((input)->buffer_size-1)*8)
 void M_DrawTextInputScroll(INT32 x, INT32 y, textinput_t *input, INT32 flags, INT32 MAXINPUTWIDTH);
 

src/mserv.h

@@ -30,11 +30,7 @@ typedef union
 typedef struct
 {
 	msg_header_t header;
-#ifndef HAVE_IPV6
 	char ip[16];
-#else
-	char ip[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"];
-#endif
 	char port[8];
 	char contact[32];
 	char version[8]; // format is: x.yy.z (like 1.30.2 or 1.31)

src/p_ceilng.c

@@ -412,7 +412,7 @@ INT32 EV_DoCeiling(line_t *line, ceiling_e type)
 		ceiling = Z_Calloc(sizeof (*ceiling), PU_LEVSPEC, NULL);
 		P_AddThinker(&ceiling->thinker);
 		sec->ceilingdata = ceiling;
-		ceiling->thinker.function = (actionf_p1)T_MoveCeiling;
+		ceiling->thinker.function.acp1 = (actionf_p1)T_MoveCeiling;
 		ceiling->sector = sec;
 		ceiling->crush = false;
 		ceiling->sourceline = (INT32)(line-lines);
@@ -635,7 +635,7 @@ INT32 EV_DoCrush(line_t *line, ceiling_e type)
 		ceiling = Z_Calloc(sizeof (*ceiling), PU_LEVSPEC, NULL);
 		P_AddThinker(&ceiling->thinker);
 		sec->ceilingdata = ceiling;
-		ceiling->thinker.function = (actionf_p1)T_CrushCeiling;
+		ceiling->thinker.function.acp1 = (actionf_p1)T_CrushCeiling;
 		ceiling->sector = sec;
 		ceiling->crush = true;
 		ceiling->sourceline = (INT32)(line-lines);

src/p_floor.c

@@ -2483,7 +2483,7 @@ void T_CameraScanner(elevator_t *elevator)
 
 	for (UINT8 i = 0; i <= splitscreen; i++)
 	{
-		if (P_MobjWasRemoved(players[displayplayers[i]].mo))
+		if (!players[displayplayers[i]].mo || P_MobjWasRemoved(players[displayplayers[i]].mo))
 			continue;
 
 		if (players[displayplayers[i]].mo->subsector->sector == elevator->actionsector)
@@ -2545,7 +2545,7 @@ INT32 EV_DoFloor(line_t *line, floor_e floortype)
 		sec->floordata = dofloor;
 
 		// set up some generic aspects of the floormove_t
-		dofloor->thinker.function = (actionf_p1)T_MoveFloor;
+		dofloor->thinker.function.acp1 = (actionf_p1)T_MoveFloor;
 		dofloor->type = floortype;
 		dofloor->crush = false; // default: types that crush will change this
 		dofloor->sector = sec;
@@ -2766,7 +2766,7 @@ INT32 EV_DoElevator(line_t *line, elevator_e elevtype, boolean customspeed)
 		P_AddThinker(&elevator->thinker);
 		sec->floordata = elevator;
 		sec->ceilingdata = elevator;
-		elevator->thinker.function = (actionf_p1)T_MoveElevator;
+		elevator->thinker.function.acp1 = (actionf_p1)T_MoveElevator;
 		elevator->type = elevtype;
 		elevator->sourceline = line;
 		elevator->distance = 1; // Always crush unless otherwise
@@ -2954,7 +2954,7 @@ INT32 EV_BounceSector(sector_t *sec, fixed_t momz, line_t *sourceline)
 	bouncer = Z_Calloc(sizeof (*bouncer), PU_LEVSPEC, NULL);
 	P_AddThinker(&bouncer->thinker);
 	sec->ceilingdata = bouncer;
-	bouncer->thinker.function = (actionf_p1)T_BounceCheese;
+	bouncer->thinker.function.acp1 = (actionf_p1)T_BounceCheese;
 
 	// set up the fields according to the type of elevator action
 	bouncer->sector = sec;
@@ -2991,7 +2991,7 @@ INT32 EV_DoContinuousFall(sector_t *sec, sector_t *backsector, fixed_t spd, bool
 	// create and initialize new thinker
 	faller = Z_Calloc(sizeof (*faller), PU_LEVSPEC, NULL);
 	P_AddThinker(&faller->thinker);
-	faller->thinker.function = (actionf_p1)T_ContinuousFalling;
+	faller->thinker.function.acp1 = (actionf_p1)T_ContinuousFalling;
 
 	// set up the fields
 	faller->sector = sec;
@@ -3044,7 +3044,7 @@ INT32 EV_StartCrumble(sector_t *sec, ffloor_t *rover, boolean floating,
 	// create and initialize new elevator thinker
 	elevator = Z_Calloc(sizeof (*elevator), PU_LEVSPEC, NULL);
 	P_AddThinker(&elevator->thinker);
-	elevator->thinker.function = (actionf_p1)T_StartCrumble;
+	elevator->thinker.function.acp1 = (actionf_p1)T_StartCrumble;
 
 	// Does this crumbler return?
 	if (crumblereturn)
@@ -3123,7 +3123,7 @@ INT32 EV_MarioBlock(sector_t *sec, sector_t *roversector, fixed_t topheight, mob
 		P_AddThinker(&block->thinker);
 		sec->floordata = block;
 		sec->ceilingdata = block;
-		block->thinker.function = (actionf_p1)T_MarioBlock;
+		block->thinker.function.acp1 = (actionf_p1)T_MarioBlock;
 
 		// Set up the fields
 		block->sector = sec;

src/p_inter.c

@@ -473,7 +473,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 			if (player->spectator)
 				return;
 
-			if (!P_MobjWasRemoved(special->tracer) && toucher == special->tracer)
+			if (special->tracer && !P_MobjWasRemoved(special->tracer) && toucher == special->tracer)
 			{
 				mobj_t *spbexplode;
 
@@ -487,7 +487,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 
 				spbexplode = P_SpawnMobj(toucher->x, toucher->y, toucher->z, MT_SPBEXPLOSION);
 				spbexplode->extravalue1 = 1; // Tell K_ExplodePlayer to use extra knockback
-				if (!P_MobjWasRemoved(special->target))
+				if (special->target && !P_MobjWasRemoved(special->target))
 					P_SetTarget(&spbexplode->target, special->target);
 
 				P_RemoveMobj(special);
@@ -496,7 +496,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 				K_SpinPlayer(player, special->target, 0, special, false);
 			return;
 		case MT_SMK_MOLE:
-			if (!P_MobjWasRemoved(special->target))
+			if (special->target && !P_MobjWasRemoved(special->target))
 				return;
 
 			if (special->health <= 0 || toucher->health <= 0)
@@ -587,7 +587,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 			special->momx = special->momy = special->momz = 0;
 			P_GivePlayerRings(player, 1);
 
-			if (UNLIKELY((maptol & TOL_NIGHTS) && special->type != MT_FLINGRING))
+			if ((maptol & TOL_NIGHTS) && special->type != MT_FLINGRING)
 				P_DoNightsScore(player);
 			break;
 
@@ -599,7 +599,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 			special->momx = special->momy = 0;
 			P_GivePlayerRings(player, 1);
 
-			if (UNLIKELY((maptol & TOL_NIGHTS) && special->type != MT_FLINGCOIN))
+			if ((maptol & TOL_NIGHTS) && special->type != MT_FLINGCOIN)
 				P_DoNightsScore(player);
 			break;
 		case MT_BLUEBALL:
@@ -615,7 +615,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 			else
 				special->scalespeed = 4*FRACUNIT/5;
 
-			if (UNLIKELY(maptol & TOL_NIGHTS))
+			if (maptol & TOL_NIGHTS)
 				P_DoNightsScore(player);
 			break;
 		case MT_AUTOPICKUP:
@@ -832,7 +832,6 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 			if (player->bumpertime < TICRATE/4)
 			{
 				S_StartSound(toucher, special->info->seesound);
-
 				if (player->pflags & PF_NIGHTSMODE)
 				{
 					player->bumpertime = TICRATE/2;
@@ -962,7 +961,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 				// scan the remaining thinkers to find koopa
 				for (th = thinkercap.next; th != &thinkercap; th = th->next)
 				{
-					if (th->function != (actionf_p1)P_MobjThinker)
+					if (th->function.acp1 != (actionf_p1)P_MobjThinker)
 						continue;
 
 					mo2 = (mobj_t *)th;
@@ -1227,9 +1226,9 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 			return; // SRB2kart - don't need bubbles mucking with the player
 			if ((player->powers[pw_shield] & SH_NOSTACK) == SH_ELEMENTAL)
 				return;
-			if (UNLIKELY(maptol & TOL_NIGHTS))
+			if (maptol & TOL_NIGHTS)
 				return;
-			if (UNLIKELY(mariomode))
+			if (mariomode)
 				return;
 			else if (toucher->eflags & MFE_VERTICALFLIP)
 			{
@@ -1766,7 +1765,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
 		case MT_SMK_ICEBLOCK:
 			{
 				mobj_t *cur = target->hnext;
-				while (!P_MobjWasRemoved(cur))
+				while (cur && !P_MobjWasRemoved(cur))
 				{
 					P_SetMobjState(cur, S_SMK_ICEBLOCK2);
 					cur = cur->hnext;
@@ -1817,7 +1816,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
 		// this can happen if the boss was hurt earlier than expected
 		for (th = thinkercap.next; th != &thinkercap; th = th->next)
 		{
-			if (th->function != (actionf_p1)P_MobjThinker)
+			if (th->function.acp1 != (actionf_p1)P_MobjThinker)
 				continue;
 
 			mo = (mobj_t *)th;
@@ -1839,14 +1838,14 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
 	// kill tracer
 	if (target->type == MT_FROGGER)
 	{
-		if (!P_MobjWasRemoved(target->tracer))
+		if (target->tracer && !P_MobjWasRemoved(target->tracer))
 			P_KillMobj(target->tracer, inflictor, source);
 	}
 
 	if (target->type == MT_FROGGER || target->type == MT_ROBRA_HEAD || target->type == MT_BLUEROBRA_HEAD) // clean hnext list
 	{
 		mobj_t *cur = target->hnext;
-		while (!P_MobjWasRemoved(cur))
+		while (cur && !P_MobjWasRemoved(cur))
 		{
 			P_KillMobj(cur, inflictor, source);
 			cur = cur->hnext;
@@ -2353,11 +2352,11 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
 			if (player->exiting)
 				return false;
 
-			if (UNLIKELY(!(target->player->pflags & (PF_NIGHTSMODE|PF_NIGHTSFALL)) && (maptol & TOL_NIGHTS)))
+			if (!(target->player->pflags & (PF_NIGHTSMODE|PF_NIGHTSFALL)) && (maptol & TOL_NIGHTS))
 				return false;
 		}
 
-		if (UNLIKELY(player->pflags & PF_NIGHTSMODE)) // NiGHTS damage handling
+		if (player->pflags & PF_NIGHTSMODE) // NiGHTS damage handling
 		{
 			if (!force)
 			{
@@ -2602,7 +2601,7 @@ void P_PlayerRingBurst(player_t *player, INT32 num_rings)
 			ns = FixedMul(((i*FRACUNIT)/16)+2*FRACUNIT, mo->scale);
 			mo->momx = FixedMul(FINECOSINE(fa),ns);
 
-			if (LIKELY(!(twodlevel || (player->mo->flags2 & MF2_TWOD))))
+			if (!(twodlevel || (player->mo->flags2 & MF2_TWOD)))
 				mo->momy = FixedMul(FINESINE(fa),ns);
 
 			P_SetObjectMomZ(mo, 8*FRACUNIT, false);
@@ -2626,7 +2625,7 @@ void P_PlayerRingBurst(player_t *player, INT32 num_rings)
 			ns = FixedMul(momxy, mo->scale);
 			mo->momx = FixedMul(FINECOSINE(fa),ns);
 
-			if (LIKELY(!(twodlevel || (player->mo->flags2 & MF2_TWOD))))
+			if (!(twodlevel || (player->mo->flags2 & MF2_TWOD)))
 				mo->momy = FixedMul(FINESINE(fa),ns);
 
 			ns = momz;
@@ -2733,7 +2732,7 @@ void P_PlayerWeaponPanelBurst(player_t *player)
 		ns = FixedMul(3*FRACUNIT, mo->scale);
 		mo->momx = FixedMul(FINECOSINE(fa),ns);
 
-		if (LIKELY(!(twodlevel || (player->mo->flags2 & MF2_TWOD))))
+		if (!(twodlevel || (player->mo->flags2 & MF2_TWOD)))
 			mo->momy = FixedMul(FINESINE(fa),ns);
 
 		P_SetObjectMomZ(mo, 4*FRACUNIT, false);
@@ -2817,7 +2816,7 @@ void P_PlayerWeaponAmmoBurst(player_t *player)
 		ns = FixedMul(2*FRACUNIT, mo->scale);
 		mo->momx = FixedMul(FINECOSINE(fa), ns);
 
-		if (LIKELY(!(twodlevel || (player->mo->flags2 & MF2_TWOD))))
+		if (!(twodlevel || (player->mo->flags2 & MF2_TWOD)))
 			mo->momy = FixedMul(FINESINE(fa),ns);
 
 		P_SetObjectMomZ(mo, 3*FRACUNIT, false);
@@ -2933,7 +2932,7 @@ void P_PlayerEmeraldBurst(player_t *player, boolean toss)
 
 			momx = FixedMul(FINECOSINE(fa), ns);
 
-			if (LIKELY(!(twodlevel || (player->mo->flags2 & MF2_TWOD))))
+			if (!(twodlevel || (player->mo->flags2 & MF2_TWOD)))
 				momy = FixedMul(FINESINE(fa),ns);
 			else
 				momy = 0;
@@ -2990,7 +2989,7 @@ void P_PlayerFlagBurst(player_t *player, boolean toss)
 	{
 		angle_t fa = P_RandomByte()*FINEANGLES/256;
 		flag->momx = FixedMul(FINECOSINE(fa), FixedMul(6*FRACUNIT, player->mo->scale));
-		if (LIKELY(!(twodlevel || (player->mo->flags2 & MF2_TWOD))))
+		if (!(twodlevel || (player->mo->flags2 & MF2_TWOD)))
 			flag->momy = FixedMul(FINESINE(fa), FixedMul(6*FRACUNIT, player->mo->scale));
 	}
 

src/p_lights.c

@@ -78,7 +78,7 @@ fireflicker_t *P_SpawnAdjustableFireFlicker(sector_t *minsector, sector_t *maxse
 
 	P_AddThinker(&flick->thinker);
 
-	flick->thinker.function = (actionf_p1)T_FireFlicker;
+	flick->thinker.function.acp1 = (actionf_p1)T_FireFlicker;
 	flick->sector = maxsector;
 	flick->maxlight = maxsector->lightlevel;
 	flick->minlight = minsector->lightlevel;
@@ -140,7 +140,7 @@ void P_SpawnLightningFlash(sector_t *sector)
 
 	if (sector->lightingdata)
 	{
-		if (((lightflash_t *)sector->lightingdata)->thinker.function
+		if (((lightflash_t *)sector->lightingdata)->thinker.function.acp1
 			== (actionf_p1)T_LightningFlash)
 		{
 			// lightning was already flashing in this sector
@@ -157,7 +157,7 @@ void P_SpawnLightningFlash(sector_t *sector)
 
 	P_AddThinker(&flash->thinker);
 
-	flash->thinker.function = (actionf_p1)T_LightningFlash;
+	flash->thinker.function.acp1 = (actionf_p1)T_LightningFlash;
 	flash->sector = sector;
 	flash->maxlight = 255;
 	flash->minlight = minlight;
@@ -219,7 +219,7 @@ strobe_t *P_SpawnAdjustableStrobeFlash(sector_t *minsector, sector_t *maxsector,
 	flash->sector = maxsector;
 	flash->darktime = darktime;
 	flash->brighttime = brighttime;
-	flash->thinker.function = (actionf_p1)T_StrobeFlash;
+	flash->thinker.function.acp1 = (actionf_p1)T_StrobeFlash;
 	flash->maxlight = maxsector->lightlevel;
 	flash->minlight = minsector->lightlevel;
 
@@ -301,7 +301,7 @@ glow_t *P_SpawnAdjustableGlowingLight(sector_t *minsector, sector_t *maxsector,
 		g->minlight = g->maxlight;
 		g->maxlight = oops;
 	}
-	g->thinker.function = (actionf_p1)T_Glow;
+	g->thinker.function.acp1 = (actionf_p1)T_Glow;
 	g->direction = 1;
 	g->speed = length/4;
 	if (g->speed > (g->maxlight - g->minlight)/2) // don't make it ridiculous speed
@@ -347,7 +347,7 @@ void P_FadeLight(INT16 tag, INT32 destvalue, INT32 speed)
 
 		P_RemoveLighting(sector); // remove the old lighting effect first
 		ll = Z_Calloc(sizeof (*ll), PU_LEVSPEC, NULL);
-		ll->thinker.function = (actionf_p1)T_LightFade;
+		ll->thinker.function.acp1 = (actionf_p1)T_LightFade;
 		sector->lightingdata = ll; // set it to the lightlevel_t
 
 		P_AddThinker(&ll->thinker); // add thinker

src/p_local.h

@@ -279,7 +279,7 @@ void P_SceneryThinker(mobj_t *mobj);
 // To test it in Lua, check mobj.valid
 FUNCINLINE static ATTRINLINE boolean P_MobjWasRemoved(const mobj_t *mobj)
 {
-	return (!mobj || mobj->thinker.function != (actionf_p1)P_MobjThinker);
+	return (!mobj || mobj->thinker.function.acp1 != (actionf_p1)P_MobjThinker);
 }
 
 fixed_t P_MobjFloorZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed_t x, fixed_t y, line_t *line, boolean lowest, boolean perfect);

src/p_map.c

@@ -140,7 +140,7 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
 	if (object->player && object->player->spectator)
 		return false;
 
-	if (UNLIKELY(object->player && (object->player->pflags & PF_NIGHTSMODE)))
+	if (object->player && (object->player->pflags & PF_NIGHTSMODE))
 	{
 		/*Someone want to make these work like bumpers?*/
 		return false;
@@ -321,7 +321,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
 		return true;
 
 	// Ignore... things.
-	if (!tmthing || P_MobjWasRemoved(thing))
+	if (!tmthing || !thing || P_MobjWasRemoved(thing))
 		return true;
 
 	I_Assert(!P_MobjWasRemoved(tmthing));
@@ -335,7 +335,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
 #ifdef SEENAMES
 	// Do name checks all the way up here
 	// So that NOTHING ELSE can see MT_NAMECHECK because it is client-side.
-	if (UNLIKELY(tmthing->type == MT_NAMECHECK))
+	if (tmthing->type == MT_NAMECHECK)
 	{
 	    // Ignore things that aren't players, ignore spectators, ignore yourself.
 		// (also don't bother to check that tmthing->target->player is non-NULL because we're not actually using it here.)
@@ -361,8 +361,8 @@ static boolean PIT_CheckThing(mobj_t *thing)
 		return true;
 
 	// Don't collide with your buddies while NiGHTS-flying.
-	if (UNLIKELY(tmthing->player && thing->player && (maptol & TOL_NIGHTS)
-		&& ((tmthing->player->pflags & PF_NIGHTSMODE) || (thing->player->pflags & PF_NIGHTSMODE))))
+	if (tmthing->player && thing->player && (maptol & TOL_NIGHTS)
+		&& ((tmthing->player->pflags & PF_NIGHTSMODE) || (thing->player->pflags & PF_NIGHTSMODE)))
 		return true;
 
 	blockdist = thing->radius + tmthing->radius;
@@ -2004,7 +2004,7 @@ boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
 
 	mapcampointer = thiscam;
 
-	if (UNLIKELY(GETSECSPECIAL(newsec->special, 4) == 12))
+	if (GETSECSPECIAL(newsec->special, 4) == 12)
 	{ // Camera noclip on entire sector.
 		tmfloorz = tmdropoffz = thiscam->z;
 		tmceilingz = tmdrpoffceilz = thiscam->z + thiscam->height;
@@ -2045,10 +2045,10 @@ boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
 		{
 			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) || GETSECSPECIAL(rover->master->frontsector->special, 4) == 12)
 				continue;
 
-			topheight    = P_CameraGetFOFTopZ(thiscam, newsec, rover, x, y, NULL);
+			topheight = P_CameraGetFOFTopZ(thiscam, newsec, rover, x, y, NULL);
 			bottomheight = P_CameraGetFOFBottomZ(thiscam, newsec, rover, x, y, NULL);
 
 			delta1 = thiscam->z - (bottomheight
@@ -2120,7 +2120,7 @@ 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 (GETSECSPECIAL(polysec->special, 4) == 12)
 						{ // Camera noclip polyobj.
 							plink = (polymaplink_t *)(plink->link.next);
 							continue;
@@ -3183,7 +3183,7 @@ stairstep:
 
 	P_HitSlideLine(bestslideline); // clip the moves
 
-	if (UNLIKELY((twodlevel || (mo->flags2 & MF2_TWOD)) && mo->player))
+	if ((twodlevel || (mo->flags2 & MF2_TWOD)) && mo->player)
 	{
 		mo->momx = tmxmove;
 		tmymove = 0;
@@ -3626,7 +3626,7 @@ static boolean PIT_ChangeSector(mobj_t *thing, boolean realcrush)
 
 						for (think = thinkercap.next; think != &thinkercap; think = think->next)
 						{
-							if (think->function != (actionf_p1)T_StartCrumble)
+							if (think->function.acp1 != (actionf_p1)T_StartCrumble)
 								continue;
 
 							crumbler = (elevator_t *)think;

src/p_maputl.c

@@ -366,7 +366,7 @@ void P_CameraLineOpening(line_t *linedef)
 			{
 				fixed_t topheight, bottomheight;
 
-				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) || GETSECSPECIAL(rover->master->frontsector->special, 4) == 12)
 					continue;
 
 				topheight = P_CameraGetFOFTopZ(mapcampointer, front, rover, tmx, tmy, linedef);
@@ -394,7 +394,7 @@ void P_CameraLineOpening(line_t *linedef)
 			{
 				fixed_t topheight, bottomheight;
 
-				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) || GETSECSPECIAL(rover->master->frontsector->special, 4) == 12)
 					continue;
 
 				topheight = P_CameraGetFOFTopZ(mapcampointer, back, rover, tmx, tmy, linedef);

src/p_mobj.h

@@ -414,7 +414,6 @@ typedef struct mobj_s
 	boolean init_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_polyobj.c

@@ -1557,7 +1557,7 @@ void Polyobj_InitLevel(void)
 	// the mobj_t pointers on a queue for use below.
 	for (th = thinkercap.next; th != &thinkercap; th = th->next)
 	{
-		if (th->function != (actionf_p1)P_MobjThinker)
+		if (th->function.acp1 != (actionf_p1)P_MobjThinker)
 				continue;
 
 		mobj_t *mo = (mobj_t *)th;
@@ -1832,7 +1832,7 @@ void T_PolyObjWaypoint(polywaypoint_t *th)
 	// We redo this each tic to make savegame compatibility easier.
 	for (wp = thinkercap.next; wp != &thinkercap; wp = wp->next)
 	{
-		if (wp->function != (actionf_p1)P_MobjThinker) // Not a mobj thinker
+		if (wp->function.acp1 != (actionf_p1)P_MobjThinker) // Not a mobj thinker
 			continue;
 
 		mo2 = (mobj_t *)wp;
@@ -1916,7 +1916,7 @@ void T_PolyObjWaypoint(polywaypoint_t *th)
 			// Find next waypoint
 			for (wp = thinkercap.next; wp != &thinkercap; wp = wp->next)
 			{
-				if (wp->function != (actionf_p1)P_MobjThinker) // Not a mobj thinker
+				if (wp->function.acp1 != (actionf_p1)P_MobjThinker) // Not a mobj thinker
 					continue;
 
 				mo2 = (mobj_t *)wp;
@@ -1955,7 +1955,7 @@ void T_PolyObjWaypoint(polywaypoint_t *th)
 
 				for (wp = thinkercap.next; wp != &thinkercap; wp = wp->next)
 				{
-					if (wp->function != (actionf_p1)P_MobjThinker) // Not a mobj thinker
+					if (wp->function.acp1 != (actionf_p1)P_MobjThinker) // Not a mobj thinker
 						continue;
 
 					mo2 = (mobj_t *)wp;
@@ -1992,7 +1992,7 @@ void T_PolyObjWaypoint(polywaypoint_t *th)
 
 				for (wp = thinkercap.next; wp != &thinkercap; wp = wp->next)
 				{
-					if (wp->function != (actionf_p1)P_MobjThinker) // Not a mobj thinker
+					if (wp->function.acp1 != (actionf_p1)P_MobjThinker) // Not a mobj thinker
 						continue;
 
 					mo2 = (mobj_t *)wp;
@@ -2357,7 +2357,7 @@ INT32 EV_DoPolyObjRotate(polyrotdata_t *prdata)
 
 	// create a new thinker
 	th = Z_Malloc(sizeof(polyrotate_t), PU_LEVSPEC, NULL);
-	th->thinker.function = (actionf_p1)T_PolyObjRotate;
+	th->thinker.function.acp1 = (actionf_p1)T_PolyObjRotate;
 	PolyObj_AddThinker(&th->thinker);
 	po->thinker = &th->thinker;
 
@@ -2425,7 +2425,7 @@ INT32 EV_DoPolyObjMove(polymovedata_t *pmdata)
 
 	// create a new thinker
 	th = Z_Malloc(sizeof(polymove_t), PU_LEVSPEC, NULL);
-	th->thinker.function = (actionf_p1)T_PolyObjMove;
+	th->thinker.function.acp1 = (actionf_p1)T_PolyObjMove;
 	PolyObj_AddThinker(&th->thinker);
 	po->thinker = &th->thinker;
 
@@ -2491,7 +2491,7 @@ INT32 EV_DoPolyObjWaypoint(polywaypointdata_t *pwdata)
 
 	// create a new thinker
 	th = Z_Malloc(sizeof(polywaypoint_t), PU_LEVSPEC, NULL);
-	th->thinker.function = (actionf_p1)T_PolyObjWaypoint;
+	th->thinker.function.acp1 = (actionf_p1)T_PolyObjWaypoint;
 	PolyObj_AddThinker(&th->thinker);
 	po->thinker = &th->thinker;
 
@@ -2512,7 +2512,7 @@ INT32 EV_DoPolyObjWaypoint(polywaypointdata_t *pwdata)
 	// Find the first waypoint we need to use
 	for (wp = thinkercap.next; wp != &thinkercap; wp = wp->next)
 	{
-		if (wp->function != (actionf_p1)P_MobjThinker) // Not a mobj thinker
+		if (wp->function.acp1 != (actionf_p1)P_MobjThinker) // Not a mobj thinker
 			continue;
 
 		mo2 = (mobj_t *)wp;
@@ -2627,7 +2627,7 @@ static void Polyobj_doSlideDoor(polyobj_t *po, polydoordata_t *doordata)
 
 	// allocate and add a new slide door thinker
 	th = Z_Malloc(sizeof(polyslidedoor_t), PU_LEVSPEC, NULL);
-	th->thinker.function = (actionf_p1)T_PolyDoorSlide;
+	th->thinker.function.acp1 = (actionf_p1)T_PolyDoorSlide;
 	PolyObj_AddThinker(&th->thinker);
 
 	// point the polyobject to this thinker
@@ -2678,7 +2678,7 @@ static void Polyobj_doSwingDoor(polyobj_t *po, polydoordata_t *doordata)
 
 	// allocate and add a new swing door thinker
 	th = Z_Malloc(sizeof(polyswingdoor_t), PU_LEVSPEC, NULL);
-	th->thinker.function = (actionf_p1)T_PolyDoorSwing;
+	th->thinker.function.acp1 = (actionf_p1)T_PolyDoorSwing;
 	PolyObj_AddThinker(&th->thinker);
 
 	// point the polyobject to this thinker
@@ -2763,7 +2763,7 @@ INT32 EV_DoPolyObjDisplace(polydisplacedata_t *prdata)
 
 	// create a new thinker
 	th = Z_Malloc(sizeof(polydisplace_t), PU_LEVSPEC, NULL);
-	th->thinker.function = (actionf_p1)T_PolyObjDisplace;
+	th->thinker.function.acp1 = (actionf_p1)T_PolyObjDisplace;
 	PolyObj_AddThinker(&th->thinker);
 	po->thinker = &th->thinker;
 
@@ -2867,7 +2867,7 @@ INT32 EV_DoPolyObjFlag(line_t *pfdata)
 
 	// create a new thinker
 	th = Z_Malloc(sizeof(polymove_t), PU_LEVSPEC, NULL);
-	th->thinker.function = (actionf_p1)T_PolyObjFlag;
+	th->thinker.function.acp1 = (actionf_p1)T_PolyObjFlag;
 	PolyObj_AddThinker(&th->thinker);
 	po->thinker = &th->thinker;
 

src/p_saveg.c

@@ -1677,194 +1677,194 @@ static void P_NetArchiveThinkers(savebuffer_t *save)
 	// save off the current thinkers
 	for (th = thinkercap.next; th != &thinkercap; th = th->next)
 	{
-		if (th->function == (actionf_p1)P_RemoveThinkerDelayed)
+		if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
 			continue;
 
 		numsaved++;
 
-		if (th->function == (actionf_p1)P_MobjThinker)
+		if (th->function.acp1 == (actionf_p1)P_MobjThinker)
 		{
 			SaveMobjThinker(save, th, tc_mobj);
 			continue;
 		}
-		else if (th->function == (actionf_p1)T_MoveCeiling)
+		else if (th->function.acp1 == (actionf_p1)T_MoveCeiling)
 		{
 			SaveCeilingThinker(save, th, tc_ceiling);
 			continue;
 		}
-		else if (th->function == (actionf_p1)T_CrushCeiling)
+		else if (th->function.acp1 == (actionf_p1)T_CrushCeiling)
 		{
 			SaveCeilingThinker(save, th, tc_crushceiling);
 			continue;
 		}
-		else if (th->function == (actionf_p1)T_MoveFloor)
+		else if (th->function.acp1 == (actionf_p1)T_MoveFloor)
 		{
 			SaveFloormoveThinker(save, th, tc_floor);
 			continue;
 		}
-		else if (th->function == (actionf_p1)T_LightningFlash)
+		else if (th->function.acp1 == (actionf_p1)T_LightningFlash)
 		{
 			SaveLightflashThinker(save, th, tc_flash);
 			continue;
 		}
-		else if (th->function == (actionf_p1)T_StrobeFlash)
+		else if (th->function.acp1 == (actionf_p1)T_StrobeFlash)
 		{
 			SaveStrobeThinker(save, th, tc_strobe);
 			continue;
 		}
-		else if (th->function == (actionf_p1)T_Glow)
+		else if (th->function.acp1 == (actionf_p1)T_Glow)
 		{
 			SaveGlowThinker(save, th, tc_glow);
 			continue;
 		}
-		else if (th->function == (actionf_p1)T_FireFlicker)
+		else if (th->function.acp1 == (actionf_p1)T_FireFlicker)
 		{
 			SaveFireflickerThinker(save, th, tc_fireflicker);
 			continue;
 		}
-		else if (th->function == (actionf_p1)T_MoveElevator)
+		else if (th->function.acp1 == (actionf_p1)T_MoveElevator)
 		{
 			SaveElevatorThinker(save, th, tc_elevator);
 			continue;
 		}
-		else if (th->function == (actionf_p1)T_ContinuousFalling)
+		else if (th->function.acp1 == (actionf_p1)T_ContinuousFalling)
 		{
 			SaveSpecialLevelThinker(save, th, tc_continuousfalling);
 			continue;
 		}
-		else if (th->function == (actionf_p1)T_ThwompSector)
+		else if (th->function.acp1 == (actionf_p1)T_ThwompSector)
 		{
 			SaveSpecialLevelThinker(save, th, tc_thwomp);
 			continue;
 		}
-		else if (th->function == (actionf_p1)T_NoEnemiesSector)
+		else if (th->function.acp1 == (actionf_p1)T_NoEnemiesSector)
 		{
 			SaveSpecialLevelThinker(save, th, tc_noenemies);
 			continue;
 		}
-		else if (th->function == (actionf_p1)T_EachTimeThinker)
+		else if (th->function.acp1 == (actionf_p1)T_EachTimeThinker)
 		{
 			SaveSpecialLevelThinker(save, th, tc_eachtime);
 			continue;
 		}
-		else if (th->function == (actionf_p1)T_RaiseSector)
+		else if (th->function.acp1 == (actionf_p1)T_RaiseSector)
 		{
 			SaveSpecialLevelThinker(save, th, tc_raisesector);
 			continue;
 		}
-		else if (th->function == (actionf_p1)T_CameraScanner)
+		else if (th->function.acp1 == (actionf_p1)T_CameraScanner)
 		{
 			SaveElevatorThinker(save, th, tc_camerascanner);
 			continue;
 		}
-		else if (th->function == (actionf_p1)T_Scroll)
+		else if (th->function.acp1 == (actionf_p1)T_Scroll)
 		{
 			SaveScrollThinker(save, th, tc_scroll);
 			continue;
 		}
-		else if (th->function == (actionf_p1)T_Friction)
+		else if (th->function.acp1 == (actionf_p1)T_Friction)
 		{
 			SaveFrictionThinker(save, th, tc_friction);
 			continue;
 		}
-		else if (th->function == (actionf_p1)T_Pusher)
+		else if (th->function.acp1 == (actionf_p1)T_Pusher)
 		{
 			SavePusherThinker(save, th, tc_pusher);
 			continue;
 		}
-		else if (th->function == (actionf_p1)T_BounceCheese)
+		else if (th->function.acp1 == (actionf_p1)T_BounceCheese)
 		{
 			SaveSpecialLevelThinker(save, th, tc_bouncecheese);
 			continue;
 		}
-		else if (th->function == (actionf_p1)T_StartCrumble)
+		else if (th->function.acp1 == (actionf_p1)T_StartCrumble)
 		{
 			SaveElevatorThinker(save, th, tc_startcrumble);
 			continue;
 		}
-		else if (th->function == (actionf_p1)T_MarioBlock)
+		else if (th->function.acp1 == (actionf_p1)T_MarioBlock)
 		{
 			SaveSpecialLevelThinker(save, th, tc_marioblock);
 			continue;
 		}
-		else if (th->function == (actionf_p1)T_MarioBlockChecker)
+		else if (th->function.acp1 == (actionf_p1)T_MarioBlockChecker)
 		{
 			SaveSpecialLevelThinker(save, th, tc_marioblockchecker);
 			continue;
 		}
-		else if (th->function == (actionf_p1)T_SpikeSector)
+		else if (th->function.acp1 == (actionf_p1)T_SpikeSector)
 		{
 			SaveSpecialLevelThinker(save, th, tc_spikesector);
 			continue;
 		}
-		else if (th->function == (actionf_p1)T_FloatSector)
+		else if (th->function.acp1 == (actionf_p1)T_FloatSector)
 		{
 			SaveSpecialLevelThinker(save, th, tc_floatsector);
 			continue;
 		}
-		else if (th->function == (actionf_p1)T_BridgeThinker)
+		else if (th->function.acp1 == (actionf_p1)T_BridgeThinker)
 		{
 			SaveSpecialLevelThinker(save, th, tc_bridgethinker);
 			continue;
 		}
-		else if (th->function == (actionf_p1)T_LaserFlash)
+		else if (th->function.acp1 == (actionf_p1)T_LaserFlash)
 		{
 			SaveLaserThinker(save, th, tc_laserflash);
 			continue;
 		}
-		else if (th->function == (actionf_p1)T_LightFade)
+		else if (th->function.acp1 == (actionf_p1)T_LightFade)
 		{
 			SaveLightlevelThinker(save, th, tc_lightfade);
 			continue;
 		}
-		else if (th->function == (actionf_p1)T_ExecutorDelay)
+		else if (th->function.acp1 == (actionf_p1)T_ExecutorDelay)
 		{
 			SaveExecutorThinker(save, th, tc_executor);
 			continue;
 		}
-		else if (th->function == (actionf_p1)T_Disappear)
+		else if (th->function.acp1 == (actionf_p1)T_Disappear)
 		{
 			SaveDisappearThinker(save, th, tc_disappear);
 			continue;
 		}
-		else if (th->function == (actionf_p1)T_PolyObjRotate)
+		else if (th->function.acp1 == (actionf_p1)T_PolyObjRotate)
 		{
 			SavePolyrotatetThinker(save, th, tc_polyrotate);
 			continue;
 		}
-		else if (th->function == (actionf_p1)T_PolyObjMove)
+		else if (th->function.acp1 == (actionf_p1)T_PolyObjMove)
 		{
 			SavePolymoveThinker(save, th, tc_polymove);
 			continue;
 		}
-		else if (th->function == (actionf_p1)T_PolyObjWaypoint)
+		else if (th->function.acp1 == (actionf_p1)T_PolyObjWaypoint)
 		{
 			SavePolywaypointThinker(save, th, tc_polywaypoint);
 			continue;
 		}
-		else if (th->function == (actionf_p1)T_PolyDoorSlide)
+		else if (th->function.acp1 == (actionf_p1)T_PolyDoorSlide)
 		{
 			SavePolyslidedoorThinker(save, th, tc_polyslidedoor);
 			continue;
 		}
-		else if (th->function == (actionf_p1)T_PolyDoorSwing)
+		else if (th->function.acp1 == (actionf_p1)T_PolyDoorSwing)
 		{
 			SavePolyswingdoorThinker(save, th, tc_polyswingdoor);
 			continue;
 		}
-		else if (th->function == (actionf_p1)T_PolyObjFlag)
+		else if (th->function.acp1 == (actionf_p1)T_PolyObjFlag)
 		{
 			SavePolymoveThinker(save, th, tc_polyflag);
 			continue;
 		}
-		else if (th->function == (actionf_p1)T_PolyObjDisplace)
+		else if (th->function.acp1 == (actionf_p1)T_PolyObjDisplace)
 		{
 			SavePolydisplaceThinker(save, th, tc_polydisplace);
 			continue;
 		}
 #ifdef PARANOIA
-		else if (th->function != (actionf_p1)P_RemoveThinkerDelayed) // wait garbage collection
-			I_Error("unknown thinker type %p", th->function);
+		else if (th->function.acp1 != (actionf_p1)P_RemoveThinkerDelayed) // wait garbage collection
+			I_Error("unknown thinker type %p", th->function.acp1);
 #endif
 	}
 
@@ -1884,7 +1884,7 @@ mobj_t *P_FindNewPosition(UINT32 oldposition)
 
 	for (th = thinkercap.next; th != &thinkercap; th = th->next)
 	{
-		if (th->function != (actionf_p1)P_MobjThinker)
+		if (th->function.acp1 != (actionf_p1)P_MobjThinker)
 			continue;
 
 		mobj = (mobj_t *)th;
@@ -1983,7 +1983,7 @@ static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker)
 		mobj = AllocMobj();
 
 	// declare this as a valid mobj as soon as possible.
-	mobj->thinker.function = thinker;
+	mobj->thinker.function.acp1 = thinker;
 
 	mobj->z = z;
 	mobj->floorz = floorz;
@@ -2216,7 +2216,7 @@ static void LoadSpecialLevelThinker(savebuffer_t *save, actionf_p1 thinker, UINT
 {
 	levelspecthink_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
 	size_t i;
-	ht->thinker.function = thinker;
+	ht->thinker.function.acp1 = thinker;
 	for (i = 0; i < 16; i++)
 	{
 		ht->vars[i] = READFIXED(save->p); //var[16]
@@ -2244,7 +2244,7 @@ static void LoadSpecialLevelThinker(savebuffer_t *save, actionf_p1 thinker, UINT
 static void LoadCeilingThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	ceiling_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function = thinker;
+	ht->thinker.function.acp1 = thinker;
 	ht->type = READUINT8(save->p);
 	ht->sector = LoadSector(READUINT32(save->p));
 	ht->bottomheight = READFIXED(save->p);
@@ -2273,7 +2273,7 @@ static void LoadCeilingThinker(savebuffer_t *save, actionf_p1 thinker)
 static void LoadFloormoveThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	floormove_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function = thinker;
+	ht->thinker.function.acp1 = thinker;
 	ht->type = READUINT8(save->p);
 	ht->crush = READUINT8(save->p);
 	ht->sector = LoadSector(READUINT32(save->p));
@@ -2297,7 +2297,7 @@ static void LoadFloormoveThinker(savebuffer_t *save, actionf_p1 thinker)
 static void LoadLightflashThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	lightflash_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function = thinker;
+	ht->thinker.function.acp1 = thinker;
 	ht->sector = LoadSector(READUINT32(save->p));
 	ht->maxlight = READINT32(save->p);
 	ht->minlight = READINT32(save->p);
@@ -2314,7 +2314,7 @@ static void LoadLightflashThinker(savebuffer_t *save, actionf_p1 thinker)
 static void LoadStrobeThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	strobe_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function = thinker;
+	ht->thinker.function.acp1 = thinker;
 	ht->sector = LoadSector(READUINT32(save->p));
 	ht->count = READINT32(save->p);
 	ht->minlight = READINT32(save->p);
@@ -2334,7 +2334,7 @@ static void LoadStrobeThinker(savebuffer_t *save, actionf_p1 thinker)
 static void LoadGlowThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	glow_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function = thinker;
+	ht->thinker.function.acp1 = thinker;
 	ht->sector = LoadSector(READUINT32(save->p));
 	ht->minlight = READINT32(save->p);
 	ht->maxlight = READINT32(save->p);
@@ -2353,7 +2353,7 @@ static void LoadGlowThinker(savebuffer_t *save, actionf_p1 thinker)
 static void LoadFireflickerThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	fireflicker_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function = thinker;
+	ht->thinker.function.acp1 = thinker;
 	ht->sector = LoadSector(READUINT32(save->p));
 	ht->count = READINT32(save->p);
 	ht->resetcount = READINT32(save->p);
@@ -2372,7 +2372,7 @@ static void LoadFireflickerThinker(savebuffer_t *save, actionf_p1 thinker)
 static void LoadElevatorThinker(savebuffer_t *save, actionf_p1 thinker, UINT8 floorOrCeiling)
 {
 	elevator_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function = thinker;
+	ht->thinker.function.acp1 = thinker;
 	ht->type = READUINT8(save->p);
 	ht->sector = LoadSector(READUINT32(save->p));
 	ht->actionsector = LoadSector(READUINT32(save->p));
@@ -2410,7 +2410,7 @@ static void LoadElevatorThinker(savebuffer_t *save, actionf_p1 thinker, UINT8 fl
 static void LoadScrollThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	scroll_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function = thinker;
+	ht->thinker.function.acp1 = thinker;
 	ht->dx = READFIXED(save->p);
 	ht->dy = READFIXED(save->p);
 	ht->affectee = READINT32(save->p);
@@ -2432,7 +2432,7 @@ static void LoadScrollThinker(savebuffer_t *save, actionf_p1 thinker)
 static inline void LoadFrictionThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	friction_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function = thinker;
+	ht->thinker.function.acp1 = thinker;
 	ht->friction = READINT32(save->p);
 	ht->movefactor = READINT32(save->p);
 	ht->affectee = READINT32(save->p);
@@ -2449,7 +2449,7 @@ static inline void LoadFrictionThinker(savebuffer_t *save, actionf_p1 thinker)
 static void LoadPusherThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	pusher_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function = thinker;
+	ht->thinker.function.acp1 = thinker;
 	ht->type = READUINT8(save->p);
 	ht->x_mag = READINT32(save->p);
 	ht->y_mag = READINT32(save->p);
@@ -2476,7 +2476,7 @@ static inline void LoadLaserThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	laserthink_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
 	ffloor_t *rover = NULL;
-	ht->thinker.function = thinker;
+	ht->thinker.function.acp1 = thinker;
 	ht->sector = LoadSector(READUINT32(save->p));
 	ht->sec = LoadSector(READUINT32(save->p));
 	ht->sourceline = LoadLine(READUINT32(save->p));
@@ -2495,7 +2495,7 @@ static inline void LoadLaserThinker(savebuffer_t *save, actionf_p1 thinker)
 FUNCINLINE static ATTRINLINE void LoadLightlevelThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	lightlevel_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function = thinker;
+	ht->thinker.function.acp1 = thinker;
 	ht->sector = LoadSector(READUINT32(save->p));
 	ht->destlevel = READINT32(save->p);
 	ht->speed = READINT32(save->p);
@@ -2512,7 +2512,7 @@ FUNCINLINE static ATTRINLINE void LoadLightlevelThinker(savebuffer_t *save, acti
 static inline void LoadExecutorThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	executor_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function = thinker;
+	ht->thinker.function.acp1 = thinker;
 	ht->line = LoadLine(READUINT32(save->p));
 	ht->caller = LoadMobj(READUINT32(save->p));
 	ht->sector = LoadSector(READUINT32(save->p));
@@ -2528,7 +2528,7 @@ static inline void LoadExecutorThinker(savebuffer_t *save, actionf_p1 thinker)
 static inline void LoadDisappearThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	disappear_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function = thinker;
+	ht->thinker.function.acp1 = thinker;
 	ht->appeartime = READUINT32(save->p);
 	ht->disappeartime = READUINT32(save->p);
 	ht->offset = READUINT32(save->p);
@@ -2547,7 +2547,7 @@ static inline void LoadDisappearThinker(savebuffer_t *save, actionf_p1 thinker)
 static inline void LoadPolyrotatetThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	polyrotate_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function = thinker;
+	ht->thinker.function.acp1 = thinker;
 	ht->polyObjNum = READINT32(save->p);
 	ht->speed = READINT32(save->p);
 	ht->distance = READINT32(save->p);
@@ -2563,7 +2563,7 @@ static inline void LoadPolyrotatetThinker(savebuffer_t *save, actionf_p1 thinker
 static void LoadPolymoveThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	polymove_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function = thinker;
+	ht->thinker.function.acp1 = thinker;
 	ht->polyObjNum = READINT32(save->p);
 	ht->speed = READINT32(save->p);
 	ht->momx = READFIXED(save->p);
@@ -2581,7 +2581,7 @@ static void LoadPolymoveThinker(savebuffer_t *save, actionf_p1 thinker)
 static inline void LoadPolywaypointThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	polywaypoint_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function = thinker;
+	ht->thinker.function.acp1 = thinker;
 	ht->polyObjNum = READINT32(save->p);
 	ht->speed = READINT32(save->p);
 	ht->sequence = READINT32(save->p);
@@ -2605,7 +2605,7 @@ static inline void LoadPolywaypointThinker(savebuffer_t *save, actionf_p1 thinke
 static inline void LoadPolyslidedoorThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	polyslidedoor_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function = thinker;
+	ht->thinker.function.acp1 = thinker;
 	ht->polyObjNum = READINT32(save->p);
 	ht->delay = READINT32(save->p);
 	ht->delayCount = READINT32(save->p);
@@ -2630,7 +2630,7 @@ static inline void LoadPolyslidedoorThinker(savebuffer_t *save, actionf_p1 think
 static inline void LoadPolyswingdoorThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	polyswingdoor_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function = thinker;
+	ht->thinker.function.acp1 = thinker;
 	ht->polyObjNum = READINT32(save->p);
 	ht->delay = READINT32(save->p);
 	ht->delayCount = READINT32(save->p);
@@ -2650,7 +2650,7 @@ static inline void LoadPolyswingdoorThinker(savebuffer_t *save, actionf_p1 think
 static inline void LoadPolydisplaceThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	polydisplace_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function = thinker;
+	ht->thinker.function.acp1 = thinker;
 	ht->polyObjNum = READINT32(save->p);
 	ht->controlSector = LoadSector(READUINT32(save->p));
 	ht->dx = READFIXED(save->p);
@@ -2680,7 +2680,7 @@ static void P_NetUnArchiveThinkers(savebuffer_t *save)
 	{
 		next = currentthinker->next;
 
-		if (currentthinker->function == (actionf_p1)P_MobjThinker)
+		if (currentthinker->function.acp1 == (actionf_p1)P_MobjThinker)
 			P_RemoveSavegameMobj((mobj_t *)currentthinker); // item isn't saved, don't remove it
 		else
 		{
@@ -2874,7 +2874,7 @@ static void P_NetUnArchiveThinkers(savebuffer_t *save)
 		for (currentthinker = thinkercap.next; currentthinker != &thinkercap;
 			currentthinker = currentthinker->next)
 		{
-			if (currentthinker->function != (actionf_p1)T_ExecutorDelay)
+			if (currentthinker->function.acp1 != (actionf_p1)T_ExecutorDelay)
 				continue;
 
 			delay = (void *)currentthinker;
@@ -2989,7 +2989,7 @@ static inline void P_FinishMobjs(void)
 	for (currentthinker = thinkercap.next; currentthinker != &thinkercap;
 		currentthinker = currentthinker->next)
 	{
-		if (currentthinker->function != (actionf_p1)P_MobjThinker)
+		if (currentthinker->function.acp1 != (actionf_p1)P_MobjThinker)
 			continue;
 
 		mobj = (mobj_t *)currentthinker;
@@ -3014,7 +3014,7 @@ static void P_RelinkPointers(void)
 	for (currentthinker = thinkercap.next; currentthinker != &thinkercap;
 		currentthinker = currentthinker->next)
 	{
-		if (currentthinker->function != (actionf_p1)P_MobjThinker)
+		if (currentthinker->function.acp1 != (actionf_p1)P_MobjThinker)
 			continue;
 
 		mobj = (mobj_t *)currentthinker;
@@ -3431,7 +3431,7 @@ void P_SaveNetGame(savebuffer_t *save, boolean resending)
 	{
 		for (th = thinkercap.next; th != &thinkercap; th = th->next)
 		{
-			if (th->function != (actionf_p1)P_MobjThinker)
+			if (th->function.acp1 != (actionf_p1)P_MobjThinker)
 				continue;
 
 			mobj = (mobj_t *)th;

src/p_setup.c

@@ -34,7 +34,6 @@
 #include "r_fps.h" // R_ResetViewInterpolation in level load
 
 #include "s_sound.h"
-#include "m_emotes.h"
 #include "st_stuff.h"
 #include "w_wad.h"
 #include "z_zone.h"
@@ -412,7 +411,7 @@ static inline float P_SegLengthFloat(seg_t *seg)
 	dx = FIXED_TO_FLOAT(seg->v2->x - seg->v1->x);
 	dy = FIXED_TO_FLOAT(seg->v2->y - seg->v1->y);
 
-	return hypotf(dx, dy);
+	return (float)hypot(dx, dy);
 }
 #endif
 
@@ -2345,7 +2344,9 @@ static void P_RunLevelScript(const char *scriptname)
 		lumpnum_t lumpnum;
 		char newname[9];
 
-		strlcpy(newname, scriptname, sizeof(newname));
+		strncpy(newname, scriptname, 8);
+
+		newname[8] = '\0';
 
 		lumpnum = W_CheckNumForName(newname);
 
@@ -2571,7 +2572,6 @@ static void P_InitMinimapInfo(void)
 	lumpnum_t lumpnum;
 	fixed_t a;
 	fixed_t b;
-
 	node_t *bsp = &nodes[numnodes-1];
 
 	minimapinfo.minimap_pic = NULL;
@@ -3009,7 +3009,7 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate)
 	if (rendermode == render_opengl)
 	{
 		// Create plane polygons.
-		HWR_LoadLevel();
+		HWR_LoadLevel(reloadinggamestate);
 	}
 #endif
 
@@ -3070,7 +3070,7 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate)
 
 	if (!fromnetsave) // uglier hack
 	{ // to make a newly loaded level start on the second frame.
-		INT32 buf = gametic % BACKUPTICS;
+		INT32 buf = gametic % TICQUEUE;
 
 		for (i = 0; i < MAXPLAYERS; i++)
 		{
@@ -3312,12 +3312,6 @@ 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
 	//
@@ -3328,7 +3322,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
 
@@ -3342,11 +3336,6 @@ UINT16 P_PartialAddWadFile(const char *wadfilename, boolean local)
 	//
 	S_LoadMusicDefs(wadnum);
 
-	//
-	// look for emotes
-	//
-	M_LoadEmotes(wadnum);
-
 	// TODO: Experimental SPRTINFO support, test first
 	R_LoadSpriteInfoLumps(wadnum, wadfiles[wadnum]->numlumps);
 
@@ -3357,8 +3346,7 @@ UINT16 P_PartialAddWadFile(const char *wadfilename, boolean local)
 
 // Only exists to make sure there's no way to overwrite partadd_stage externally
 // unless you really push yourself.
-SINT8 P_PartialAddGetStage(void)
-{
+SINT8 P_PartialAddGetStage(void) {
 	return partadd_stage;
 }
 
@@ -3392,8 +3380,13 @@ 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_setup.h

@@ -68,7 +68,7 @@ void P_SetupLevelSky(INT32 skynum, boolean global);
 boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate);
 
 #ifdef HWRENDER
-void HWR_LoadLevel(void);
+void HWR_LoadLevel(boolean reloadinggamestate);
 #endif
 
 boolean P_AddWadFile(const char *wadfilename, boolean local);

src/p_spec.c

@@ -1302,7 +1302,7 @@ static void P_AddExecutorDelay(line_t *line, mobj_t *mobj, sector_t *sector)
 
 	e = Z_Calloc(sizeof (*e), PU_LEVSPEC, NULL);
 
-	e->thinker.function = (actionf_p1)T_ExecutorDelay;
+	e->thinker.function.acp1 = (actionf_p1)T_ExecutorDelay;
 	e->line = line;
 	e->sector = sector;
 	e->timer = (line->backsector->ceilingheight>>FRACBITS)+(line->backsector->floorheight>>FRACBITS);
@@ -2602,7 +2602,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
 
 				for (th = thinkercap.next; th != &thinkercap; th = th->next)
 				{
-					if (th->function != (actionf_p1)T_Scroll)
+					if (th->function.acp1 != (actionf_p1)T_Scroll)
 						continue;
 
 					scroller = (scroll_t *)th;
@@ -2937,7 +2937,7 @@ void P_SetupSignExit(player_t *player)
 	// spin all signposts in the level then.
 	for (think = thinkercap.next; think != &thinkercap; think = think->next)
 	{
-		if (think->function != (actionf_p1)P_MobjThinker)
+		if (think->function.acp1 != (actionf_p1)P_MobjThinker)
 			continue; // not a mobj thinker
 
 		thing = (mobj_t *)think;
@@ -2986,7 +2986,7 @@ boolean P_IsFlagAtBase(mobjtype_t flag)
 
 	for (think = thinkercap.next; think != &thinkercap; think = think->next)
 	{
-		if (think->function != (actionf_p1)P_MobjThinker)
+		if (think->function.acp1 != (actionf_p1)P_MobjThinker)
 			continue; // not a mobj thinker
 
 		mo = (mobj_t *)think;
@@ -3419,7 +3419,7 @@ void P_ProcessSpecialSector(player_t *player, sector_t *sector, sector_t *rovers
 			// The chimps are my friends.. heeheeheheehehee..... - LouisJM
 			for (th = thinkercap.next; th != &thinkercap; th = th->next)
 			{
-				if (th->function != (actionf_p1)P_MobjThinker)
+				if (th->function.acp1 != (actionf_p1)P_MobjThinker)
 					continue;
 
 				mo2 = (mobj_t *)th;
@@ -3760,7 +3760,7 @@ DoneSection2:
 				// to find the first waypoint
 				for (th = thinkercap.next; th != &thinkercap; th = th->next)
 				{
-					if (th->function != (actionf_p1)P_MobjThinker)
+					if (th->function.acp1 != (actionf_p1)P_MobjThinker)
 						continue;
 
 					mo2 = (mobj_t *)th;
@@ -3833,7 +3833,7 @@ DoneSection2:
 				// to find the last waypoint
 				for (th = thinkercap.next; th != &thinkercap; th = th->next)
 				{
-					if (th->function != (actionf_p1)P_MobjThinker)
+					if (th->function.acp1 != (actionf_p1)P_MobjThinker)
 						continue;
 
 					mo2 = (mobj_t *)th;
@@ -3889,7 +3889,6 @@ DoneSection2:
 					{
 						if (!playeringame[i] || players[i].spectator)
 							continue;
-
 						nump++;
 					}
 
@@ -3913,7 +3912,7 @@ DoneSection2:
 
 					player->kartstuff[k_lapanimation] = 80;
 
-					if (UNLIKELY(player->pflags & PF_NIGHTSMODE))
+					if (player->pflags & PF_NIGHTSMODE)
 						player->drillmeter += 48*20;
 
 					if (netgame && player->laps >= (UINT8)cv_numlaps.value)
@@ -4045,7 +4044,7 @@ DoneSection2:
 				// to find the first waypoint
 				for (th = thinkercap.next; th != &thinkercap; th = th->next)
 				{
-					if (th->function != (actionf_p1)P_MobjThinker)
+					if (th->function.acp1 != (actionf_p1)P_MobjThinker)
 						continue;
 
 					mo2 = (mobj_t *)th;
@@ -4083,7 +4082,7 @@ DoneSection2:
 				// Find waypoint before this one (waypointlow)
 				for (th = thinkercap.next; th != &thinkercap; th = th->next)
 				{
-					if (th->function != (actionf_p1)P_MobjThinker)
+					if (th->function.acp1 != (actionf_p1)P_MobjThinker)
 						continue;
 
 					mo2 = (mobj_t *)th;
@@ -4110,7 +4109,7 @@ DoneSection2:
 				// Find waypoint after this one (waypointhigh)
 				for (th = thinkercap.next; th != &thinkercap; th = th->next)
 				{
-					if (th->function != (actionf_p1)P_MobjThinker)
+					if (th->function.acp1 != (actionf_p1)P_MobjThinker)
 						continue;
 
 					mo2 = (mobj_t *)th;
@@ -4800,7 +4799,7 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, f
 			break;
 
 		// Should this FOF have spikeness?
-		if (th->function == (actionf_p1)T_SpikeSector)
+		if (th->function.acp1 == (actionf_p1)T_SpikeSector)
 		{
 			lst = (levelspecthink_t *)th;
 
@@ -4808,7 +4807,7 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, f
 				P_AddSpikeThinker(sec, (INT32)sec2num);
 		}
 		// Should this FOF have friction?
-		else if(th->function == (actionf_p1)T_Friction)
+		else if(th->function.acp1 == (actionf_p1)T_Friction)
 		{
 			f = (friction_t *)th;
 
@@ -4816,7 +4815,7 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, f
 				Add_Friction(f->friction, f->movefactor, (INT32)(sec-sectors), f->affectee);
 		}
 		// Should this FOF have wind/current/pusher?
-		else if(th->function == (actionf_p1)T_Pusher)
+		else if(th->function.acp1 == (actionf_p1)T_Pusher)
 		{
 			p = (pusher_t *)th;
 
@@ -4907,7 +4906,7 @@ static void P_AddSpikeThinker(sector_t *sec, INT32 referrer)
 	spikes = Z_Calloc(sizeof (*spikes), PU_LEVSPEC, NULL);
 	P_AddThinker(&spikes->thinker);
 
-	spikes->thinker.function = (actionf_p1)T_SpikeSector;
+	spikes->thinker.function.acp1 = (actionf_p1)T_SpikeSector;
 
 	spikes->sector = sec;
 	spikes->vars[0] = referrer;
@@ -4929,7 +4928,7 @@ static void P_AddFloatThinker(sector_t *sec, INT32 tag, line_t *sourceline)
 	floater = Z_Calloc(sizeof (*floater), PU_LEVSPEC, NULL);
 	P_AddThinker(&floater->thinker);
 
-	floater->thinker.function = (actionf_p1)T_FloatSector;
+	floater->thinker.function.acp1 = (actionf_p1)T_FloatSector;
 
 	floater->sector = sec;
 	floater->vars[0] = tag;
@@ -4958,7 +4957,7 @@ static void P_AddBlockThinker(sector_t *sec, line_t *sourceline)
 	block = Z_Calloc(sizeof (*block), PU_LEVSPEC, NULL);
 	P_AddThinker(&block->thinker);
 
-	block->thinker.function = (actionf_p1)T_MarioBlockChecker;
+	block->thinker.function.acp1 = (actionf_p1)T_MarioBlockChecker;
 	block->sourceline = sourceline;
 
 	block->sector = sec;
@@ -4987,7 +4986,7 @@ static void P_AddRaiseThinker(sector_t *sec, line_t *sourceline)
 	raise = Z_Calloc(sizeof (*raise), PU_LEVSPEC, NULL);
 	P_AddThinker(&raise->thinker);
 
-	raise->thinker.function = (actionf_p1)T_RaiseSector;
+	raise->thinker.function.acp1 = (actionf_p1)T_RaiseSector;
 
 	if (sourceline->flags & ML_BLOCKMONSTERS)
 		raise->vars[0] = 1;
@@ -5030,7 +5029,7 @@ static void P_AddOldAirbob(sector_t *sec, line_t *sourceline, boolean noadjust)
 	airbob = Z_Calloc(sizeof (*airbob), PU_LEVSPEC, NULL);
 	P_AddThinker(&airbob->thinker);
 
-	airbob->thinker.function = (actionf_p1)T_RaiseSector;
+	airbob->thinker.function.acp1 = (actionf_p1)T_RaiseSector;
 
 	// set up the fields
 	airbob->sector = sec;
@@ -5095,7 +5094,7 @@ static inline void P_AddThwompThinker(sector_t *sec, sector_t *actionsector, lin
 	thwomp = Z_Calloc(sizeof (*thwomp), PU_LEVSPEC, NULL);
 	P_AddThinker(&thwomp->thinker);
 
-	thwomp->thinker.function = (actionf_p1)T_ThwompSector;
+	thwomp->thinker.function.acp1 = (actionf_p1)T_ThwompSector;
 
 	// set up the fields according to the type of elevator action
 	thwomp->sector = sec;
@@ -5136,7 +5135,7 @@ static inline void P_AddNoEnemiesThinker(sector_t *sec, line_t *sourceline)
 	nobaddies = Z_Calloc(sizeof (*nobaddies), PU_LEVSPEC, NULL);
 	P_AddThinker(&nobaddies->thinker);
 
-	nobaddies->thinker.function = (actionf_p1)T_NoEnemiesSector;
+	nobaddies->thinker.function.acp1 = (actionf_p1)T_NoEnemiesSector;
 
 	nobaddies->sector = sec;
 	nobaddies->sourceline = sourceline;
@@ -5158,7 +5157,7 @@ static inline void P_AddEachTimeThinker(sector_t *sec, line_t *sourceline)
 	eachtime = Z_Calloc(sizeof (*eachtime), PU_LEVSPEC, NULL);
 	P_AddThinker(&eachtime->thinker);
 
-	eachtime->thinker.function = (actionf_p1)T_EachTimeThinker;
+	eachtime->thinker.function.acp1 = (actionf_p1)T_EachTimeThinker;
 
 	eachtime->sector = sec;
 	eachtime->sourceline = sourceline;
@@ -5180,7 +5179,7 @@ static inline void P_AddCameraScanner(sector_t *sourcesec, sector_t *actionsecto
 	elevator = Z_Calloc(sizeof (*elevator), PU_LEVSPEC, NULL);
 	P_AddThinker(&elevator->thinker);
 
-	elevator->thinker.function = (actionf_p1)T_CameraScanner;
+	elevator->thinker.function.acp1 = (actionf_p1)T_CameraScanner;
 	elevator->type = elevateBounce;
 
 	// set up the fields according to the type of elevator action
@@ -5269,7 +5268,7 @@ static inline void EV_AddLaserThinker(sector_t *sec, sector_t *sec2, line_t *lin
 
 	P_AddThinker(&flash->thinker);
 
-	flash->thinker.function = (actionf_p1)T_LaserFlash;
+	flash->thinker.function.acp1 = (actionf_p1)T_LaserFlash;
 	flash->ffloor = ffloor;
 	flash->sector = sec; // For finding mobjs
 	flash->sec = sec2;
@@ -5383,11 +5382,11 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate)
 	// Firstly, find out how many there are in each sector
 	for (th = thinkercap.next; th != &thinkercap; th = th->next)
 	{
-		if (th->function == (actionf_p1)T_SpikeSector)
+		if (th->function.acp1 == (actionf_p1)T_SpikeSector)
 			secthinkers[((levelspecthink_t *)th)->sector - sectors].count++;
-		else if (th->function == (actionf_p1)T_Friction)
+		else if (th->function.acp1 == (actionf_p1)T_Friction)
 			secthinkers[((friction_t *)th)->affectee].count++;
-		else if (th->function == (actionf_p1)T_Pusher)
+		else if (th->function.acp1 == (actionf_p1)T_Pusher)
 			secthinkers[((pusher_t *)th)->affectee].count++;
 	}
 
@@ -5405,11 +5404,11 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate)
 	{
 		size_t secnum = (size_t)-1;
 
-		if (th->function == (actionf_p1)T_SpikeSector)
+		if (th->function.acp1 == (actionf_p1)T_SpikeSector)
 			secnum = ((levelspecthink_t *)th)->sector - sectors;
-		else if (th->function == (actionf_p1)T_Friction)
+		else if (th->function.acp1 == (actionf_p1)T_Friction)
 			secnum = ((friction_t *)th)->affectee;
-		else if (th->function == (actionf_p1)T_Pusher)
+		else if (th->function.acp1 == (actionf_p1)T_Pusher)
 			secnum = ((pusher_t *)th)->affectee;
 
 		if (secnum != (size_t)-1)
@@ -6633,7 +6632,7 @@ void T_Scroll(scroll_t *s)
 static void Add_Scroller(INT32 type, fixed_t dx, fixed_t dy, INT32 control, INT32 affectee, INT32 accel, INT32 exclusive)
 {
 	scroll_t *s = Z_Calloc(sizeof *s, PU_LEVSPEC, NULL);
-	s->thinker.function = (actionf_p1)T_Scroll;
+	s->thinker.function.acp1 = (actionf_p1)T_Scroll;
 	s->type = type;
 	s->dx = dx;
 	s->dy = dy;
@@ -6803,7 +6802,7 @@ static void Add_MasterDisappearer(tic_t appeartime, tic_t disappeartime, tic_t o
 {
 	disappear_t *d = Z_Malloc(sizeof *d, PU_LEVSPEC, NULL);
 
-	d->thinker.function = (actionf_p1)T_Disappear;
+	d->thinker.function.acp1 = (actionf_p1)T_Disappear;
 	d->appeartime = appeartime;
 	d->disappeartime = disappeartime;
 	d->offset = offset;
@@ -6888,7 +6887,7 @@ static void Add_Friction(INT32 friction, INT32 movefactor, INT32 affectee, INT32
 {
 	friction_t *f = Z_Calloc(sizeof *f, PU_LEVSPEC, NULL);
 
-	f->thinker.function = (actionf_p1)T_Friction;
+	f->thinker.function.acp1 = (actionf_p1)T_Friction;
 	f->friction = friction;
 	f->movefactor = movefactor;
 	f->affectee = affectee;
@@ -7043,7 +7042,7 @@ static void Add_Pusher(pushertype_e type, fixed_t x_mag, fixed_t y_mag, mobj_t *
 {
 	pusher_t *p = Z_Calloc(sizeof *p, PU_LEVSPEC, NULL);
 
-	p->thinker.function = (actionf_p1)T_Pusher;
+	p->thinker.function.acp1 = (actionf_p1)T_Pusher;
 	p->source = source;
 	p->type = type;
 	p->x_mag = x_mag>>FRACBITS;
@@ -7103,7 +7102,7 @@ static inline boolean PIT_PushThing(mobj_t *thing)
 		return false;
 
 	// Allow this to affect pushable objects at some point?
-	if (thing->player && (!(thing->flags & (MF_NOGRAVITY | MF_NOCLIP)) || UNLIKELY(thing->player->pflags & PF_NIGHTSMODE)))
+	if (thing->player && (!(thing->flags & (MF_NOGRAVITY | MF_NOCLIP)) || thing->player->pflags & PF_NIGHTSMODE))
 	{
 		INT32 dist;
 		INT32 speed;
@@ -7134,7 +7133,7 @@ static inline boolean PIT_PushThing(mobj_t *thing)
 		// Written with bits and pieces of P_HomingAttack
 		if ((speed > 0) && (P_CheckSight(thing, tmpusher->source)))
 		{
-			if (LIKELY(!(thing->player->pflags & PF_NIGHTSMODE)))
+			if (!(thing->player->pflags & PF_NIGHTSMODE))
 			{
 				// only push wrt Z if health & 1 (mapthing has ambush flag)
 				if (tmpusher->source->health & 1)

src/p_tick.c

@@ -115,7 +115,7 @@ void Command_Numthinkers_f(void)
 
 	for (think = listtype->next; think != listtype; think = think->next)
 	{
-		if (think->function != action)
+		if (think->function.acp1 != action)
 			continue;
 
 		count++;
@@ -152,7 +152,7 @@ void Command_CountMobjs_f(void)
 
 			for (th = thinkercap.next; th != &thinkercap; th = th->next)
 			{
-				if (th->function != (actionf_p1)P_MobjThinker)
+				if (th->function.acp1 != (actionf_p1)P_MobjThinker)
 					continue;
 
 				if (((mobj_t *)th)->type == i)
@@ -172,7 +172,7 @@ void Command_CountMobjs_f(void)
 
 		for (th = thinkercap.next; th != &thinkercap; th = th->next)
 		{
-			if (th->function != (actionf_p1)P_MobjThinker)
+			if (th->function.acp1 != (actionf_p1)P_MobjThinker)
 				continue;
 
 			if (((mobj_t *)th)->type == i)
@@ -190,7 +190,7 @@ void Command_CountMobjs_f(void)
 void P_InitThinkers(void)
 {
 	thinkercap.prev = thinkercap.next = &thinkercap;
-	precipcap.prev  = precipcap.next  = &precipcap;
+	precipcap.prev = precipcap.next = &precipcap;
 	waypointcap = NULL;
 }
 
@@ -207,7 +207,7 @@ void P_AddThinker(thinker_t *thinker)
 
 	thinker->references = 0;    // killough 11/98: init reference counter to 0
 
-	thinker->cachable = (thinker->function == (actionf_p1)P_MobjThinker);
+	thinker->cachable = (thinker->function.acp1 == (actionf_p1)P_MobjThinker);
 #ifdef PARANOIA
 	thinker->debug_mobjtype = MT_NULL;
 #endif
@@ -235,7 +235,7 @@ void P_AddPrecipThinker(thinker_t *thinker)
 #ifdef PARANOIA
 static const char *MobjTypeName(const mobj_t *mobj)
 {
-	actionf_p1 p1 = mobj->thinker.function;
+	actionf_p1 p1 = mobj->thinker.function.acp1;
 
 	if (p1 == (actionf_p1)P_MobjThinker)
 	{
@@ -254,7 +254,7 @@ static const char *MobjTypeName(const mobj_t *mobj)
 
 static const char *MobjThinkerName(const mobj_t *mobj)
 {
-	actionf_p1 p1 = mobj->thinker.function;
+	actionf_p1 p1 = mobj->thinker.function.acp1;
 
 	if (p1 == (actionf_p1)P_MobjThinker)
 	{
@@ -371,7 +371,7 @@ void P_UnlinkThinker(thinker_t *thinker)
 void P_RemoveThinker(thinker_t *thinker)
 {
 	LUA_InvalidateUserdata(thinker);
-	thinker->function = (actionf_p1)P_RemoveThinkerDelayed;
+	thinker->function.acp1 = (actionf_p1)P_RemoveThinkerDelayed;
 }
 
 /*
@@ -455,15 +455,12 @@ static inline void P_RunThinkers(void)
 	for (currentthinker = thinkercap.next; currentthinker != &thinkercap; currentthinker = currentthinker->next)
 	{
 #ifdef PARANOIA
-		I_Assert(currentthinker->function != NULL);
+		I_Assert(currentthinker->function.acp1 != NULL);
 #endif
-		currentthinker->function(currentthinker);
+		currentthinker->function.acp1(currentthinker);
 	}
 }
 
-// Controller rumble!
-// this keeps track of a bunch of things
-// and makes your controller rumble accordingly
 static void P_DeviceRumbleTick(void)
 {
 	UINT8 i;
@@ -475,31 +472,27 @@ static void P_DeviceRumbleTick(void)
 
 	for (i = 0; i <= splitscreen; i++)
 	{
+		UINT16 low = 0;
+		UINT16 high = 0;
+
 		if (!cv_usejoystick[i].value || !cv_rumble[i].value)
 		{
 			continue;
 		}
 
+		player_t *player = ((i == 0) ? &players[consoleplayer] : &players[displayplayers[i]]);
+
+		if (player->spectator || !player->mo)
+		{
+			continue;
+		}
+
 		if (camera[i].freecam)
 		{
 			continue;
 		}
 
-		UINT16 low = 0, high = 0;
-		UINT16 lenght = 57; // in ms
-
-		const player_t *player = ((i == 0) ? &players[consoleplayer] : &players[displayplayers[i]]);
-
-		// allow lua to do some crap for spectators
-		if (player->spectator || !player->mo)
-		{
-			continue;
-		}
-
-		// reset the rumble if you exit or are ded lel
-		if (player->exiting ||
-			player->playerstate == PST_DEAD ||
-			player->kartstuff[k_respawn] > 1)
+		if (player->exiting)
 		{
 			G_PlayerDeviceRumble(i, low, high, 0);
 			continue;
@@ -508,17 +501,15 @@ static void P_DeviceRumbleTick(void)
 		if (player->kartstuff[k_spinouttimer])
 		{
 			//low = high = FRACUNIT / 6;
-			low = high = FixedMul((FRACUNIT / 4), (FixedDiv(player->kartstuff[k_spinouttimer], (3*TICRATE / 2)))); // try do some some kinda fadeout
+			low = high = FixedMul((FRACUNIT / 4), (FixedDiv(player->kartstuff[k_spinouttimer], (3*TICRATE / 2))));
 		}
 		else if (player->kartstuff[k_sneakertimer] > (sneakertime-(TICRATE/2)))
 		{
 			low = high = FRACUNIT / 8;
 		}
 		else if ((player->kartstuff[k_offroad])
-			&& player->speed != 0
-			&& P_IsObjectOnGround(player->mo))
+			&& P_IsObjectOnGround(player->mo) && player->speed != 0)
 		{
-			// weaken this depending on if you got hyu or invinc
 			if (player->kartstuff[k_hyudorotimer])
 			{
 				high = FRACUNIT / 128;
@@ -533,8 +524,7 @@ static void P_DeviceRumbleTick(void)
 			}
 		}
 		else if ((player->kartstuff[k_bananadrag] > TICRATE)
-			&& player->speed != 0
-			&& P_IsObjectOnGround(player->mo))
+			&& P_IsObjectOnGround(player->mo) && player->speed != 0)
 		{
 			if (leveltime & 1) // this is actually funny lel
 				high = FRACUNIT / 64;
@@ -551,7 +541,7 @@ static void P_DeviceRumbleTick(void)
 			continue;
 		}
 
-		G_PlayerDeviceRumble(i, low, high, lenght);
+		G_PlayerDeviceRumble(i, low, high, 57);
 	}
 }
 
@@ -566,11 +556,7 @@ void P_RunChaseCameras(void)
 			player_t *p = &players[displayplayers[i]];
 			camera_t *cam = &camera[i];
 
-			if (cv_verticallook[i].value &&
-				leveltime > starttime
-				&& p->mo
-				&& p->kartstuff[k_respawn] == 0
-				&& p->kartstuff[k_throwdir] != 0)
+			if (cv_verticallook[i].value && leveltime > starttime && p->mo && p->kartstuff[k_respawn] == 0 && p->kartstuff[k_throwdir] != 0)
 			{
 				if (p->speed < 6 * p->mo->scale && abs(cam->dpad_y_held) < 2*TICRATE)
 					cam->dpad_y_held += p->kartstuff[k_throwdir];
@@ -613,11 +599,6 @@ static void P_RunQuakes(void)
 	--quake.time;
 }
 
-// Reset our Sprite scales and offsets
-// at the start of our tic
-// this is just to make things simpler
-// as we dont have to reset it ourselves after use
-// done at the start so lua can still overwrite everything
 static inline void P_ResetSpriteStuff(void)
 {
 	thinker_t *th;
@@ -629,7 +610,7 @@ static inline void P_ResetSpriteStuff(void)
 	{
 		mobj_t *mo;
 
-		if (th->function != (actionf_p1)P_MobjThinker) // not a mobj
+		if (th->function.acp1 != (actionf_p1)P_MobjThinker) // not a mobj
 			continue;
 
 		mo = (mobj_t *)th;
@@ -753,12 +734,8 @@ void P_Ticker(boolean run)
 
 		PS_START_TIMING(ps_playerthink_time);
 		for (i = 0; i < MAXPLAYERS; i++)
-		{
-			if (!playeringame[i] || P_MobjWasRemoved(players[i].mo))
-				continue;
-
-			P_PlayerThink(&players[i]);
-		}
+			if (playeringame[i] && players[i].mo && !P_MobjWasRemoved(players[i].mo))
+				P_PlayerThink(&players[i]);
 		PS_STOP_TIMING(ps_playerthink_time);
 	}
 
@@ -777,12 +754,8 @@ void P_Ticker(boolean run)
 
 		// Run any "after all the other thinkers" stuff
 		for (i = 0; i < MAXPLAYERS; i++)
-		{
-			if (!playeringame[i] || P_MobjWasRemoved(players[i].mo))
-				continue;
-
-			P_PlayerAfterThink(&players[i]);
-		}
+			if (playeringame[i] && players[i].mo && !P_MobjWasRemoved(players[i].mo))
+				P_PlayerAfterThink(&players[i]);
 
 		// Apply rumble to local players
 		if (!demo.playback)
@@ -860,12 +833,12 @@ void P_Ticker(boolean run)
 
 		if (demo.recording)
 		{
+			INT32 axis = JoyAxis(AXISLOOKBACK, 1);
+
 			G_WriteAllGhostTics();
 
 			if (cv_recordmultiplayerdemos.value)
 			{
-				const INT32 axis = JoyAxis(AXISLOOKBACK, 1);
-
 				if (demo.savemode == DSM_NOTSAVING || demo.savemode == DSM_WILLAUTOSAVE)
 					if (demo.savebutton && demo.savebutton + 3*TICRATE < leveltime && (InputDown(gc_lookback, 1) || (cv_usejoystick[0].value && axis > 0)))
 						demo.savemode = DSM_TITLEENTRY;
@@ -981,7 +954,10 @@ void P_PreTicker(INT32 frames)
 		// Run any "after all the other thinkers" stuff
 		for (i = 0; i < MAXPLAYERS; i++)
 		{
-			if (!playeringame[i] || P_MobjWasRemoved(players[i].mo))
+			if (!playeringame[i])
+				continue;
+
+			if (!players[i].mo || P_MobjWasRemoved(players[i].mo))
 				continue;
 
 			P_PlayerAfterThink(&players[i]);

src/p_user.c

@@ -73,7 +73,7 @@ void P_Thrust(mobj_t *mo, angle_t angle, fixed_t move)
 
 	mo->momx += FixedMul(move, FINECOSINE(angle));
 
-	if (LIKELY(!(twodlevel || (mo->flags2 & MF2_TWOD))))
+	if (!(twodlevel || (mo->flags2 & MF2_TWOD)))
 		mo->momy += FixedMul(move, FINESINE(angle));
 }
 
@@ -90,7 +90,7 @@ void P_InstaThrust(mobj_t *mo, angle_t angle, fixed_t move)
 
 	mo->momx = FixedMul(move, FINECOSINE(angle));
 
-	if (LIKELY(!(twodlevel || (mo->flags2 & MF2_TWOD))))
+	if (!(twodlevel || (mo->flags2 & MF2_TWOD)))
 		mo->momy = FixedMul(move,FINESINE(angle));
 }
 
@@ -498,9 +498,9 @@ void P_PlayLivesJingle(player_t *player)
 	if (player && !P_IsLocalPlayer(player))
 		return;
 
-	if (UNLIKELY(use1upSound))
+	if (use1upSound)
 		S_StartSound(NULL, sfx_oneup);
-	else if (UNLIKELY(mariomode))
+	else if (mariomode)
 		S_StartSound(NULL, sfx_marioa);
 	else
 	{
@@ -528,7 +528,7 @@ void P_PlayRinglossSound(mobj_t *source, mobj_t *damager)
 			S_StartSound(NULL, sfx);
 		}
 		else
-			S_StartSound(source, UNLIKELY(mariomode) ? sfx_mario8 : sfx_khurt1 + key);
+			S_StartSound(source, (mariomode) ? sfx_mario8 : sfx_khurt1 + key);
 	}
 	else
 		S_StartSound(source, sfx_slip);
@@ -552,13 +552,9 @@ static UINT8 getPlayerPos(player_t *player)
 	{
 		UINT8 pos = 1;
 
-		for (UINT8 i = 0; i < MAXPLAYERS; ++i)
-		{
-			if (!playeringame[i] || players[i].spectator)
-				continue;
-
-			if (players[i].marescore > player->marescore)
-				++pos;
+		for (int i = 0; i < MAXPLAYERS; ++i) {
+			if (!playeringame[i] || players[i].spectator) continue;
+			if (players[i].marescore > player->marescore) ++pos;
 		}
 
 		return pos;
@@ -1068,7 +1064,7 @@ void P_SpawnShieldOrb(player_t *player)
 	// blaze through the thinkers to see if an orb already exists!
 	for (th = thinkercap.next; th != &thinkercap; th = th->next)
 	{
-		if (th->function != (actionf_p1)P_MobjThinker)
+		if (th->function.acp1 != (actionf_p1)P_MobjThinker)
 			continue;
 
 		shieldobj = (mobj_t *)th;
@@ -1287,14 +1283,13 @@ boolean P_InQuicksand(mobj_t *mo) // Returns true if you are in quicksand
 {
 	sector_t *sector = mo->subsector->sector;
 	fixed_t topheight, bottomheight;
-	fixed_t flipoffset;
+
+	fixed_t flipoffset = ((mo->eflags & MFE_VERTICALFLIP) ? (mo->height/2) : 0);
 
 	if (sector->ffloors)
 	{
 		ffloor_t *rover;
 
-		flipoffset = ((mo->eflags & MFE_VERTICALFLIP) ? (mo->height/2) : 0);
-
 		for (rover = sector->ffloors; rover; rover = rover->next)
 		{
 			if (!(rover->flags & FF_EXISTS))
@@ -1683,7 +1678,6 @@ static void P_DoBubbleBreath(player_t *player)
 		bubble = P_SpawnMobj(player->mo->x, player->mo->y, zh, MT_SMALLBUBBLE);
 	else if (P_RandomChance(3*FRACUNIT/256))
 		bubble = P_SpawnMobj(player->mo->x, player->mo->y, zh, MT_MEDIUMBUBBLE);
-
 	if (bubble)
 	{
 		bubble->threshold = 42;
@@ -1691,8 +1685,8 @@ static void P_DoBubbleBreath(player_t *player)
 		P_SetScale(bubble, bubble->destscale);
 	}
 
-	//if (player->pflags & PF_NIGHTSMODE) // NiGHTS Super doesn't spawn flight bubbles
-		//return;
+	if (player->pflags & PF_NIGHTSMODE) // NiGHTS Super doesn't spawn flight bubbles
+		return;
 }
 
 //
@@ -1786,7 +1780,7 @@ void P_Telekinesis(player_t *player, fixed_t thrust, fixed_t range)
 
 	for (th = thinkercap.next; th != &thinkercap; th = th->next)
 	{
-		if (th->function != (actionf_p1)P_MobjThinker)
+		if (th->function.acp1 != (actionf_p1)P_MobjThinker)
 			continue;
 
 		mo2 = (mobj_t *)th;
@@ -2161,7 +2155,7 @@ static void P_MovePlayer(player_t *player)
 	}
 	// note: don't unset stasis here
 
-	if (UNLIKELY(!player->spectator && G_TagGametype()))
+	if (!player->spectator && G_TagGametype())
 	{
 		// If we have stasis already here, it's because it's forced on us
 		// by a linedef executor or what have you
@@ -2221,7 +2215,7 @@ static void P_MovePlayer(player_t *player)
 			player->lturn_max[leveltime%MAXPREDICTTICS] = player->rturn_max[leveltime%MAXPREDICTTICS] = 0;
 		}
 
-		if (LIKELY(leveltime >= starttime))
+		if (leveltime >= starttime)
 		{
 			// KART: Don't directly apply angleturn! It may have been either A) forged by a malicious client, or B) not be a smooth turn due to a player dropping frames.
 			// Instead, turn the player only up to the amount they're supposed to turn accounting for latency. Allow exactly 1 extra turn unit to try to keep old replays synced.
@@ -2260,7 +2254,7 @@ static void P_MovePlayer(player_t *player)
 		P_3dMovement(player);
 	}
 
-	if (UNLIKELY(maptol & TOL_2D)) // psure this doesent even work at all
+	if (maptol & TOL_2D)
 		runspd = FixedMul(runspd, 2*FRACUNIT/3);
 
 	/////////////////////////
@@ -2321,10 +2315,10 @@ static void P_MovePlayer(player_t *player)
 
 	// Drifting sound
 	// Start looping the sound now.
-	if (onground && leveltime % 50 == 0 && player->kartstuff[k_drift] != 0)
+	if (leveltime % 50 == 0 && onground && player->kartstuff[k_drift] != 0)
 		S_StartSound(player->mo, sfx_drift);
 	// Leveltime being 50 might take a while at times. We'll start it up once, isntantly.
-	else if (onground && !S_SoundPlaying(player->mo, sfx_drift) && player->kartstuff[k_drift] != 0)
+	else if (!S_SoundPlaying(player->mo, sfx_drift) && onground && player->kartstuff[k_drift] != 0)
 		S_StartSound(player->mo, sfx_drift);
 	// Ok, we'll stop now.
 	else if (player->kartstuff[k_drift] == 0 || !onground)
@@ -2349,7 +2343,7 @@ static void P_MovePlayer(player_t *player)
 		P_SetPlayerMobjState(player->mo, S_KART_STND1); // SRB2kart - was S_PLAY_STND
 	}
 
-	if (UNLIKELY(player->gotflag)) // If you can't glide, then why the heck would you be gliding?
+	if (player->gotflag) // If you can't glide, then why the heck would you be gliding?
 	{
 		player->pflags &= ~PF_GLIDING;
 		player->glidetime = 0;
@@ -2512,7 +2506,7 @@ static void P_DoZoomTube(player_t *player)
 		// Find next waypoint
 		for (th = thinkercap.next; th != &thinkercap; th = th->next)
 		{
-			if (th->function != (actionf_p1)P_MobjThinker) // Not a mobj thinker
+			if (th->function.acp1 != (actionf_p1)P_MobjThinker) // Not a mobj thinker
 				continue;
 
 			mo2 = (mobj_t *)th;
@@ -2602,7 +2596,7 @@ void P_NukeEnemies(mobj_t *inflictor, mobj_t *source, fixed_t radius)
 
 	for (think = thinkercap.next; think != &thinkercap; think = think->next)
 	{
-		if (think->function != (actionf_p1)P_MobjThinker)
+		if (think->function.acp1 != (actionf_p1)P_MobjThinker)
 			continue; // not a mobj thinker
 
 		mo = (mobj_t *)think;
@@ -2679,7 +2673,7 @@ boolean P_LookForEnemies(player_t *player)
 
 	for (think = thinkercap.next; think != &thinkercap; think = think->next)
 	{
-		if (think->function != (actionf_p1)P_MobjThinker)
+		if (think->function.acp1 != (actionf_p1)P_MobjThinker)
 			continue; // not a mobj thinker
 
 		mo = (mobj_t *)think;
@@ -2710,8 +2704,8 @@ boolean P_LookForEnemies(player_t *player)
 			player->mo->z-mo->z) > FixedMul(RING_DIST, player->mo->scale))
 			continue; // out of range
 
-		if (UNLIKELY((twodlevel || player->mo->flags2 & MF2_TWOD)
-		&& abs(player->mo->y-mo->y) > player->mo->radius))
+		if ((twodlevel || player->mo->flags2 & MF2_TWOD)
+		&& abs(player->mo->y-mo->y) > player->mo->radius)
 			continue; // not in your 2d plane
 
 		if (mo->type == MT_PLAYER) // Don't chase after other players!
@@ -2803,7 +2797,7 @@ void P_FindEmerald(void)
 	// to find all emeralds
 	for (th = thinkercap.next; th != &thinkercap; th = th->next)
 	{
-		if (th->function != (actionf_p1)P_MobjThinker)
+		if (th->function.acp1 != (actionf_p1)P_MobjThinker)
 			continue;
 
 		mo2 = (mobj_t *)th;
@@ -3516,7 +3510,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) || GETSECSPECIAL(rover->master->frontsector->special, 4) == 12)
 					continue;
 
 				topheight = P_CameraGetFOFTopZ(thiscam, newsubsec->sector, rover, midx, midy, NULL);
@@ -3581,7 +3575,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 (GETSECSPECIAL(polysec->special, 4) == 12)
 							{ // Camera noclip polyobj.
 								plink = (polymaplink_t *)(plink->link.next);
 								continue;
@@ -3637,7 +3631,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 (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) && GETSECSPECIAL(rover->master->frontsector->special, 4) == 12)
 				{
 					topheight = P_CameraGetFOFTopZ(thiscam, newsubsec->sector, rover, midx, midy, NULL);
 					bottomheight = P_CameraGetFOFBottomZ(thiscam, newsubsec->sector, rover, midx, midy, NULL);
@@ -4083,7 +4077,7 @@ boolean P_SpectatorJoinGame(player_t *player)
 	// Team changing in Team Match and CTF
 	// Pressing fire assigns you to a team that needs players if allowed.
 	// Partial code reproduction from p_tick.c autobalance code.
-	else if (UNLIKELY(G_GametypeHasTeams()))
+	else if (G_GametypeHasTeams())
 	{
 		INT32 changeto = 0;
 		INT32 z, numplayersred = 0, numplayersblue = 0;
@@ -4251,7 +4245,7 @@ static void P_CalcPostImg(player_t *player, camera_t *thiscam)
 	else
 		pviewheight = player->mo->z + player->viewheight;
 
-	if (player->awayviewtics && !P_MobjWasRemoved(player->awayviewmobj))
+	if (player->awayviewtics && player->awayviewmobj && !P_MobjWasRemoved(player->awayviewmobj))
 	{
 		sector = player->awayviewmobj->subsector->sector;
 		pviewheight = player->awayviewmobj->z + 20*FRACUNIT;
@@ -4325,10 +4319,10 @@ static INT32 Quaketilt(player_t *player)
 	if (abs(delta) > ANGLE_90)
 		delta = (INT32)(( moma + ANGLE_180 ) - player->mo->angle );
 
+	const boolean sliptiding = player->kartstuff[k_drift] ? 0 : player->kartstuff[k_aizdriftstrat];
+
 	if (P_IsObjectOnGround(player->mo))
 	{
-		const boolean sliptiding = player->kartstuff[k_drift] ? 0 : player->kartstuff[k_aizdriftstrat];
-
 		if (sliptiding)
 		{
 			tilt = ANGLE_45;
@@ -4481,8 +4475,8 @@ void P_PlayerThink(player_t *player)
 	{
 		seenplayer = NULL;
 
-		if (UNLIKELY(cv_seenames.value && cv_allowseenames.value &&
-			!(G_TagGametype() && (player->pflags & PF_TAGIT))))
+		if (cv_seenames.value && cv_allowseenames.value &&
+			!(G_TagGametype() && (player->pflags & PF_TAGIT)))
 		{
 			mobj_t *mo = P_SpawnNameFinder(player->mo, MT_NAMECHECK);
 
@@ -4771,8 +4765,8 @@ void P_PlayerThink(player_t *player)
 	}
 
 	// Even if not NiGHTS, pull in nearby objects when walking around as John Q. Elliot.
-	if (UNLIKELY(!objectplacing && !((netgame || multiplayer) && player->spectator)
-	&& maptol & TOL_NIGHTS && (!(player->pflags & PF_NIGHTSMODE) || player->powers[pw_nights_helper])))
+	if (!objectplacing && !((netgame || multiplayer) && player->spectator)
+	&& maptol & TOL_NIGHTS && (!(player->pflags & PF_NIGHTSMODE) || player->powers[pw_nights_helper]))
 	{
 		thinker_t *th;
 		mobj_t *mo2;
@@ -4782,7 +4776,7 @@ void P_PlayerThink(player_t *player)
 
 		for (th = thinkercap.next; th != &thinkercap; th = th->next)
 		{
-			if (th->function != (actionf_p1)P_MobjThinker)
+			if (th->function.acp1 != (actionf_p1)P_MobjThinker)
 				continue;
 
 			mo2 = (mobj_t *)th;
@@ -4837,7 +4831,7 @@ void P_PlayerThink(player_t *player)
 	player->pflags &= ~PF_FULLSTASIS;
 
 	if (player->onconveyor == 1)
-		player->cmomy = player->cmomx = 0;
+			player->cmomy = player->cmomx = 0;
 
 	P_DoBubbleBreath(player); // Spawn Sonic's bubbles
 	P_CheckInvincibilityTimer(player); // Spawn Invincibility Sparkles
@@ -4874,7 +4868,7 @@ void P_PlayerThink(player_t *player)
 #endif
 
 	// check for use
-	if (LIKELY(!(player->pflags & PF_NIGHTSMODE)))
+	if (!(player->pflags & PF_NIGHTSMODE))
 	{
 		if (cmd->buttons & BT_BRAKE)
 			player->pflags |= PF_USEDOWN;
@@ -5046,11 +5040,6 @@ void P_PlayerAfterThink(player_t *player)
 		P_PlayerInSpecialSector(player);
 #endif
 
-	if (player->playerstate == PST_DEAD)
-	{
-		return;
-	}
-
 	for (i = 0; i <= splitscreen; i++)
 	{
 		if (player == &players[displayplayers[i]])
@@ -5060,7 +5049,12 @@ void P_PlayerAfterThink(player_t *player)
 		}
 	}
 
-	if (UNLIKELY(player->pflags & PF_NIGHTSMODE))
+	if (player->playerstate == PST_DEAD)
+	{
+		return;
+	}
+
+	if (player->pflags & PF_NIGHTSMODE)
 	{
 		player->powers[pw_gravityboots] = 0;
 	}

src/r_data.c

@@ -235,7 +235,6 @@ 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;
@@ -485,7 +484,9 @@ UINT8 *R_GetColumn(fixed_t tex, INT32 col)
 		// Odd width texture, cannot just mask.
 		// Sometime gets colnum = -1 or = width, even without tiling.
 		// Test LostCiv, Map 20, crates.
-		col = ((col % texwidth) + texwidth) % texwidth;
+		col = ( col < 0 ) ?
+			texwidth - (((-col - 1) % texwidth) + 1)
+			: col % texwidth;
 	}
 
 	if (!data)
@@ -521,151 +522,32 @@ 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"
-
-static INT32
-Rloadtextures (INT32 i, INT32 w)
+void R_LoadTextures(void)
 {
+	INT32 i, k, w;
 	UINT16 j;
-	INT32 k;
 	UINT16 texstart, texend, texturesLumpPos;
 	softwarepatch_t *patchlump;
 	texpatch_t *patch;
 	texture_t *texture;
 
-	// Get the lump numbers for the markers in the WAD, if they exist.
-	if (W_FileHasFolders(wadfiles[w]))
+	// Free previous memory before numtextures change.
+	if (numtextures)
 	{
-		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)
+		for (i = 0; i < numtextures; i++)
 		{
-			R_ParseTEXTURESLump(w, texturesLumpPos, &i);
-			texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", (UINT16)w, texturesLumpPos + 1);
+			Z_Free(textures[i]);
+			Z_Free(texturecache[i]);
 		}
+		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.
 
@@ -674,80 +556,152 @@ static INT32 R_CountTextures(UINT16 wadnum)
 	// 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.
-
-	// Count the textures from TEXTURES lumps
-	texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", wadnum, 0);
-
-	while (texturesLumpPos != INT16_MAX)
+	for (w = 0, numtextures = 0; w < numwadfiles; w++)
 	{
-		count += R_CountTexturesInTEXTURESLump(wadnum, texturesLumpPos);
-		texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", wadnum, texturesLumpPos + 1);
+		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 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;
+	// If no textures found by this point, bomb out
+	if (!numtextures)
+		I_Error("No textures detected in any WADs!\n");
 
 	// Allocate memory and initialize to 0 for all the textures we are initialising.
-	recallocuser(&textures, oldsize, newsize);
+	// There are actually 5 buffers allocated in one for convenience.
+	textures = Z_Calloc((numtextures * sizeof(void *)) * 5, PU_STATIC, NULL);
 
 	// Allocate texture column offset table.
-	recallocuser(&texturecolumnofs, oldsize, newsize);
+	texturecolumnofs = (void *)((UINT8 *)textures + (numtextures * sizeof(void *)));
 	// Allocate texture referencing cache.
-	recallocuser(&texturecache, oldsize, newsize);
-	// Allocate texture width table.
-	recallocuser(&texturewidthmask, oldsize, newsize);
-	// Allocate texture height table.
-	recallocuser(&textureheight, oldsize, newsize);
+	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));
 	// Create translation table for global animation.
-	Z_Realloc(texturetranslation, (newtextures + 1) * sizeof(*texturetranslation), PU_STATIC, &texturetranslation);
+	texturetranslation = Z_Malloc((numtextures + 1) * sizeof(*texturetranslation), PU_STATIC, NULL);
 
-	for (i = 0; i < numtextures; ++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)
-	{
+	for (i = 0; i < numtextures; i++)
 		texturetranslation[i] = i;
-		i++;
+
+	for (i = 0, w = 0; w < numwadfiles; w++)
+	{
+		// 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++;
+		}
 	}
-}
-
-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)
@@ -755,46 +709,6 @@ static void R_FinishLoadingTextures(INT32 add)
 #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;
@@ -1046,7 +960,6 @@ 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;
@@ -1830,22 +1743,19 @@ 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 (tidcache[i].hash == hash && !strncasecmp(tidcache[i].name, name, 8))
+		if (!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 (textures[i]->hash == hash && !strncasecmp(textures[i]->name, name, 8))
+		if (!strncasecmp(textures[i]->name, name, 8))
 		{
 			tidcachelen++;
 			Z_Realloc(tidcache, tidcachelen * sizeof(*tidcache), PU_STATIC, &tidcache);
@@ -1854,7 +1764,6 @@ 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;
 		}
@@ -1956,7 +1865,7 @@ static void R_PrecacheLevelSprites(void)
 
 	for (th = thinkercap.next; th != &thinkercap; th = th->next)
 	{
-		if (th->function != (actionf_p1)P_MobjThinker)
+		if (th->function.acp1 != (actionf_p1)P_MobjThinker)
 			continue;
 
 		spritepresent[((mobj_t *)th)->sprite] = 1;

src/r_data.h

@@ -53,7 +53,6 @@ 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.
@@ -77,7 +76,6 @@ 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_fps.c

@@ -42,13 +42,13 @@ static CV_PossibleValue_t fpscap_cons_t[] = {
 	{0, NULL}
 };
 
-consvar_t cv_fpscap   = {"fpscap", "Match refresh rate", CV_SAVE, fpscap_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_fpscap = {"fpscap", "Match refresh rate", CV_SAVE, fpscap_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_fpscapbg = {"fpscapbackground", "Match refresh rate", CV_SAVE, fpscap_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 consvar_t cv_precipinterp = {"precipinterpolation", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 ps_metric_t ps_interp_frac = {0};
-ps_metric_t ps_interp_lag  = {0};
+ps_metric_t ps_interp_lag = {0};
 
 static boolean R_UseBackgroundFramerateCap(void)
 {
@@ -67,21 +67,21 @@ static boolean R_UseBackgroundFramerateCap(void)
 	return false;
 }
 
-static UINT32 R_GetFrameCap(INT32 val)
+static UINT32 R_GetBackgroundFramerateCap(void)
 {
-	if (val == 0)
+	if (cv_fpscapbg.value == 0)
 	{
 		// 0: Match refresh rate
 		return I_GetRefreshRate();
 	}
 
-	if (val < 0)
+	if (cv_fpscapbg.value < 0)
 	{
 		// -1: Unlimited
 		return 0;
 	}
 
-	return val;
+	return cv_fpscapbg.value;
 }
 
 UINT32 R_GetFramerateCap(void)
@@ -95,10 +95,22 @@ UINT32 R_GetFramerateCap(void)
 
 	if (R_UseBackgroundFramerateCap())
 	{
-		return R_GetFrameCap(cv_fpscapbg.value);
+		return R_GetBackgroundFramerateCap();
 	}
 
-	return R_GetFrameCap(cv_fpscap.value);
+	if (cv_fpscap.value == 0)
+	{
+		// 0: Match refresh rate
+		return I_GetRefreshRate();
+	}
+
+	if (cv_fpscap.value < 0)
+	{
+		// -1: Unlimited
+		return 0;
+	}
+
+	return cv_fpscap.value;
 }
 
 boolean R_UsingFrameInterpolation(void)

src/r_main.cpp

@@ -151,7 +151,6 @@ static CV_PossibleValue_t fov_cons_t[] = {{MINFOV*FRACUNIT, "MIN"}, {MAXFOV*FRAC
 static CV_PossibleValue_t translucenthud_cons_t[] = {{0, "MIN"}, {10, "MAX"}, {0, NULL}};
 static CV_PossibleValue_t maxportals_cons_t[] = {{0, "MIN"}, {12, "MAX"}, {0, NULL}}; // lmao rendering 32 portals, you're a card
 static CV_PossibleValue_t homremoval_cons_t[] = {{0, "No"}, {1, "Yes"}, {2, "Flash"}, {0, NULL}};
-static CV_PossibleValue_t secbright_cons_t[] = {{0, "MIN"}, {255, "MAX"}, {0, NULL}};
 
 static void R_SetFov(fixed_t playerfov);
 
@@ -202,8 +201,6 @@ consvar_t cv_ripplewater     = {"waterripples", "On", CV_SAVE, CV_OnOff, NULL, 0
 // Okay, whoever said homremoval causes a performance hit should be shot.
 consvar_t cv_homremoval      = {"homremoval", "Yes", CV_SAVE, homremoval_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-consvar_t cv_secbright       = {"r_secbright", "0", CV_SAVE, secbright_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-
 consvar_t cv_maxportals      = {"maxportals", "2", CV_SAVE, maxportals_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 // cap fov, fov too high tears software apart.
@@ -1136,6 +1133,7 @@ static void R_SetupSkyScale(player_t *player, camera_t *thiscam, mapheader_t *mh
 	{
 		if (skyboxmo[1])
 		{
+			angle_t ang;
 			fixed_t x = 0, y = 0;
 
 			if (mh->skybox_scalex > 0)
@@ -1167,8 +1165,8 @@ static void R_SetupSkyScale(player_t *player, camera_t *thiscam, mapheader_t *mh
 					newview->y -= x;
 					break;
 				default:
-					angle_t ang = viewmobj->angle>>ANGLETOFINESHIFT;
-					newview->x += FixedMul(x,FINECOSINE(ang)) - FixedMul(y,  FINESINE(ang));
+					ang = viewmobj->angle>>ANGLETOFINESHIFT;
+					newview->x  += FixedMul(x,FINECOSINE(ang)) - FixedMul(y,  FINESINE(ang));
 					newview->y += FixedMul(x,  FINESINE(ang)) + FixedMul(y,FINECOSINE(ang));
 					break;
 			}
@@ -1194,14 +1192,14 @@ static void R_SetupSkyScale(player_t *player, camera_t *thiscam, mapheader_t *mh
 	}
 }
 
-void R_SkyboxFrame(UINT8 pnum)
+void R_SkyboxFrame(int s)
 {
-	player_t *player = &players[displayplayers[pnum]];
-	camera_t *thiscam = &camera[pnum];
-	sector_t *viewsec = NULL;
+	player_t *player = &players[displayplayers[s]];
+	camera_t *thiscam = &camera[s];
+	subsector_t *subsector = NULL;
 	mapheader_t *mh = mapheaderinfo[gamemap-1];
 
-	R_SetViewContext(static_cast<viewcontext_e>(VIEWCONTEXT_SKY1 + pnum));
+	R_SetViewContext(static_cast<viewcontext_e>(VIEWCONTEXT_SKY1 + s));
 
 	// cut-away view stuff
 	newview->sky = true;
@@ -1217,38 +1215,35 @@ void R_SkyboxFrame(UINT8 pnum)
 
 	R_SetupAimingFrame(player, thiscam);
 
-	if (!P_MobjWasRemoved(viewmobj))
-	{
-		newview->angle += viewmobj->angle;
+	newview->angle += viewmobj->angle;
 
-		newview->x = viewmobj->x;
-		newview->y = viewmobj->y;
-		newview->z = (viewmobj->spawnpoint) ? (((fixed_t)viewmobj->spawnpoint->angle) << FRACBITS) : 0;
-
-		if (viewmobj->subsector)
-			viewsec = viewmobj->subsector->sector;
-	}
+	newview->x = viewmobj->x;
+	newview->y = viewmobj->y;
+	newview->z = (viewmobj->spawnpoint) ? (((fixed_t)viewmobj->spawnpoint->angle)<<FRACBITS) : 0;
 
 	if (mh)
 	{
 		R_SetupSkyScale(player, thiscam, mh);
 	}
 
-	R_SetupCommonFrame(player, viewsec);
+	if (!P_MobjWasRemoved(viewmobj) && viewmobj->subsector && viewmobj->subsector->sector)
+		subsector = viewmobj->subsector;
+
+	R_SetupCommonFrame(player, subsector->sector);
 }
 
-void R_SetupFrame(UINT8 pnum, boolean skybox)
+void R_SetupFrame(int s, boolean skybox)
 {
-	player_t *player = &players[displayplayers[pnum]];
-	camera_t *thiscam = &camera[pnum];
-	boolean chasecam = (cv_chasecam[pnum].value);
-	sector_t *viewsec = NULL;
+	player_t *player = &players[displayplayers[s]];
+	camera_t *thiscam = &camera[s];
+	boolean chasecam = (cv_chasecam[s].value);
+	sector_t * sector = NULL;
 
-	R_SetViewContext(static_cast<viewcontext_e>(VIEWCONTEXT_PLAYER1 + pnum));
+	R_SetViewContext(static_cast<viewcontext_e>(VIEWCONTEXT_PLAYER1 + s));
 
 	if (thiscam->reset)
 	{
-		R_ResetViewInterpolation(pnum);
+		R_ResetViewInterpolation(s);
 		thiscam->reset = false;
 	}
 
@@ -1283,10 +1278,10 @@ void R_SetupFrame(UINT8 pnum, boolean skybox)
 		newview->y = viewmobj->y;
 		newview->z = viewmobj->z + 20*FRACUNIT;
 
-		if (viewmobj->subsector)
-			viewsec = viewmobj->subsector->sector;
+		if (viewmobj->subsector && viewmobj->subsector->sector)
+			sector = viewmobj->subsector->sector;
 
-		R_SetupCommonFrame(player, viewsec);
+		R_SetupCommonFrame(player, sector);
 	}
 	else if (thiscam && chasecam) // use outside cam view
 	{
@@ -1297,10 +1292,10 @@ void R_SetupFrame(UINT8 pnum, boolean skybox)
 		newview->y = thiscam->y;
 		newview->z = thiscam->z + (thiscam->height>>1);
 
-		if (thiscam->subsector)
-			viewsec = thiscam->subsector->sector;
+		if (thiscam->subsector && thiscam->subsector->sector)
+			sector = thiscam->subsector->sector;
 
-		R_SetupCommonFrame(player, viewsec);
+		R_SetupCommonFrame(player, sector);
 	}
 	else if (player->mo) // use the player's eyes view
 	{
@@ -1311,10 +1306,10 @@ void R_SetupFrame(UINT8 pnum, boolean skybox)
 		newview->y = viewmobj->y;
 		newview->z = player->viewz;
 
-		if (viewmobj->subsector)
-			viewsec = viewmobj->subsector->sector;
+		if (viewmobj->subsector && viewmobj->subsector->sector)
+			sector = viewmobj->subsector->sector;
 
-		R_SetupCommonFrame(player, viewsec);
+		R_SetupCommonFrame(player, sector);
 	}
 }
 
@@ -1561,7 +1556,6 @@ void R_RegisterEngineStuff(void)
 	CV_RegisterVar(&cv_skybox);
 	CV_RegisterVar(&cv_ffloorclip);
 	CV_RegisterVar(&cv_spriteclip);
-	CV_RegisterVar(&cv_secbright);
 	CV_RegisterVar(&cv_softcyancut);
 
 	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)

src/r_main.h

@@ -197,15 +197,9 @@ extern consvar_t cv_tailspickup;
 extern consvar_t cv_maxinterpdist;
 extern consvar_t cv_playerfade;
 extern consvar_t cv_ripplewater;
-extern consvar_t cv_secbright;
 
 extern consvar_t cv_randomdirlight;
 
-static inline INT32 R_GetSoftLightlevel(INT32 llevel)
-{
-	return CLAMP(llevel, cv_secbright.value, 255) >> LIGHTSEGSHIFT;
-}
-
 // Called by startup code.
 void R_Init(void);
 
@@ -221,8 +215,8 @@ void R_SetViewSize(void);
 void R_ExecuteSetViewSize(void);
 
 fixed_t R_GetPlayerFov(player_t *player);
-void R_SkyboxFrame(UINT8 pnum);
-void R_SetupFrame(UINT8 pnum, boolean skybox);
+void R_SkyboxFrame(int s);
+void R_SetupFrame(int s, boolean skybox);
 
 // Called by G_Drawer.
 void R_RenderPlayerView(player_t *player);

src/r_plane.cpp

@@ -1059,7 +1059,7 @@ void R_DrawSinglePlane(drawspandata_t* ds, visplane_t *pl, boolean allow_paralle
 #else
 		if (!pl->extra_colormap || !(pl->extra_colormap->fog & 2))
 #endif
-			light = R_GetSoftLightlevel(pl->lightlevel);
+			light = (pl->lightlevel >> LIGHTSEGSHIFT);
 		else
 			light = LIGHTLEVELS-1;
 	}
@@ -1111,17 +1111,16 @@ void R_DrawSinglePlane(drawspandata_t* ds, visplane_t *pl, boolean allow_paralle
 #else
 				if (!pl->extra_colormap || !(pl->extra_colormap->fog & 2))
 #endif
-					light = R_GetSoftLightlevel(pl->lightlevel);
+					light = (pl->lightlevel >> LIGHTSEGSHIFT);
 				else
 					light = LIGHTLEVELS-1;
 			}
 			else if (pl->ffloor->flags & FF_FOG)
 			{
 				spanfunctype = SPANDRAWFUNC_FOG;
-				light = R_GetSoftLightlevel(pl->lightlevel);
+				light = (pl->lightlevel >> LIGHTSEGSHIFT);
 			}
-			else
-				light = R_GetSoftLightlevel(pl->lightlevel);
+			else light = (pl->lightlevel >> LIGHTSEGSHIFT);
 
 			if (pl->ffloor->flags & FF_RIPPLE && cv_ripplewater.value)
 			{
@@ -1173,8 +1172,7 @@ void R_DrawSinglePlane(drawspandata_t* ds, visplane_t *pl, boolean allow_paralle
 				}
 			}
 		}
-		else
-			light = R_GetSoftLightlevel(pl->lightlevel);
+		else light = (pl->lightlevel >> LIGHTSEGSHIFT);
 	}
 
 	ds->currentplane = pl;

src/r_segs.cpp

@@ -209,11 +209,11 @@ static void R_RenderMaskedSegLoop(drawcolumndata_t* dc, drawseg_t *drawseg, INT3
 			rlight->flags = static_cast<ffloortype_e>(light->flags);
 
 			if (rlight->flags & FF_FOG || (rlight->extra_colormap && rlight->extra_colormap->fog))
-				lightnum = R_GetSoftLightlevel(rlight->lightlevel);
+				lightnum = (rlight->lightlevel >> LIGHTSEGSHIFT);
 			else if (R_CheckColumnFunc(COLDRAWFUNC_FUZZY))
 				lightnum = LIGHTLEVELS - 1;
 			else
-				lightnum = R_GetSoftLightlevel(rlight->lightlevel);
+				lightnum = (rlight->lightlevel >> LIGHTSEGSHIFT);
 
 			if (rlight->extra_colormap && rlight->extra_colormap->fog)
 				;
@@ -227,7 +227,7 @@ static void R_RenderMaskedSegLoop(drawcolumndata_t* dc, drawseg_t *drawseg, INT3
 	{
 		if ((R_CheckColumnFunc(COLDRAWFUNC_FUZZY) == false)
 			|| (frontsector->extra_colormap && frontsector->extra_colormap->fog))
-			lightnum = R_GetSoftLightlevel(frontsector->lightlevel);
+			lightnum = (frontsector->lightlevel >> LIGHTSEGSHIFT);
 		else
 			lightnum = LIGHTLEVELS - 1;
 
@@ -764,9 +764,9 @@ void R_RenderThickSideRange(drawseg_t *drawseg, INT32 x1, INT32 x2, ffloor_t *pf
 
 			// Check if the current light effects the colormap/lightlevel
 			if (pfloor->flags & FF_FOG)
-				rlight->lightnum = R_GetSoftLightlevel(pfloor->master->frontsector->lightlevel);
+				rlight->lightnum = (pfloor->master->frontsector->lightlevel >> LIGHTSEGSHIFT);
 			else
-				rlight->lightnum = R_GetSoftLightlevel(rlight->lightlevel);
+				rlight->lightnum = (rlight->lightlevel >> LIGHTSEGSHIFT);
 
 			if (pfloor->flags & FF_FOG || rlight->flags & FF_FOG || (rlight->extra_colormap && rlight->extra_colormap->fog))
 				;
@@ -782,13 +782,14 @@ void R_RenderThickSideRange(drawseg_t *drawseg, INT32 x1, INT32 x2, ffloor_t *pf
 	{
 		// Get correct light level!
 		if ((frontsector->extra_colormap && frontsector->extra_colormap->fog))
-			lightnum = R_GetSoftLightlevel(frontsector->lightlevel);
+			lightnum = (frontsector->lightlevel >> LIGHTSEGSHIFT);
 		else if (fog)
-			lightnum = R_GetSoftLightlevel(pfloor->master->frontsector->lightlevel);
+			lightnum = (pfloor->master->frontsector->lightlevel >> LIGHTSEGSHIFT);
 		else if (fuzzy)
 			lightnum = LIGHTLEVELS-1;
 		else
-			lightnum = R_GetSoftLightlevel(R_FakeFlat(frontsector, &tempsec, &templight, &templight, false)->lightlevel);
+			lightnum = R_FakeFlat(frontsector, &tempsec, &templight, &templight, false)
+				->lightlevel >> LIGHTSEGSHIFT;
 
 		if (pfloor->flags & FF_FOG || (frontsector->extra_colormap && frontsector->extra_colormap->fog))
 			;
@@ -1384,7 +1385,7 @@ static void R_RenderSegLoop(drawcolumndata_t* dc)
 			for (i = 0; i < dc->numlights; i++)
 			{
 				INT32 lightnum;
-				lightnum = R_GetSoftLightlevel(dc->lightlist[i].lightlevel);
+				lightnum = (dc->lightlist[i].lightlevel >> LIGHTSEGSHIFT);
 
 				if (dc->lightlist[i].extra_colormap)
 					;
@@ -2442,7 +2443,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 		//  use different light tables
 		//  for horizontal / vertical / diagonal
 		// OPTIMIZE: get rid of LIGHTSEGSHIFT globally
-		lightnum = R_GetSoftLightlevel(frontsector->lightlevel);
+		lightnum = (frontsector->lightlevel >> LIGHTSEGSHIFT);
 
 		if (P_ApplyLightOffset(lightnum, frontsector))
 			lightnum += curline->lightOffset;

src/r_things.cpp

@@ -1061,7 +1061,7 @@ static void R_SplitSprite(vissprite_t *sprite)
 
 		if (!(sector->lightlist[i].caster->flags & FF_NOSHADE))
 		{
-			INT32 lightnum = R_GetSoftLightlevel(*sector->lightlist[i].lightlevel);
+			INT32 lightnum = (*sector->lightlist[i].lightlevel >> LIGHTSEGSHIFT);
 
 			if (lightnum < 0)
 				spritelights = scalelight[0];
@@ -1660,7 +1660,7 @@ static void R_ProjectSprite(mobj_t *thing)
 			lightnum = thing->subsector->sector->lightlevel;
 		}
 
-		lightnum = R_GetSoftLightlevel(lightnum + R_ThingLightLevel(thing));
+		lightnum = (lightnum + R_ThingLightLevel(thing)) >> LIGHTSEGSHIFT;
 
 		if (maplighting.directional && P_SectorUsesDirectionalLighting(thing->subsector->sector))
 		{
@@ -2057,7 +2057,7 @@ void R_AddSprites(sector_t *sec, INT32 lightlevel)
 	{
 		if (sec->heightsec == -1) lightlevel = sec->lightlevel;
 
-		lightnum = R_GetSoftLightlevel(lightlevel);
+		lightnum = (lightlevel >> LIGHTSEGSHIFT);
 
 		if (lightnum < 0)
 			spritelights = scalelight[0];

src/s_sound.c

@@ -34,7 +34,7 @@
 #include "lua_hook.h" // MusicChange hook
 #include "lua_hud.h" // LUA_HudEnabled(hud_musiccredit)
 
-static boolean S_AdjustSoundParams(const mobj_t *listener, const mobj_t *source, INT32 *vol, INT32 *sep, sfxinfo_t *sfxinfo);
+static boolean S_AdjustSoundParams(const mobj_t *listener, const mobj_t *source, INT32 *vol, INT32 *sep, INT32 *pitch, sfxinfo_t *sfxinfo);
 static void SetChannelsNum(void);
 static void Command_Tunes_f(void);
 static void Command_RestartAudio_f(void);
@@ -59,12 +59,10 @@ static void AmigaType_OnChange(void);
 #endif
 #endif
 
-#if defined(HAVE_SDL) && SOUND==SOUND_SDL
 consvar_t cv_samplerate = {"samplerate", "44100", 0, CV_Unsigned, NULL, 22050, NULL, NULL, 0, 0, NULL}; //Alam: For easy hacking?
-#endif
 
-static CV_PossibleValue_t audbuffersize_cons_t[] = {{128, "128"}, {256, "256"}, {512, "512"}, {1024, "1024"}, {2048, "2048"}, {4096, "4096"}, {0, NULL}};
-consvar_t cv_audbuffersize = {"audiobuffersize", "2048", CV_SAVE, audbuffersize_cons_t, BufferSize_OnChange, 0, NULL, NULL, 0, 0, NULL};
+static CV_PossibleValue_t audbuffersize_cons_t[] = {{256, "256"}, {512, "512"}, {1024, "1024"}, {2048, "2048"}, {4096, "4096"}, {0, NULL}};
+consvar_t cv_audbuffersize = {"buffersize", "2048", CV_SAVE, audbuffersize_cons_t, BufferSize_OnChange, 0, NULL, NULL, 0, 0, NULL};
 
 // stereo reverse
 consvar_t stereoreverse = {"stereoreverse", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -81,11 +79,7 @@ consvar_t cv_midimusicvolume = {"midimusicvolume", "18", CV_SAVE, soundvolume_co
 #endif
 
 // number of channels available
-static CV_PossibleValue_t numChannels_cons_t[] = {{0, "MIN"}, {255, "MAX"}, {0, NULL}};
-consvar_t cv_numChannels = {"snd_channels", "64", CV_SAVE|CV_CALL, numChannels_cons_t, SetChannelsNum, 0, NULL, NULL, 0, 0, NULL};
-
-static CV_PossibleValue_t samesoundlimit_cons_t[] = {{0, "MIN"}, {64, "MAX"}, {0, NULL}};
-consvar_t cv_samesoundlimit = {"samesoundlimit", "0", CV_SAVE, samesoundlimit_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_numChannels = {"snd_channels", "64", CV_SAVE|CV_CALL, CV_Unsigned, SetChannelsNum, 0, NULL, NULL, 0, 0, NULL};
 
 //consvar_t cv_resetmusic = {"resetmusic", "No", CV_SAVE|CV_NOSHOWHELP, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
 
@@ -280,9 +274,7 @@ void S_RegisterSoundStuff(void)
 
 	CV_RegisterVar(&stereoreverse);
 	CV_RegisterVar(&precachesound);
-#if defined(HAVE_SDL) && SOUND==SOUND_SDL
 	CV_RegisterVar(&cv_samplerate);
-#endif
 	//CV_RegisterVar(&cv_resetmusic);
 	CV_RegisterVar(&cv_gamesounds);
 	CV_RegisterVar(&cv_gamedigimusic);
@@ -290,8 +282,6 @@ void S_RegisterSoundStuff(void)
 	CV_RegisterVar(&cv_gamemidimusic);
 #endif
 
-	CV_RegisterVar(&cv_samesoundlimit);
-
 	// bird music stuff
 	CV_RegisterVar(&cv_playmusicifunfocused);
 	CV_RegisterVar(&cv_playsoundifunfocused);
@@ -334,6 +324,9 @@ static void SetChannelsNum(void)
 	Z_Free(channels);
 	channels = NULL;
 
+	if (cv_numChannels.value == 999999999) //Alam_GBC: OH MY ROD!(ROD rimmiced with GOD!)
+		CV_StealthSet(&cv_numChannels,cv_numChannels.defaultvalue);
+
 	if (cv_numChannels.value)
 		channels = (channel_t *)Z_Calloc(cv_numChannels.value * sizeof (channel_t), PU_STATIC, NULL);
 	numofchannels = (channels ? cv_numChannels.value : 0);
@@ -434,25 +427,6 @@ static INT32 S_ScaleVolumeWithSplitscreen(INT32 volume)
 	return FixedDiv(volume * FRACUNIT, root) / FRACUNIT;
 }
 
-static boolean S_CheckSameSoundLimit(sfxenum_t sfx_id)
-{
-	INT32 cnum, scount = 0;
-
-	if (!cv_samesoundlimit.value)
-		return true;
-
-	for (cnum = 0; cnum < numofchannels; cnum++)
-		if ((size_t)(channels[cnum].sfxinfo - S_sfx) == (size_t)sfx_id)
-			scount++;
-
-	//CONS_Printf("same sound count: %d for sfx: %d\n", scount, sfx_id);
-
-	if (scount >= cv_samesoundlimit.value)
-		return false;
-
-	return true;
-}
-
 void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume)
 {
 	const mobj_t *origin = (const mobj_t *)origin_p;
@@ -460,7 +434,7 @@ void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume)
 	INT32 initial_volume;
 
 	sfxinfo_t *sfx;
-	INT32 sep, cnum;
+	INT32 sep, pitch, priority, cnum;
 	boolean anyListeners = false;
 	boolean itsUs = false;
 	INT32 i;
@@ -475,16 +449,13 @@ void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume)
 	if (sfx_id == sfx_None)
 		return;
 
-	// reached same sound limit?
-	if (!S_CheckSameSoundLimit(sfx_id))
-		return;
-
-	memset(listener, 0, sizeof(listener));
+	initial_volume = (origin ? S_ScaleVolumeWithSplitscreen(volume) : volume);
 
 	for (i = 0; i <= splitscreen; i++)
 	{
 		player_t *player = &players[displayplayers[i]];
 
+		memset(&listener[i], 0, sizeof (listener[i]));
 		listenmobj[i] = NULL;
 
 		if (player->awayviewtics)
@@ -500,6 +471,11 @@ void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume)
 		{
 			itsUs = true;
 		}
+	}
+
+	for (i = 0; i <= splitscreen; i++)
+	{
+		player_t *player = &players[displayplayers[i]];
 
 		if (camera[i].chase && !player->awayviewtics)
 		{
@@ -538,9 +514,9 @@ void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume)
 		sfx = &S_sfx[sfx_id];
 	}
 
-	initial_volume = (origin ? S_ScaleVolumeWithSplitscreen(volume) : volume);
-
 	// Initialize sound parameters
+	pitch = NORM_PITCH;
+	priority = NORM_PRIORITY;
 	sep = NORM_SEP;
 
 	i = 0; // sensible default
@@ -578,7 +554,7 @@ void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume)
 
 			if (listenmobj[i])
 			{
-				audible = S_AdjustSoundParams(listenmobj[i], origin, &volume, &sep, sfx);
+				audible = S_AdjustSoundParams(listenmobj[i], origin, &volume, &sep, &pitch, sfx);
 			}
 
 			if (!audible)
@@ -598,6 +574,12 @@ void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume)
 			sfx->data = I_GetSfx(sfx);
 		}
 
+		// increase the usefulness
+		if (sfx->usefulness++ < 0)
+		{
+			sfx->usefulness = -1;
+		}
+
 		// Avoid channel reverse if surround
 		if (reverse)
 		{
@@ -616,7 +598,7 @@ void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume)
 		channels[cnum].sfxinfo = sfx;
 		channels[cnum].origin = origin;
 		channels[cnum].volume = initial_volume;
-		channels[cnum].handle = I_StartSound(sfx_id, volume, sep, cnum);
+		channels[cnum].handle = I_StartSound(sfx_id, volume, sep, pitch, priority, cnum);
 	}
 }
 
@@ -625,7 +607,7 @@ void S_StartSound(const void *origin, sfxenum_t sfx_id)
 	if (S_SoundDisabled())
 		return;
 
-	if (UNLIKELY(mariomode)) // Sounds change in Mario mode!
+	if (mariomode) // Sounds change in Mario mode!
 	{
 		switch (sfx_id)
 		{
@@ -648,8 +630,7 @@ void S_StartSound(const void *origin, sfxenum_t sfx_id)
 				break;
 		}
 	}
-
-	if (UNLIKELY(maptol & TOL_XMAS)) // Some sounds change for xmas
+	if (maptol & TOL_XMAS) // Some sounds change for xmas
 	{
 		switch (sfx_id)
 		{
@@ -696,7 +677,7 @@ static INT32 actualmidimusicvolume;
 
 void S_UpdateSounds(void)
 {
-	INT32 cnum, volume, sep;
+	INT32 cnum, volume, sep, pitch;
 	boolean audible = false;
 	channel_t *c;
 	INT32 i;
@@ -706,16 +687,14 @@ void S_UpdateSounds(void)
 
 	// Update sound/music volumes, if changed manually at console
 	if (actualsfxvolume != cv_soundvolume.value)
-		S_SetSfxVolume(cv_soundvolume.value);
+		S_SetSfxVolume (cv_soundvolume.value);
 	if (actualdigmusicvolume != cv_digmusicvolume.value)
-		S_SetDigMusicVolume(cv_digmusicvolume.value);
+		S_SetDigMusicVolume (cv_digmusicvolume.value);
 #ifndef NO_MIDI
 	if (actualmidimusicvolume != cv_midimusicvolume.value)
-		S_SetMIDIMusicVolume(cv_midimusicvolume.value);
+		S_SetMIDIMusicVolume (cv_midimusicvolume.value);
 #endif
 
-	memset(listener, 0, sizeof(listener));
-
 	// We're done now, if we're not in a level.
 	if (gamestate != GS_LEVEL)
 	{
@@ -735,6 +714,7 @@ void S_UpdateSounds(void)
 	{
 		player_t *player = &players[displayplayers[i]];
 
+		memset(&listener[i], 0, sizeof (listener[i]));
 		listenmobj[i] = NULL;
 
 		if (player->awayviewtics)
@@ -745,6 +725,15 @@ void S_UpdateSounds(void)
 		{
 			listenmobj[i] = player->mo;
 		}
+	}
+
+#ifndef NOMUMBLE
+	I_UpdateMumble(players[consoleplayer].mo, listener[0]);
+#endif
+
+	for (i = 0; i <= splitscreen; i++)
+	{
+		player_t *player = &players[displayplayers[i]];
 
 		if (camera[i].chase && !player->awayviewtics)
 		{
@@ -762,10 +751,6 @@ void S_UpdateSounds(void)
 		}
 	}
 
-#ifndef NOMUMBLE
-	I_UpdateMumble(players[consoleplayer].mo, listener[0]);
-#endif
-
 	for (cnum = 0; cnum < numofchannels; cnum++)
 	{
 		c = &channels[cnum];
@@ -776,6 +761,7 @@ void S_UpdateSounds(void)
 			{
 				// initialize parameters
 				volume = c->volume; // 8 bits internal volume precision
+				pitch = NORM_PITCH;
 				sep = NORM_SEP;
 
 				// check non-local sounds for distance clipping
@@ -831,13 +817,13 @@ void S_UpdateSounds(void)
 						{
 							audible = S_AdjustSoundParams(
 								listenmobj[i], c->origin,
-								&volume, &sep,
+								&volume, &sep, &pitch,
 								c->sfxinfo
 							);
 						}
 
 						if (audible)
-							I_UpdateSoundParams(c->handle, volume, sep);
+							I_UpdateSoundParams(c->handle, volume, sep, pitch);
 						else
 							S_StopChannel(cnum);
 					}
@@ -890,6 +876,8 @@ static void S_StopChannel(INT32 cnum)
 			if (cnum != i && c->sfxinfo == channels[i].sfxinfo)
 				break;
 
+		// degrade usefulness of sound data
+		c->sfxinfo->usefulness--;
 		c->sfxinfo = 0;
 	}
 
@@ -930,7 +918,8 @@ fixed_t S_CalculateSoundDistance(fixed_t sx1, fixed_t sy1, fixed_t sz1, fixed_t
 // If the sound is not audible, returns a 0.
 // Otherwise, modifies parameters and returns 1.
 //
-static boolean S_AdjustSoundParams(const mobj_t *listener, const mobj_t *source, INT32 *vol, INT32 *sep, sfxinfo_t *sfxinfo)
+boolean S_AdjustSoundParams(const mobj_t *listener, const mobj_t *source, INT32 *vol, INT32 *sep, INT32 *pitch,
+	sfxinfo_t *sfxinfo)
 {
 	const boolean reverse = (stereoreverse.value ^ encoremode);
 
@@ -939,6 +928,8 @@ static boolean S_AdjustSoundParams(const mobj_t *listener, const mobj_t *source,
 	listener_t listensource;
 	INT32 i;
 
+	(void)pitch;
+
 	if (!listener)
 		return false;
 
@@ -971,16 +962,13 @@ static boolean S_AdjustSoundParams(const mobj_t *listener, const mobj_t *source,
 		else
 		{
 			// Essentially check in a 1024 unit radius of the player for an outdoor area.
-#define RADIUSSTEP (64*FRACUNIT)
-#define SEARCHRADIUS (16*RADIUSSTEP)
-			yl = listensource.y - SEARCHRADIUS;
-			yh = listensource.y + SEARCHRADIUS;
-			xl = listensource.x - SEARCHRADIUS;
-			xh = listensource.x + SEARCHRADIUS;
-			approx_dist = SEARCHRADIUS;
-#undef SEARCHRADIUS
-			for (y = yl; y <= yh; y += RADIUSSTEP)
-				for (x = xl; x <= xh; x += RADIUSSTEP)
+			yl = listensource.y - 1024*FRACUNIT;
+			yh = listensource.y + 1024*FRACUNIT;
+			xl = listensource.x - 1024*FRACUNIT;
+			xh = listensource.x + 1024*FRACUNIT;
+			approx_dist = 1024*FRACUNIT;
+			for (y = yl; y <= yh; y += FRACUNIT*64)
+				for (x = xl; x <= xh; x += FRACUNIT*64)
 				{
 					if (R_PointInSubsectorFast(x, y)->sector->ceilingpic == skyflatnum)
 					{
@@ -992,7 +980,6 @@ static boolean S_AdjustSoundParams(const mobj_t *listener, const mobj_t *source,
 						}
 					}
 				}
-#undef RADIUSSTEP
 		}
 	}
 	else
@@ -1003,14 +990,14 @@ static boolean S_AdjustSoundParams(const mobj_t *listener, const mobj_t *source,
 
 	// Ring loss, deaths, etc, should all be heard louder.
 	if (sfxinfo->pitch & SF_X8AWAYSOUND)
-		approx_dist = FixedDiv(approx_dist, 8*FRACUNIT);
+		approx_dist = FixedDiv(approx_dist,8*FRACUNIT);
 
 	// Combine 8XAWAYSOUND with 4XAWAYSOUND and get.... 32XAWAYSOUND?
 	if (sfxinfo->pitch & SF_X4AWAYSOUND)
-		approx_dist = FixedDiv(approx_dist, 4*FRACUNIT);
+		approx_dist = FixedDiv(approx_dist,4*FRACUNIT);
 
 	if (sfxinfo->pitch & SF_X2AWAYSOUND)
-		approx_dist = FixedDiv(approx_dist, 2*FRACUNIT);
+		approx_dist = FixedDiv(approx_dist,2*FRACUNIT);
 
 	if (approx_dist > S_CLIPPING_DIST)
 		return false;
@@ -1043,7 +1030,7 @@ static boolean S_AdjustSoundParams(const mobj_t *listener, const mobj_t *source,
 	if (approx_dist >= S_CLOSE_DIST)
 	{
 		// distance effect
-		const INT32 n = (15 * ((S_CLIPPING_DIST - approx_dist)>>FRACBITS));
+		INT32 n = (15 * ((S_CLIPPING_DIST - approx_dist)>>FRACBITS));
 		*vol = FixedMul(*vol * FRACUNIT / 255, n) / S_ATTENUATOR;
 	}
 
@@ -1159,6 +1146,7 @@ void S_InitSfxChannels(INT32 sfxVolume)
 	// Note that sounds have not been cached (yet).
 	for (i = 1; i < NUMSFX; i++)
 	{
+		S_sfx[i].usefulness = -1; // for I_GetSfx()
 		S_sfx[i].lumpnum = LUMPERROR;
 	}
 
@@ -1918,12 +1906,12 @@ void S_SetMusicVolume(INT32 digvolume, INT32 seqvolume)
 	}
 }
 
-void S_SetRestoreMusicFadeInCvar(consvar_t *cv)
+void S_SetRestoreMusicFadeInCvar (consvar_t *cv)
 {
 	music_refade_cv = cv_birdmusic.value ? cv : 0;
 }
 
-int S_GetRestoreMusicFadeIn(void)
+int S_GetRestoreMusicFadeIn (void)
 {
 	if (music_refade_cv && cv_fading.value)
 		return music_refade_cv->value;
@@ -2032,6 +2020,7 @@ void S_KeepMusic(void)
 	if (oldmap == gamemap && oldencore == encoremode)
 	{
 		const boolean musicchanged = S_CheckMusicException();
+
 		resumekeepmusic = (musicchanged && keepmusic.resume);
 		keepmapmusic = (!musicchanged || resumekeepmusic);
 	}
@@ -2198,7 +2187,6 @@ static void Command_Tunes_f(void)
 			mapmusic.name, (mapmusic.flags & MUSIC_TRACKMASK));
 		return;
 	}
-
 	if (!strcasecmp(tunearg, "-none"))
 	{
 		S_StopMusic();
@@ -2217,7 +2205,6 @@ static void Command_Tunes_f(void)
 		CONS_Alert(CONS_NOTICE, M_GetText("Valid music slots are 1 to 1035.\n"));
 		return;
 	}
-
 	if (!tunenum && strlen(tunearg) > 6) // This is automatic -- just show the error just in case
 		CONS_Alert(CONS_NOTICE, M_GetText("Music name too long - truncated to six characters.\n"));
 
@@ -2227,11 +2214,12 @@ static void Command_Tunes_f(void)
 	if (tunenum)
 		snprintf(mapmusic.name, 7, "%sM", G_BuildMapName(tunenum));
 	else
-		strlcpy(mapmusic.name, tunearg, sizeof(mapmusic.name));
+		strncpy(mapmusic.name, tunearg, 7);
 
 	if (argc > 4)
 		position = (UINT32)atoi(COM_Argv(4));
 
+	mapmusic.name[6] = 0;
 	mapmusic.flags = (track & MUSIC_TRACKMASK);
 	mapmusic.position = position;
 	mapmusic.resume = 0;
@@ -2258,7 +2246,7 @@ static void Command_RestartAudio_f(void)
 	I_StartupSound();
 	I_InitMusic();
 
-	// These must be called or no sound and music until manually set.
+// These must be called or no sound and music until manually set.
 
 	I_SetSfxVolume(cv_soundvolume.value);
 #ifdef NO_MIDI

src/s_sound.h

@@ -32,8 +32,6 @@ extern consvar_t stereoreverse;
 extern consvar_t cv_soundvolume, cv_digmusicvolume;//, cv_midimusicvolume;
 extern consvar_t cv_numChannels;
 
-extern consvar_t cv_samesoundlimit;
-
 extern consvar_t cv_audbuffersize;
 //extern consvar_t cv_resetmusic;
 extern consvar_t cv_gamedigimusic;

src/screen.c

@@ -66,9 +66,7 @@ static void Highreshudscale_OnChange(void)
 
 static void SCR_ChangeFullscreen (void);
 
-static CV_PossibleValue_t fullscreen_cons_t[] = {{0, "No"}, {1, "Yes"}, {2, "Borderless Window"}, {0, NULL}};
-
-consvar_t cv_fullscreen = {"fullscreen", "Yes", CV_SAVE|CV_CALL, fullscreen_cons_t, SCR_ChangeFullscreen, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_fullscreen = {"fullscreen", "Yes", CV_SAVE|CV_CALL, CV_YesNo, SCR_ChangeFullscreen, 0, NULL, NULL, 0, 0, NULL};
 
 static CV_PossibleValue_t accuratefps_cons_t[] = {{0, "Inaccurate"}, {1, "Accurate"}, {0, NULL}};
 consvar_t cv_accuratefps = {"fpssampling", "1", CV_SAVE, accuratefps_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -327,8 +325,6 @@ void SCR_SetDefaultMode(void)
 void SCR_ChangeFullscreen(void)
 {
 #ifdef DIRECTFULLSCREEN
-	I_SetBorderlessWindow(); // Running this here so we can have borderless window at startup
-
 	// allow_fullscreen is set by VID_PrepareModeList
 	// it is used to prevent switching to fullscreen during startup
 	if (!allow_fullscreen)

src/sdl/i_system.cpp

@@ -1806,22 +1806,13 @@ void I_SleepDuration(precise_t duration)
 {
 #if defined(__linux__) || defined(__FreeBSD__) || defined(__HAIKU__)
 	UINT64 precision = I_GetPrecisePrecision();
-	precise_t dest = I_GetPreciseTime() + duration;
-	precise_t slack = (precision / 5000); // 0.2 ms slack
-	if (duration > slack)
-	{
-		duration -= slack;
-		struct timespec ts = {
+	struct timespec ts = {
 			.tv_sec = static_cast<__time_t>(duration / precision),
 			.tv_nsec = static_cast<__syscall_slong_t>(duration * 1000000000 / precision % 1000000000),
-		};
-		int status;
-		do status = clock_nanosleep(CLOCK_MONOTONIC, 0, &ts, &ts);
-		while (status == EINTR);
-	}
-
-	// busy-wait the rest
-	while (((INT64)dest - (INT64)I_GetPreciseTime()) > 0);
+	};
+	int status;
+	do status = clock_nanosleep(CLOCK_MONOTONIC, 0, &ts, &ts);
+	while (status == EINTR);
 #elif defined (MIN_SLEEP_DURATION_MS)
 	UINT64 precision = I_GetPrecisePrecision();
 	INT32 sleepvalue = cv_sleep.value;

src/sdl/i_video.c

@@ -150,7 +150,7 @@ UINT8 graphics_started = 0; // Is used in console.c and screen.c
 // To disable fullscreen at startup; is set in VID_PrepareModeList
 boolean allow_fullscreen = false;
 static SDL_bool disable_fullscreen = SDL_FALSE;
-#define USE_FULLSCREEN (disable_fullscreen||!allow_fullscreen)? 0: (cv_fullscreen.value == 1)
+#define USE_FULLSCREEN (disable_fullscreen||!allow_fullscreen)?0:cv_fullscreen.value
 static SDL_bool disable_mouse = SDL_FALSE;
 #define USE_MOUSEINPUT (!disable_mouse && cv_usemouse.value && havefocus)
 #define MOUSE_MENU false //(!disable_mouse && cv_usemouse.value && menuactive && !USE_FULLSCREEN)
@@ -1353,7 +1353,6 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen)
 		{
 			wasfullscreen = SDL_TRUE;
 			SDL_SetWindowFullscreen(window, SDL_WINDOW_FULLSCREEN_DESKTOP);
-			I_SetBorderlessWindow();
 		}
 		else // windowed mode
 		{
@@ -1361,7 +1360,6 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen)
 			{
 				wasfullscreen = SDL_FALSE;
 				SDL_SetWindowFullscreen(window, 0);
-				I_SetBorderlessWindow();
 			}
 
 			// Reposition window only in windowed mode
@@ -1381,7 +1379,6 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen)
 		if (fullscreen)
 		{
 			SDL_SetWindowFullscreen(window, SDL_WINDOW_FULLSCREEN_DESKTOP);
-			I_SetBorderlessWindow();
 		}
 	}
 
@@ -2160,10 +2157,4 @@ static void Impl_SetVsync(void)
 #endif
 }
 
-void I_SetBorderlessWindow(void)
-{
-	SDL_bool borderless = (cv_fullscreen.value == 2) ? SDL_FALSE : SDL_TRUE;
-	SDL_SetWindowBordered(window, borderless);
-}
-
 #endif

src/sdl/mixer_sound.c

@@ -80,7 +80,7 @@ write netcode into the sound code, OKAY?
 #define GME_BASS 1.0f
 #endif // HAVE_GME
 
-
+ 
 //static UINT16 BUFFERSIZE = 2048;
 static UINT16 SAMPLERATE = 44100;
 
@@ -528,12 +528,14 @@ void I_FreeSfx(sfxinfo_t *sfx)
 	sfx->lumpnum = LUMPERROR;
 }
 
-INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, INT32 channel)
+INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority, INT32 channel)
 {
 	UINT8 volume = (((UINT16)vol + 1) * (UINT16)sfx_volume) / 62; // (256 * 31) / 62 == 127
 	INT32 handle = Mix_PlayChannel(channel, S_sfx[id].data, 0);
 	Mix_Volume(handle, volume);
 	Mix_SetPanning(handle, min((UINT16)(0xff-sep)<<1, 0xff), min((UINT16)(sep)<<1, 0xff));
+	(void)pitch; // Mixer can't handle pitch
+	(void)priority; // priority and channel management is handled by SRB2...
 	return handle;
 }
 
@@ -547,11 +549,12 @@ boolean I_SoundIsPlaying(INT32 handle)
 	return Mix_Playing(handle);
 }
 
-void I_UpdateSoundParams(INT32 handle, UINT8 vol, UINT8 sep)
+void I_UpdateSoundParams(INT32 handle, UINT8 vol, UINT8 sep, UINT8 pitch)
 {
 	UINT8 volume = (((UINT16)vol + 1) * (UINT16)sfx_volume) / 62; // (256 * 31) / 62 == 127
 	Mix_Volume(handle, volume);
 	Mix_SetPanning(handle, min((UINT16)(0xff-sep)<<1, 0xff), min((UINT16)(sep)<<1, 0xff));
+	(void)pitch;
 }
 
 void I_SetSfxVolume(UINT8 volume)
@@ -707,7 +710,7 @@ static void mix_gme(void *udata, Uint8 *stream, int len)
 
 	// play gme into stream
 	gme_play(gme, len/2, (short *)stream);
-
+	
 	// Limiter to prevent music from being disorted with some formats
 	if (music_volume >= 18)
 		music_volume = 18;
@@ -723,7 +726,7 @@ static void mix_openmpt(void *udata, Uint8 *stream, int len)
 {
 	int i;
 	short *p;
-
+	
 	(void)udata;
 
 	if (!openmpt_mhandle || songpaused)
@@ -731,7 +734,7 @@ static void mix_openmpt(void *udata, Uint8 *stream, int len)
 
 	// Play module into stream
 	openmpt_module_read_interleaved_stereo(openmpt_mhandle, SAMPLERATE, cv_audbuffersize.value, (short *)stream);
-
+	
 	// Limiter to prevent music from being disorted with some formats
 	if (music_volume >= 18)
 		music_volume = 18;
@@ -820,7 +823,7 @@ boolean I_SetSongSpeed(float speed)
 #endif
 #ifdef HAVE_OPENMPT
 	if (openmpt_mhandle)
-	{
+	{		
 		if (speed > 4.0f)
 			speed = 4.0f; // Limit this to 4x to prevent crashing, stupid fix but... ~SteelT 27/9/19
 #if OPENMPT_API_VERSION_MAJOR < 1 && OPENMPT_API_VERSION_MINOR < 5

src/sdl/sdl_sound.c

@@ -1079,7 +1079,7 @@ void I_StartupSound(void)
 {
 #ifndef HAVE_MIXER
 #ifndef NO_MIDI
-	midi_disabled =
+	midi_disabled = 
 #endif
 	digital_disabled = true;
 #endif

src/sounds.h

@@ -78,6 +78,9 @@ struct sfxinfo_struct
 	// pitch if a link
 	INT32 pitch;
 
+	// volume if a link
+	INT32 volume;
+
 	// sound data
 	void *data;
 
@@ -88,6 +91,11 @@ struct sfxinfo_struct
 	// 0 up to (NUMSKINSOUNDS-1), -1 = not skin specifc
 	INT32 skinsound;
 
+	// this is checked every second to see if sound
+	// can be thrown out (if 0, then decrement, if -1,
+	// then throw out, if > 0, then it is in use)
+	INT32 usefulness;
+
 	// lump number of sfx
 	lumpnum_t lumpnum;
 };

src/st_stuff.c

@@ -419,28 +419,27 @@ static void ST_drawDebugInfo(void)
 
 static void ST_drawLevelTitle(void)
 {
-	char *lvlttl, *subttl, *zonttl, *actnum;
-	INT32 lvlttlxpos, ttlnumxpos, zonexpos;
-	INT32 dupcalc;
-	UINT8 gtc;
+	char *lvlttl = mapheaderinfo[gamemap-1]->lvlttl;
+	char *subttl = mapheaderinfo[gamemap-1]->subttl;
+	char *zonttl = mapheaderinfo[gamemap-1]->zonttl; // SRB2kart
+	char *actnum = mapheaderinfo[gamemap-1]->actnum;
+	INT32 lvlttlxpos;
+	INT32 ttlnumxpos;
+	INT32 zonexpos;
+	INT32 dupcalc = (vid.width/vid.dupx);
+	UINT8 gtc = G_GetGametypeColor(gametype);
 	INT32 sub = 0;
-	INT32 bary;
+	INT32 bary = (splitscreen)
+		? BASEVIDHEIGHT/2
+		: 163;
 	INT32 lvlw;
 
-	if (!cv_stagetitle.value || (timeinmap > 113))
+	if (!cv_stagetitle.value)
 		return;
 
-	if (*mapheaderinfo[gamemap-1]->lvlttl == '\0')
+	if (timeinmap > 113)
 		return;
 
-	lvlttl = mapheaderinfo[gamemap-1]->lvlttl;
-	subttl = mapheaderinfo[gamemap-1]->subttl;
-	zonttl = mapheaderinfo[gamemap-1]->zonttl; // SRB2kart
-	actnum = mapheaderinfo[gamemap-1]->actnum;
-	dupcalc = (vid.width/vid.dupx);
-	gtc = G_GetGametypeColor(gametype);
-	bary = (splitscreen) ? BASEVIDHEIGHT/2 : 163;
-
 	lvlw = V_LevelNameWidth(lvlttl);
 
 	if (actnum[0])
@@ -604,7 +603,7 @@ static void ST_overlayDrawer(void)
 	}
 
 	// draw level title Tails
-	if (!(hu_showscores && (netgame || multiplayer) && !mapreset) && LUA_HudEnabled(hud_stagetitle) && !forceshowhud)
+	if (*mapheaderinfo[gamemap-1]->lvlttl != '\0' && !(hu_showscores && (netgame || multiplayer) && !mapreset) && LUA_HudEnabled(hud_stagetitle) && !forceshowhud)
 		ST_drawLevelTitle();
 
 	if (!hu_showscores && netgame && !mapreset)
@@ -741,7 +740,7 @@ void ST_Drawer(void)
 	UINT8 i;
 
 #ifdef SEENAMES
-	if (UNLIKELY(cv_seenames.value && cv_allowseenames.value && displayplayers[0] == consoleplayer && seenplayer && seenplayer->mo && !mapreset))
+	if (cv_seenames.value && cv_allowseenames.value && displayplayers[0] == consoleplayer && seenplayer && seenplayer->mo && !mapreset)
 	{
 		if (cv_seenames.value == 1)
 			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT/2 + 15, V_HUDTRANSHALF, player_names[seenplayer-players]);

src/w_wad.c

@@ -126,10 +126,6 @@ void W_Shutdown(void)
 			Z_Free(wad->lumpinfo[wad->numlumps].longname);
 			Z_Free(wad->lumpinfo[wad->numlumps].fullname);
 		}
-
-		M_AATreeFree(wad->startfolders);
-		M_AATreeFree(wad->endfolders);
-
 		Z_Free(wad->lumpinfo);
 		Z_Free(wad);
 	}
@@ -342,11 +338,6 @@ static void W_InvalidateLumpnumCache(void)
 	memset(lumpnumcache, 0, sizeof (lumpnumcache));
 }
 
-UINT32 W_HashLumpName(const char *name)
-{
-	return FNV1a_HashLowercaseString(name);
-}
-
 /** Detect a file type.
  * \todo Actually detect the wad/pkzip headers and whatnot, instead of just checking the extensions.
  */
@@ -371,24 +362,11 @@ static lumpinfo_t* ResGetLumpsStandalone (FILE* handle, UINT16* numlumps, const
 	fseek(handle, 0, SEEK_END);
 	lumpinfo->size = ftell(handle);
 	fseek(handle, 0, SEEK_SET);
+	strlcpy(lumpinfo->name, lumpname, 9);
 
-	strlcpy(lumpinfo->name, lumpname, sizeof(lumpinfo->name));
-	lumpinfo->namelength = strlen(lumpinfo->name);
-	lumpinfo->hash.name = W_HashLumpName(lumpname);
-
-	// Allocate the lump's long name.
-	lumpinfo->longname = Z_Malloc((lumpinfo->namelength + 1) * sizeof(char), PU_STATIC, NULL);
-	strcpy(lumpinfo->longname, lumpname);
-	lumpinfo->longname[lumpinfo->namelength] = '\0';
-	lumpinfo->longnamelength = lumpinfo->namelength;
-	lumpinfo->hash.longname = lumpinfo->hash.name;
-
-	// Allocate the lump's full name.
-	lumpinfo->fullname = Z_Malloc((lumpinfo->namelength + 1) * sizeof(char), PU_STATIC, NULL);
-	strcpy(lumpinfo->fullname, lumpname);
-	lumpinfo->fullname[lumpinfo->namelength] = '\0';
-	lumpinfo->fullnamelength = lumpinfo->namelength;
-	lumpinfo->hash.fullname = lumpinfo->hash.name;
+	// Allocate the lump's full and long name.
+	lumpinfo->fullname = Z_StrDup(lumpname);
+	lumpinfo->longname = Z_StrDup(lumpname);
 
 	*numlumps = 1;
 	return lumpinfo;
@@ -476,22 +454,16 @@ static lumpinfo_t* ResGetLumpsWad (FILE* handle, UINT16* nlmp, const char* filen
 			lump_p->compression = CM_NOCOMPRESSION;
 		memset(lump_p->name, 0x00, 9);
 		strncpy(lump_p->name, fileinfo->name, 8);
-		lump_p->namelength = strlen(lump_p->name);
-		lump_p->hash.name = W_HashLumpName(lump_p->name);
 
 		// Allocate the lump's long name.
 		lump_p->longname = Z_Malloc(9 * sizeof(char), PU_STATIC, NULL);
 		strncpy(lump_p->longname, fileinfo->name, 8);
 		lump_p->longname[8] = '\0';
-		lump_p->longnamelength = lump_p->namelength;
-		lump_p->hash.longname = lump_p->hash.name;
 
 		// Allocate the lump's full name.
 		lump_p->fullname = Z_Malloc(9 * sizeof(char), PU_STATIC, NULL);
 		strncpy(lump_p->fullname, fileinfo->name, 8);
 		lump_p->fullname[8] = '\0';
-		lump_p->fullnamelength = lump_p->namelength;
-		lump_p->hash.fullname = lump_p->hash.name;
 	}
 	free(fileinfov);
 	*nlmp = numlumps;
@@ -684,18 +656,12 @@ static lumpinfo_t* ResGetLumpsZip (FILE* handle, UINT16* nlmp)
 
 		memset(lump_p->name, '\0', 9); // Making sure they're initialized to 0. Is it necessary?
 		strncpy(lump_p->name, trimname, min(8, dotpos - trimname));
-		lump_p->namelength = strlen(lump_p->name);
-		lump_p->hash.name = W_HashLumpName(lump_p->name);
 
 		lump_p->longname = Z_Calloc(dotpos - trimname + 1, PU_STATIC, NULL);
 		strlcpy(lump_p->longname, trimname, dotpos - trimname + 1);
-		lump_p->longnamelength = strlen(lump_p->longname);
-		lump_p->hash.longname = W_HashLumpName(lump_p->longname);
 
 		lump_p->fullname = (char*)(Z_Calloc(SHORT(zentry->namelen) + 1, PU_STATIC, NULL));
 		strncpy(lump_p->fullname, fullname, SHORT(zentry->namelen));
-		lump_p->fullnamelength = zentry->namelen;
-		lump_p->hash.fullname = W_HashLumpName(lump_p->fullname);
 
 		switch(SHORT(zentry->compression))
 		{
@@ -851,8 +817,6 @@ UINT16 W_InitFile(const char *filename, boolean local)
 	fseek(handle, 0, SEEK_END);
 	wadfile->filesize = (unsigned)ftell(handle);
 	wadfile->type = type;
-	wadfile->startfolders = M_AATreeAlloc(0);
-	wadfile->endfolders = M_AATreeAlloc(0);
 
 	// already generated, just copy it over
 	M_Memcpy(&wadfile->md5sum, &md5sum, 16);
@@ -908,6 +872,7 @@ UINT16 W_InitFile(const char *filename, boolean local)
 	return wadfile->numlumps;
 }
 
+
 /** Tries to load a series of files.
   * All files are wads unless they have an extension of ".soc" or ".lua".
   *
@@ -1011,8 +976,6 @@ UINT16 W_CheckNumForNamePwad(const char *name, UINT16 wad, UINT16 startlump)
 {
 	UINT16 i;
 	static char uname[9];
-	UINT32 hash;
-	size_t namelen;
 
 	if (!TestValidLump(wad,0))
 		return INT16_MAX;
@@ -1020,8 +983,6 @@ UINT16 W_CheckNumForNamePwad(const char *name, UINT16 wad, UINT16 startlump)
 	memset(uname, 0, sizeof uname);
 	strncpy(uname, name, sizeof(uname)-1);
 	strupr(uname);
-	namelen = strlen(uname);
-	hash = W_HashLumpName(uname);
 
 	//
 	// scan forward
@@ -1032,9 +993,7 @@ UINT16 W_CheckNumForNamePwad(const char *name, UINT16 wad, UINT16 startlump)
 	{
 		lumpinfo_t *lump_p = wadfiles[wad]->lumpinfo + startlump;
 		for (i = startlump; i < wadfiles[wad]->numlumps; i++, lump_p++)
-			if (lump_p->namelength == namelen
-				&& lump_p->hash.name == hash
-				&& !memcmp(lump_p->name, uname, sizeof(uname) - 1))
+			if (memcmp(lump_p->name, uname, sizeof(uname) - 1) == 0)
 				return i;
 	}
 
@@ -1051,12 +1010,13 @@ UINT16 W_CheckNumForNamePwad(const char *name, UINT16 wad, UINT16 startlump)
 UINT16 W_CheckNumForLongNamePwad(const char *name, UINT16 wad, UINT16 startlump)
 {
 	UINT16 i;
+	static char uname[256 + 1];
 
 	if (!TestValidLump(wad,0))
 		return INT16_MAX;
 
-	size_t namelen = strlen(name);
-	UINT32 hash = W_HashLumpName(name);
+	strlcpy(uname, name, sizeof uname);
+	strupr(uname);
 
 	//
 	// scan forward
@@ -1067,9 +1027,7 @@ UINT16 W_CheckNumForLongNamePwad(const char *name, UINT16 wad, UINT16 startlump)
 	{
 		lumpinfo_t *lump_p = wadfiles[wad]->lumpinfo + startlump;
 		for (i = startlump; i < wadfiles[wad]->numlumps; i++, lump_p++)
-			if (lump_p->longnamelength == namelen
-				&& lump_p->hash.longname == hash
-				&& !stricmp(lump_p->longname, name))
+			if (!strcmp(lump_p->longname, uname))
 				return i;
 	}
 
@@ -1093,12 +1051,6 @@ UINT16 W_CheckNumForFolderStartPK3(const char *name, UINT16 wad, UINT16 startlum
 	INT32 i;
 	lumpinfo_t *lump_p = wadfiles[wad]->lumpinfo + startlump;
 	name_length = strlen(name);
-	UINT32 hash = quickncasehash(name, name_length);
-
-	void *val = M_AATreeGet(wadfiles[wad]->startfolders, hash);
-	if (val != NULL)
-		return (uintptr_t)val;
-
 	for (i = startlump; i < wadfiles[wad]->numlumps; i++, lump_p++)
 	{
 		if (strnicmp(name, lump_p->fullname, name_length) == 0)
@@ -1106,16 +1058,10 @@ UINT16 W_CheckNumForFolderStartPK3(const char *name, UINT16 wad, UINT16 startlum
 			/* SLADE is special and puts a single directory entry. Skip that. */
 			if (strlen(lump_p->fullname) == name_length)
 				i++;
-
-			M_AATreeSet(wadfiles[wad]->startfolders, hash, (void *)(uintptr_t)i);
-
-			return i;
+			break;
 		}
 	}
-
-	M_AATreeSet(wadfiles[wad]->startfolders, hash, (void *)INT16_MAX);
-
-	return INT16_MAX;
+	return i;
 }
 
 // In a PK3 type of resource file, it looks for the next lumpinfo entry that doesn't share the specified pathfile.
@@ -1126,20 +1072,11 @@ UINT16 W_CheckNumForFolderEndPK3(const char *name, UINT16 wad, UINT16 startlump)
 	INT32 i;
 	lumpinfo_t *lump_p = wadfiles[wad]->lumpinfo + startlump;
 	size_t name_length = strlen(name);
-	UINT32 hash = quickncasehash(name, name_length);
-
-	void *val = M_AATreeGet(wadfiles[wad]->endfolders, hash);
-	if (val != NULL)
-		return (uintptr_t)val;
-
 	for (i = startlump; i < wadfiles[wad]->numlumps; i++, lump_p++)
 	{
 		if (strnicmp(name, lump_p->fullname, name_length))
 			break;
 	}
-
-	M_AATreeSet(wadfiles[wad]->endfolders, hash, (void *)(uintptr_t)i);
-
 	return i;
 }
 
@@ -1264,6 +1201,41 @@ lumpnum_t W_CheckNumForLongName(const char *name)
 	}
 }
 
+// Look for valid map data through all added files in descendant order.
+// Get a map marker for WADs, and a standalone WAD file lump inside PK3s.
+// TODO: Make it search through cache first, maybe...?
+lumpnum_t W_CheckNumForMap(const char *name)
+{
+	UINT16 lumpNum, end;
+	UINT32 i;
+	for (i = numwadfiles - 1; i < numwadfiles; i--)
+	{
+		if (wadfiles[i]->type == RET_WAD)
+		{
+			for (lumpNum = 0; lumpNum < wadfiles[i]->numlumps; lumpNum++)
+				if (!strncmp(name, (wadfiles[i]->lumpinfo + lumpNum)->name, 8))
+					return (i<<16) + lumpNum;
+		}
+		else if (wadfiles[i]->type == RET_PK3)
+		{
+			lumpNum = W_CheckNumForFolderStartPK3("maps/", i, 0);
+			if (lumpNum != INT16_MAX)
+				end = W_CheckNumForFolderEndPK3("maps/", i, lumpNum);
+			else
+				continue;
+			// Now look for the specified map.
+			for (; lumpNum < end; lumpNum++)
+				if (!strnicmp(name, (wadfiles[i]->lumpinfo + lumpNum)->name, 8))
+				{
+					const char *extension = strrchr(wadfiles[i]->lumpinfo[lumpNum].fullname, '.');
+					if (!(extension && stricmp(extension, ".wad")))
+						return (i<<16) + lumpNum;
+				}
+		}
+	}
+	return LUMPERROR;
+}
+
 //
 // W_GetNumForName
 //

src/w_wad.h

@@ -22,8 +22,6 @@ extern "C" {
 #include "hardware/hw_data.h"
 #endif
 
-#include "m_aatree.h"
-
 #ifdef __GNUG__
 #pragma interface
 #endif
@@ -77,19 +75,8 @@ typedef struct
 	char name[9];           // filelump_t name[] e.g. "LongEntr"
 	char *longname;         //                   e.g. "LongEntryName"
 	char *fullname;         //                   e.g. "Folder/Subfolder/LongEntryName.extension"
-
-	size_t namelength;      // length of name
-	size_t longnamelength;  // length of longname
-	size_t fullnamelength;  // length of fullname
-
 	size_t size; // real (uncompressed) size
 	compmethod compression; // lump compression method
-
-	struct {
-		UINT32 name;        // hash of name
-		UINT32 longname;    // hash of longname
-		UINT32 fullname;    // hash of fullname
-	} hash;
 } lumpinfo_t;
 
 // =========================================================================
@@ -144,8 +131,6 @@ typedef struct wadfile_s
 #ifdef ROTSPRITE
 	lumpcache_t *rotcache; // Cache rotsprites for rotating patches.
 #endif
-	aatree_t *startfolders;
-	aatree_t *endfolders;
 	UINT16 numlumps; // this wad's number of resources
 	FILE *handle;
 	UINT32 filesize; // for network
@@ -182,8 +167,6 @@ INT32 W_AddAutoloadedLocalFiles(char **filenames);
 
 #define W_FileHasFolders(wadfile) ((wadfile)->type == RET_PK3)
 
-UINT32 W_HashLumpName(const char *name);
-
 const char *W_CheckNameForNumPwad(UINT16 wad, UINT16 lump);
 const char *W_CheckNameForNum(lumpnum_t lumpnum);
 
@@ -197,6 +180,7 @@ UINT16 W_CheckNumForFullNamePK3(const char *name, UINT16 wad, UINT16 startlump);
 UINT16 W_CheckNumForFolderStartPK3(const char *name, UINT16 wad, UINT16 startlump);
 UINT16 W_CheckNumForFolderEndPK3(const char *name, UINT16 wad, UINT16 startlump);
 
+lumpnum_t W_CheckNumForMap(const char *name);
 lumpnum_t W_CheckNumForName(const char *name);
 lumpnum_t W_CheckNumForLongName(const char *name);
 lumpnum_t W_GetNumForName(const char *name); // like W_CheckNumForName but I_Error on LUMPERROR