From 064ab7cb041d13e36411966fc25dc2ddba388171 Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Fri, 4 Jan 2019 20:08:48 -0600
Subject: [PATCH 01/17] Add k_kart files to CB project

---
 SRB2.cbp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/SRB2.cbp b/SRB2.cbp
index 2a1eb87b8..acdc61c7f 100644
--- a/SRB2.cbp
+++ b/SRB2.cbp
@@ -1545,6 +1545,10 @@ HW3SOUND for 3D hardware sound  support
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="src/info.h" />
+		<Unit filename="src/k_kart.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="src/k_kart.h" />
 		<Unit filename="src/keys.h" />
 		<Unit filename="src/lua_baselib.c">
 			<Option compilerVar="CC" />

From 7dcee6f0b491677effe76ffc7ee7d58841c49b71 Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Fri, 4 Jan 2019 22:27:09 -0600
Subject: [PATCH 02/17] Send latency in players' ticcmds

---
 src/d_clisrv.c | 19 +++++++++++++++++++
 src/d_clisrv.h |  8 ++++----
 src/d_ticcmd.h |  1 +
 src/g_game.c   |  1 +
 src/k_kart.c   |  2 +-
 5 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index eafc12833..e05b9b442 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -4007,6 +4007,25 @@ FILESTAMP
 					&netbuffer->u.client4pak.cmd4, 1);
 			}
 
+			{ // Store the node's latency in tics on the ticcmd right as we receive it. I think this should be sync-stable
+				UINT8 latency = min(maketic - nettics[node], 12); //@TODO add a cvar to allow setting this max
+
+				switch (netbuffer->packettype)
+				{
+				case PT_CLIENT4CMD:
+					netcmds[maketic%BACKUPTICS][(UINT8)nodetoplayer4[node]].latency = latency;
+
+				case PT_CLIENT3CMD:
+					netcmds[maketic%BACKUPTICS][(UINT8)nodetoplayer3[node]].latency = latency;
+
+				case PT_CLIENT2CMD:
+					netcmds[maketic%BACKUPTICS][(UINT8)nodetoplayer2[node]].latency = latency;
+
+				default:
+					netcmds[maketic%BACKUPTICS][netconsole].latency = latency;
+				}
+			}
+
 			// A delay before we check resynching
 			// Used on join or just after a synch fail
 			if (resynch_delay[node])
diff --git a/src/d_clisrv.h b/src/d_clisrv.h
index 4207325ee..911f25b41 100644
--- a/src/d_clisrv.h
+++ b/src/d_clisrv.h
@@ -433,10 +433,10 @@ typedef struct
 	UINT8 reserved; // Padding
 	union
 	{
-		clientcmd_pak clientpak;            //         144 bytes
-		client2cmd_pak client2pak;          //         200 bytes
-		client3cmd_pak client3pak;          //         256 bytes(?)
-		client4cmd_pak client4pak;          //         312 bytes(?)
+		clientcmd_pak clientpak;            //         145 bytes
+		client2cmd_pak client2pak;          //         202 bytes
+		client3cmd_pak client3pak;          //         258 bytes(?)
+		client4cmd_pak client4pak;          //         316 bytes(?)
 		servertics_pak serverpak;           //      132495 bytes (more around 360, no?)
 		serverconfig_pak servercfg;         //         773 bytes
 		resynchend_pak resynchend;          //
diff --git a/src/d_ticcmd.h b/src/d_ticcmd.h
index 7df2d4122..6524870d4 100644
--- a/src/d_ticcmd.h
+++ b/src/d_ticcmd.h
@@ -60,6 +60,7 @@ typedef struct
 	INT16 aiming; // vertical aiming, see G_BuildTicCmd
 	UINT16 buttons;
 	INT16 driftturn; // SRB2Kart: Used for getting drift turn speed
+	UINT8 latency; // Netgames: how many tics ago was this ticcmd generated from this player's end?
 } ATTRPACK ticcmd_t;
 
 #if defined(_MSC_VER)
