From 11f23df9939fbf2140af7c80b24323aa6094a1c7 Mon Sep 17 00:00:00 2001 From: Daniel Wong Date: Wed, 11 Jan 2023 16:45:09 +1100 Subject: [PATCH] Fix multiple BSFX playing at same time - See https://github.com/07th-mod/matsuribayashi/issues/44 --- Update/_meak_007.txt | 6 +++--- Update/_meak_019_1.txt | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Update/_meak_007.txt b/Update/_meak_007.txt index 98bfda4..8dfec54 100644 --- a/Update/_meak_007.txt +++ b/Update/_meak_007.txt @@ -409,7 +409,7 @@ void main() SetValidityOfInput( FALSE ); Wait( 1000 ); SetValidityOfInput( TRUE ); - ModPlayBGM( 0, "Ame", 56, 0, 0 ); + PlayBGM( 1, "Ame", 56, 0 ); if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); } @@ -1947,7 +1947,7 @@ void main() ModFadeOutBGM( 1, 300, FALSE, 1 ); FadeOutBGM( 2, 300, FALSE ); ModPlayBGM( 0, "ame", 56, 0, 0 ); - ModPlayBGM( 2, "ame", 56, 0, 0 ); + ModPlayBGM( 0, "ame", 56, 0, 1 ); if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); } @@ -2004,7 +2004,7 @@ void main() DisableWindow(); ModPlayBGM( 0, "ame", 56, 0, 0 ); - ModPlayBGM( 2, "ame", 56, 0, 0 ); + SetValidityOfInput( FALSE ); Wait( 2000 ); SetValidityOfInput( TRUE ); diff --git a/Update/_meak_019_1.txt b/Update/_meak_019_1.txt index 1645a9f..0c2f914 100644 --- a/Update/_meak_019_1.txt +++ b/Update/_meak_019_1.txt @@ -1641,7 +1641,7 @@ void main() ModDrawCharacter(2, 1, "sprite/kei1_nayamu_", "2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 0, FALSE ); DrawScene("background/gr1", 400 ); PlayBGM( 0, "semi", 56, 0 ); - ModPlayBGM( 2, "semi", 56, 0, 0 ); + if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); } OutputLine(NULL, " 昇降口から出ると、圭一は表の流しでザブザブと、律儀に顔を洗っていた。", @@ -2029,7 +2029,7 @@ void main() FadeOutBGM( 1, 400, FALSE ); DrawScene("background/sora", 400 ); PlayBGM( 0, "semi", 56, 0 ); - ModPlayBGM( 2, "semi", 56, 0, 0 ); + SetValidityOfInput( FALSE ); Wait( 2000 ); SetValidityOfInput( TRUE );