From 911dd5733406d0f2d3c5af0da82579e71fff4965 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Fri, 29 Nov 2019 01:56:44 -0800
Subject: [PATCH] Restore level music to where it left off

Toggleable via the resume cvar.
---
 src/d_netcmd.c |  2 ++
 src/doomstat.h |  1 +
 src/g_game.c   |  2 ++
 src/g_game.h   |  2 ++
 src/p_user.c   | 10 +++++++++-
 src/s_sound.c  |  3 +++
 6 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 3498c7cfc..5cca6637f 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -988,6 +988,8 @@ void D_RegisterClientCommands(void)
 	CV_RegisterVar(&cv_invincmusicfade);
 	CV_RegisterVar(&cv_growmusicfade);
 
+	CV_RegisterVar(&cv_resume);
+
 	// ingame object placing
 	COM_AddCommand("objectplace", Command_ObjectPlace_f);
 	COM_AddCommand("writethings", Command_Writethings_f);
diff --git a/src/doomstat.h b/src/doomstat.h
index f4f7acfd0..c65d368d5 100644
--- a/src/doomstat.h
+++ b/src/doomstat.h
@@ -34,6 +34,7 @@ extern INT16 gamemap;
 extern char mapmusname[7];
 extern UINT16 mapmusflags;
 extern UINT32 mapmusposition;
+extern UINT32 mapmusresume;
 #define MUSIC_TRACKMASK   0x0FFF // ----************
 #define MUSIC_RELOADRESET 0x8000 // *---------------
 #define MUSIC_FORCERESET  0x4000 // -*--------------
diff --git a/src/g_game.c b/src/g_game.c
index 49af6e509..31baf6b3d 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -80,6 +80,7 @@ static void G_DoStartVote(void);
 char   mapmusname[7]; // Music name
 UINT16 mapmusflags; // Track and reset bit
 UINT32 mapmusposition; // Position to jump to
+UINT32 mapmusresume;
 
 INT16 gamemap = 1;
 INT16 maptol;
@@ -532,6 +533,7 @@ consvar_t cv_deadzone4 = {"joy4_deadzone", "0.5", CV_FLOAT|CV_SAVE, deadzone_con
 consvar_t cv_invincmusicfade = {"invincmusicfade", "300", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_growmusicfade = {"growmusicfade", "500", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL};
 
+consvar_t cv_resume = {"resume", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 #if MAXPLAYERS > 16
 #error "please update player_name table using the new value for MAXPLAYERS"
diff --git a/src/g_game.h b/src/g_game.h
index 62bffbc7f..c5b3e5dc3 100644
--- a/src/g_game.h
+++ b/src/g_game.h
@@ -121,6 +121,8 @@ extern consvar_t cv_ghost_besttime, cv_ghost_bestlap, cv_ghost_last, cv_ghost_gu
 extern consvar_t cv_invincmusicfade;
 extern consvar_t cv_growmusicfade;
 
+extern consvar_t cv_resume;
+
 typedef enum
 {
 	AXISNONE = 0,
diff --git a/src/p_user.c b/src/p_user.c
index c79c74b8f..7172bebd1 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -1188,6 +1188,8 @@ boolean P_EndingMusic(player_t *player)
 //
 void P_RestoreMusic(player_t *player)
 {
+	UINT32 position;
+
 	if (!P_IsLocalPlayer(player)) // Only applies to a local player
 		return;
 
@@ -1262,8 +1264,14 @@ void P_RestoreMusic(player_t *player)
 			if (G_RaceGametype() && player->laps >= (UINT8)(cv_numlaps.value))
 				S_SpeedMusic(1.2f);
 #endif
-			S_ChangeMusicEx(mapmusname, mapmusflags, true, mapmusposition, 0,
+			if (mapmusresume && cv_resume.value)
+				position = mapmusresume;
+			else
+				position = mapmusposition;
+
+			S_ChangeMusicEx(mapmusname, mapmusflags, true, position, 0,
 					S_GetRestoreMusicFadeIn());
+			mapmusresume = 0;
 		}
 	}
 }
diff --git a/src/s_sound.c b/src/s_sound.c
index 8f9223bc4..036462edb 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -2073,6 +2073,9 @@ void S_StopMusic(void)
 		|| demo.title) // SRB2Kart: Demos don't interrupt title screen music
 		return;
 
+	if (strcasecmp(music_name, mapmusname) == 0)
+		mapmusresume = I_GetSongPosition();
+
 	if (I_SongPaused())
 		I_ResumeSong();