diff --git a/src/logic-scenes/main menu/video_settings.gd b/src/logic-scenes/main menu/video_settings.gd index bee0a33..913d92a 100644 --- a/src/logic-scenes/main menu/video_settings.gd +++ b/src/logic-scenes/main menu/video_settings.gd @@ -45,7 +45,6 @@ var has_stage:bool = false: @onready var fps_enabler: CheckBox = %EnableFps var fps_enabled: bool: set(value): - print("toggle") fps_enabled = value @onready var fps_selector: SpinBox = %MaxFps @@ -85,6 +84,10 @@ var has_changed: bool = false: set(value): has_changed = value preset_selected = 0 + if has_changed: + %ExitButton.text = "discard" + else: + %ExitButton.text = "close" func _ready() -> void: load_settings() @@ -120,15 +123,8 @@ func load_settings(): file.close() var parsed: Dictionary = JSON.parse_string(raw_json) - print(parsed) - for key in parsed.keys(): set(key, parsed[key]) - - for property in get_property_list(): - if parsed.has(property.name): - if typeof(parsed[property.name]) == property.type: - set(property.name, parsed[property.name]) func propagate_settings(): fullscreen_selector.select(window_mode) @@ -161,6 +157,8 @@ func save_settings(): var file = FileAccess.open(settings_path, FileAccess.WRITE) file.store_string(JSON.stringify(out_dict)) file.close() + + has_changed = false func _on_exit_confirmed() -> void: State.leave_stage(self) diff --git a/src/logic-scenes/main menu/video_settings.tscn b/src/logic-scenes/main menu/video_settings.tscn index e9ffba1..f075491 100644 --- a/src/logic-scenes/main menu/video_settings.tscn +++ b/src/logic-scenes/main menu/video_settings.tscn @@ -300,10 +300,12 @@ popup/item_3/text = "Letterbox" popup/item_3/id = 3 [node name="ExitButton" type="Button" parent="VBoxContainer/GridContainer"] +unique_name_in_owner = true layout_mode = 2 -text = "discard" +text = "close" [node name="ConfirmButton" type="Button" parent="VBoxContainer/GridContainer"] +unique_name_in_owner = true layout_mode = 2 text = "save and apply"