diff options
Diffstat (limited to 'client/menu')
| -rw-r--r-- | client/menu/settings/input/input_manager.gd | 6 | ||||
| -rw-r--r-- | client/menu/settings/input/input_setting.gd | 4 |
2 files changed, 6 insertions, 4 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() |