diff --git a/src/g_game.c b/src/g_game.c
index ac8e27a37..5b5ceb1a7 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -4542,6 +4542,7 @@ ticcmd_t *G_MoveTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n)
 		dest[i].aiming = (INT16)SHORT(src[i].aiming);
 		dest[i].buttons = (UINT16)SHORT(src[i].buttons);
 		dest[i].driftturn = (INT16)SHORT(src[i].driftturn);
+		dest[i].latency = (INT16)SHORT(src[i].latency);
 	}
 	return dest;
 }
diff --git a/src/k_kart.c b/src/k_kart.c
index 2a152162a..6162e7725 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -8263,7 +8263,7 @@ void K_drawKartHUD(void)
 	{
 		UINT8 p;
 		for (p = 0; p < MAXPLAYERS; p++)
-			V_DrawString(8, 64+(8*p), V_YELLOWMAP, va("%d - %d", p, playernode[p]));
+			V_DrawString(8, 64+(8*p), V_YELLOWMAP, va("%d - %d (%dl)", p, playernode[p], players[p].cmd.latency));
 	}
 }
 

From b3432cef052e4005254a2b6aefab9c917dac7014 Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Fri, 4 Jan 2019 23:08:33 -0600
Subject: [PATCH 03/17] Don't turn players more than they're allowed to

