Merge branch 'experimental' into rewrite-error-messages

source/psychlua/HScript.hx

@@ -25,7 +25,12 @@ class HScript extends SScript
 	{
 		initHaxeModule(parent);
 		var hs:HScript = try parent.hscript catch (e) null;
-		if(hs != null)
+		if(hs == null)
+		{
+			trace('initializing haxe interp for: ${parent.scriptName}');
+			parent.hscript = new HScript(parent, code, varsToBring);
+		}
+		else
 		{
 			hs.doString(code);
 			@:privateAccess
@@ -69,21 +74,23 @@ class HScript extends SScript
 
 		// Some very commonly used classes
 		setClass(flixel.FlxG);
+		setClass(flixel.math.FlxMath);
 		setClass(flixel.FlxSprite);
 		setClass(flixel.FlxCamera);
 		setClass(flixel.util.FlxTimer);
 		setClass(flixel.tweens.FlxTween);
 		setClass(flixel.tweens.FlxEase);
 		set('FlxColor', CustomFlxColor);
+    setClass(backend.BaseStage.Countdown);
 		setClass(PlayState);
 		setClass(Paths);
 		setClass(Conductor);
 		setClass(ClientPrefs);
+		setClass(Achievements);
 		setClass(Character);
 		setClass(Alphabet);
 		setClass(objects.Note);
 		setClass(CustomSubstate);
-		setClass(backend.BaseStage.Countdown);
 		#if (!flash && sys)
 		setClass(flixel.addons.display.FlxRuntimeShader);
 		#end
@@ -230,17 +237,8 @@ class HScript extends SScript
 		#if LUA_ALLOWED
 		funk.addLocalCallback("runHaxeCode", function(codeToRun:String, ?varsToBring:Any = null, ?funcToRun:String = null, ?funcArgs:Array<Dynamic> = null):Dynamic {
 			#if SScript
-			var retVal:TeaCall = null;
-			initHaxeModuleCode(funk, codeToRun);
-			if(varsToBring != null)
-			{
-				for (key in Reflect.fields(varsToBring))
-				{
-					//trace('Key $key: ' + Reflect.field(varsToBring, key));
-					funk.hscript.set(key, Reflect.field(varsToBring, key));
-				}
-			}
-			retVal = funk.hscript.executeCode(funcToRun, funcArgs);
+			initHaxeModuleCode(funk, codeToRun, varsToBring);
+			var retVal:TeaCall = funk.hscript.executeCode(funcToRun, funcArgs);
 			if (retVal != null)
 			{
 				if(retVal.succeeded)