From 7e026824a4a4db5e4072d82bb200c9d1253ef537 Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Fri, 11 Jan 2019 20:45:59 -0600
Subject: [PATCH 01/25] Fix rendering gaps on polys with upper/lower textures

---
 src/r_segs.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/r_segs.c b/src/r_segs.c
index 6d6ba1ef..74836526 100644
--- a/src/r_segs.c
+++ b/src/r_segs.c
@@ -3063,8 +3063,9 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 		else
 			markceiling = false;
 
-		// Don't render the ceiling again when rendering polyobjects
-		if (curline->polyseg)
+		// Don't mark ceiling flat lines for polys unless this line has an upper texture, otherwise we get flat leakage pulling downward
+		// (If it DOES have an upper texture and we do this, the ceiling won't render at all)
+		if (curline->polyseg && !curline->sidedef->toptexture)
 			markceiling = false;
 	}
 
@@ -3076,8 +3077,9 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 		else
 			markfloor = false;
 
-		// Don't render the floor again when rendering polyobjects
-		if (curline->polyseg)
+		// Don't mark floor flat lines for polys unless this line has a lower texture, otherwise we get flat leakage pulling upward
+		// (If it DOES have a lower texture and we do this, the floor won't render at all)
+		if (curline->polyseg && !curline->sidedef->bottomtexture)
 			markfloor = false;
 	}
 

From e2b392805aab55942a1069a30bf18bbacfbc8281 Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Sat, 16 Feb 2019 10:33:18 -0600
Subject: [PATCH 02/25] Simulate fractional precision on item odds

This notably prevents some items from disappearing
completely above 8 players in netgames.
---
 src/k_kart.c | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index b006ae3b..a398fa01 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -651,6 +651,9 @@ static INT32 K_KartGetItemOdds(UINT8 pos, SINT8 item, fixed_t mashed)
 	else
 		newodds = K_KartItemOddsRace[item-1][pos];
 
+	// Base multiplication to ALL item odds to simulate fractional precision
+	newodds *= 4;
+
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
 		if (!playeringame[i] || players[i].spectator)
@@ -867,8 +870,8 @@ static void K_KartItemRoulette(player_t *player, ticcmd_t *cmd)
 	UINT8 pingame = 0;
 	UINT8 roulettestop;
 	INT32 useodds = 0;
-	INT32 spawnchance[NUMKARTRESULTS * NUMKARTODDS];
-	INT32 chance = 0, numchoices = 0;
+	INT32 spawnchance[NUMKARTRESULTS];
+	INT32 totalspawnchance = 0;
 	INT32 bestbumper = 0;
 	fixed_t mashed = 0;
 	boolean dontforcespb = false;
@@ -965,24 +968,23 @@ static void K_KartItemRoulette(player_t *player, ticcmd_t *cmd)
 	}
 
 	// Initializes existing spawnchance values
-	for (i = 0; i < (NUMKARTRESULTS * NUMKARTODDS); i++)
+	for (i = 0; i < NUMKARTRESULTS; i++)
 		spawnchance[i] = 0;
 
 	// Split into another function for a debug function below
 	useodds = K_FindUseodds(player, mashed, pingame, bestbumper, (spbplace != -1 && player->kartstuff[k_position] == spbplace+1), dontforcespb);
 
-#define SETITEMRESULT(itemnum) \
-	for (chance = 0; chance < K_KartGetItemOdds(useodds, itemnum, mashed); chance++) \
-		spawnchance[numchoices++] = itemnum
-
 	for (i = 1; i < NUMKARTRESULTS; i++)
-		SETITEMRESULT(i);
-
-#undef SETITEMRESULT
+		spawnchance[i] = (totalspawnchance += K_KartGetItemOdds(useodds, i, mashed));
 
 	// Award the player whatever power is rolled
-	if (numchoices > 0)
-		K_KartGetItemResult(player, spawnchance[P_RandomKey(numchoices)]);
+	if (totalspawnchance > 0)
+	{
+		totalspawnchance = P_RandomKey(totalspawnchance);
+		for (i = 0; i < NUMKARTRESULTS && spawnchance[i] <= totalspawnchance; i++);
+
+		K_KartGetItemResult(player, i);
+	}
 	else
 	{
 		player->kartstuff[k_itemtype] = KITEM_SAD;

From 1785adffc2ea1e755b9cb120c6415e660ccf3eb9 Mon Sep 17 00:00:00 2001
From: james <justsomejames2@gmail.com>
Date: Sat, 16 Feb 2019 23:25:50 -0800
Subject: [PATCH 03/25] Expose splitscreenplayer (from Got_AddPlayer) as
 splitscreen in player_t

---
 src/d_clisrv.c      | 6 ++++++
 src/d_clisrv.h      | 2 ++
 src/d_player.h      | 2 ++
 src/g_game.c        | 3 +++
 src/lua_playerlib.c | 4 ++++
 src/p_saveg.c       | 4 ++++
 6 files changed, 21 insertions(+)

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 7516df2e..0aec7fd9 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -648,6 +648,8 @@ static inline void resynch_write_player(resynch_pak *rsp, const size_t i)
 
 	rsp->jointime = (tic_t)LONG(players[i].jointime);
 
+	rsp->splitscreen = players[i].splitscreen;
+
 	rsp->hasmo = false;
 	//Transfer important mo information if the player has a body.
 	//This lets us resync players even if they are dead.
@@ -783,6 +785,8 @@ static void resynch_read_player(resynch_pak *rsp)
 
 	players[i].jointime = (tic_t)LONG(rsp->jointime);
 
+	players[i].splitscreen = rsp->splitscreen;
+
 	//We get a packet for each player in game.
 	if (!playeringame[i])
 		return;
@@ -3316,6 +3320,8 @@ static void Got_AddPlayer(UINT8 **p, INT32 playernum)
 		addedtogame = true;
 	}
 
