Added a new SoundManager based on OpenAL. I also simplified the API along the

[supertux.git] / src / object / fireworks.cpp

diff --git a/src/object/fireworks.cpp b/src/object/fireworks.cpp
index 18648e0..c322671 100644 (file)
--- a/src/object/fireworks.cpp
+++ b/src/object/fireworks.cpp
@@ -17,7 +17,6 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
-
 #include <config.h>
 
 #include "fireworks.h"
@@ -25,12 +24,10 @@
 #include "sector.h"
 #include "camera.h"
 #include "gameobjs.h"
-#include "app/globals.h"
+#include "main.h"
 #include "video/drawing_context.h"
 #include "audio/sound_manager.h"
 
-using namespace SuperTux;
-
 Fireworks::Fireworks()
 {
   timer.start(.2);
@@ -41,7 +38,7 @@ Fireworks::~Fireworks()
 }
 
 void
-Fireworks::action(float )
+Fireworks::update(float )
 {
     if(timer.check()) {
         Sector* sector = Sector::current();
@@ -54,7 +51,7 @@ Fireworks::action(float )
         sector->add_object(new Particles(pos, 0, 360, Vector(140, 140),
                 Vector(0, 0), 45, Color(red, green, 0), 3, 1.3,
                 LAYER_FOREGROUND1+1));
-        sound_manager->play_sound("fireworks");
+        sound_manager->play("fireworks");
         timer.start(((float) rand() / RAND_MAX) + .5);
     }
 }