diff options
| author | metamuffin <metamuffin@disroot.org> | 2025-07-17 22:28:13 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2025-07-17 22:28:13 +0200 |
| commit | 6fc045c151d45ffecef9c8ca343e1a794bb3d6cd (patch) | |
| tree | aaa7f7dad524e3e97eb4c943fb8eb344ac9264fd | |
| parent | 5bc14ed9464bf9520cfc3841b46da85ec33583f1 (diff) | |
| download | hurrycurry-6fc045c151d45ffecef9c8ca343e1a794bb3d6cd.tar hurrycurry-6fc045c151d45ffecef9c8ca343e1a794bb3d6cd.tar.bz2 hurrycurry-6fc045c151d45ffecef9c8ca343e1a794bb3d6cd.tar.zst | |
Clean up input setting instantiation a bit
| -rw-r--r-- | client/menu/settings/input/input_manager.gd | 6 | ||||
| -rw-r--r-- | client/menu/settings/input/input_setting.gd | 4 | ||||
| -rw-r--r-- | client/settings.gd | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/client/menu/settings/input/input_manager.gd b/client/menu/settings/input/input_manager.gd index e1304938..e3158a03 100644 --- a/client/menu/settings/input/input_manager.gd +++ b/client/menu/settings/input/input_manager.gd @@ -43,11 +43,9 @@ func get_events(action_name: String) -> Array: return [] return input_map[action_name] -func input_map_to_settings(map: Dictionary) -> Array: +func settings() -> Array: var entries := [] - for k in map.keys(): - var events = map[k] - entries.append(InputSetting.new(k, events)) + for k in input_map.keys(): entries.append(InputSetting.new(k)) return entries func change_input_map_action(action_name: String, events: Array, save: bool = true): diff --git a/client/menu/settings/input/input_setting.gd b/client/menu/settings/input/input_setting.gd index dae5f2b7..72e1aa81 100644 --- a/client/menu/settings/input/input_setting.gd +++ b/client/menu/settings/input/input_setting.gd @@ -18,6 +18,10 @@ extends GameSetting const INPUT_VALUE_NODE_SCENE = preload("res://menu/settings/input/input_value_node.tscn") +func _init(new_id: String): + super(new_id) + default = InputManager.default_input_map[new_id] + func create_row(): var row = super() row.value_node = INPUT_VALUE_NODE_SCENE.instantiate() diff --git a/client/settings.gd b/client/settings.gd index 07673db4..978c0fac 100644 --- a/client/settings.gd +++ b/client/settings.gd @@ -60,9 +60,7 @@ static func get_root(): DropdownSetting.new("scale_mode", "resize", ["resize", "disabled"]), RangeSetting.new("scale_factor", 1. if not Global.on_mobile() else 1.5, 0.5, 1.5, 3), ]), - SettingsCategory.new("input", - InputManager.input_map_to_settings(InputManager.default_input_map) - ), + SettingsCategory.new("input", InputManager.settings()), SettingsCategory.new("server", [ PathSetting.new("binary_path", "", FileDialog.FileMode.FILE_MODE_OPEN_FILE), PathSetting.new("editor_binary_path", "", FileDialog.FileMode.FILE_MODE_OPEN_DIR), |