[Pingus-CVS] CVS: Games/Pingus/src pingu.cxx,1.38,1.39 surface_button.cxx,1.21,1.22 world.cxx,1.40,1.41

[grumbel]

Update of /usr/local/cvsroot/Games/Pingus/src
In directory dark:/tmp/cvs-serv27502

Modified Files:
        pingu.cxx surface_button.cxx world.cxx 
Log Message:
fixed memleak in sound


Index: pingu.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingu.cxx,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- pingu.cxx   18 Feb 2003 15:04:47 -0000      1.38
+++ pingu.cxx   4 Mar 2003 13:59:44 -0000       1.39
@@ -313,7 +313,7 @@
       die. */
   if (rel_getpixel(0, -1) == Groundtype::GP_OUTOFSCREEN) 
     {
-      PingusSound::play_sound("sounds/die.wav");
+      PingusSound::play_sound("die");
       status = PS_DEAD;
       return;
     }

Index: surface_button.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/surface_button.cxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- surface_button.cxx  19 Feb 2003 09:50:36 -0000      1.21
+++ surface_button.cxx  4 Mar 2003 13:59:44 -0000       1.22
@@ -122,7 +122,7 @@
 SurfaceButton::on_pointer_enter ()
 {
   mouse_over = true;
-  PingusSound::play_sound ("sounds/tick.wav");
+  PingusSound::play_sound ("tick");
   //std::cout << "X: " << this << "enter" << std::endl;
 }
 
@@ -263,7 +263,7 @@
 QuitButton::on_click()
 {
   std::cout << "QuitButton: do exit" << std::endl;
-  PingusSound::play_sound ("sounds/goodidea.wav");
+  PingusSound::play_sound ("goodidea");
   menu->get_manager ()->show_exit_menu ();
 }
 
@@ -362,7 +362,7 @@
 void 
 StoryButton::on_click ()
 {
-  PingusSound::play_sound ("sounds/letsgo.wav");
+  PingusSound::play_sound ("letsgo");
   ScreenManager::instance()->push_screen(WorldMapNS::WorldMapManager::instance 
());
 }
 
@@ -382,7 +382,7 @@
 void
 ThemeButton::on_click ()
 {
-  PingusSound::play_sound ("sounds/letsgo.wav");
+  PingusSound::play_sound ("letsgo");
   
   ThemeSelector theme_selector;
   theme_selector.display();

Index: world.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/world.cxx,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- world.cxx   3 Mar 2003 20:32:18 -0000       1.40
+++ world.cxx   4 Mar 2003 13:59:44 -0000       1.41
@@ -221,7 +221,7 @@
 void 
 World::armageddon(void)
 {
-  PingusSound::play_sound ("sounds/goodidea.wav");
+  PingusSound::play_sound ("goodidea");
   do_armageddon = true;
   armageddon_count = 0;
 }
@@ -259,11 +259,11 @@
       if (panning < -1.0f)
        panning = -1.0f;
 
-      PingusSound::play_sound("sounds/" + name + ".wav", volume, panning);
+      PingusSound::play_sound(name, volume, panning);
     }
   else // No view available, so no stereo enabled
     {
-      PingusSound::play_sound("sounds/" + name + ".wav", volume);
+      PingusSound::play_sound(name, volume);
     }
 }