Skip to content

Commit 3017f48

Browse files
Merge branch 'CodenameCrew:main' into svg-support-coauth-by-TechnikTil
2 parents 13b4a4f + 42a650d commit 3017f48

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

source/funkin/game/PlayState.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ class PlayState extends MusicBeatState
673673
case 2: "girlfriend";
674674
}) : strumLine.position;
675675
if (strumLine.characters != null) for(k=>charName in strumLine.characters) {
676-
var char = new Character(0, 0, charName, stage.isCharFlipped(charPosName, strumLine.type == 1));
676+
var char = new Character(0, 0, charName, stage.isCharFlipped(stage.characterPoses[charName] != null ? charName : charPosName, strumLine.type == 1));
677677
stage.applyCharStuff(char, charPosName, k);
678678
chars.push(char);
679679
}

source/funkin/game/cutscenes/DialogueCutscene.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ class DialogueCutscene extends Cutscene {
8686
callback: node.getAtt('callback'),
8787
changeDefAnim: node.getAtt('changeDefAnim'),
8888
speed: Std.parseFloat(node.getAtt("speed")).getDefault(0.05),
89-
musicVolume: node.has.musicVolume ? (volume = Std.parseFloat(node.att.speed).getDefault(0.8)) : null,
89+
musicVolume: node.has.musicVolume ? (volume = Std.parseFloat(node.att.musicVolume).getDefault(0.8)) : null,
9090
changeMusic: node.has.changeMusic ? FlxG.sound.load(Paths.music(node.att.changeMusic), volume, true) : null,
9191
playSound: node.has.playSound ? FlxG.sound.load(Paths.sound(node.att.playSound)) : null,
9292
nextSound: node.has.nextSound ? FlxG.sound.load(Paths.sound(node.att.nextSound)) : null,

0 commit comments

Comments
 (0)