diff --git a/src/autoload/Shared.gd b/src/autoload/Shared.gd index 6414fa8..62a025f 100644 --- a/src/autoload/Shared.gd +++ b/src/autoload/Shared.gd @@ -436,6 +436,7 @@ func set_radial_blur(arg := radial_blur): func set_light_enabled(arg := light_enabled): light_enabled = arg + #print("light_enabled: ", light_enabled) if is_instance_valid(Clouds.star_light): Clouds.star_light.enabled = bool(light_enabled) @@ -471,6 +472,7 @@ func set_iterations(arg := iterations): func set_target_fps(arg := target_fps): target_fps = abs(arg) + #print("target_fps: ", target_fps) Engine.target_fps = target_fps ### Exit Game diff --git a/src/menu/options/MenuOptions.tscn b/src/menu/options/MenuOptions.tscn index 8bb9efa..b833aec 100644 --- a/src/menu/options/MenuOptions.tscn +++ b/src/menu/options/MenuOptions.tscn @@ -511,7 +511,6 @@ __meta__ = { "_edit_use_anchors_": false } var_name = "is_interpolate" -is_int = false [node name="Label" type="Label" parent="Control/Menu/List/Interpolate"] anchor_right = 0.5 @@ -546,6 +545,7 @@ __meta__ = { } list = PoolStringArray( "OFF", "30", "60", "90", "120", "144", "240" ) var_name = "target_fps" +is_int = true [node name="Label" type="Label" parent="Control/Menu/List/TargetFPS"] anchor_right = 0.5 @@ -571,9 +571,9 @@ __meta__ = { [node name="Iterations" type="Control" parent="Control/Menu/List"] visible = false -margin_top = 1200.0 +margin_top = 1270.0 margin_right = 640.0 -margin_bottom = 1270.0 +margin_bottom = 1340.0 rect_min_size = Vector2( 0, 70 ) script = ExtResource( 24 ) __meta__ = { @@ -581,6 +581,7 @@ __meta__ = { } list = PoolStringArray( "60", "90", "120", "144" ) var_name = "iterations" +is_int = true [node name="Label" type="Label" parent="Control/Menu/List/Iterations"] anchor_right = 0.5 diff --git a/src/menu/options/scroll/ScrollVar.gd b/src/menu/options/scroll/ScrollVar.gd index 37e9fa2..5c4c71a 100644 --- a/src/menu/options/scroll/ScrollVar.gd +++ b/src/menu/options/scroll/ScrollVar.gd @@ -2,10 +2,10 @@ extends Scroll export var var_name := "shadow_enabled" export var is_frac := false -export var is_int := true +export var is_int := false func _ready(): - cursor = Shared.get(var_name) + cursor = clamp(int(Shared.get(var_name)), 0.0, list.size() - 1) if is_frac: cursor = (cursor * list.size()) - 1 elif is_int: cursor = max(0, list.find(str(cursor))) set_label()