This should account for latency properly.
---
 src/d_clisrv.c |  2 +-
 src/d_player.h |  2 ++
 src/d_ticcmd.h |  2 ++
 src/g_game.c   |  2 +-
 src/k_kart.h   |  2 ++
 src/p_user.c   | 46 ++++++++++++++++++++++++++++++++++++++++++++--
 6 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index e05b9b442..f131ef0b7 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -4008,7 +4008,7 @@ FILESTAMP
 			}
 
 			{ // Store the node's latency in tics on the ticcmd right as we receive it. I think this should be sync-stable
-				UINT8 latency = min(maketic - nettics[node], 12); //@TODO add a cvar to allow setting this max
+				UINT8 latency = min(maketic - nettics[node], MAXPREDICTTICS-1); //@TODO add a cvar to allow setting this max
 
 				switch (netbuffer->packettype)
 				{
diff --git a/src/d_player.h b/src/d_player.h
index 1b1d4d0a2..2759058f6 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -415,6 +415,8 @@ typedef struct player_s
 	// SRB2kart stuff
 	INT32 kartstuff[NUMKARTSTUFF];
 	angle_t frameangle; // for the player add the ability to have the sprite only face other angles
+	INT16 lturn_max[MAXPREDICTTICS]; // What's the expected turn value for full-left for a number of frames back (to account for netgame latency)?
+	INT16 rturn_max[MAXPREDICTTICS]; // Ditto but for full-right
 
 	// Bit flags.
 	// See pflags_t, above.
diff --git a/src/d_ticcmd.h b/src/d_ticcmd.h
index 6524870d4..dab758f8d 100644
--- a/src/d_ticcmd.h
+++ b/src/d_ticcmd.h
@@ -21,6 +21,8 @@
 #pragma interface
 #endif
 
+#define MAXPREDICTTICS 12
+
 // Button/action code definitions.
 typedef enum
 {
diff --git a/src/g_game.c b/src/g_game.c
index 5b5ceb1a7..9b3ba2e85 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1202,7 +1202,7 @@ boolean camspin, camspin2, camspin3, camspin4;
 
 static fixed_t forwardmove[2] = {25<<FRACBITS>>16, 50<<FRACBITS>>16};
 static fixed_t sidemove[2] = {2<<FRACBITS>>16, 4<<FRACBITS>>16};
-static fixed_t angleturn[3] = {400, 800, 200}; // + slow turn
+static fixed_t angleturn[3] = {KART_FULLTURN/2, KART_FULLTURN, KART_FULLTURN/4}; // + slow turn
 
 void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
 {
diff --git a/src/k_kart.h b/src/k_kart.h
index fed490db9..3f7120913 100644
--- a/src/k_kart.h
+++ b/src/k_kart.h
@@ -9,6 +9,8 @@
 #include "doomdef.h"
 #include "d_player.h" // Need for player_t
 
+#define KART_FULLTURN 800
+
 UINT8 colortranslations[MAXSKINCOLORS][16];
 extern const char *KartColor_Names[MAXSKINCOLORS];
 extern const UINT8 KartColor_Opposite[MAXSKINCOLORS*2];
diff --git a/src/p_user.c b/src/p_user.c
index 853ceaf01..014110b76 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -6633,8 +6633,50 @@ static void P_MovePlayer(player_t *player)
 		P_2dMovement(player);
 	else*/
 	{
-		if (!player->climbing && (!P_AnalogMove(player)))
-			player->mo->angle = (cmd->angleturn<<16 /* not FRACBITS */);
+		INT16 angle_diff, max_left_turn, max_right_turn;
+		boolean add_delta = true;
+
+		// Kart: store the current turn range for later use
+		if (((player->mo && player->speed > 0) // Moving
+			|| (leveltime > starttime && (cmd->buttons & BT_ACCELERATE && cmd->buttons & BT_BRAKE)) // Rubber-burn turn
+			|| (player->kartstuff[k_respawn]) // Respawning
+			|| (player->spectator || objectplacing)) // Not a physical player
+			&& !(player->kartstuff[k_spinouttimer] && player->kartstuff[k_sneakertimer])) // Spinning and boosting cancels out turning
+		{
+			player->lturn_max[leveltime%MAXPREDICTTICS] = K_GetKartTurnValue(player, KART_FULLTURN)+1;
+			player->rturn_max[leveltime%MAXPREDICTTICS] = K_GetKartTurnValue(player, -KART_FULLTURN)-1;
+		} else {
+			player->lturn_max[leveltime%MAXPREDICTTICS] = player->rturn_max[leveltime%MAXPREDICTTICS] = 0;
+		}
+
+		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.
+			angle_diff = cmd->angleturn - (player->mo->angle>>16);
+			max_left_turn = player->lturn_max[(leveltime + MAXPREDICTTICS - cmd->latency) % MAXPREDICTTICS];
+			max_right_turn = player->rturn_max[(leveltime + MAXPREDICTTICS - cmd->latency) % MAXPREDICTTICS];
+
+			//CONS_Printf("----------------\nangle diff: %d - turning options: %d to %d - ", angle_diff, max_left_turn, max_right_turn);
+
+			if (angle_diff > max_left_turn)
+				angle_diff = max_left_turn;
+			else if (angle_diff < max_right_turn)
+				angle_diff = max_right_turn;
+			else
+			{
+				// Try to keep normal turning as accurate to 1.0.1 as possible to reduce replay desyncs.
+				player->mo->angle = cmd->angleturn<<16;
+				add_delta = false;
+			}
+			//CONS_Printf("applied turn: %d\n", angle_diff);
+
+			if (add_delta) {
+				player->mo->angle += angle_diff<<16;
+				player->mo->angle &= ~0xFFFF; // Try to keep the turning somewhat similar to how it was before?
+				CONS_Printf("leftover turn (%s): %d\n", player_names[player-players], (INT16) (cmd->angleturn - (player->mo->angle>>16)));
+			}
+		}
 
 		ticruned++;
 		if ((cmd->angleturn & TICCMD_RECEIVED) == 0)

From cc9bf7251324233b01bae08879fec3bdf5c647bb Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Fri, 4 Jan 2019 23:08:50 -0600
Subject: [PATCH 04/17] test stuff

---
 src/doomdef.h | 2 +-
 src/g_game.c  | 3 +++
 src/p_user.c  | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/doomdef.h b/src/doomdef.h
index a35f3291d..0791e07e9 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -140,7 +140,7 @@
 extern FILE *logstream;
 #endif
 
-//#define DEVELOP // Disable this for release builds to remove excessive cheat commands and enable MD5 checking and stuff, all in one go. :3
+#define DEVELOP // Disable this for release builds to remove excessive cheat commands and enable MD5 checking and stuff, all in one go. :3
 #ifdef DEVELOP
 #define VERSION    0 // Game version
 #define SUBVERSION 0 // more precise version number
diff --git a/src/g_game.c b/src/g_game.c
index 9b3ba2e85..c35d4c5da 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1552,6 +1552,9 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
 	else if (cmd->driftturn < (-angleturn[1] * realtics))
 		cmd->driftturn = (-angleturn[1] * realtics);
 
+	cmd->angleturn = FixedMul(cmd->angleturn, cv_cam2_dist.value/160);
+
+	if (cv_playbackspeed.value == 1)
 	if (player->mo)
 		cmd->angleturn = K_GetKartTurnValue(player, cmd->angleturn);
 
diff --git a/src/p_user.c b/src/p_user.c
index 014110b76..65ec2547d 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -6649,6 +6649,10 @@ static void P_MovePlayer(player_t *player)
 			player->lturn_max[leveltime%MAXPREDICTTICS] = player->rturn_max[leveltime%MAXPREDICTTICS] = 0;
 		}
 
+		if (cv_soniccd.value)
+		{
+			player->mo->angle = cmd->angleturn << 16;
+		} else
 		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.

From f7aa9ebb250995babf8f6522214895e17979c1e7 Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Sat, 5 Jan 2019 01:13:16 -0600
Subject: [PATCH 05/17] Determine latency with leveltime BS instead of nettics

---
 src/d_clisrv.c | 19 -------------------
 src/g_game.c   |  4 ++++
 src/p_user.c   |  5 ++++-
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index f131ef0b7..eafc12833 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -4007,25 +4007,6 @@ FILESTAMP
 					&netbuffer->u.client4pak.cmd4, 1);
 			}
 
-			{ // Store the node's latency in tics on the ticcmd right as we receive it. I think this should be sync-stable
-				UINT8 latency = min(maketic - nettics[node], MAXPREDICTTICS-1); //@TODO add a cvar to allow setting this max
-
-				switch (netbuffer->packettype)
-				{
-				case PT_CLIENT4CMD:
-					netcmds[maketic%BACKUPTICS][(UINT8)nodetoplayer4[node]].latency = latency;
-
-				case PT_CLIENT3CMD:
-					netcmds[maketic%BACKUPTICS][(UINT8)nodetoplayer3[node]].latency = latency;
-
-				case PT_CLIENT2CMD:
-					netcmds[maketic%BACKUPTICS][(UINT8)nodetoplayer2[node]].latency = latency;
-
-				default:
-					netcmds[maketic%BACKUPTICS][netconsole].latency = latency;
-				}
-			}
-
 			// A delay before we check resynching
 			// Used on join or just after a synch fail
 			if (resynch_delay[node])
diff --git a/src/g_game.c b/src/g_game.c
index c35d4c5da..c9b242b19 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1567,6 +1567,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
 		lang += (cmd->angleturn<<16);
 
 	cmd->angleturn = (INT16)(lang >> 16);
+	cmd->latency = leveltime & 0xFF; // Send leveltime when this tic was generated to the server for control lag calculations
 
 	if (!hu_stopped)
 	{
@@ -2142,6 +2143,9 @@ void G_Ticker(boolean run)
 					players[i].kartstuff[k_throwdir] = 0;
 
 			G_CopyTiccmd(cmd, &netcmds[buf][i], 1);
+
+			// Use the leveltime sent in the player's ticcmd to determine control lag
+			cmd->latency = min((leveltime & 0xFF) - cmd->latency, MAXPREDICTTICS-1); //@TODO add a cvar to allow setting this max
 		}
 	}
 
