From 8bb4259de85a281a01ea1c306bf466d8e68b09e4 Mon Sep 17 00:00:00 2001
From: TehRealSalt <tehrealsalt@gmail.com>
Date: Mon, 22 Jan 2018 18:39:53 -0500
Subject: [PATCH] Fixed brakes

---
 src/g_game.c   | 15 ++++++++++++---
 src/hu_stuff.c |  5 +++--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/g_game.c b/src/g_game.c
index 8d8ed407..f2f07493 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1368,7 +1368,8 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
 	if (InputDown(gc_brake, ssplayer))
 	{
 		cmd->buttons |= BT_BRAKE;
-		forward -= forwardmove[0];	// 25 - Halved value so clutching is possible
+		if (cmd->buttons & BT_ACCELERATE || cmd->forwardmove <= 0)
+			forward -= forwardmove[0];	// 25 - Halved value so clutching is possible
 	}
 	// But forward/backward IS used for aiming.
 	axis = JoyAxis(AXISMOVE, ssplayer);
@@ -1544,8 +1545,16 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
 		side = temp;
 	}
 
-	cmd->forwardmove = (SINT8)(cmd->forwardmove + forward);
-	cmd->sidemove = (SINT8)(cmd->sidemove + side);
+	if (cmd->buttons & BT_BRAKE && !forward) // Sal: If you're not accelerating, but going forward, then you should just lose your momentum. Request from Sev
+	{
+		cmd->forwardmove = (SINT8)(cmd->forwardmove / 2);
+		cmd->sidemove = (SINT8)(cmd->sidemove / 2);
+	}
+	else
+	{
+		cmd->forwardmove = (SINT8)(cmd->forwardmove + forward);
+		cmd->sidemove = (SINT8)(cmd->sidemove + side);
+	}
 
 	if (cv_kartmirror.value)
 		cmd->sidemove = -cmd->sidemove;
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index abc94f59..24e4da10 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -1171,7 +1171,8 @@ void HU_Drawer(void)
 		return;
 
 	// draw the crosshair, not when viewing demos nor with chasecam
-	if (!automapactive && cv_crosshair.value && !demoplayback && !camera.chase && !players[displayplayer].spectator)
+	// SRB2kart: not for kart though :V
+	/*if (!automapactive && cv_crosshair.value && !demoplayback && !camera.chase && !players[displayplayer].spectator)
 		HU_DrawCrosshair();
 
 	if (!automapactive && cv_crosshair2.value && !demoplayback && !camera2.chase && !players[secondarydisplayplayer].spectator)
@@ -1181,7 +1182,7 @@ void HU_Drawer(void)
 		HU_DrawCrosshair3();
 
 	if (!automapactive && cv_crosshair4.value && !demoplayback && !camera4.chase && !players[fourthdisplayplayer].spectator)
-		HU_DrawCrosshair4();
+		HU_DrawCrosshair4();*/
 
 	// draw desynch text
 	if (hu_resynching)