From 72ed94bfcf11ae1ea5b22678a1cf810824390742 Mon Sep 17 00:00:00 2001
From: TehRealSalt <tehrealsalt@gmail.com>
Date: Sat, 30 Jun 2018 23:43:45 -0400
Subject: [PATCH] Reset scores between Battle matches for now

I want to tackle the two intermission screens whenever I do the same for Race
---
 src/g_game.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/g_game.c b/src/g_game.c
index 1ca67918..3a055b1d 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -3390,8 +3390,13 @@ static void G_DoWorldDone(void)
 {
 	if (server)
 	{
-		// SRB2kart: don't reset player between maps
-		D_MapChange(nextmap+1, deferredgametype, ultimatemode, (deferredgametype != gametype), 0, false, false);
+		// SRB2Kart
+		if (G_RaceGametype() && (deferredgametype == gametype))
+			// don't reset player between maps in Race
+			D_MapChange(nextmap+1, deferredgametype, ultimatemode, false, 0, false, false);
+		else
+			// resetplayer in Battle for more equality
+			D_MapChange(nextmap+1, deferredgametype, ultimatemode, true, 0, false, false);
 	}
 
 	gameaction = ga_nothing;