+	players[newplayernum].splitscreen = splitscreenplayer;
+
 	if (netgame)
 	{
 		if (server && cv_showjoinaddress.value)
diff --git a/src/d_clisrv.h b/src/d_clisrv.h
index 62bd8bc1..b628606d 100644
--- a/src/d_clisrv.h
+++ b/src/d_clisrv.h
@@ -283,6 +283,8 @@ typedef struct
 
 	tic_t jointime;
 
+	UINT8 splitscreen;
+
 	//player->mo stuff
 	UINT8 hasmo; // Boolean
 
diff --git a/src/d_player.h b/src/d_player.h
index b430f20a..baed9a72 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -571,6 +571,8 @@ typedef struct player_s
 	UINT8 bot;
 
 	tic_t jointime; // Timer when player joins game to change skin/color
+
+	UINT8 splitscreen;
 #ifdef HWRENDER
 	fixed_t fovadd; // adjust FOV for hw rendering
 #endif
diff --git a/src/g_game.c b/src/g_game.c
index f0d221ff..eb0396c8 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -2357,6 +2357,7 @@ void G_PlayerReborn(INT32 player)
 	UINT8 skincolor;
 	INT32 skin;
 	tic_t jointime;
+	UINT8 psplitscreen;
 	boolean spectator;
 	INT16 bot;
 	SINT8 pity;
@@ -2380,6 +2381,7 @@ void G_PlayerReborn(INT32 player)
 	ctfteam = players[player].ctfteam;
 	exiting = players[player].exiting;
 	jointime = players[player].jointime;
+	psplitscreen = players[player].splitscreen;
 	spectator = players[player].spectator;
 	pflags = (players[player].pflags & (PF_TIMEOVER|PF_FLIPCAM|PF_TAGIT|PF_TAGGED|PF_ANALOGMODE|PF_WANTSTOJOIN));
 
@@ -2476,6 +2478,7 @@ void G_PlayerReborn(INT32 player)
 	p->pflags = pflags;
 	p->ctfteam = ctfteam;
 	p->jointime = jointime;
+	p->splitscreen = psplitscreen;
 	p->spectator = spectator;
 
 	// save player config truth reborn
diff --git a/src/lua_playerlib.c b/src/lua_playerlib.c
index 5f136fc1..0bea1e7b 100644
--- a/src/lua_playerlib.c
+++ b/src/lua_playerlib.c
@@ -325,6 +325,8 @@ static int player_get(lua_State *L)
 		lua_pushinteger(L, plr->bot);
 	else if (fastcmp(field,"jointime"))
 		lua_pushinteger(L, plr->jointime);
+	else if (fastcmp(field,"splitscreen"))
+		lua_pushinteger(L, plr->splitscreen);
 #ifdef HWRENDER
 	else if (fastcmp(field,"fovadd"))
 		lua_pushfixed(L, plr->fovadd);
@@ -613,6 +615,8 @@ static int player_set(lua_State *L)
 		return NOSET;
 	else if (fastcmp(field,"jointime"))
 		plr->jointime = (tic_t)luaL_checkinteger(L, 3);
+	else if (fastcmp(field,"splitscreen"))
+		return NOSET;
 #ifdef HWRENDER
 	else if (fastcmp(field,"fovadd"))
 		plr->fovadd = luaL_checkfixed(L, 3);
diff --git a/src/p_saveg.c b/src/p_saveg.c
index 975a4a5d..a2ae8f17 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -249,6 +249,8 @@ static void P_NetArchivePlayers(void)
 
 		WRITEUINT32(save_p, players[i].jointime);
 
+		WRITEUINT8(save_p, players[i].splitscreen);
+
 		WRITEUINT16(save_p, flags);
 
 		if (flags & CAPSULE)
@@ -426,6 +428,8 @@ static void P_NetUnArchivePlayers(void)
 
 		players[i].jointime = READUINT32(save_p);
 
+		players[i].splitscreen = READUINT8(save_p);
+
 		flags = READUINT16(save_p);
 
 		if (flags & CAPSULE)

From 6f3b10313fae85b0b40914c0a1c85df231866c47 Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Sun, 17 Feb 2019 22:09:37 -0600
Subject: [PATCH 04/25] Add some P_MobjWasRemoved checks around code that
 shrink touches

It's the only place in the vanilla game where K_DropItems
is called that isn't from a direct collision with the player
it's being called on. It's also a syncfail that doesn't happen
anywhere else, and I saw my sync state appear to get slightly
corrupted when it happened. Let's see if this fixes anything...
---
 src/k_kart.c | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index b006ae3b..2c913e10 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -1978,12 +1978,16 @@ void K_SpinPlayer(player_t *player, mobj_t *source, INT32 type, mobj_t *inflicto
 static void K_RemoveGrowShrink(player_t *player)
 {
 	player->kartstuff[k_growshrinktimer] = 0;
-	if (player->kartstuff[k_invincibilitytimer] == 0)
-		player->mo->color = player->skincolor;
-	player->mo->scalespeed = mapobjectscale/TICRATE;
-	player->mo->destscale = mapobjectscale;
-	if (cv_kartdebugshrink.value && !modeattacking && !player->bot)
-		player->mo->destscale = (6*player->mo->destscale)/8;
+
+	if (!P_MobjWasRemoved(player->mo))
+	{
+		if (player->kartstuff[k_invincibilitytimer] == 0)
+			player->mo->color = player->skincolor;
+		player->mo->scalespeed = mapobjectscale/TICRATE;
+		player->mo->destscale = mapobjectscale;
+		if (cv_kartdebugshrink.value && !modeattacking && !player->bot)
+			player->mo->destscale = (6*player->mo->destscale)/8;
+	}
 	P_RestoreMusic(player);
 }
 
@@ -3290,11 +3294,15 @@ static void K_DoShrink(player_t *user)
 			{
 				// Start shrinking!
 				K_DropItems(&players[i]);
-				players[i].mo->scalespeed = mapobjectscale/TICRATE;
-				players[i].mo->destscale = (6*mapobjectscale)/8;
-				if (cv_kartdebugshrink.value && !modeattacking && !players[i].bot)
-					players[i].mo->destscale = (6*players[i].mo->destscale)/8;
-				players[i].kartstuff[k_growshrinktimer] = -(200+(40*(MAXPLAYERS-players[i].kartstuff[k_position])));
+
+				if (!P_MobjWasRemoved(players[i].mo))
+				{
+					players[i].mo->scalespeed = mapobjectscale/TICRATE;
+					players[i].mo->destscale = (6*mapobjectscale)/8;
+					if (cv_kartdebugshrink.value && !modeattacking && !players[i].bot)
+						players[i].mo->destscale = (6*players[i].mo->destscale)/8;
+					players[i].kartstuff[k_growshrinktimer] = -(200+(40*(MAXPLAYERS-players[i].kartstuff[k_position])));
+				}
 			}
 
 			// Grow should get taken away.
@@ -3419,7 +3427,7 @@ void K_DropHnextList(player_t *player)
 	mobjtype_t type;
 	boolean orbit, ponground, dropall = true;
 
-	if (!work)
+	if (!work || P_MobjWasRemoved(work))
 		return;
 
 	flip = P_MobjFlip(player->mo);
@@ -3556,7 +3564,7 @@ void K_DropItems(player_t *player)
 
 	K_DropHnextList(player);
 
-	if (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);

From f39bd03e10523a0d25bfbfefcfcf31c4377bad95 Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Mon, 18 Feb 2019 00:58:08 -0500
Subject: [PATCH 05/25] Add command to ban an IP address.

---
 src/d_clisrv.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 7516df2e..7be04682 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -2756,6 +2756,32 @@ static void Command_Ban(void)
 
 }
 
+static void Command_BanIP(void)
+{
+	if (COM_Argc() < 2)
+	{
+		CONS_Printf(M_GetText("banip <ip> <reason>: ban an ip address\n"));
+		return;
+	}
+
+	if (server) // Only the server can use this, otherwise does nothing.
+	{
+		const char *address = (COM_Argv(1));
+		const char *reason = (COM_Argv(2));
+
+		if (I_SetBanAddress && I_SetBanAddress(address, NULL))
+		{
+			CONS_Printf("Banned ip address for:%s\n", reason);
+			Ban_Add(reason);
+			D_SaveBan();
+		}
+		else
+		{
+			return;
+		}
+	}
+}
+
 static void Command_Kick(void)
 {
 	if (COM_Argc() < 2)
@@ -3062,6 +3088,7 @@ void D_ClientServerInit(void)
 	COM_AddCommand("getplayernum", Command_GetPlayerNum);
 	COM_AddCommand("kick", Command_Kick);
 	COM_AddCommand("ban", Command_Ban);
+	COM_AddCommand("banip", Command_BanIP);
 	COM_AddCommand("clearbans", Command_ClearBans);
 	COM_AddCommand("showbanlist", Command_ShowBan);
 	COM_AddCommand("reloadbans", Command_ReloadBan);

From 69156054448f628ac1ed19bba4aa74e1f1627d29 Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Mon, 18 Feb 2019 01:03:39 -0500
Subject: [PATCH 06/25] Save ban list right after banning.

---
 src/d_clisrv.c          | 3 +++
 src/djgppdos/i_system.c | 3 ---
 src/sdl/i_system.c      | 3 ---
 src/sdl12/i_system.c    | 3 ---
 src/win32/win_sys.c     | 3 ---
 5 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 7be04682..5ad2e92a 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -2725,7 +2725,10 @@ static void Command_Ban(void)
 		else
 		{
 			if (server) // only the server is allowed to do this right now
+			{
 				Ban_Add(COM_Argv(2));
+				D_SaveBan(); // save the ban list
+			}
 
 			if (COM_Argc() == 2)
 			{
diff --git a/src/djgppdos/i_system.c b/src/djgppdos/i_system.c
index bc3c8b2b..5970f5ae 100644
--- a/src/djgppdos/i_system.c
+++ b/src/djgppdos/i_system.c
@@ -615,9 +615,6 @@ void I_Quit (void)
 	//added:16-02-98: when recording a demo, should exit using 'q' key,
 	//        but sometimes we forget and use 'F10'.. so save here too.
 	M_SaveConfig (NULL);   //save game config, cvars..
-#ifndef NONET
-	D_SaveBan(); // save the ban list
-#endif
 	G_SaveGameData(); // Tails 12-08-2002
 	if (demorecording)
 		G_CheckDemoStatus();
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index f360072a..6d72d9bb 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -3054,9 +3054,6 @@ void I_Quit(void)
 	quiting = SDL_FALSE;
 	I_ShutdownConsole();
 	M_SaveConfig(NULL); //save game config, cvars..
-#ifndef NONET
-	D_SaveBan(); // save the ban list
-#endif
 	G_SaveGameData(false); // Tails 12-08-2002
 	//added:16-02-98: when recording a demo, should exit using 'q' key,
 	//        but sometimes we forget and use 'F10'.. so save here too.
diff --git a/src/sdl12/i_system.c b/src/sdl12/i_system.c
index d055a4ca..a841860f 100644
--- a/src/sdl12/i_system.c
+++ b/src/sdl12/i_system.c
@@ -2975,9 +2975,6 @@ void I_Quit(void)
 	quiting = SDL_FALSE;
 	I_ShutdownConsole();
 	M_SaveConfig(NULL); //save game config, cvars..
-#ifndef NONET
-	D_SaveBan(); // save the ban list
-#endif
 	G_SaveGameData(); // Tails 12-08-2002
 	//added:16-02-98: when recording a demo, should exit using 'q' key,
 	//        but sometimes we forget and use 'F10'.. so save here too.
diff --git a/src/win32/win_sys.c b/src/win32/win_sys.c
index fa9d6d64..47250334 100644
--- a/src/win32/win_sys.c
+++ b/src/win32/win_sys.c
@@ -639,9 +639,6 @@ void I_Error(const char *error, ...)
 	if (!errorcount)
 	{
 		M_SaveConfig(NULL); // save game config, cvars..
-#ifndef NONET
-		D_SaveBan(); // save the ban list
-#endif
 		G_SaveGameData();
 	}
 

From a2316389d2a169815181c98132d9b98262cc9c80 Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Mon, 18 Feb 2019 02:04:58 -0500
Subject: [PATCH 07/25] Save when quitting the game.

Also use default reason if not custom reason is given.
---
 src/d_clisrv.c          | 14 ++++++++++++--
 src/djgppdos/i_system.c |  3 +++
 src/sdl/i_system.c      |  3 +++
 src/sdl12/i_system.c    |  3 +++
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 5ad2e92a..ea8077d6 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -2770,11 +2770,21 @@ static void Command_BanIP(void)
 	if (server) // Only the server can use this, otherwise does nothing.
 	{
 		const char *address = (COM_Argv(1));
-		const char *reason = (COM_Argv(2));
+		const char *reason;
+
+		if (COM_Argc() == 2)
+			reason = NULL;
+		else
+			reason = COM_Argv(2);
+
 
 		if (I_SetBanAddress && I_SetBanAddress(address, NULL))
 		{
-			CONS_Printf("Banned ip address for:%s\n", reason);
+			if (reason)
+				CONS_Printf("Banned ip address %s for: %s\n", address, reason);
+			else
+				CONS_Printf("Banned ip address %s\n", address);
+
 			Ban_Add(reason);
 			D_SaveBan();
 		}
diff --git a/src/djgppdos/i_system.c b/src/djgppdos/i_system.c
index 5970f5ae..bc3c8b2b 100644
--- a/src/djgppdos/i_system.c
+++ b/src/djgppdos/i_system.c
@@ -615,6 +615,9 @@ void I_Quit (void)
 	//added:16-02-98: when recording a demo, should exit using 'q' key,
 	//        but sometimes we forget and use 'F10'.. so save here too.
 	M_SaveConfig (NULL);   //save game config, cvars..
+#ifndef NONET
+	D_SaveBan(); // save the ban list
+#endif
 	G_SaveGameData(); // Tails 12-08-2002
 	if (demorecording)
 		G_CheckDemoStatus();
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index 6d72d9bb..f360072a 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -3054,6 +3054,9 @@ void I_Quit(void)
 	quiting = SDL_FALSE;
 	I_ShutdownConsole();
 	M_SaveConfig(NULL); //save game config, cvars..
+#ifndef NONET
+	D_SaveBan(); // save the ban list
+#endif
 	G_SaveGameData(false); // Tails 12-08-2002
 	//added:16-02-98: when recording a demo, should exit using 'q' key,
 	//        but sometimes we forget and use 'F10'.. so save here too.
diff --git a/src/sdl12/i_system.c b/src/sdl12/i_system.c
index a841860f..d055a4ca 100644
--- a/src/sdl12/i_system.c
+++ b/src/sdl12/i_system.c
@@ -2975,6 +2975,9 @@ void I_Quit(void)
 	quiting = SDL_FALSE;
 	I_ShutdownConsole();
 	M_SaveConfig(NULL); //save game config, cvars..
+#ifndef NONET
+	D_SaveBan(); // save the ban list
+#endif
 	G_SaveGameData(); // Tails 12-08-2002
 	//added:16-02-98: when recording a demo, should exit using 'q' key,
 	//        but sometimes we forget and use 'F10'.. so save here too.

From 86a9168e86ceeaad711eb57880f9f518f684835c Mon Sep 17 00:00:00 2001
From: Latapostrophe <hyperclassic3@gmail.com>
Date: Mon, 18 Feb 2019 22:19:28 +0100
Subject: [PATCH 08/25] Fix dedicated server extra lua variables not being
 synched for joiners

---
 src/lua_script.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lua_script.c b/src/lua_script.c
index 1f87d33e..28f02ca3 100644
--- a/src/lua_script.c
+++ b/src/lua_script.c
@@ -1020,7 +1020,7 @@ void LUA_Archive(void)
 
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
-		if (!playeringame[i])
+		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(&players[i], "player");
@@ -1056,7 +1056,7 @@ void LUA_UnArchive(void)
 
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
-		if (!playeringame[i])
+		if (!playeringame[i] && i > 0)	// same here, this is to synch dediservs properly.
 			continue;
 		UnArchiveExtVars(&players[i]);
 	}

From 9eb669a061736e959ed42481a2d7abd1d6cd7862 Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Mon, 18 Feb 2019 21:08:11 -0600
Subject: [PATCH 09/25] Crash fix I think (CHERRY PICK INTO BASE)

---
 src/r_things.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/r_things.c b/src/r_things.c
index 135ae6a2..52c92b02 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -651,7 +651,7 @@ void R_DrawMaskedColumn(column_t *column)
 
 	basetexturemid = dc_texturemid;
 
-	for (; column->topdelta != 0xff ;)
+	for (; column && column->topdelta != 0xff ;)
 	{
 		// calculate unclipped screen coordinates
 		// for post

From a4ac2b000fcd8b0094e08317c58adb4197e6f268 Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Sat, 16 Feb 2019 11:52:35 -0600
Subject: [PATCH 10/25] Improve replay resyncing code

Notably, it should no longer cause immediate
desync warnings if a track starts on a slope.
---
 src/g_game.c | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/g_game.c b/src/g_game.c
index f0d221ff..a7b9670c 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -4763,7 +4763,8 @@ void G_WriteGhostTic(mobj_t *ghost)
 	// GZT_XYZ is only useful if you've moved 256 FRACUNITS or more in a single tic.
 	if (abs(ghost->x-oldghost.x) > MAXMOM
 	|| abs(ghost->y-oldghost.y) > MAXMOM
-	|| abs(ghost->z-oldghost.z) > MAXMOM)
+	|| abs(ghost->z-oldghost.z) > MAXMOM
+	|| leveltime & 255 == 1) // Hack to enable slightly nicer resyncing
 	{
 		oldghost.x = ghost->x;
 		oldghost.y = ghost->y;
@@ -4777,8 +4778,8 @@ void G_WriteGhostTic(mobj_t *ghost)
 	{
 		// For moving normally:
 		// Store one full byte of movement, plus one byte of fractional movement.
-		INT16 momx = (INT16)((ghost->x-oldghost.x)>>8);
-		INT16 momy = (INT16)((ghost->y-oldghost.y)>>8);
+		INT16 momx = (INT16)((ghost->x-oldghost.x + (1<<4))>>8);
+		INT16 momy = (INT16)((ghost->y-oldghost.y + (1<<4))>>8);
 		if (momx != oldghost.momx
 		|| momy != oldghost.momy)
 		{
@@ -4788,7 +4789,7 @@ void G_WriteGhostTic(mobj_t *ghost)
 			WRITEINT16(demo_p,momx);
 			WRITEINT16(demo_p,momy);
 		}
-		momx = (INT16)((ghost->z-oldghost.z)>>8);
+		momx = (INT16)((ghost->z-oldghost.z + (1<<4))>>8);
 		if (momx != oldghost.momz)
 		{
 			oldghost.momz = momx;
@@ -4892,8 +4893,9 @@ void G_WriteGhostTic(mobj_t *ghost)
 void G_ConsGhostTic(void)
 {
 	UINT8 ziptic;
-	UINT16 px,py,pz,gx,gy,gz;
+	UINT32 px,py,pz,gx,gy,gz;
 	mobj_t *testmo;
+	UINT32 syncleeway;
 	boolean nightsfail = false;
 
 	if (!demo_p || !demo_start)
@@ -4910,6 +4912,7 @@ void G_ConsGhostTic(void)
 		oldghost.x = READFIXED(demo_p);
 		oldghost.y = READFIXED(demo_p);
 		oldghost.z = READFIXED(demo_p);
+		syncleeway = 0;
 	}
 	else
 	{
@@ -4923,6 +4926,7 @@ void G_ConsGhostTic(void)
 		oldghost.x += oldghost.momx;
 		oldghost.y += oldghost.momy;
 		oldghost.z += oldghost.momz;
+		syncleeway = FRACUNIT;
 	}
 	if (ziptic & GZT_ANGLE)
 		demo_p++;
@@ -4988,14 +4992,14 @@ void G_ConsGhostTic(void)
 	}
 
 	// Re-synchronise
-	px = testmo->x>>FRACBITS;
-	py = testmo->y>>FRACBITS;
-	pz = testmo->z>>FRACBITS;
-	gx = oldghost.x>>FRACBITS;
-	gy = oldghost.y>>FRACBITS;
-	gz = oldghost.z>>FRACBITS;
+	px = testmo->x;
+	py = testmo->y;
+	pz = testmo->z;
+	gx = oldghost.x;
+	gy = oldghost.y;
+	gz = oldghost.z;
 
-	if (nightsfail || px != gx || py != gy || pz != gz)
+	if (nightsfail || abs(px-gx) > syncleeway || abs(py-gy) > syncleeway || abs(pz-gz) > syncleeway)
 	{
 		if (demosynced)
 			CONS_Alert(CONS_WARNING, M_GetText("Demo playback has desynced!\n"));

From a4c8388f3b000ec706e4df79fa008e411a1062e2 Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Mon, 18 Feb 2019 22:36:26 -0600
Subject: [PATCH 11/25] Fix bumps sometimes shooting off stupidly fast

---
 src/k_kart.c | 69 ++++++++++++++++++++++++++--------------------------
 1 file changed, 35 insertions(+), 34 deletions(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index b006ae3b..f8efff2b 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -1056,7 +1056,7 @@ void K_KartBouncing(mobj_t *mobj1, mobj_t *mobj2, boolean bounce, boolean solid)
 	mobj_t *fx;
 	fixed_t momdifx, momdify;
 	fixed_t distx, disty;
-	fixed_t dot, p;
+	fixed_t dot, force;
 	fixed_t mass1, mass2;
 
 	if (!mobj1 || !mobj2)
@@ -1114,6 +1114,35 @@ void K_KartBouncing(mobj_t *mobj1, mobj_t *mobj2, boolean bounce, boolean solid)
 	momdifx = mobj1->momx - mobj2->momx;
 	momdify = mobj1->momy - mobj2->momy;
 
+	// Adds the OTHER player's momentum, so that it reduces the chance of you being "inside" the other object
+	distx = (mobj1->x + mobj2->momx) - (mobj2->x + mobj1->momx);
+	disty = (mobj1->y + mobj2->momy) - (mobj2->y + mobj1->momy);
+
+	if (distx == 0 && disty == 0)
+		// if there's no distance between the 2, they're directly on top of each other, don't run this
+		return;
+
+	{ // Normalize distance to the sum of the two objects' radii, since in a perfect world that would be the distance at the point of collision...
+		fixed_t dist = P_AproxDistance(distx, disty) ?: 1;
+		fixed_t nx = FixedDiv(distx, dist);
+		fixed_t ny = FixedDiv(disty, dist);
+
+		distx = FixedMul(mobj1->radius+mobj2->radius, nx);
+		disty = FixedMul(mobj1->radius+mobj2->radius, ny);
+
+		CONS_Printf("dist %f %f %d %d %d %d\n",
+					FIXED_TO_FLOAT(P_AproxDistance(distx, disty)),
+					FIXED_TO_FLOAT(P_AproxDistance(momdifx, momdify)),
+					mobj1->momx, mobj1->momy, mobj2->momx, mobj2->momy);
+
+		if (momdifx == 0 && momdify == 0)
+		{
+			// If there's no momentum difference, they're moving at exactly the same rate. Pretend they moved into each other.
+			momdifx = -nx;
+			momdify = -ny;
+		}
+	}
+
 	// if the speed difference is less than this let's assume they're going proportionately faster from each other
 	if (P_AproxDistance(momdifx, momdify) < (25*mapobjectscale))
 	{
@@ -1124,34 +1153,6 @@ void K_KartBouncing(mobj_t *mobj1, mobj_t *mobj2, boolean bounce, boolean solid)
 		momdify = FixedMul((25*mapobjectscale), normalisedy);
 	}
 
-	// Adds the OTHER player's momentum, so that it reduces the chance of you being "inside" the other object
-	distx = (mobj1->x + mobj2->momx) - (mobj2->x + mobj1->momx);
-	disty = (mobj1->y + mobj2->momy) - (mobj2->y + mobj1->momy);
-
-	{ // Don't allow dist to get WAY too low, that it pushes you stupidly huge amounts, or backwards...
-		fixed_t dist = P_AproxDistance(distx, disty);
-		fixed_t nx = FixedDiv(distx, dist);
-		fixed_t ny = FixedDiv(disty, dist);
-
-		if (P_AproxDistance(distx, disty) < (3*mobj1->radius)/4)
-		{
-			distx = FixedMul((3*mobj1->radius)/4, nx);
-			disty = FixedMul((3*mobj1->radius)/4, ny);
-		}
-
-		if (P_AproxDistance(distx, disty) < (3*mobj2->radius)/4)
-		{
-			distx = FixedMul((3*mobj2->radius)/4, nx);
-			disty = FixedMul((3*mobj2->radius)/4, ny);
-		}
-	}
-
-	if (distx == 0 && disty == 0)
-	{
-		// if there's no distance between the 2, they're directly on top of each other, don't run this
-		return;
-	}
-
 	dot = FixedMul(momdifx, distx) + FixedMul(momdify, disty);
 
 	if (dot >= 0)
@@ -1160,7 +1161,7 @@ void K_KartBouncing(mobj_t *mobj1, mobj_t *mobj2, boolean bounce, boolean solid)
 		return;
 	}
 
-	p = FixedDiv(dot, FixedMul(distx, distx)+FixedMul(disty, disty));
+	force = FixedDiv(dot, FixedMul(distx, distx)+FixedMul(disty, disty));
 
 	if (bounce == true && mass2 > 0) // Perform a Goomba Bounce.
 		mobj1->momz = -mobj1->momz;
@@ -1175,14 +1176,14 @@ void K_KartBouncing(mobj_t *mobj1, mobj_t *mobj2, boolean bounce, boolean solid)
 
 	if (mass2 > 0)
 	{
-		mobj1->momx = mobj1->momx - FixedMul(FixedMul(FixedDiv(2*mass2, mass1 + mass2), p), distx);
-		mobj1->momy = mobj1->momy - FixedMul(FixedMul(FixedDiv(2*mass2, mass1 + mass2), p), disty);
+		mobj1->momx = mobj1->momx - FixedMul(FixedMul(FixedDiv(2*mass2, mass1 + mass2), force), distx);
+		mobj1->momy = mobj1->momy - FixedMul(FixedMul(FixedDiv(2*mass2, mass1 + mass2), force), disty);
 	}
 
 	if (mass1 > 0 && solid == false)
 	{
-		mobj2->momx = mobj2->momx - FixedMul(FixedMul(FixedDiv(2*mass1, mass1 + mass2), p), -distx);
-		mobj2->momy = mobj2->momy - FixedMul(FixedMul(FixedDiv(2*mass1, mass1 + mass2), p), -disty);
+		mobj2->momx = mobj2->momx - FixedMul(FixedMul(FixedDiv(2*mass1, mass1 + mass2), force), -distx);
+		mobj2->momy = mobj2->momy - FixedMul(FixedMul(FixedDiv(2*mass1, mass1 + mass2), force), -disty);
 	}
 
 	// Do the bump fx when we've CONFIRMED we can bump.

From 9c1749d26982fd36fc05d531e26182314b7f10b8 Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Mon, 18 Feb 2019 23:35:01 -0600
Subject: [PATCH 12/25] Make extra sure we launch in the correct direction

---
 src/k_kart.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index f8efff2b..807c9ce7 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -1114,9 +1114,9 @@ void K_KartBouncing(mobj_t *mobj1, mobj_t *mobj2, boolean bounce, boolean solid)
 	momdifx = mobj1->momx - mobj2->momx;
 	momdify = mobj1->momy - mobj2->momy;
 
-	// Adds the OTHER player's momentum, so that it reduces the chance of you being "inside" the other object
-	distx = (mobj1->x + mobj2->momx) - (mobj2->x + mobj1->momx);
-	disty = (mobj1->y + mobj2->momy) - (mobj2->y + mobj1->momy);
+	// Adds the OTHER player's momentum times a bunch, for the best chance of getting the correct direction
+	distx = (mobj1->x + mobj2->momx*3) - (mobj2->x + mobj1->momx*3);
+	disty = (mobj1->y + mobj2->momy*3) - (mobj2->y + mobj1->momy*3);
 
 	if (distx == 0 && disty == 0)
 		// if there's no distance between the 2, they're directly on top of each other, don't run this

From caf7888eed70c9778875adacddb83b1dbad3b9d9 Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Mon, 18 Feb 2019 23:35:24 -0600
Subject: [PATCH 13/25] Fix players sometimes snapping backwards on landing
 after spikeball hits

---
 src/k_kart.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index 807c9ce7..9887318a 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -5476,7 +5476,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 	}
 
 	// Wipeout slowdown
-	if (player->kartstuff[k_spinouttimer] && player->kartstuff[k_wipeoutslow])
+	if (player->kartstuff[k_spinouttimer] && player->kartstuff[k_wipeoutslow] && player->mo->friction > FRACUNIT/2)
 	{
 		if (player->kartstuff[k_offroad])
 			player->mo->friction -= 4912;

From 838ed005d217344326c602744f9d960384259c0a Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Mon, 18 Feb 2019 23:39:08 -0600
Subject: [PATCH 14/25] Remove debugging print

---
 src/k_kart.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index 9887318a..fded8b1c 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -1130,11 +1130,6 @@ void K_KartBouncing(mobj_t *mobj1, mobj_t *mobj2, boolean bounce, boolean solid)
 		distx = FixedMul(mobj1->radius+mobj2->radius, nx);
 		disty = FixedMul(mobj1->radius+mobj2->radius, ny);
 
-		CONS_Printf("dist %f %f %d %d %d %d\n",
-					FIXED_TO_FLOAT(P_AproxDistance(distx, disty)),
-					FIXED_TO_FLOAT(P_AproxDistance(momdifx, momdify)),
-					mobj1->momx, mobj1->momy, mobj2->momx, mobj2->momy);
-
 		if (momdifx == 0 && momdify == 0)
 		{
 			// If there's no momentum difference, they're moving at exactly the same rate. Pretend they moved into each other.

From 9c5ae02755d01e002c1943de1d091e4b5d06a0b0 Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Tue, 19 Feb 2019 08:05:35 -0600
Subject: [PATCH 15/25] Fix cmd latency occasionally jumping to max

---
 src/g_game.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/g_game.c b/src/g_game.c
index f0d221ff..3944c02a 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -2162,7 +2162,7 @@ void G_Ticker(boolean run)
 			G_CopyTiccmd(cmd, &netcmds[buf][i], 1);
 
 			// Use the leveltime sent in the player's ticcmd to determine control lag
-			cmd->latency = modeattacking ? 0 : min((leveltime & 0xFF) - cmd->latency, MAXPREDICTTICS-1); //@TODO add a cvar to allow setting this max
+			cmd->latency = modeattacking ? 0 : min(((leveltime & 0xFF) - cmd->latency) & 0xFF, MAXPREDICTTICS-1); //@TODO add a cvar to allow setting this max
 		}
 	}
 

From 580e12a32af9763eee3d71053e0ed53e505983ff Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Tue, 19 Feb 2019 16:04:23 -0600
Subject: [PATCH 16/25] Add null check too

---
 src/k_kart.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index 2c913e10..e67de72b 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -1979,7 +1979,7 @@ static void K_RemoveGrowShrink(player_t *player)
 {
 	player->kartstuff[k_growshrinktimer] = 0;
 
-	if (!P_MobjWasRemoved(player->mo))
+	if (player->mo && !P_MobjWasRemoved(player->mo))
 	{
 		if (player->kartstuff[k_invincibilitytimer] == 0)
 			player->mo->color = player->skincolor;

From 8988927d160957d4bad569ff0ec214ac7f5c7329 Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Tue, 19 Feb 2019 16:46:48 -0600
Subject: [PATCH 17/25] Only apply friction changes on the ground

---
 src/k_kart.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index fded8b1c..d63591e7 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -5471,7 +5471,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 	}
 
 	// Wipeout slowdown
-	if (player->kartstuff[k_spinouttimer] && player->kartstuff[k_wipeoutslow] && player->mo->friction > FRACUNIT/2)
+	if (player->kartstuff[k_spinouttimer] && player->kartstuff[k_wipeoutslow] && P_IsObjectOnGround(player->mo))
 	{
 		if (player->kartstuff[k_offroad])
 			player->mo->friction -= 4912;

From a59a1c53b0d2f11888d788e8936d22a45f2824b4 Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Tue, 19 Feb 2019 17:05:04 -0600
Subject: [PATCH 18/25] Add check to all of the friction stuff

---
 src/k_kart.c | 63 +++++++++++++++++++++++++++-------------------------
 1 file changed, 33 insertions(+), 30 deletions(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index d63591e7..39f2a714 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -5440,43 +5440,46 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 		}
 	}
 
-	// Friction
-	if (!player->kartstuff[k_offroad])
+	if (onground)
 	{
-		if (player->speed > 0 && cmd->forwardmove == 0 && player->mo->friction == 59392)
-			player->mo->friction += 4608;
-		if (player->speed > 0 && cmd->forwardmove < 0 && player->mo->friction == 59392)
-			player->mo->friction += 1608;
-	}
+		// Friction
+		if (!player->kartstuff[k_offroad])
+		{
+			if (player->speed > 0 && cmd->forwardmove == 0 && player->mo->friction == 59392)
+				player->mo->friction += 4608;
+			if (player->speed > 0 && cmd->forwardmove < 0 && player->mo->friction == 59392)
+				player->mo->friction += 1608;
+		}
 
-	// Karma ice physics
-	if (G_BattleGametype() && player->kartstuff[k_bumper] <= 0)
-	{
-		player->mo->friction += 1228;
+		// Karma ice physics
+		if (G_BattleGametype() && player->kartstuff[k_bumper] <= 0)
+		{
+			player->mo->friction += 1228;
 
-		if (player->mo->friction > FRACUNIT)
-			player->mo->friction = FRACUNIT;
-		if (player->mo->friction < 0)
-			player->mo->friction = 0;
+			if (player->mo->friction > FRACUNIT)
+				player->mo->friction = FRACUNIT;
+			if (player->mo->friction < 0)
+				player->mo->friction = 0;
 
-		player->mo->movefactor = FixedDiv(ORIG_FRICTION, player->mo->friction);
+			player->mo->movefactor = FixedDiv(ORIG_FRICTION, player->mo->friction);
 
-		if (player->mo->movefactor < FRACUNIT)
-			player->mo->movefactor = 19*player->mo->movefactor - 18*FRACUNIT;
-		else
-			player->mo->movefactor = FRACUNIT; //player->mo->movefactor = ((player->mo->friction - 0xDB34)*(0xA))/0x80;
+			if (player->mo->movefactor < FRACUNIT)
+				player->mo->movefactor = 19*player->mo->movefactor - 18*FRACUNIT;
+			else
+				player->mo->movefactor = FRACUNIT; //player->mo->movefactor = ((player->mo->friction - 0xDB34)*(0xA))/0x80;
 
-		if (player->mo->movefactor < 32)
-			player->mo->movefactor = 32;
-	}
+			if (player->mo->movefactor < 32)
+				player->mo->movefactor = 32;
+		}
 
-	// Wipeout slowdown
-	if (player->kartstuff[k_spinouttimer] && player->kartstuff[k_wipeoutslow] && P_IsObjectOnGround(player->mo))
-	{
-		if (player->kartstuff[k_offroad])
-			player->mo->friction -= 4912;
-		if (player->kartstuff[k_wipeoutslow] == 1)
-			player->mo->friction -= 9824;
+		// Wipeout slowdown
+		if (player->kartstuff[k_spinouttimer] && player->kartstuff[k_wipeoutslow])
+		{
+			if (player->kartstuff[k_offroad])
+				player->mo->friction -= 4912;
+			if (player->kartstuff[k_wipeoutslow] == 1)
+				player->mo->friction -= 9824;
+		}
 	}
 
 	K_KartDrift(player, onground);

From d2c708ba93886a1a5f3037299a04ef0054c15cb8 Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Tue, 19 Feb 2019 19:26:32 -0600
Subject: [PATCH 19/25] Maybe this is a better way to work around the
 DrawMasked crash...

---
 src/r_things.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/r_things.c b/src/r_things.c
index 52c92b02..d94001c9 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -651,7 +651,7 @@ void R_DrawMaskedColumn(column_t *column)
 
 	basetexturemid = dc_texturemid;
 
-	for (; column && column->topdelta != 0xff ;)
+	for (; column->topdelta != 0xff ;)
 	{
 		// calculate unclipped screen coordinates
 		// for post
@@ -925,6 +925,13 @@ static void R_DrawVisSprite(vissprite_t *vis)
 	if (vis->x2 >= vid.width)
 		vis->x2 = vid.width-1;
 
+#if 1
+	// Something is occasionally setting 1px-wide sprites whose frac is exactly the width of the sprite, causing crashes due to
+	// accessing invalid column info. Until the cause is found, let's try to correct those manually...
+	while (frac + vis->xiscale*(vis->x2-vis->x1) > SHORT(patch->width)<<FRACBITS && vis->x2 >= vis->x1)
+		vis->x2--;
+#endif
+
 	for (dc_x = vis->x1; dc_x <= vis->x2; dc_x++, frac += vis->xiscale)
 	{
 		if (vis->scalestep) // currently papersprites only

From 0913a623fb35e6073773fc3e5ba7034fdfbfbff3 Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Tue, 19 Feb 2019 21:22:35 -0500
Subject: [PATCH 20/25] Some small changes.

---
 src/d_clisrv.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index ea8077d6..2054d166 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -2781,9 +2781,9 @@ static void Command_BanIP(void)
 		if (I_SetBanAddress && I_SetBanAddress(address, NULL))
 		{
 			if (reason)
-				CONS_Printf("Banned ip address %s for: %s\n", address, reason);
+				CONS_Printf("Banned IP address %s for: %s\n", address, reason);
 			else
-				CONS_Printf("Banned ip address %s\n", address);
+				CONS_Printf("Banned IP address %s\n", address);
 
 			Ban_Add(reason);
 			D_SaveBan();

From 879d3aa1a804005943b93f9f1e1ef1a6fd6d9425 Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Tue, 19 Feb 2019 22:21:07 -0600
Subject: [PATCH 21/25] Hold on, this works.

---
 src/r_things.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/r_things.c b/src/r_things.c
index d94001c9..e4eaf413 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -925,13 +925,6 @@ static void R_DrawVisSprite(vissprite_t *vis)
 	if (vis->x2 >= vid.width)
 		vis->x2 = vid.width-1;
 
-#if 1
-	// Something is occasionally setting 1px-wide sprites whose frac is exactly the width of the sprite, causing crashes due to
-	// accessing invalid column info. Until the cause is found, let's try to correct those manually...
-	while (frac + vis->xiscale*(vis->x2-vis->x1) > SHORT(patch->width)<<FRACBITS && vis->x2 >= vis->x1)
-		vis->x2--;
-#endif
-
 	for (dc_x = vis->x1; dc_x <= vis->x2; dc_x++, frac += vis->xiscale)
 	{
 		if (vis->scalestep) // currently papersprites only
@@ -1321,7 +1314,7 @@ static void R_ProjectSprite(mobj_t *thing)
 		if (max(tz, tz2) < FixedMul(MINZ, this_scale)) // non-papersprite clipping is handled earlier
 			return;
 
-		scalestep = (yscale2 - yscale)/(x2 - x1);
+		scalestep = (yscale2 - yscale)/(x2 - x1) ?: 1;
 
 		// The following two are alternate sorting methods which might be more applicable in some circumstances. TODO - maybe enable via MF2?
 		// sortscale = max(yscale, yscale2);

From c1deea0714d2ee6f3881fc47318114252b17d2d3 Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Thu, 21 Feb 2019 18:48:42 -0500
Subject: [PATCH 22/25] Disable multi statement macros errors.

---
 src/Makefile.cfg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Makefile.cfg b/src/Makefile.cfg
index 1238050b..9e624cc7 100644
--- a/src/Makefile.cfg
+++ b/src/Makefile.cfg
@@ -228,6 +228,7 @@ ifdef GCC80
  WFLAGS+=-Wno-format-overflow
  WFLAGS+=-Wno-stringop-truncation
  WFLAGS+=-Wno-stringop-overflow
+ WFLAGS+=-Wno-error=multistatement-macros
 endif
 
 

From 0eb30bceb75116db4f6275f979011c35bb3766f3 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Fri, 22 Feb 2019 15:57:44 -0800
Subject: [PATCH 23/25] Rename splitscreen member to something more meaningful

---
 src/d_clisrv.c      | 6 +++---
 src/d_clisrv.h      | 2 +-
 src/d_player.h      | 2 +-
 src/g_game.c        | 6 +++---
 src/lua_playerlib.c | 6 +++---
 src/p_saveg.c       | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 0aec7fd9..bf9c1695 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -648,7 +648,7 @@ static inline void resynch_write_player(resynch_pak *rsp, const size_t i)
 
 	rsp->jointime = (tic_t)LONG(players[i].jointime);
 
-	rsp->splitscreen = players[i].splitscreen;
+	rsp->splitscreenindex = players[i].splitscreenindex;
 
 	rsp->hasmo = false;
 	//Transfer important mo information if the player has a body.
@@ -785,7 +785,7 @@ static void resynch_read_player(resynch_pak *rsp)
 
 	players[i].jointime = (tic_t)LONG(rsp->jointime);
 
-	players[i].splitscreen = rsp->splitscreen;
+	players[i].splitscreenindex = rsp->splitscreenindex;
 
 	//We get a packet for each player in game.
 	if (!playeringame[i])
@@ -3320,7 +3320,7 @@ static void Got_AddPlayer(UINT8 **p, INT32 playernum)
 		addedtogame = true;
 	}
 
-	players[newplayernum].splitscreen = splitscreenplayer;
+	players[newplayernum].splitscreenindex = splitscreenplayer;
 
 	if (netgame)
 	{
diff --git a/src/d_clisrv.h b/src/d_clisrv.h
index b628606d..5dc48753 100644
--- a/src/d_clisrv.h
+++ b/src/d_clisrv.h
@@ -283,7 +283,7 @@ typedef struct
 
 	tic_t jointime;
 
-	UINT8 splitscreen;
+	UINT8 splitscreenindex;
 
 	//player->mo stuff
 	UINT8 hasmo; // Boolean
diff --git a/src/d_player.h b/src/d_player.h
index baed9a72..a5d73ec7 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -572,7 +572,7 @@ typedef struct player_s
 
 	tic_t jointime; // Timer when player joins game to change skin/color
 
-	UINT8 splitscreen;
+	UINT8 splitscreenindex;
 #ifdef HWRENDER
 	fixed_t fovadd; // adjust FOV for hw rendering
 #endif
diff --git a/src/g_game.c b/src/g_game.c
index eb0396c8..d04bbf6b 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -2357,7 +2357,7 @@ void G_PlayerReborn(INT32 player)
 	UINT8 skincolor;
 	INT32 skin;
 	tic_t jointime;
-	UINT8 psplitscreen;
+	UINT8 splitscreenindex;
 	boolean spectator;
 	INT16 bot;
 	SINT8 pity;
@@ -2381,7 +2381,7 @@ void G_PlayerReborn(INT32 player)
 	ctfteam = players[player].ctfteam;
 	exiting = players[player].exiting;
 	jointime = players[player].jointime;
-	psplitscreen = players[player].splitscreen;
+	splitscreenindex = players[player].splitscreenindex;
 	spectator = players[player].spectator;
 	pflags = (players[player].pflags & (PF_TIMEOVER|PF_FLIPCAM|PF_TAGIT|PF_TAGGED|PF_ANALOGMODE|PF_WANTSTOJOIN));
 
@@ -2478,7 +2478,7 @@ void G_PlayerReborn(INT32 player)
 	p->pflags = pflags;
 	p->ctfteam = ctfteam;
 	p->jointime = jointime;
-	p->splitscreen = psplitscreen;
+	p->splitscreenindex = splitscreenindex;
 	p->spectator = spectator;
 
 	// save player config truth reborn
diff --git a/src/lua_playerlib.c b/src/lua_playerlib.c
index 0bea1e7b..1c37f4c4 100644
--- a/src/lua_playerlib.c
+++ b/src/lua_playerlib.c
@@ -325,8 +325,8 @@ static int player_get(lua_State *L)
 		lua_pushinteger(L, plr->bot);
 	else if (fastcmp(field,"jointime"))
 		lua_pushinteger(L, plr->jointime);
-	else if (fastcmp(field,"splitscreen"))
-		lua_pushinteger(L, plr->splitscreen);
+	else if (fastcmp(field,"splitscreenindex"))
+		lua_pushinteger(L, plr->splitscreenindex);
 #ifdef HWRENDER
 	else if (fastcmp(field,"fovadd"))
 		lua_pushfixed(L, plr->fovadd);
@@ -615,7 +615,7 @@ static int player_set(lua_State *L)
 		return NOSET;
 	else if (fastcmp(field,"jointime"))
 		plr->jointime = (tic_t)luaL_checkinteger(L, 3);
-	else if (fastcmp(field,"splitscreen"))
+	else if (fastcmp(field,"splitscreenindex"))
 		return NOSET;
 #ifdef HWRENDER
 	else if (fastcmp(field,"fovadd"))
diff --git a/src/p_saveg.c b/src/p_saveg.c
index a2ae8f17..5a43745b 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -249,7 +249,7 @@ static void P_NetArchivePlayers(void)
 
 		WRITEUINT32(save_p, players[i].jointime);
 
-		WRITEUINT8(save_p, players[i].splitscreen);
+		WRITEUINT8(save_p, players[i].splitscreenindex);
 
 		WRITEUINT16(save_p, flags);
 
@@ -428,7 +428,7 @@ static void P_NetUnArchivePlayers(void)
 
 		players[i].jointime = READUINT32(save_p);
 
-		players[i].splitscreen = READUINT8(save_p);
+		players[i].splitscreenindex = READUINT8(save_p);
 
 		flags = READUINT16(save_p);
 

From df503c7f198f8e29e5d254bdb52638359e913e4a Mon Sep 17 00:00:00 2001
From: Sally Cochenour <tehrealsalt@gmail.com>
Date: Fri, 22 Feb 2019 19:07:54 -0500
Subject: [PATCH 24/25] Add parentheses

---
 src/g_game.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/g_game.c b/src/g_game.c
index e2a59969..71906027 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -4767,7 +4767,7 @@ void G_WriteGhostTic(mobj_t *ghost)
 	if (abs(ghost->x-oldghost.x) > MAXMOM
 	|| abs(ghost->y-oldghost.y) > MAXMOM
 	|| abs(ghost->z-oldghost.z) > MAXMOM
-	|| leveltime & 255 == 1) // Hack to enable slightly nicer resyncing
+	|| (leveltime & 255 == 1)) // Hack to enable slightly nicer resyncing
 	{
 		oldghost.x = ghost->x;
 		oldghost.y = ghost->y;

From b2d4ec501cb2ec67a0b345a3fe49667c1975540a Mon Sep 17 00:00:00 2001
From: Sally Cochenour <tehrealsalt@gmail.com>
Date: Fri, 22 Feb 2019 19:11:50 -0500
Subject: [PATCH 25/25] Add parentheses 2: Move parentheses

---
 src/g_game.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/g_game.c b/src/g_game.c
index 71906027..0a19ec8f 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -4767,7 +4767,7 @@ void G_WriteGhostTic(mobj_t *ghost)
 	if (abs(ghost->x-oldghost.x) > MAXMOM
 	|| abs(ghost->y-oldghost.y) > MAXMOM
 	|| abs(ghost->z-oldghost.z) > MAXMOM
-	|| (leveltime & 255 == 1)) // Hack to enable slightly nicer resyncing
+	|| (leveltime & 255) == 1) // Hack to enable slightly nicer resyncing
 	{
 		oldghost.x = ghost->x;
 		oldghost.y = ghost->y;