From 1c0cee807754520efc9e5423d49535b69bec509d Mon Sep 17 00:00:00 2001 From: fallenoak Date: Thu, 27 Nov 2025 12:20:14 -0600 Subject: [PATCH] feat(sound): stop existing glue music in SI2::StartGlueMusic --- src/sound/SI2.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/sound/SI2.cpp b/src/sound/SI2.cpp index a6226bc..79dbd87 100644 --- a/src/sound/SI2.cpp +++ b/src/sound/SI2.cpp @@ -1012,8 +1012,7 @@ void SI2::StartGlueMusic(const char* name) { // Stop playing credits music - EventUnregister(EVENT_ID_POLL, &SI2::CreditsMusicUpdate); - SI2::StopOrFadeOut(&s_CreditsMusicObject, 0, 3.0f, 1); + SI2::StopCreditsMusic(); if (!name) { return; @@ -1023,9 +1022,11 @@ void SI2::StartGlueMusic(const char* name) { return; } - // Start playing glue music + // Stop any existing glue music - // TODO SI2::Sub9860E0(-1.0); + SI2::StopGlueMusic(-1.0f); + + // Start playing new glue music SStrCopy(s_GlueMusicName, name, sizeof(s_GlueMusicName));