diff --git a/src/g_game.c b/src/g_game.c index edfab6d88..4e2735ba1 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -2306,7 +2306,7 @@ void G_PlayerReborn(INT32 player) { if (keepmusic) { - S_CopyKeepMusicStuff(); + S_CopyKeepMusicStuff(); // this is horrible, why do we COMPLETELY need to reset the music on respawn?? oh well } else { diff --git a/src/s_sound.c b/src/s_sound.c index 4f3a342d6..21f65b93f 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -125,6 +125,7 @@ static char keepmusname[7]; static UINT32 keepmusresume = 0; static UINT16 keepmusflags = 0; static UINT32 keepmusposition = 0; +static void S_SetKeepMusResume(void); #ifdef HAVE_OPENMPT openmpt_module *openmpt_mhandle = NULL; @@ -1830,6 +1831,8 @@ void S_StopMusic(void) mapmusresume = (cv_birdmusic.value && (strcasecmp(music_name, mapmusname) == 0)) ? I_GetSongPosition() : 0; + S_SetKeepMusResume(); + if (I_SongPaused()) I_ResumeSong(); @@ -1971,6 +1974,14 @@ void S_ResetKeepAndSpecialMus(void) keepmusic = skipintromus = false; } +static void S_SetKeepMusResume(void) +{ + if (strcasecmp(music_name, mapmusname) == 0) + { + keepmusresume = I_GetSongPosition(); + } +} + // save some values static void S_SetKeepMusicPosition(void) { @@ -1979,13 +1990,9 @@ static void S_SetKeepMusicPosition(void) return; } - if (strcasecmp(music_name, mapmusname) == 0) - { - strncpy(keepmusname, mapmusname, 7); - keepmusresume = I_GetSongPosition(); - keepmusflags = mapmusflags; - keepmusposition = mapmusposition; - } + strncpy(keepmusname, mapmusname, 7); + keepmusflags = mapmusflags; + keepmusposition = mapmusposition; } static void S_ClearKeepMusicPosition(void) @@ -1998,12 +2005,14 @@ static void S_ClearKeepMusicPosition(void) void S_CopyKeepMusicStuff(void) { + if (!cv_keepmusic.value) + { + return; + } + strncpy(mapmusname, keepmusname, 7); mapmusflags = keepmusflags; - if (keepmusicresume) - mapmusposition = keepmusposition; - else - mapmusposition = mapheaderinfo[gamemap-1]->muspos; + mapmusposition = keepmusposition; } // determine if we should keep the music on a map restart