diff --git a/src/g_game.c b/src/g_game.c
index 9b46562f..b0a4163b 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -4499,6 +4499,13 @@ void G_ReadDemoTiccmd(ticcmd_t *cmd, INT32 playernum)
 
 	G_CopyTiccmd(cmd, &oldcmd, 1);
 
+	// SRB2kart: Copy-pasted from ticcmd building, removes that crappy demo cam
+	if (((players[displayplayer].mo && players[displayplayer].speed > 0) // Moving
+		|| (leveltime > starttime && (cmd->buttons & BT_ACCELERATE && cmd->buttons & BT_BRAKE)) // Rubber-burn turn
+		|| (players[displayplayer].spectator || objectplacing)) // Not a physical player
+		&& !(players[displayplayer].kartstuff[k_spinouttimer] && players[displayplayer].kartstuff[k_sneakertimer])) // Spinning and boosting cancels out spinout
+		localangle += (cmd->angleturn<<16);
+
 	if (!(demoflags & DF_GHOST) && *demo_p == DEMOMARKER)
 	{
 		// end of demo data stream
diff --git a/src/g_game.h b/src/g_game.h
index e34a6986..4dab9a76 100644
--- a/src/g_game.h
+++ b/src/g_game.h
@@ -188,7 +188,6 @@ void G_StopMetalDemo(void);
 ATTRNORETURN void FUNCNORETURN G_StopMetalRecording(void);
 void G_StopDemo(void);
 boolean G_CheckDemoStatus(void);
-char *G_DemoPlayerName(char *defdemoname);
 
 boolean G_IsSpecialStage(INT32 mapnum);
 boolean G_GametypeUsesLives(void);
diff --git a/src/p_user.c b/src/p_user.c
index c63fc730..1ddfc251 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -8216,7 +8216,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
 //	if (leveltime > 0 && timeinmap <= 0)
 //		return true;
 
-	if (player->pflags & PF_NIGHTSMODE)
+	if (demoplayback)
 	{
 		focusangle = mo->angle;
 		focusaiming = 0;
@@ -8323,9 +8323,6 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
 			input = InvAngle(input);
 
 		angle = thiscam->angle + input;
-
-		if (demoplayback && player == &players[consoleplayer])
-			localangle = angle;
 	}
 
 	if (!resetcalled && (leveltime > starttime)
diff --git a/src/r_main.c b/src/r_main.c
index bd1cd477..734508ad 100644
--- a/src/r_main.c
+++ b/src/r_main.c
@@ -861,7 +861,7 @@ void R_SkyboxFrame(player_t *player)
 	{
 		aimingangle = player->aiming;
 		viewangle = player->mo->angle;
-		if (!demoplayback && player->playerstate != PST_DEAD)
+		if (/*!demoplayback && */player->playerstate != PST_DEAD)
 		{
 			if (player == &players[consoleplayer])
 			{
@@ -1138,7 +1138,7 @@ void R_SetupFrame(player_t *player, boolean skybox)
 		aimingangle = player->aiming;
 		viewangle = viewmobj->angle;
 
-		if (!demoplayback && player->playerstate != PST_DEAD)
+		if (/*!demoplayback && */player->playerstate != PST_DEAD)
 		{
 			if (player == &players[consoleplayer])
 			{