diff options
| -rw-r--r-- | client/menu/settings/settings_category.gd | 2 | ||||
| -rw-r--r-- | client/settings.gd | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/client/menu/settings/settings_category.gd b/client/menu/settings/settings_category.gd index b5d02d8f..9a7a57c2 100644 --- a/client/menu/settings/settings_category.gd +++ b/client/menu/settings/settings_category.gd @@ -18,8 +18,6 @@ extends GameSetting var settings: Array # Dictionary[String, GameSetting] -var options: VBoxContainer - func _init(new_id: String, new_settings: Array): super(new_id) settings = new_settings diff --git a/client/settings.gd b/client/settings.gd index 2c3ae9a5..8d81f740 100644 --- a/client/settings.gd +++ b/client/settings.gd @@ -103,7 +103,10 @@ static var change_hooks_apply = { static func apply_initial(): for key in change_hooks_apply.keys(): - change_hooks_apply[key].call(Global.get_setting(key)) + if Global.settings.has(key): + change_hooks_apply[key].call(Global.get_setting(key)) + else: + change_hooks_apply[key].call() static func h_aa(mode): match mode: @@ -156,7 +159,7 @@ static func h_fullscreen(mode: String): "never": if DisplayServer.window_get_mode() == DisplayServer.WINDOW_MODE_FULLSCREEN: DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_WINDOWED) -static func h_input(_x): +static func h_input(): InputManager.apply_input_map(Settings.get_category_dict("input")) # TODO whatever this does |