From 83738a20b79fd6c40a850cf5f32ad324ad8115c0 Mon Sep 17 00:00:00 2001
From: fickleheart <fickle@tinted.red>
Date: Sat, 12 Jan 2019 02:48:18 -0600
Subject: [PATCH] Fix players spawning in the wrong spots when watching replays

---
 src/g_game.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/g_game.c b/src/g_game.c
index abc5857b..2e8c5b48 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -4364,7 +4364,7 @@ void G_InitNew(UINT8 pencoremode, const char *mapname, boolean resetplayer, bool
 
 			players[i].marescore = 0;
 
-			if (resetplayer) // SRB2Kart
+			if (resetplayer && !(multiplayer && demoplayback)) // SRB2Kart
 			{
 				players[i].score = 0;
 			}
@@ -5983,7 +5983,6 @@ void G_DoPlayDemo(char *defdemoname)
 
 		while (p != 0xFF)
 		{
-			player = &players[p];
 			if (!playeringame[displayplayer])
 				displayplayer = consoleplayer = p;
 			playeringame[p] = true;
@@ -6008,7 +6007,7 @@ void G_DoPlayDemo(char *defdemoname)
 				}
 
 			// Score, since Kart uses this to determine where you start on the map
-			player->score = READUINT32(demo_p);
+			players[p].score = READUINT32(demo_p);
 
 			// Look for the next player
 			p = READUINT8(demo_p);