Merge branch 'master' of codeberg.org:hurrycurry/hurrycurry

4 files changed, 10 insertions, 8 deletions

diff --git a/client/menu/ingame.tscn b/client/menu/ingame.tscn
index 55678847..4bb2a458 100644
--- a/client/menu/ingame.tscn
+++ b/client/menu/ingame.tscn
@@ -1,10 +1,11 @@
-[gd_scene load_steps=10 format=3 uid="uid://lxlgtjm8hw7v"]
+[gd_scene load_steps=11 format=3 uid="uid://lxlgtjm8hw7v"]
 
 [ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_2vmyh"]
 [ext_resource type="Script" path="res://menu/ingame.gd" id="2_0h3no"]
 [ext_resource type="Material" uid="uid://beea1pc5nt67r" path="res://menu/theme/dark_blur_material.tres" id="3_vvvlt"]
 [ext_resource type="Script" path="res://menu/blur_setup.gd" id="4_b6bm7"]
 [ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/font-sansita-swashed.woff2" id="4_scupw"]
+[ext_resource type="StyleBox" uid="uid://bw4jamyna1top" path="res://menu/theme/style/panel_style_sidebar.tres" id="4_vr8y1"]
 
 [sub_resource type="Animation" id="Animation_8sedy"]
 length = 0.001
@@ -67,6 +68,7 @@ anchors_preset = 9
 anchor_bottom = 1.0
 offset_right = 296.0
 grow_vertical = 2
+theme_override_styles/panel = ExtResource("4_vr8y1")
 script = ExtResource("4_b6bm7")
 
 [node name="Margin" type="MarginContainer" parent="Side"]
diff --git a/client/menu/main.tscn b/client/menu/main.tscn
index 26decd2b..ff4e7a94 100644
--- a/client/menu/main.tscn
+++ b/client/menu/main.tscn
@@ -6,8 +6,7 @@
 [ext_resource type="Material" uid="uid://2j8a0c0a2ta5" path="res://menu/theme/blur_material.tres" id="4_nx4vf"]
 [ext_resource type="Script" path="res://menu/blur_setup.gd" id="5_0mn56"]
 [ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/font-sansita-swashed.woff2" id="5_k7bqq"]
-
-[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ukani"]
+[ext_resource type="StyleBox" uid="uid://bw4jamyna1top" path="res://menu/theme/style/panel_style_sidebar.tres" id="5_qlyeo"]
 
 [sub_resource type="FontVariation" id="FontVariation_htgmg"]
 base_font = ExtResource("5_k7bqq")
@@ -32,7 +31,7 @@ anchors_preset = 9
 anchor_bottom = 1.0
 offset_right = 294.0
 grow_vertical = 2
-theme_override_styles/panel = SubResource("StyleBoxFlat_ukani")
+theme_override_styles/panel = ExtResource("5_qlyeo")
 script = ExtResource("5_0mn56")
 
 [node name="margin" type="MarginContainer" parent="side"]
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