fixes

CodenameCrew · Nov 25, 2023 · 30b11a2 · 30b11a2
1 parent fbe4487
commit 30b11a2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/source/funkin/editors/charter/Charter.hx b/source/funkin/editors/charter/Charter.hx
@@ -592,10 +592,11 @@ class Charter extends UIState {
 							selection = [cast n];
 					}
 					if (FlxG.mouse.justReleasedRight) {
+						var mousePos = FlxG.mouse.getPositionInCameraView(charterCamera);
 						if (!selection.contains(cast n))
 							selection = [cast n];
 						closeCurrentContextMenu();
-						openContextMenu(topMenu[1].childs);
+						openContextMenu(topMenu[1].childs, null, mousePos.x, mousePos.y);
 					}
 				}
 			});
@@ -745,8 +746,9 @@ class Charter extends UIState {
 				}
 
 				if (FlxG.mouse.justReleasedRight) {
+					var mousePos = FlxG.mouse.getPositionInCameraView(charterCamera);
 					closeCurrentContextMenu();
-					openContextMenu(topMenu[1].childs);
+					openContextMenu(topMenu[1].childs, null, mousePos.x, mousePos.y);
 				}
 		}
 		addEventSpr.selectable = !selectionBox.visible;

diff --git a/source/funkin/editors/charter/CharterStrumline.hx b/source/funkin/editors/charter/CharterStrumline.hx
@@ -53,7 +53,7 @@ class CharterStrumline extends UISprite {
 		button = new CharterStrumlineOptions(this);
 		members.push(button);
 
-		vocals = strumLine.vocalsSuffix != "" ? FlxG.sound.load(Paths.voices(PlayState.SONG.meta.name, PlayState.difficulty, strumLine.vocalsSuffix)) : new FlxSound();
+		vocals = strumLine.vocalsSuffix.length > 0 ? FlxG.sound.load(Paths.voices(PlayState.SONG.meta.name, PlayState.difficulty, strumLine.vocalsSuffix)) : new FlxSound();
 		vocals.group = FlxG.sound.defaultMusicGroup;
 	}
 
@@ -100,7 +100,7 @@ class CharterStrumline extends UISprite {
 		members.push(healthIcon);
 
 		vocals = null;
-		vocals = strumLine.vocalsSuffix != "" ? FlxG.sound.load(Paths.voices(PlayState.SONG.meta.name, PlayState.difficulty, strumLine.vocalsSuffix)) : new FlxSound();
+		vocals = strumLine.vocalsSuffix.length > 0 ? FlxG.sound.load(Paths.voices(PlayState.SONG.meta.name, PlayState.difficulty, strumLine.vocalsSuffix)) : new FlxSound();
 		vocals.group = FlxG.sound.defaultMusicGroup;
 	}
 }