diff --git a/src/p_user.c b/src/p_user.c
index 65ec2547d..32223e6e5 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -6678,7 +6678,10 @@ static void P_MovePlayer(player_t *player)
 			if (add_delta) {
 				player->mo->angle += angle_diff<<16;
 				player->mo->angle &= ~0xFFFF; // Try to keep the turning somewhat similar to how it was before?
-				CONS_Printf("leftover turn (%s): %d\n", player_names[player-players], (INT16) (cmd->angleturn - (player->mo->angle>>16)));
+				CONS_Printf("leftover turn (%s): %5d or %4d%%\n",
+								player_names[player-players],
+								(INT16) (cmd->angleturn - (player->mo->angle>>16)),
+								(INT16) (cmd->angleturn - (player->mo->angle>>16)) * 100 / (angle_diff ?: 1));
 			}
 		}
 

From 955e0ad8c963b8d3a9fa791f677a4adec68a4e3b Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Tue, 8 Jan 2019 20:27:54 -0600
Subject: [PATCH 06/17] Make starting boost timing compensate for latency

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

diff --git a/src/k_kart.c b/src/k_kart.c
index 6162e7725..6118e17d3 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -5487,7 +5487,12 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 	if (leveltime >= starttime-(2*TICRATE) && leveltime <= starttime)
 	{
 		if (cmd->buttons & BT_ACCELERATE)
+		{
+			if (player->kartstuff[k_boostcharge] == 0)
+				player->kartstuff[k_boostcharge] = cmd->latency;
+
 			player->kartstuff[k_boostcharge]++;
+		}
 		else
 			player->kartstuff[k_boostcharge] = 0;
 	}

