Merge branch 'FNF-CNE-Devs:main' into cne-pr

MobilePorting · Nov 25, 2024 · ef0a2c0 · ef0a2c0
2 parents 2ec4332 + a2a12f1
commit ef0a2c0
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,4 +8,5 @@ latest/windows/haxe/
 .haxelib/
 pages/
 docs/doc.xml
-mods/Baldi's Basics in Funkin'/
+mods/*
+!mods/readme.txt
diff --git a/source/funkin/backend/scripting/HScript.hx b/source/funkin/backend/scripting/HScript.hx
@@ -74,8 +74,10 @@ class HScript extends Script {
 				var code = Assets.getText(p);
 				var expr:Expr = null;
 				try {
-					if (code != null && code.trim() != "")
+					if (code != null && code.trim() != "") {
+						parser.line = 1; // fun fact: this is all you need to reuse a parser without issues. all the other vars get reset on parse.
 						expr = parser.parseString(code, cl.join("/") + "." + hxExt);
+					}
 				} catch(e:Error) {
 					_errorHandler(e);
 				} catch(e) {

diff --git a/source/funkin/editors/charter/ChartDataScreen.hx b/source/funkin/editors/charter/ChartDataScreen.hx
@@ -23,6 +23,7 @@ class ChartDataScreen extends UISubstateWindow {
 	public override function create() {
 		FlxG.sound.music.pause();
 		Charter.instance.vocals.pause();
+		for (strumLine in Charter.instance.strumLines.members) strumLine.vocals.pause();
 
 		winTitle = 'Chart Properties';
 		winWidth = 420; winHeight = 230; // guys look, the funny numbers!

diff --git a/source/funkin/editors/charter/CharterEventScreen.hx b/source/funkin/editors/charter/CharterEventScreen.hx
@@ -41,6 +41,7 @@ class CharterEventScreen extends UISubstateWindow {
 
 		FlxG.sound.music.pause(); // prevent the song from continuing
 		Charter.instance.vocals.pause();
+		for (strumLine in Charter.instance.strumLines.members) strumLine.vocals.pause();
 
 		events = chartEvent.events.copy();
 

diff --git a/source/funkin/editors/charter/CharterMetaDataScreen.hx b/source/funkin/editors/charter/CharterMetaDataScreen.hx
@@ -40,6 +40,7 @@ class CharterMetaDataScreen extends UISubstateWindow {
 
 		FlxG.sound.music.pause();
 		Charter.instance.vocals.pause();
+		for (strumLine in Charter.instance.strumLines.members) strumLine.vocals.pause();
 
 		function addLabelOn(ui:UISprite, text:String)
 			add(new UIText(ui.x, ui.y - 24, 0, text));

diff --git a/source/funkin/editors/charter/CharterNoteTypesList.hx b/source/funkin/editors/charter/CharterNoteTypesList.hx
@@ -13,6 +13,7 @@ class CharterNoteTypesList extends UISubstateWindow {
 	public override function create() {
 		FlxG.sound.music.pause();
 		Charter.instance.vocals.pause();
+		for (strumLine in Charter.instance.strumLines.members) strumLine.vocals.pause();
 
 		winTitle = 'Note Types List Editor';
 		winWidth = 380; winHeight = 390;

diff --git a/source/funkin/editors/charter/CharterStrumlineScreen.hx b/source/funkin/editors/charter/CharterStrumlineScreen.hx
@@ -52,6 +52,7 @@ class CharterStrumlineScreen extends UISubstateWindow {
 
 		FlxG.sound.music.pause();
 		Charter.instance.vocals.pause();
+		for (strumLine in Charter.instance.strumLines.members) strumLine.vocals.pause();
 
 		super.create();
 

diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx
@@ -687,7 +687,7 @@ class PlayState extends MusicBeatState
 				startingPos,
 				strumLine.strumScale == null ? 1 : strumLine.strumScale,
 				strumLine.type == 2 || (!coopMode && !((strumLine.type == 1 && !opponentMode) || (strumLine.type == 0 && opponentMode))),
-				strumLine.type != 1, coopMode ? (strumLine.type == 1 ? controlsP1 : controlsP2) : controls,
+				strumLine.type != 1, coopMode ? ((strumLine.type == 1) != opponentMode ? controlsP1 : controlsP2) : controls,
 				strumLine.vocalsSuffix
 			);
 			strLine.cameras = [camHUD];