diff options
| -rw-r--r-- | client/audio/sound.gd | 22 | ||||
| -rw-r--r-- | server/data/src/demands.rs | 2 |
2 files changed, 14 insertions, 10 deletions
diff --git a/client/audio/sound.gd b/client/audio/sound.gd index d2696aad..d9c20600 100644 --- a/client/audio/sound.gd +++ b/client/audio/sound.gd @@ -34,15 +34,19 @@ const EFFECT_FADE_SPEED = 0.5 func set_music(filename, volume = 0., dampen = false): if current_music_filename != filename: - var player = AudioStreamPlayer.new() - player.stream = load("res://audio/music/%s.ogg" % filename) - player.volume_db = VOLUME_MIN + 1. - player.autoplay = true - player.name = filename - player.bus = "Music" - current_music_player = player - current_music_filename = filename - $Music.add_child(player) + if filename == null: + current_music_filename = null + current_music_player = null + else: + var player = AudioStreamPlayer.new() + player.stream = load("res://audio/music/%s.ogg" % filename) + player.volume_db = VOLUME_MIN + 1. + player.autoplay = true + player.name = filename + player.bus = "Music" + current_music_player = player + current_music_filename = filename + $Music.add_child(player) volume_target = volume dampen_target = 1. if dampen else 0. diff --git a/server/data/src/demands.rs b/server/data/src/demands.rs index 77e187af..b3ad76b4 100644 --- a/server/data/src/demands.rs +++ b/server/data/src/demands.rs @@ -26,7 +26,7 @@ pub fn generate_demands( ) -> Vec<Demand> { let recipes = recipes .iter() - .filter(|r| r.tile().map(|t| tiles.contains(&t)).unwrap_or(true)) + .filter(|r| r.tile().map_or(true, |t| tiles.contains(&t))) .collect::<Vec<_>>(); let mut producable = HashMap::new(); |