From 92c5a0836ba0a7cdfdafaf28f97151412920b5c1 Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Tue, 8 Jan 2019 20:36:06 -0600
Subject: [PATCH 07/17] Remove filthy filthy cheats

---
 src/g_game.c |  3 ---
 src/p_user.c | 12 ++++--------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/g_game.c b/src/g_game.c
index c9b242b19..8e19ca288 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1552,9 +1552,6 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
 	else if (cmd->driftturn < (-angleturn[1] * realtics))
 		cmd->driftturn = (-angleturn[1] * realtics);
 
-	cmd->angleturn = FixedMul(cmd->angleturn, cv_cam2_dist.value/160);
-
-	if (cv_playbackspeed.value == 1)
 	if (player->mo)
 		cmd->angleturn = K_GetKartTurnValue(player, cmd->angleturn);
 
diff --git a/src/p_user.c b/src/p_user.c
index 32223e6e5..6aa7a591b 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -6649,10 +6649,6 @@ static void P_MovePlayer(player_t *player)
 			player->lturn_max[leveltime%MAXPREDICTTICS] = player->rturn_max[leveltime%MAXPREDICTTICS] = 0;
 		}
 
-		if (cv_soniccd.value)
-		{
-			player->mo->angle = cmd->angleturn << 16;
-		} else
 		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.
@@ -6678,10 +6674,10 @@ static void P_MovePlayer(player_t *player)
 			if (add_delta) {
 				player->mo->angle += angle_diff<<16;
 				player->mo->angle &= ~0xFFFF; // Try to keep the turning somewhat similar to how it was before?
-				CONS_Printf("leftover turn (%s): %5d or %4d%%\n",
-								player_names[player-players],
-								(INT16) (cmd->angleturn - (player->mo->angle>>16)),
-								(INT16) (cmd->angleturn - (player->mo->angle>>16)) * 100 / (angle_diff ?: 1));
+				//CONS_Printf("leftover turn (%s): %5d or %4d%%\n",
+				//				player_names[player-players],
+				//				(INT16) (cmd->angleturn - (player->mo->angle>>16)),
+				//				(INT16) (cmd->angleturn - (player->mo->angle>>16)) * 100 / (angle_diff ?: 1));
 			}
 		}
 

From 40ff1e5067806def79fad963d21bd69d6c473eb9 Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Tue, 8 Jan 2019 20:55:33 -0600
Subject: [PATCH 08/17] Experimental nettic buffer to stop net-induced frame
 drops?

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

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index eafc12833..f5d9b213c 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -3017,6 +3017,9 @@ static void Got_KickCmd(UINT8 **p, INT32 playernum)
 	}
 }
 
