diff options
| author | metamuffin <metamuffin@disroot.org> | 2024-09-07 14:44:26 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2024-09-07 14:44:26 +0200 |
| commit | 7ae48041d88ac32cd0892a78125103cbdccd7dab (patch) | |
| tree | 666c6b9fd372972bdb55ad815ee4abb4f3be03fd | |
| parent | 5e105902f0abfaba01bc878956fe3c9a096aa455 (diff) | |
| download | hurrycurry-7ae48041d88ac32cd0892a78125103cbdccd7dab.tar hurrycurry-7ae48041d88ac32cd0892a78125103cbdccd7dab.tar.bz2 hurrycurry-7ae48041d88ac32cd0892a78125103cbdccd7dab.tar.zst | |
hook input changes
| -rw-r--r-- | client/menu/settings/input/input_manager.gd | 7 | ||||
| -rw-r--r-- | client/settings.gd | 11 |
2 files changed, 9 insertions, 9 deletions
diff --git a/client/menu/settings/input/input_manager.gd b/client/menu/settings/input/input_manager.gd index 784b4974..d216884b 100644 --- a/client/menu/settings/input/input_manager.gd +++ b/client/menu/settings/input/input_manager.gd @@ -38,13 +38,6 @@ func input_map_to_settings(map: Dictionary) -> Array: entries.append(InputSetting.new(k, events)) return entries -func settings_dictionary_to_input_map(settings: Dictionary) -> Dictionary: - var map := {} - for k in settings.keys(): - var setting: InputSetting = settings[k] - map[k] = setting.get_value() - return map - func change_input_map_action(action_name: String, events: Array, save: bool = true): if !InputMap.has_action(action_name): push_error("Action %s does not exist" % action_name, false) diff --git a/client/settings.gd b/client/settings.gd index 341db7cc..2c3ae9a5 100644 --- a/client/settings.gd +++ b/client/settings.gd @@ -79,6 +79,14 @@ static func hook_changed_init(key: String, display: bool, callable: Callable): hook_changed(key, display, callable) callable.call(Global.get_setting(key)) +static func get_category_dict(prefix: String): + var map = {} + for k in Global.settings.keys(): + var kn = k.trim_prefix(prefix+".") + if kn == k: continue + map[kn] = Global.get_setting(k) + return map + static var change_hooks_display = {} static var change_hooks_apply = { "input": h_input, @@ -149,8 +157,7 @@ static func h_fullscreen(mode: String): DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_WINDOWED) static func h_input(_x): - pass - # InputManager.apply_input_map(InputManager.settings_dictionary_to_input_map()) + InputManager.apply_input_map(Settings.get_category_dict("input")) # TODO whatever this does # if not get_setting("tutorial_started"): |