From 91eb3804128df59fd47f25e6d77ec71cd42ef329 Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Sat, 26 Oct 2019 15:02:45 -0400
Subject: [PATCH] Fix some jingle resuming behavior with boss music switching
---
src/p_enemy.c | 14 +++++++++-----
src/s_sound.c | 33 +++++++++++++++++++++++++++------
src/s_sound.h | 1 +
3 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/src/p_enemy.c b/src/p_enemy.c
index cc2d64e8b9..12a34ebf5e 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -3930,11 +3930,15 @@ void A_BossDeath(mobj_t *mo)
{
// Touching the egg trap button calls P_DoPlayerExit, which calls P_RestoreMusic.
// So just park ourselves in the mapmus variables.
- boolean changed = strnicmp(mapheaderinfo[gamemap-1]->musname, mapmusname, 7);
- strncpy(mapmusname, mapheaderinfo[gamemap-1]->muspostbossname, 7);
- mapmusname[6] = 0;
- mapmusflags = (mapheaderinfo[gamemap-1]->muspostbosstrack & MUSIC_TRACKMASK) | MUSIC_RELOADRESET;
- mapmusposition = mapheaderinfo[gamemap-1]->muspostbosspos;
+ // But don't change the mapmus variables if they were modified from their level header values (e.g., TUNES).
+ boolean changed = strnicmp(mapheaderinfo[gamemap-1]->musname, S_MusicName(), 7);
+ if (!strnicmp(mapheaderinfo[gamemap-1]->musname, mapmusname, 7))
+ {
+ strncpy(mapmusname, mapheaderinfo[gamemap-1]->muspostbossname, 7);
+ mapmusname[6] = 0;
+ mapmusflags = (mapheaderinfo[gamemap-1]->muspostbosstrack & MUSIC_TRACKMASK) | MUSIC_RELOADRESET;
+ mapmusposition = mapheaderinfo[gamemap-1]->muspostbosspos;
+ }
// don't change if we're in another tune
// but in case we're in jingle, use our parked mapmus variables so the correct track restores
diff --git a/src/s_sound.c b/src/s_sound.c
index 22bc848fe0..aa088754b0 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -64,6 +64,8 @@ static void ModFilter_OnChange(void);
static lumpnum_t S_GetMusicLumpNum(const char *mname);
+static boolean S_CheckQueue(void);
+
// commands for music and sound servers
#ifdef MUSSERV
consvar_t musserver_cmd = {"musserver_cmd", "musserver", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -1613,13 +1615,14 @@ static void S_AddMusicStackEntry(const char *mname, UINT16 mflags, boolean loopi
if (!music_stacks)
{
music_stacks = Z_Calloc(sizeof (*mst), PU_MUSIC, NULL);
- strncpy(music_stacks->musname, (status == JT_MASTER ? mname : mapmusname), 7);
- music_stacks->musflags = (status == JT_MASTER ? mflags : mapmusflags);
- music_stacks->looping = (status == JT_MASTER ? looping : true);
- music_stacks->position = (status == JT_MASTER ? position : S_GetMusicPosition());
+ strncpy(music_stacks->musname, (status == JT_MASTER ? mname : (S_CheckQueue() ? queue_name : mapmusname)), 7);
+ music_stacks->musflags = (status == JT_MASTER ? mflags : (S_CheckQueue() ? queue_flags : mapmusflags));
+ music_stacks->looping = (status == JT_MASTER ? looping : (S_CheckQueue() ? queue_looping : true));
+ music_stacks->position = (status == JT_MASTER ? position : (S_CheckQueue() ? queue_position : S_GetMusicPosition()));
music_stacks->tic = gametic;
music_stacks->status = JT_MASTER;
music_stacks->mlumpnum = S_GetMusicLumpNum(music_stacks->musname);
+ music_stacks->noposition = S_CheckQueue();
if (status == JT_MASTER)
return; // we just added the user's entry here
@@ -1638,6 +1641,7 @@ static void S_AddMusicStackEntry(const char *mname, UINT16 mflags, boolean loopi
new_mst->tic = gametic;
new_mst->status = status;
new_mst->mlumpnum = S_GetMusicLumpNum(new_mst->musname);
+ new_mst->noposition = false;
mst->next = new_mst;
new_mst->prev = mst;
@@ -1745,11 +1749,23 @@ boolean S_RecallMusic(UINT16 status, boolean fromfirst)
entry->tic = gametic;
entry->status = JT_MASTER;
entry->mlumpnum = S_GetMusicLumpNum(entry->musname);
+ entry->noposition = false; // don't set this until we do the mapmuschanged check, below. Else, this breaks some resumes.
}
if (entry->status == JT_MASTER)
{
mapmuschanged = strnicmp(entry->musname, mapmusname, 7);
+ if (mapmuschanged)
+ {
+ strncpy(entry->musname, mapmusname, 7);
+ entry->musflags = mapmusflags;
+ entry->looping = true;
+ entry->position = mapmusposition;
+ entry->tic = gametic;
+ entry->status = JT_MASTER;
+ entry->mlumpnum = S_GetMusicLumpNum(entry->musname);
+ entry->noposition = true;
+ }
S_ResetMusicStack();
}
else if (!entry->status)
@@ -1758,7 +1774,7 @@ boolean S_RecallMusic(UINT16 status, boolean fromfirst)
return false;
}
- if (!mapmuschanged && strncmp(entry->musname, S_MusicName(), 7)) // don't restart music if we're already playing it
+ if (strncmp(entry->musname, S_MusicName(), 7)) // don't restart music if we're already playing it
{
if (music_stack_fadeout)
S_ChangeMusicEx(entry->musname, entry->musflags, entry->looping, 0, music_stack_fadeout, 0);
@@ -1766,7 +1782,7 @@ boolean S_RecallMusic(UINT16 status, boolean fromfirst)
{
S_ChangeMusicEx(entry->musname, entry->musflags, entry->looping, 0, 0, music_stack_fadein);
- if (!music_stack_noposition) // HACK: Global boolean to toggle position resuming, e.g., de-superize
+ if (!entry->noposition && !music_stack_noposition) // HACK: Global boolean to toggle position resuming, e.g., de-superize
{
UINT32 poslapse = 0;
@@ -1908,6 +1924,11 @@ static void S_QueueMusic(const char *mmusic, UINT16 mflags, boolean looping, UIN
queue_fadeinms = fadeinms;
}
+static boolean S_CheckQueue(void)
+{
+ return queue_name[0];
+}
+
static void S_ClearQueue(void)
{
queue_name[0] = queue_flags = queue_looping = queue_position = queue_fadeinms = 0;
diff --git a/src/s_sound.h b/src/s_sound.h
index 20b2489a5d..c46c9fa089 100644
--- a/src/s_sound.h
+++ b/src/s_sound.h
@@ -220,6 +220,7 @@ typedef struct musicstack_s
tic_t tic;
UINT16 status;
lumpnum_t mlumpnum;
+ boolean noposition; // force music stack resuming from zero (like music_stack_noposition)
struct musicstack_s *prev;
struct musicstack_s *next;
--
GitLab