Changeset 254

Timestamp:

01/07/07 21:33:21 (5 years ago)

Author:

mg

Message:

Redo the way sounds effects are done.

Files:

• trunk/src/pyspacewar/ui.py (modified) (11 diffs)

trunk/src/pyspacewar/ui.py

@@ -212 +212 @@
     value = 1 / (1 + math.exp(-t))
     return y1 + (y2 - y1) * value
-
-
-class NoSound(object):
-    """A pygame.mixer.Sound stub for when you cannot load a sound file."""
-
-    def play(*args):
-        pass
-
-    def stop(*args):
-        pass
-
-    def set_volume(*args):
-        pass
 
 
@@ -1400 +1387 @@
         action = self.menu_items[self.menu.selected_item][1:]
         if action:
-            self.ui.menu_sound.play()
+            self.ui.play_sound('menu')
             handler = action[0]
             args = action[1:]
@@ -2009 +1996 @@
         config.add_section('sounds')
         config.read([find('sounds', 'sounds.ini')])
-
-        def load_sound(name):
+        self.sounds = {}
+        self.sound_looping = {}
+        for name in ['thruster', 'fire', 'bounce', 'hit', 'explode', 'respawn',
+                     'menu']:
             if config.has_option('sounds', name):
                 filename = config.get('sounds', name)
                 if filename:
                     try:
-                        return pygame.mixer.Sound(find('sounds', filename))
+                        sound = pygame.mixer.Sound(find('sounds', filename))
+                        self.sounds[name] = sound
                     except pygame.error:
                         print "pyspacewar: could not load %s" % filename
-            return NoSound()
-
-        self.thruster_sound_playing = False
-        self.thruster_sound = load_sound('thruster')
-        self.thruster_sound.set_volume(0.5)
-        self.fire_sound = load_sound('fire')
-        self.bounce_sound = load_sound('bounce')
-        self.hit_sound = load_sound('hit')
-        self.explode_sound = load_sound('explode')
-        self.respawn_sound = load_sound('respawn')
-        self.menu_sound = load_sound('menu')
+        if 'thruster' in self.sounds:
+            self.sounds['thruster'].set_volume(0.5)
 
     def _load_music(self):
@@ -2057 +2038 @@
                 pygame.mixer.music.stop()
         self.now_playing = which
+
+    def play_sound(self, which):
+        """Play a certain sound effect."""
+        if which in self.sounds:
+            self.sounds[which].play()
+
+    def start_sound(self, which):
+        """Start looping a certain sound effect."""
+        if not self.sound_looping.get(which) and which in self.sounds:
+            self.sounds[which].play(-1)
+            self.sound_looping[which] = True
+
+    def stop_sound(self, which):
+        """Stop playing a certain sound effect."""
+        if self.sound_looping.get(which) and which in self.sounds:
+            self.sounds[which].stop()
+            self.sound_looping[which] = False
 
     def _init_fonts(self):
@@ -2209 +2207 @@
     def main_menu(self):
         """Enter the main menu."""
-        self.menu_sound.play()
+        self.play_sound('menu')
         self.ui_mode = MainMenuMode(self)
 
@@ -2253 +2251 @@
     def game_menu(self):
         """Enter the game menu."""
-        self.menu_sound.play()
+        self.play_sound('menu')
         self.ui_mode = GameMenuMode(self)
 
@@ -2355 +2353 @@
         player_id = self.ships.index(ship)
         if not self.ai_controlled[player_id] or self.sound_in_vacuum:
-            self.fire_sound.play()
+            self.play_sound('fire')
 
     def bounce_effect_Ship(self, ship, obstacle):
@@ -2363 +2361 @@
             # It sounds weird to hear that sound when dead ships bounce
             if not self.ai_controlled[player_id] or self.sound_in_vacuum:
-                self.bounce_sound.play()
+                self.play_sound('bounce')
 
     def hit_effect_Ship(self, ship, missile):
@@ -2369 +2367 @@
         player_id = self.ships.index(ship)
         if not self.ai_controlled[player_id] or self.sound_in_vacuum:
-            self.hit_sound.play()
+            self.play_sound('hit')
 
     def explode_effect_Ship(self, ship, killer):
@@ -2375 +2373 @@
         player_id = self.ships.index(ship)
         if not self.ai_controlled[player_id] or self.sound_in_vacuum:
-            self.explode_sound.play()
+            self.play_sound('explode')
 
     def respawn_effect_Ship(self, ship):
         """Play a sound effect when the player's ship respawns."""
         player_id = self.ships.index(ship)
-        self.respawn_sound.play()
+        self.play_sound('respawn')
 
     def update_continuous_sounds(self):
@@ -2390 +2388 @@
                                ship.left_thrust or ship.right_thrust or
                                ship.engage_brakes) or makes_noise
-        if self.thruster_sound_playing and not makes_noise:
-            self.thruster_sound.stop()
-        elif not self.thruster_sound_playing and makes_noise:
-            self.thruster_sound.play(-1)
-        self.thruster_sound_playing = makes_noise
+        if makes_noise:
+            self.start_sound('thruster')
+        else:
+            self.stop_sound('thruster')
 
     def draw(self):