Mercurial > mamba

changeset 316:cd544a311f11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move directory names into sound.py for simplicity
author Neil Muller <drnlmuller@gmail.com>
date Fri, 16 Sep 2011 19:13:40 +0200
parents e0a5e597ae66
children e89702425a73
files mamba/snake.py mamba/sound.py mamba/sprites.py
diffstat 3 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/mamba/snake.py	Fri Sep 16 19:05:21 2011 +0200
+++ b/mamba/snake.py	Fri Sep 16 19:13:40 2011 +0200
@@ -17,7 +17,7 @@
 class Snake(object):
 
     def __init__(self, tile_pos, orientation):
-        load_sound('crash', 'sounds/crash.ogg')
+        load_sound('crash', 'crash.ogg')
         self.segments = self.create_segments(tile_pos, orientation)
         self.pending_segments = []  # segments waiting to be added
         self.segment_group = Group()
--- a/mamba/sound.py	Fri Sep 16 19:05:21 2011 +0200
+++ b/mamba/sound.py	Fri Sep 16 19:13:40 2011 +0200
@@ -70,7 +70,7 @@
         """Play a looping track using pygame's music support"""
         if self.sound_enabled:
             try:
-                mixer.music.load(data.filepath(track_name))
+                mixer.music.load(data.filepath('music/%s' % track_name))
                 mixer.music.play(-1)  # Loop sound
                 mixer.music.set_volume(volume)
             except:
@@ -89,15 +89,15 @@
         if not self.sound_enabled:
             self._sounds[key] = None
         else:
-            if not os.path.exists(data.filepath(track_name)):
+            track_name = data.filepath('sounds/%s' % track_name)
+            if not os.path.exists(track_name):
                 # Pygame doesn't error out for missing files, so
                 # handle that ourselves
                 print "Can't find sound %s. Skipping" % track_name
                 self._sounds[key] = None
                 return
             try:
-                self._sounds[key] = pygame.mixer.Sound(
-                        data.filepath(track_name))
+                self._sounds[key] = pygame.mixer.Sound(track_name)
                 if volume is not None:
                     self._sounds[key].set_volume(volume)
             except:
--- a/mamba/sprites.py	Fri Sep 16 19:05:21 2011 +0200
+++ b/mamba/sprites.py	Fri Sep 16 19:13:40 2011 +0200
@@ -290,7 +290,7 @@
 
 
 class EdibleTile(SingleImageTileSprite):
-    sound_name = 'sounds/squeak.ogg'
+    sound_name = 'squeak.ogg'
 
     def __init__(self, **kw):
         if self.sound_name: