X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Ffireworks.cpp;h=f8ae8cf1f3495b29aa5025d0650dc3db1165c564;hb=81a9cc55cbb542fc0410ecbf21b0268d84f2e87a;hp=18648e025c5a71daf964505b8f4f048be0c00550;hpb=c0093d25093395cb62fc2526ab42be65a9f015b8;p=supertux.git

diff --git a/src/object/fireworks.cpp b/src/object/fireworks.cpp
index 18648e025..f8ae8cf1f 100644
--- 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();