From 3f42b140cbedfaa9ce82b0da62f31c98b2f9f067 Mon Sep 17 00:00:00 2001
From: NeeEoo <NeeEoo@users.noreply.github.com>
Date: Mon, 10 Apr 2023 14:20:22 +0200
Subject: [PATCH] Small fixes

---
 .../funkin/scripting/MultiThreadedScript.hx   |  4 +--
 source/funkin/shaders/FunkinShader.hx         | 32 +++++++++----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/source/funkin/scripting/MultiThreadedScript.hx b/source/funkin/scripting/MultiThreadedScript.hx
index ee426f53..2bdb6cc6 100644
--- a/source/funkin/scripting/MultiThreadedScript.hx
+++ b/source/funkin/scripting/MultiThreadedScript.hx
@@ -56,10 +56,10 @@ class MultiThreadedScript implements IFlxDestroyable implements IHScriptCustomBe
 		__variables = Type.getInstanceFields(Type.getClass(this));
 	}
 
-	public inline function hget(name:String):Dynamic
+	public function hget(name:String):Dynamic
 		return __variables.contains(name) ? Reflect.getProperty(this, name) : script.get(name);
 
-	public inline function hset(name:String, val:Dynamic):Dynamic {
+	public function hset(name:String, val:Dynamic):Dynamic {
 		if (__variables.contains(name))
 			Reflect.setProperty(this, name, val);
 		else
diff --git a/source/funkin/shaders/FunkinShader.hx b/source/funkin/shaders/FunkinShader.hx
index 6212357f..e0720cec 100644
--- a/source/funkin/shaders/FunkinShader.hx
+++ b/source/funkin/shaders/FunkinShader.hx
@@ -358,12 +358,12 @@ class FunkinShader extends FlxShader implements IHScriptCustomBehaviour {
 		}
 	}
 
-	public function hget(v:String):Dynamic {
-		if (__instanceFields.contains(v) || __instanceFields.contains('get_${v}')) {
-			return Reflect.getProperty(this, v);
+	public function hget(name:String):Dynamic {
+		if (__instanceFields.contains(name) || __instanceFields.contains('get_${name}')) {
+			return Reflect.getProperty(this, name);
 		}
-		if (!Reflect.hasField(data, v)) return null;
-		var field = Reflect.field(data, v);
+		if (!Reflect.hasField(data, name)) return null;
+		var field = Reflect.field(data, name);
 		var cl = Std.string(Type.getClass(field));
 
 		// cant do "field is ShaderInput" for some reason
@@ -378,17 +378,17 @@ class FunkinShader extends FlxShader implements IHScriptCustomBehaviour {
 		return field;
 	}
 
-	public function hset(v:String, val:Dynamic):Dynamic {
-		if (__instanceFields.contains(v) || __instanceFields.contains('set_${v}')) {
-			Reflect.setProperty(this, v, val);
+	public function hset(name:String, val:Dynamic):Dynamic {
+		if (__instanceFields.contains(name) || __instanceFields.contains('set_${name}')) {
+			Reflect.setProperty(this, name, val);
 			return val;
 		}
 
-		if (!Reflect.hasField(data, v)) {
-			Reflect.setField(data, v, val);
+		if (!Reflect.hasField(data, name)) {
+			Reflect.setField(data, name, val);
 			return val;
 		} else {
-			var field = Reflect.field(data, v);
+			var field = Reflect.field(data, name);
 			var cl = Std.string(Type.getClass(field));
 
 			// cant do "field is ShaderInput" for some reason
@@ -398,23 +398,23 @@ class FunkinShader extends FlxShader implements IHScriptCustomBehaviour {
 					// that means we wait for a single number, instead of an array
 					@:privateAccess
 					if (field.__isInt && !(val is Int)) {
-						throw new ShaderTypeException(v, Type.getClass(val), 'Int');
+						throw new ShaderTypeException(name, Type.getClass(val), 'Int');
 						return null;
 					} else
 					@:privateAccess
 					if (field.__isBool && !(val is Bool)) {
-						throw new ShaderTypeException(v, Type.getClass(val), 'Bool');
+						throw new ShaderTypeException(name, Type.getClass(val), 'Bool');
 						return null;
 					} else
 					@:privateAccess
 					if (field.__isFloat && !(val is Float)) {
-						throw new ShaderTypeException(v, Type.getClass(val), 'Float');
+						throw new ShaderTypeException(name, Type.getClass(val), 'Float');
 						return null;
 					}
 					return field.value = [val];
 				} else {
 					if (!(val is Array)) {
-						throw new ShaderTypeException(v, Type.getClass(val), Array);
+						throw new ShaderTypeException(name, Type.getClass(val), Array);
 						return null;
 					}
 					return field.value = val;
@@ -422,7 +422,7 @@ class FunkinShader extends FlxShader implements IHScriptCustomBehaviour {
 			} else if (cl.startsWith("openfl.display.ShaderInput")) {
 				// shader input!!
 				if (!(val is BitmapData)) {
-					throw new ShaderTypeException(v, Type.getClass(val), BitmapData);
+					throw new ShaderTypeException(name, Type.getClass(val), BitmapData);
 					return null;
 				}
 				field.input = cast val;