projects
/
naja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix loading of old saves.
[naja.git]
/
naja
/
sound.py
diff --git
a/naja/sound.py
b/naja/sound.py
index 311586510874fd792241b3c72455b736f3b0af46..14ef8d4bac9bc56ff79aa88030ae3d3404691924 100644
(file)
--- a/
naja/sound.py
+++ b/
naja/sound.py
@@
-1,5
+1,7
@@
"""Sound utilities."""
"""Sound utilities."""
+import time
+
from pygame import mixer
from naja.options import options
from pygame import mixer
from naja.options import options
@@
-47,11
+49,13
@@
class PygameSound(object):
sound = self._sounds[track_name] = mixer.Sound(track_name)
return sound
sound = self._sounds[track_name] = mixer.Sound(track_name)
return sound
- def play_sound(self, name, volume=DEFAULT_SOUND_VOLUME):
+ def play_sound(self, name, volume=DEFAULT_SOUND_VOLUME
, foreground=False
):
sound = self.load_sound(name)
if sound is not None:
sound.set_volume(volume)
sound.play()
sound = self.load_sound(name)
if sound is not None:
sound.set_volume(volume)
sound.play()
+ if foreground:
+ time.sleep(sound.get_length())
def play_music(self, name, volume=DEFAULT_MUSIC_VOLUME):
if not options.music:
def play_music(self, name, volume=DEFAULT_MUSIC_VOLUME):
if not options.music: