diff --git a/assets/data/charts/test/modchart.hx b/assets/data/charts/test/modchart.hx index 68527bf2..1630ac65 100644 --- a/assets/data/charts/test/modchart.hx +++ b/assets/data/charts/test/modchart.hx @@ -3,7 +3,6 @@ function create() { pixelNotesForBF = false; enablePixelUI = true; enableCameraHacks = false; - // defaultCamZoom = 0.5; } function updatePost(elapsed) { diff --git a/buildnumber.txt b/buildnumber.txt index 15448f16..34201494 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -1261 \ No newline at end of file +1265 \ No newline at end of file diff --git a/source/funkin/scripting/HScript.hx b/source/funkin/scripting/HScript.hx index caf3fcea..35fa206e 100644 --- a/source/funkin/scripting/HScript.hx +++ b/source/funkin/scripting/HScript.hx @@ -23,13 +23,23 @@ class HScript extends Script { interp.variables.set("trace", this.trace); try { expr = parser.parseString(code, fileName); + } catch(e:Error) { + _errorHandler(e); } catch(e) { - return; + _errorHandler(new Error(ECustom(e.toString()), 0, 0, fileName, 0)); } } private function _errorHandler(error:Error) { - this.error('$fileName:${error.line}: ${error.toString()}'); + + var fn = '$fileName:${error.line}: '; + var err = error.toString(); + if (err.startsWith(fn)) err = err.substr(fn.length); + + Logs.traceColored([ + Logs.logText(fn, GREEN), + Logs.logText(err, RED) + ], ERROR); } public override function setParent(parent:Dynamic) { diff --git a/source/funkin/scripting/Script.hx b/source/funkin/scripting/Script.hx index b310094f..9dfed228 100644 --- a/source/funkin/scripting/Script.hx +++ b/source/funkin/scripting/Script.hx @@ -205,7 +205,7 @@ class Script extends FlxBasic implements IFlxDestroyable { */ public function error(text:String, ?additionalInfo:Dynamic):Void { Logs.traceColored([ - Logs.logText(fileName, GREEN), + Logs.logText(fileName, RED), Logs.logText(text) ], ERROR); } diff --git a/source/funkin/system/MusicBeatState.hx b/source/funkin/system/MusicBeatState.hx index 5ed375ed..621963b3 100644 --- a/source/funkin/system/MusicBeatState.hx +++ b/source/funkin/system/MusicBeatState.hx @@ -88,9 +88,8 @@ class MusicBeatState extends FlxUIState implements IBeatReceiver stateScript = Script.create(Paths.script('data/states/${scriptName}')); stateScript.setParent(this); stateScript.load(); - } else { + } else stateScript.reload(); - } } } override function create()