From 55cf2896a2690993fe13306156289ca2779225aa Mon Sep 17 00:00:00 2001
From: Henrique <phenriquefel@gmail.com>
Date: Wed, 7 Jul 2021 17:11:56 -0300
Subject: [PATCH] Cleanup

---
 .../armory/logicnode/RemoveInputMapKeyNode.hx |  2 +-
 .../armory/logicnode/SetInputMapKeyNode.hx    |  1 -
 Sources/armory/system/InputMap.hx             | 26 +++++++++----------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/Sources/armory/logicnode/RemoveInputMapKeyNode.hx b/Sources/armory/logicnode/RemoveInputMapKeyNode.hx
index ddd69518..9a304ead 100644
--- a/Sources/armory/logicnode/RemoveInputMapKeyNode.hx
+++ b/Sources/armory/logicnode/RemoveInputMapKeyNode.hx
@@ -15,7 +15,7 @@ class RemoveInputMapKeyNode extends LogicNode {
 		var k = InputMap.getInputMapKey(inputMap, key);
 
 		if (k != null) {
-			if (InputMap.getInputMap(inputMap).removeInput(k)) {
+			if (InputMap.getInputMap(inputMap).removeKey(k)) {
 				runOutput(0);
 			}
 		}
diff --git a/Sources/armory/logicnode/SetInputMapKeyNode.hx b/Sources/armory/logicnode/SetInputMapKeyNode.hx
index a449575d..e657456d 100644
--- a/Sources/armory/logicnode/SetInputMapKeyNode.hx
+++ b/Sources/armory/logicnode/SetInputMapKeyNode.hx
@@ -36,7 +36,6 @@ class SetInputMapKeyNode extends LogicNode {
 			}
 		
 		} else {
-			k.key = key;
 			k.scale = scale;
 			k.deadzone = deadzone;
 			k.setIndex(index);
diff --git a/Sources/armory/system/InputMap.hx b/Sources/armory/system/InputMap.hx
index 88b47ec9..6df4c721 100644
--- a/Sources/armory/system/InputMap.hx
+++ b/Sources/armory/system/InputMap.hx
@@ -7,7 +7,7 @@ class InputMap {
 
 	static var inputMaps = new Map<String, InputMap>();
 
-	public var inputs(default, null) = new Array<InputMapKey>();
+	public var keys(default, null) = new Array<InputMapKey>();
 	public var lastKeyPressed(default, null) = "";
 
 	public function new() {}
@@ -26,7 +26,7 @@ class InputMap {
 
 	public static function getInputMapKey(inputMap: String, key: String): Null<InputMapKey> {
 		if (inputMaps.exists(inputMap)) {
-			for (i in inputMaps[inputMap].inputs) {
+			for (i in inputMaps[inputMap].keys) {
 				if (i.key == key) {
 					return i;
 				}
@@ -37,30 +37,30 @@ class InputMap {
 	}
 
 	public function addKeyboard(key: String, scale: FastFloat = 1.0): InputMapKey {
-		return addInput(new KeyboardKey(key, scale));
+		return addKey(new KeyboardKey(key, scale));
 	}
 
 	public function addMouse(key: String, scale: FastFloat = 1.0, deadzone: FastFloat = 0.0): InputMapKey {
-		return addInput(new MouseKey(key, scale, deadzone));
+		return addKey(new MouseKey(key, scale, deadzone));
 	}
 
 	public function addGamepad(key: String, scale: FastFloat = 1.0, deadzone: FastFloat = 0.0): InputMapKey {
-		return addInput(new GamepadKey(key, scale, deadzone));
+		return addKey(new GamepadKey(key, scale, deadzone));
 	}
 
-	public function addInput(input: InputMapKey): InputMapKey {
-		inputs.push(input);
-		return input;
+	public function addKey(key: InputMapKey): InputMapKey {
+		keys.push(key);
+		return key;
 	}
 
-	public function removeInput(input: InputMapKey): Bool {
-		return inputs.remove(input);
+	public function removeKey(key: InputMapKey): Bool {
+		return keys.remove(key);
 	}
 
 	public function value(): FastFloat {
 		var v = 0.0;
 
-		for (i in inputs) {
+		for (i in keys) {
 			v += i.value();
 		}
 
@@ -68,7 +68,7 @@ class InputMap {
 	}
 
 	public function started() {
-		for (i in inputs) {
+		for (i in keys) {
 			if (i.started()) {
 				lastKeyPressed = i.key;
 				return true;
@@ -79,7 +79,7 @@ class InputMap {
 	}
 
 	public function released() {
-		for (i in inputs) {
+		for (i in keys) {
 			if (i.released()) {
 				lastKeyPressed = i.key;
 				return true;