[Pingus-CVS] r2712 - in branches/pingus_sdl/src: . sound

[jsalmon3]

Author: jsalmon3
Date: 2007-07-12 17:46:37 +0200 (Thu, 12 Jul 2007)
New Revision: 2712

Modified:
   branches/pingus_sdl/src/game_session.cpp
   branches/pingus_sdl/src/shared_ptr.hpp
   branches/pingus_sdl/src/sound/sound.cpp
Log:
Play sounds correctly, fixed memory leak

Modified: branches/pingus_sdl/src/game_session.cpp
===================================================================
--- branches/pingus_sdl/src/game_session.cpp    2007-07-12 07:54:26 UTC (rev 
2711)
+++ branches/pingus_sdl/src/game_session.cpp    2007-07-12 15:46:37 UTC (rev 
2712)
@@ -129,7 +129,7 @@
       }
 
       if (show_result_screen)
-        ScreenManager::instance()->replace_screen(new ResultScreen(result));
+        ScreenManager::instance()->replace_screen(new ResultScreen(result), 
true);
       else
         ScreenManager::instance()->pop_screen();
       return;

Modified: branches/pingus_sdl/src/shared_ptr.hpp
===================================================================
--- branches/pingus_sdl/src/shared_ptr.hpp      2007-07-12 07:54:26 UTC (rev 
2711)
+++ branches/pingus_sdl/src/shared_ptr.hpp      2007-07-12 15:46:37 UTC (rev 
2712)
@@ -75,8 +75,8 @@
   
   ~SharedPtr() { decrement(); }
 
-  bool operator==(const T* ptr) const { return ptr == (impl ? impl.ptr : 0); }
-  bool operator==(const SharedPtr<T, U>& ptr) const { return ptr.impl == impl; 
}
+  bool operator==(const T* ptr) const { return ptr == (impl ? impl.ptr : 0); }
+  bool operator==(const SharedPtr<T, U>& ptr) const { return ptr.impl == impl; 
}
 
   SharedPtr<T>& operator=(const SharedPtr<T>& ptr) {
     if (ptr.impl != impl) {
@@ -134,9 +134,9 @@
   }
   ~UnknownSharedPtr() { decrement(); }
 
-  bool operator==(const UnknownSharedPtr& ptr) const { return ptr.impl == 
impl; }
-  template <typename T, typename U>
-  bool operator==(const SharedPtr<T, U>& ptr) const { return ptr.impl == impl; 
}
+  bool operator==(const UnknownSharedPtr& ptr) const { return ptr.impl == 
impl; }
+  template <typename T, typename U>
+  bool operator==(const SharedPtr<T, U>& ptr) const { return ptr.impl == impl; 
}
 
   template<typename T, typename U>
   UnknownSharedPtr& operator=(const SharedPtr<T, U>& ptr) {

Modified: branches/pingus_sdl/src/sound/sound.cpp
===================================================================
--- branches/pingus_sdl/src/sound/sound.cpp     2007-07-12 07:54:26 UTC (rev 
2711)
+++ branches/pingus_sdl/src/sound/sound.cpp     2007-07-12 15:46:37 UTC (rev 
2712)
@@ -87,19 +87,19 @@
   switch (name)
     {
     case Sound::DIGGER:
-      play_sound (path_manager.complete ("sounds/digger.wav"), volume, 
panning);
+      play_sound ("digger", volume, panning);
       break;
     case Sound::PLOP:
-      play_sound (path_manager.complete ("sounds/plop.wav"), volume, panning);
+      play_sound ("plop", volume, panning);
       break;
     case Sound::GOODIDEA:
-      play_sound (path_manager.complete ("sounds/goodidea.wav"), volume, 
panning);
+      play_sound ("goodidea", volume, panning);
       break;
     case Sound::OHNO:
-      play_sound (path_manager.complete ("sounds/ohno.wav"), volume, panning);
+      play_sound ("ohno", volume, panning);
       break;
     case Sound::TICK:
-      play_sound (path_manager.complete ("sounds/tick.wav"), volume, panning);
+      play_sound ("tick", volume, panning);
       break;
     }
 }