fix: Music does not play, if volume was 0 on game loads

This commit is contained in:
2025-07-24 20:46:48 +04:00
parent d7a0494d7e
commit f949502ef4
2 changed files with 29 additions and 9 deletions

View File

@@ -6,25 +6,42 @@ const MUSIC_PATH := "res://audio/Space Horror InGame Music (Exploration) _Clemen
var is_music_playing := false var is_music_playing := false
func _ready(): func _ready():
if is_music_playing: add_child(music_player)
return
var stream: AudioStream = load(MUSIC_PATH) var stream: AudioStream = load(MUSIC_PATH)
if not stream: if not stream:
push_error("Failed to load music stream: %s" % MUSIC_PATH) push_error("Failed to load music stream: %s" % MUSIC_PATH)
return return
# Loop safely
if stream is AudioStreamWAV: if stream is AudioStreamWAV:
stream.loop_mode = AudioStreamWAV.LOOP_FORWARD stream.loop_mode = AudioStreamWAV.LOOP_FORWARD
elif stream is AudioStreamOggVorbis: elif stream is AudioStreamOggVorbis:
stream.loop = true stream.loop = true
# Setup player
music_player.stream = stream music_player.stream = stream
music_player.bus = "Music" music_player.bus = "Music"
music_player.volume_db = linear_to_db(SettingsManager.get_setting("music_volume")) music_player.volume_db = linear_to_db(SettingsManager.get_setting("music_volume"))
add_child(music_player)
music_player.play()
if SettingsManager.get_setting("music_volume") > 0:
_start_music()
func update_music_volume(volume: float) -> void:
var volume_db = linear_to_db(volume)
music_player.volume_db = volume_db
AudioServer.set_bus_volume_db(AudioServer.get_bus_index("Music"), volume_db)
if volume > 0:
_start_music()
else:
_stop_music()
func _start_music() -> void:
if is_music_playing:
return
music_player.play()
is_music_playing = true is_music_playing = true
func _stop_music() -> void:
if not is_music_playing:
return
music_player.stop()
is_music_playing = false

View File

@@ -40,10 +40,13 @@ func _on_volume_slider_changed(value, setting_key):
if bus_map.has(setting_key): if bus_map.has(setting_key):
var bus_index = AudioServer.get_bus_index(bus_map[setting_key]) var bus_index = AudioServer.get_bus_index(bus_map[setting_key])
if bus_index >= 0: if bus_index < 0:
return
if setting_key == "music_volume":
AudioManager.update_music_volume(value)
else:
AudioServer.set_bus_volume_db(bus_index, linear_to_db(value)) AudioServer.set_bus_volume_db(bus_index, linear_to_db(value))
func _input(event): func _input(event):
if event.is_action_pressed("ui_cancel") or event.is_action_pressed("ui_menu_toggle"): if event.is_action_pressed("ui_cancel") or event.is_action_pressed("ui_menu_toggle"):
print("ESC pressed in settings") print("ESC pressed in settings")