aboutsummaryrefslogtreecommitdiff
path: root/client/settings.gd
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2024-09-07 18:13:43 +0200
committermetamuffin <metamuffin@disroot.org>2024-09-07 18:13:43 +0200
commitddacfd4ccadf183e9c620a157dd907b56bc7de72 (patch)
treeb4142ce6cc4f20fd7c36c2a3ffabac9abcf04bb0 /client/settings.gd
parent5501ba69bd3149060173d61eb200b3a0b1e7d941 (diff)
parent2f9828a2c5da49a7cca2e5b26c0e1c6d01577d1e (diff)
downloadhurrycurry-ddacfd4ccadf183e9c620a157dd907b56bc7de72.tar
hurrycurry-ddacfd4ccadf183e9c620a157dd907b56bc7de72.tar.bz2
hurrycurry-ddacfd4ccadf183e9c620a157dd907b56bc7de72.tar.zst
Merge branch 'master' of codeberg.org:hurrycurry/hurrycurry
Diffstat (limited to 'client/settings.gd')
-rw-r--r--client/settings.gd7
1 files changed, 5 insertions, 2 deletions
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