+static CV_PossibleValue_t netticbuffer_cons_t[] = {{0, "MIN"}, {3, "MAX"}};
+consvar_t cv_netticbuffer = {"netticbuffer", "1", CV_SAVE, netticbuffer_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+
 consvar_t cv_allownewplayer = {"allowjoin", "On", CV_NETVAR, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL	};
 #ifdef VANILLAJOINNEXTROUND
 consvar_t cv_joinnextround = {"joinnextround", "Off", CV_NETVAR, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; /// \todo not done
@@ -3068,6 +3071,7 @@ void D_ClientServerInit(void)
 	RegisterNetXCmd(XD_REMOVEPLAYER, Got_RemovePlayer);
 #ifndef NONET
 	CV_RegisterVar(&cv_allownewplayer);
+	CV_RegisterVar(&cv_netticbuffer);
 #ifdef VANILLAJOINNEXTROUND
 	CV_RegisterVar(&cv_joinnextround);
 #endif
@@ -4925,6 +4929,10 @@ void TryRunTics(tic_t realtics)
 				ExtraDataTicker();
 				gametic++;
 				consistancy[gametic%BACKUPTICS] = Consistancy();
+
+				// Leave a certain amount of tics present in the net buffer as long as we've ran at least one tic this frame.
+				if (gamestate == GS_LEVEL && leveltime > 3 && neededtic <= gametic + cv_netticbuffer.value)
+					break;
 			}
 	}
 	else

From bc3a7ba5cb4cf3f9c08d7778684042ab117287f8 Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Tue, 8 Jan 2019 23:27:39 -0600
Subject: [PATCH 09/17] Save stored turn ranges in NetArchivePlayers

---
 src/p_saveg.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/p_saveg.c b/src/p_saveg.c
index 555a26140..965fa8779 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -282,6 +282,12 @@ static void P_NetArchivePlayers(void)
 		WRITEUINT8(save_p, players[i].accelstart);
 		WRITEUINT8(save_p, players[i].acceleration);
 		WRITEFIXED(save_p, players[i].jumpfactor);
+
+		for (j = 0; j < MAXPREDICTTICS; j++)
+		{
+			WRITEINT16(save_p, players[i].lturn_max[j]);
+			WRITEINT16(save_p, players[i].rturn_max[j]);
+		}
 	}
 }
 
@@ -456,6 +462,12 @@ static void P_NetUnArchivePlayers(void)
 		players[i].accelstart = READUINT8(save_p);
 		players[i].acceleration = READUINT8(save_p);
 		players[i].jumpfactor = READFIXED(save_p);
+
+		for (j = 0; j < MAXPREDICTTICS; j++)
+		{
+			players[i].lturn_max[j] = READINT16(save_p);
+			 players[i].rturn_max[j] = READINT16(save_p);
+		}
 	}
 }
 

From 797c20d603ddef5dc6f6ea920ca91af27aa40b8e Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Tue, 8 Jan 2019 23:27:51 -0600
Subject: [PATCH 10/17] Don't use netticbuffer for servers

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

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 55fea367f..bf0f5ae23 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -4938,7 +4938,7 @@ void TryRunTics(tic_t realtics)
 				consistancy[gametic%BACKUPTICS] = Consistancy();
 
 				// Leave a certain amount of tics present in the net buffer as long as we've ran at least one tic this frame.
-				if (gamestate == GS_LEVEL && leveltime > 3 && neededtic <= gametic + cv_netticbuffer.value)
+				if (client && gamestate == GS_LEVEL && leveltime > 3 && neededtic <= gametic + cv_netticbuffer.value)
 					break;
 			}
 	}

From 1c799202801ececaa92f03c8d98c14e3e99665d2 Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Wed, 9 Jan 2019 00:49:32 -0600
Subject: [PATCH 11/17] oops

---
 src/doomdef.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/doomdef.h b/src/doomdef.h
index 50601dc7d..975c920b8 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -140,7 +140,7 @@
 extern FILE *logstream;
 #endif
 
-#define DEVELOP // Disable this for release builds to remove excessive cheat commands and enable MD5 checking and stuff, all in one go. :3
+//#define DEVELOP // Disable this for release builds to remove excessive cheat commands and enable MD5 checking and stuff, all in one go. :3
 #ifdef DEVELOP
 #define VERSION    0 // Game version
 #define SUBVERSION 0 // more precise version number

From 00c658fccd9bba29f8dcf66acf1683cee2d41f1c Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Wed, 9 Jan 2019 09:05:57 -0600
Subject: [PATCH 12/17] Make sure cmd.latency is always 0 in mode attack?

