aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Spartan322 <Megacake1234@gmail.com>2023-05-16 21:19:40 +0200
committer Spartan322 <Megacake1234@gmail.com>2023-05-16 21:19:40 +0200
commitbcd60b398c4d518c188dccf535f0d0b330ae2cf2 (patch)
tree7679c70c26722230047eca6df3f72a3efcd92795
parent1e490997cda95c6064d56eaba57d60737653e266 (diff)
Fix SettingHSlider not loading properly on default values
Fixes volume sliders being ignored when loaded at zero Fix MusicConductor ignoring MUSIC_BUS
-rw-r--r--game/src/MusicConductor/MusicConductor.tscn2
-rw-r--r--game/src/OptionMenu/SettingNodes/SettingHSlider.gd5
2 files changed, 5 insertions, 2 deletions
diff --git a/game/src/MusicConductor/MusicConductor.tscn b/game/src/MusicConductor/MusicConductor.tscn
index 7194f0b..182de99 100644
--- a/game/src/MusicConductor/MusicConductor.tscn
+++ b/game/src/MusicConductor/MusicConductor.tscn
@@ -8,6 +8,6 @@ music_directory = "res://audio/music"
first_song_name = "The_Crown"
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
-bus = &"Music"
+bus = &"MUSIC_BUS"
[connection signal="finished" from="AudioStreamPlayer" to="." method="_on_audio_stream_player_finished"]
diff --git a/game/src/OptionMenu/SettingNodes/SettingHSlider.gd b/game/src/OptionMenu/SettingNodes/SettingHSlider.gd
index 4e7c9c9..6fa30ed 100644
--- a/game/src/OptionMenu/SettingNodes/SettingHSlider.gd
+++ b/game/src/OptionMenu/SettingNodes/SettingHSlider.gd
@@ -20,12 +20,15 @@ func load_setting(file : ConfigFile):
var load_value = file.get_value(section_name, setting_name, default_value)
match typeof(load_value):
TYPE_FLOAT, TYPE_INT:
+ if value == load_value: value_changed.emit(value)
value = load_value
return
TYPE_STRING, TYPE_STRING_NAME:
var load_string := load_value as String
if load_string.is_valid_float():
- value = load_string.to_float()
+ load_value = load_string.to_float()
+ if value == load_value: value_changed.emit(value)
+ value = load_value
return
push_error("Setting value '%s' invalid for setting [%s] \"%s\"" % [load_value, section_name, setting_name])
value = default_value