trying a different approach

JoaTH-Team · Nov 1, 2024 · 15c4148 · 15c4148
1 parent bd95239
commit 15c4148
Showing 1 changed file with 22 additions and 22 deletions.
diff --git a/source/options/ControlsSubState.hx b/source/options/ControlsSubState.hx
@@ -104,52 +104,52 @@ class ControlsSubState extends ExtendableSubState {
 		if (gamepadMode) {
 			switch (curSelected) {
 				case 0:
-					curControl.text = FlxGamepadInputID.toStringMap.get(SaveData.settings.gamepadBinds[0][0]);
+					curControl.text = FlxGamepadInputID.toStringMap.get(Input.binds.get('left').gamepad[0]);
 				case 1:
-					curControl.text = FlxGamepadInputID.toStringMap.get(SaveData.settings.gamepadBinds[0][1]);
+					curControl.text = FlxGamepadInputID.toStringMap.get(Input.binds.get('left').gamepad[1]);
 				case 2:
-					curControl.text = FlxGamepadInputID.toStringMap.get(SaveData.settings.gamepadBinds[1][0]);
+					curControl.text = FlxGamepadInputID.toStringMap.get(Input.binds.get('down').gamepad[0]);
 				case 3:
-					curControl.text = FlxGamepadInputID.toStringMap.get(SaveData.settings.gamepadBinds[1][1]);
+					curControl.text = FlxGamepadInputID.toStringMap.get(Input.binds.get('down').gamepad[1]);
 				case 4:
-					curControl.text = FlxGamepadInputID.toStringMap.get(SaveData.settings.gamepadBinds[2][0]);
+					curControl.text = FlxGamepadInputID.toStringMap.get(Input.binds.get('up').gamepad[0]);
 				case 5:
-					curControl.text = FlxGamepadInputID.toStringMap.get(SaveData.settings.gamepadBinds[2][1]);
+					curControl.text = FlxGamepadInputID.toStringMap.get(Input.binds.get('up').gamepad[1]);
 				case 6:
-					curControl.text = FlxGamepadInputID.toStringMap.get(SaveData.settings.gamepadBinds[3][0]);
+					curControl.text = FlxGamepadInputID.toStringMap.get(Input.binds.get('right').gamepad[0]);
 				case 7:
-					curControl.text = FlxGamepadInputID.toStringMap.get(SaveData.settings.gamepadBinds[3][1]);
+					curControl.text = FlxGamepadInputID.toStringMap.get(Input.binds.get('right').gamepad[1]);
 				case 8:
-					curControl.text = FlxGamepadInputID.toStringMap.get(SaveData.settings.gamepadBinds[4][0]);
+					curControl.text = FlxGamepadInputID.toStringMap.get(Input.binds.get('accept').gamepad[0]);
 				case 9:
-					curControl.text = FlxGamepadInputID.toStringMap.get(SaveData.settings.gamepadBinds[5][0]);
+					curControl.text = FlxGamepadInputID.toStringMap.get(Input.binds.get('exit').gamepad[0]);
 				case 10:
-					curControl.text = FlxGamepadInputID.toStringMap.get(SaveData.settings.gamepadBinds[6][0]);
+					curControl.text = FlxGamepadInputID.toStringMap.get(Input.binds.get('restart').gamepad[0]);
 			}
 		} else {
 			switch (curSelected) {
 				case 0:
-					curControl.text = FlxKey.toStringMap.get(SaveData.settings.keyboardBinds[0][0]);
+					curControl.text = FlxKey.toStringMap.get(Input.binds.get('left').key[0]);
 				case 1:
-					curControl.text = FlxKey.toStringMap.get(SaveData.settings.keyboardBinds[0][1]);
+					curControl.text = FlxKey.toStringMap.get(Input.binds.get('left').key[1]);
 				case 2:
-					curControl.text = FlxKey.toStringMap.get(SaveData.settings.keyboardBinds[1][0]);
+					curControl.text = FlxKey.toStringMap.get(Input.binds.get('down').key[0]);
 				case 3:
-					curControl.text = FlxKey.toStringMap.get(SaveData.settings.keyboardBinds[1][1]);
+					curControl.text = FlxKey.toStringMap.get(Input.binds.get('down').key[1]);
 				case 4:
-					curControl.text = FlxKey.toStringMap.get(SaveData.settings.keyboardBinds[2][0]);
+					curControl.text = FlxKey.toStringMap.get(Input.binds.get('up').key[0]);
 				case 5:
-					curControl.text = FlxKey.toStringMap.get(SaveData.settings.keyboardBinds[2][1]);
+					curControl.text = FlxKey.toStringMap.get(Input.binds.get('up').key[1]);
 				case 6:
-					curControl.text = FlxKey.toStringMap.get(SaveData.settings.keyboardBinds[3][0]);
+					curControl.text = FlxKey.toStringMap.get(Input.binds.get('right').key[0]);
 				case 7:
-					curControl.text = FlxKey.toStringMap.get(SaveData.settings.keyboardBinds[3][1]);
+					curControl.text = FlxKey.toStringMap.get(Input.binds.get('right').key[1]);
 				case 8:
-					curControl.text = FlxKey.toStringMap.get(SaveData.settings.keyboardBinds[4][0]);
+					curControl.text = FlxKey.toStringMap.get(Input.binds.get('accept').key[0]);
 				case 9:
-					curControl.text = FlxKey.toStringMap.get(SaveData.settings.keyboardBinds[5][0]);
+					curControl.text = FlxKey.toStringMap.get(Input.binds.get('exit').key[0]);
 				case 10:
-					curControl.text = FlxKey.toStringMap.get(SaveData.settings.keyboardBinds[6][0]);
+					curControl.text = FlxKey.toStringMap.get(Input.binds.get('restart').key[0]);
 			}
 		}