From cb4ef15c77e15f0b18d4b79fcecda53a28264aad Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 26 Dec 2024 17:51:06 +0100 Subject: [PATCH] another attempt at fixing skipintro mus playing titlescreen music --- src/qs22j.c | 1 + src/s_sound.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qs22j.c b/src/qs22j.c index 17f2b7c2e..c610bde4d 100644 --- a/src/qs22j.c +++ b/src/qs22j.c @@ -16,6 +16,7 @@ #include #include + #include "qs22j.h" #define INSORTTHRESH 5 // if n < this use insertion sort diff --git a/src/s_sound.c b/src/s_sound.c index 4181d57d4..453778027 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -2044,7 +2044,7 @@ void S_InitMapMusic(void) { char *maptitle = G_BuildMapTitle(gamemap); // for some reason, occasionally the title screen music doesent seem to be reset in time, so skipping the intro may make it just continue playing it instead, weird.. - skipintromus = (stricmp(music_name, "titles") != 0) && (maptitle && (stricmp(maptitle, "Wandering Falls") != 0)); // thanks diggle! + skipintromus = gamestate == GS_LEVEL && (stricmp(music_name, "titles") != 0) && (maptitle && (stricmp(maptitle, "Wandering Falls") != 0)); // thanks diggle! if (maptitle) Z_Free(maptitle); }