---
 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 f3059998a..dfb5b86c0 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -2154,7 +2154,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 = 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, MAXPREDICTTICS-1); //@TODO add a cvar to allow setting this max
 		}
 	}
 

From 00f8e8b0e694499efa2baff5614562a3f98a2d65 Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Wed, 9 Jan 2019 09:07:41 -0600
Subject: [PATCH 13/17] Here too

---
 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 dfb5b86c0..5b483692b 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1568,7 +1568,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
 		lang += (cmd->angleturn<<16);
 
 	cmd->angleturn = (INT16)(lang >> 16);
-	cmd->latency = leveltime & 0xFF; // Send leveltime when this tic was generated to the server for control lag calculations
+	cmd->latency = modeattacking ? 0 : (leveltime & 0xFF); // Send leveltime when this tic was generated to the server for control lag calculations
 
 	if (!hu_stopped)
 	{

From e944ef9cac5c708fcd85215d4158241b539f6041 Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Fri, 11 Jan 2019 18:11:52 -0600
Subject: [PATCH 14/17] i,m gowonna update my name in the cwedits uwu

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

diff --git a/src/f_finale.c b/src/f_finale.c
index d210b9c81..fe56eefb2 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -438,7 +438,7 @@ static const char *credits[] = {
 	"\"ZarroTsu\"",
 	"",
 	"\1Support Programming",
-	"\"fickle\"",
+	"Colette \"fickleheart\" Bordelon",
 	"\"Lat\'\"",
 	"\"Monster Iestyn\"",
 	"\"Shuffle\"",

From 31d9a86b6f86ca9fe2424d176557458cc12463e8 Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Tue, 15 Jan 2019 20:19:25 -0600
Subject: [PATCH 15/17] Don't multiply driftturn by realtics

(I also moved multiplying angleturn to a single spot)
---
 src/g_game.c | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/g_game.c b/src/g_game.c
index ce12c0334..004ff62df 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1352,27 +1352,27 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
 	// let movement keys cancel each other out
 	if (turnright && !(turnleft))
 	{
-		cmd->angleturn = (INT16)(cmd->angleturn - (angleturn[tspeed] * realtics));
-		cmd->driftturn = (INT16)(cmd->driftturn - (angleturn[tspeed] * realtics));
+		cmd->angleturn = (INT16)(cmd->angleturn - (angleturn[tspeed]));
+		cmd->driftturn = (INT16)(cmd->driftturn - (angleturn[tspeed]));
 	}
 	else if (turnleft && !(turnright))
 	{
-		cmd->angleturn = (INT16)(cmd->angleturn + (angleturn[tspeed] * realtics));
-		cmd->driftturn = (INT16)(cmd->driftturn + (angleturn[tspeed] * realtics));
+		cmd->angleturn = (INT16)(cmd->angleturn + (angleturn[tspeed]));
+		cmd->driftturn = (INT16)(cmd->driftturn + (angleturn[tspeed]));
 	}
 
 	if (analogjoystickmove && axis != 0)
 	{
 		// JOYAXISRANGE should be 1023 (divide by 1024)
-		cmd->angleturn = (INT16)(cmd->angleturn - (((axis * angleturn[1]) >> 10) * realtics)); // ANALOG!
-		cmd->driftturn = (INT16)(cmd->driftturn - (((axis * angleturn[1]) >> 10) * realtics));
+		cmd->angleturn = (INT16)(cmd->angleturn - (((axis * angleturn[1]) >> 10))); // ANALOG!
+		cmd->driftturn = (INT16)(cmd->driftturn - (((axis * angleturn[1]) >> 10)));
 	}
 
 	// Specator mouse turning
 	if (player->spectator)
 	{
-		cmd->angleturn = (INT16)(cmd->angleturn - ((mousex*(encoremode ? -1 : 1)*8) * realtics));
-		cmd->driftturn = (INT16)(cmd->driftturn - ((mousex*(encoremode ? -1 : 1)*8) * realtics));
+		cmd->angleturn = (INT16)(cmd->angleturn - ((mousex*(encoremode ? -1 : 1)*8)));
+		cmd->driftturn = (INT16)(cmd->driftturn - ((mousex*(encoremode ? -1 : 1)*8)));
 	}
 
 	// Speed bump strafing
@@ -1549,19 +1549,21 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
 	//{ SRB2kart - Drift support
 	// Not grouped with the rest of turn stuff because it needs to know what buttons you're pressing for rubber-burn turn
 	// limit turning to angleturn[1] to stop mouselook letting you look too fast
-	if (cmd->angleturn > (angleturn[1] * realtics))
-		cmd->angleturn = (angleturn[1] * realtics);
-	else if (cmd->angleturn < (-angleturn[1] * realtics))
-		cmd->angleturn = (-angleturn[1] * realtics);
+	if (cmd->angleturn > (angleturn[1]))
+		cmd->angleturn = (angleturn[1]);
+	else if (cmd->angleturn < (-angleturn[1]))
+		cmd->angleturn = (-angleturn[1]);
 
-	if (cmd->driftturn > (angleturn[1] * realtics))
-		cmd->driftturn = (angleturn[1] * realtics);
-	else if (cmd->driftturn < (-angleturn[1] * realtics))
-		cmd->driftturn = (-angleturn[1] * realtics);
+	if (cmd->driftturn > (angleturn[1]))
+		cmd->driftturn = (angleturn[1]);
+	else if (cmd->driftturn < (-angleturn[1]))
+		cmd->driftturn = (-angleturn[1]);
 
 	if (player->mo)
 		cmd->angleturn = K_GetKartTurnValue(player, cmd->angleturn);
 
+	cmd->angleturn *= realtics;
+
 	// SRB2kart - no additional angle if not moving
 	if (((player->mo && player->speed > 0) // Moving
 		|| (leveltime > starttime && (cmd->buttons & BT_ACCELERATE && cmd->buttons & BT_BRAKE)) // Rubber-burn turn

From b3c890df63304b286eff4c9b1757ec45b71ed370 Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Tue, 15 Jan 2019 20:20:13 -0600
Subject: [PATCH 16/17] Kick players who send cmds with invalid driftturn

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

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index cf558d272..5a0162685 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -3982,7 +3982,8 @@ FILESTAMP
 
 			// Check ticcmd for "speed hacks"
 			if (netcmds[maketic%BACKUPTICS][netconsole].forwardmove > MAXPLMOVE || netcmds[maketic%BACKUPTICS][netconsole].forwardmove < -MAXPLMOVE
-				|| netcmds[maketic%BACKUPTICS][netconsole].sidemove > MAXPLMOVE || netcmds[maketic%BACKUPTICS][netconsole].sidemove < -MAXPLMOVE)
+				|| netcmds[maketic%BACKUPTICS][netconsole].sidemove > MAXPLMOVE || netcmds[maketic%BACKUPTICS][netconsole].sidemove < -MAXPLMOVE ||
+				netcmds[maketic%BACKUPTICS][netconsole].driftturn > KART_FULLTURN || netcmds[maketic%BACKUPTICS][netconsole].driftturn < -KART_FULLTURN)
 			{
 				XBOXSTATIC char buf[2];
 				CONS_Alert(CONS_WARNING, M_GetText("Illegal movement value received from node %d\n"), netconsole);

From 654580d48b035a4f56f6fc62e6a13c16a9aeeb81 Mon Sep 17 00:00:00 2001
From: TehRealSalt <tehrealsalt@gmail.com>
Date: Tue, 15 Jan 2019 21:56:46 -0500
Subject: [PATCH 17/17] Minor whitespace

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

diff --git a/src/p_saveg.c b/src/p_saveg.c
index 965fa8779..975a4a5d2 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -466,7 +466,7 @@ static void P_NetUnArchivePlayers(void)
 		for (j = 0; j < MAXPREDICTTICS; j++)
 		{
 			players[i].lturn_max[j] = READINT16(save_p);
-			 players[i].rturn_max[j] = READINT16(save_p);
+			players[i].rturn_max[j] = READINT16(save_p);
 		}
 	}
 }