Merge remote-tracking branch 'upstream/main' into cne-pr

MobilePorting · Oct 30, 2024 · b618014 · b618014
2 parents 4f9dfbc + cb54e5e
commit b618014
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 26 deletions.
diff --git a/assets/data/config/credits.xml b/assets/data/config/credits.xml
diff --git a/assets/data/config/options.xml b/assets/data/config/options.xml
diff --git a/source/funkin/game/cutscenes/DialogueCutscene.hx b/source/funkin/game/cutscenes/DialogueCutscene.hx
@@ -89,7 +89,7 @@ class DialogueCutscene extends Cutscene {
 					musicVolume: node.has.musicVolume ? (volume = Std.parseFloat(node.att.speed).getDefault(0.8)) : null,
 					changeMusic: node.has.changeMusic ? FlxG.sound.load(Paths.music(node.att.changeMusic), volume, true) : null,
 					playSound: node.has.playSound ? FlxG.sound.load(Paths.sound(node.att.playSound)) : null,
-					nextSound: node.has.nextSound ? FlxG.sound.load(Paths.music(node.att.nextSound)) : null,
+					nextSound: node.has.nextSound ? FlxG.sound.load(Paths.sound(node.att.nextSound)) : null,
 					textSound: null
 				};
 
@@ -220,4 +220,4 @@ typedef DialogueLine = {
 	var nextSound:FlxSound;
 	var textSound:FlxSound;
 	var changeDefAnim:String;
-}
+}