From 762dfd3063f50854399a46865fe9b34379f18b08 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Sat, 28 Nov 2020 12:31:16 +0000
Subject: [PATCH] When resuming from a rewind, don't: * run wipes again * run
 titlecards again * stop the music

---
 src/g_demo.c  |  2 +-
 src/g_game.c  |  2 +-
 src/p_setup.c | 60 +++++++++++++++++++++++++--------------------------
 src/p_tick.c  |  2 ++
 4 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/src/g_demo.c b/src/g_demo.c
index aebc447f2..693a4f095 100644
--- a/src/g_demo.c
+++ b/src/g_demo.c
@@ -1468,7 +1468,7 @@ void G_ConfirmRewind(tic_t rewindtime)
 
 	if (rewindtime <= starttime)
 	{
-		demo.rewinding = false;
+		demo.rewinding = true; // this doesn't APPEAR to cause any misery, and it allows us to prevent running all the wipes again
 		G_DoPlayDemo(NULL); // Restart the current demo
 	}
 	else
diff --git a/src/g_game.c b/src/g_game.c
index 0151783e9..1f17fc181 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1252,7 +1252,7 @@ void G_StartTitleCard(void)
 {
 	// The title card has been disabled for this map.
 	// Oh well.
-	if (!G_IsTitleCardAvailable())
+	if (!G_IsTitleCardAvailable() || demo.rewinding)
 	{
 		WipeStageTitle = false;
 		return;
diff --git a/src/p_setup.c b/src/p_setup.c
index 50f39c5fa..15e6767a5 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -3924,40 +3924,40 @@ boolean P_LoadLevel(boolean fromnetsave)
 	}
 	*/
 
-	// Make sure all sounds are stopped before Z_FreeTags.
-	S_StopSounds();
-	S_ClearSfx();
-
-	// Fade out music here. Deduct 2 tics so the fade volume actually reaches 0.
-	// But don't halt the music! S_Start will take care of that. This dodges a MIDI crash bug.
-	if (!titlemapinaction)
-		S_FadeMusic(0, FixedMul(
-			FixedDiv((F_GetWipeLength(wipedefs[wipe_level_toblack])-2)*NEWTICRATERATIO, NEWTICRATE), MUSICRATE));
-
-	// Reset the palette now all fades have been done
-	if (rendermode != render_none)
-		V_SetPaletteLump(GetPalette()); // Set the level palette
-
-	if (!titlemapinaction)
-	{
-		if (ranspecialwipe == 2)
-		{
-			pausedelay = -3; // preticker plus one
-			S_StartSound(NULL, sfx_s3k73);
-		}
-
-		// As oddly named as this is, this handles music only.
-		// We should be fine starting it here.
-		// Don't do this during titlemap, because the menu code handles music by itself.
-		S_Start();
-	}
-
-	levelfadecol = (encoremode ? 0 : 31);
-
 	// Let's fade to white here
 	// But only if we didn't do the encore startup wipe
 	if (!demo.rewinding)
 	{
+		// Make sure all sounds are stopped before Z_FreeTags.
+		S_StopSounds();
+		S_ClearSfx();
+
+		// Fade out music here. Deduct 2 tics so the fade volume actually reaches 0.
+		// But don't halt the music! S_Start will take care of that. This dodges a MIDI crash bug.
+		if (!titlemapinaction)
+			S_FadeMusic(0, FixedMul(
+				FixedDiv((F_GetWipeLength(wipedefs[wipe_level_toblack])-2)*NEWTICRATERATIO, NEWTICRATE), MUSICRATE));
+
+		// Reset the palette now all fades have been done
+		if (rendermode != render_none)
+			V_SetPaletteLump(GetPalette()); // Set the level palette
+
+		if (!titlemapinaction)
+		{
+			if (ranspecialwipe == 2)
+			{
+				pausedelay = -3; // preticker plus one
+				S_StartSound(NULL, sfx_s3k73);
+			}
+
+			// As oddly named as this is, this handles music only.
+			// We should be fine starting it here.
+			// Don't do this during titlemap, because the menu code handles music by itself.
+			S_Start();
+		}
+
+		levelfadecol = (encoremode ? 0 : 31);
+
 		if (rendermode != render_none)
 		{
 			F_WipeStartScreen();
diff --git a/src/p_tick.c b/src/p_tick.c
index 9d7a6ac5c..cef59ea8d 100644
--- a/src/p_tick.c
+++ b/src/p_tick.c
@@ -516,6 +516,8 @@ void P_Ticker(boolean run)
 		if (demo.rewinding && leveltime > 0)
 		{
 			leveltime = (leveltime-1) & ~3;
+			if (timeinmap > 0)
+				timeinmap = (timeinmap-1) & ~3;
 			G_PreviewRewind(leveltime);
 		}
 		else if (demo.freecam && democam.cam)	// special case: allow freecam to MOVE during pause!