From 0d94f5bc05ab73fca716ea2c84d23678482c68ee Mon Sep 17 00:00:00 2001 From: Yoshman29 Date: Thu, 6 Oct 2022 23:22:59 +0200 Subject: [PATCH] fixed compilation issues --- buildnumber.txt | 2 +- source/funkin/scripting/HScript.hx | 8 +++++--- source/funkin/scripting/Script.hx | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/buildnumber.txt b/buildnumber.txt index 66321c08..1a1f7f82 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -189 \ No newline at end of file +190 \ No newline at end of file diff --git a/source/funkin/scripting/HScript.hx b/source/funkin/scripting/HScript.hx index acdb51db..f6cd5f61 100644 --- a/source/funkin/scripting/HScript.hx +++ b/source/funkin/scripting/HScript.hx @@ -16,7 +16,7 @@ class HScript extends Script { parser.allowJSON = parser.allowMetadata = parser.allowTypes = true; var expr:Expr; try { - expr = parser.parseString(code, filename); + expr = parser.parseString(code, fileName); } catch(e) { return; } @@ -24,10 +24,12 @@ class HScript extends Script { } private function _errorHandler(error:Error) { - error('$fileName:${error.line}: ${Std.string(error.e)}'); + this.error('$fileName:${error.line}: ${error.toString()}'); } - public override function call(func:String, parameters:Array) { + public override function call(func:String, ?parameters:Array):Dynamic { // TODO: call + super.call(func, parameters); + return null; } } \ No newline at end of file diff --git a/source/funkin/scripting/Script.hx b/source/funkin/scripting/Script.hx index 00db47ed..e2948557 100644 --- a/source/funkin/scripting/Script.hx +++ b/source/funkin/scripting/Script.hx @@ -85,7 +85,7 @@ class Script { * @param text Text of the error (ex: Null Object Reference). * @param additionalInfo Additional information you could provide. */ - public function error(text:String, additionalInfo:Dynamic):Void { + public function error(text:String, ?additionalInfo:Dynamic):Void { // TODO: Logs (like on YCE) trace('$text'); }