From f6919981e57f3b64dcfcb16d030e240a6da31221 Mon Sep 17 00:00:00 2001 From: Misa Date: Mon, 12 Apr 2021 10:35:42 -0700 Subject: [PATCH] Silence music instead of halting in foundtrinket When you pick up a trinket in the wild, the music gets silenced, so it silently plays in the background until you advance the trinket text. However, foundtrinket (used when Victoria or Vitellary give you a trinket) is inconsistent with this, and halts the music instead of silencing it. This was probably due to the musicfadein script command not being implemented, so Terry or Simon had to simply make do and halt the music instead. But musicfadein is implemented and is being used in the trinket cutscenes, so this is another inconsistency that I will fix. --- desktop_version/src/Script.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop_version/src/Script.cpp b/desktop_version/src/Script.cpp index 45265cfc..ac3c4be3 100644 --- a/desktop_version/src/Script.cpp +++ b/desktop_version/src/Script.cpp @@ -1947,7 +1947,7 @@ void scriptclass::run(void) } else if (words[0] == "foundtrinket") { - music.haltdasmusik(); + music.silencedasmusik(); music.playef(3); size_t trinket = ss_toi(words[1]);