Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/Saludame.activity/sound_manager.py
diff options
context:
space:
mode:
Diffstat (limited to 'Saludame.activity/sound_manager.py')
-rw-r--r--Saludame.activity/sound_manager.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/Saludame.activity/sound_manager.py b/Saludame.activity/sound_manager.py
index 479fe42..6003aba 100644
--- a/Saludame.activity/sound_manager.py
+++ b/Saludame.activity/sound_manager.py
@@ -37,6 +37,7 @@ class SoundManager:
if name <> self.current_music_name:
self.state = SoundManager.FADE_OUT
self.next_music_name = name
+ pygame.mixer.music.fadeout(1000)
elif self.state == SoundManager.FADE_OUT:
if name == self.current_music_name:
@@ -52,6 +53,15 @@ class SoundManager:
def start_playing(self):
global music
+
+ if self.next_music_name:
+ self.current_music_name = self.next_music_name
+ self.next_music_name = None
+
path = music[self.current_music_name]
pygame.mixer.music.load(path)
pygame.mixer.music.play()
+
+ # Sounds
+ def play_time_change(self):
+ pygame.mixer.Sound("assets/sound/time_change.ogg").play()