stopped infoblocks from ringing, since they're not telephones anymore - code is only...

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

diff --git a/src/object/fireworks.cpp b/src/object/fireworks.cpp
index 18648e0..1129097 100644 (file)
--- a/src/object/fireworks.cpp
+++ b/src/object/fireworks.cpp
@@ -17,19 +17,16 @@
 //  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"
-#include "resources.h"
-#include "sector.h"
-#include "camera.h"
-#include "gameobjs.h"
-#include "app/globals.h"
-#include "video/drawing_context.h"
-#include "audio/sound_manager.h"
-
-using namespace SuperTux;
+#include "fireworks.hpp"
+#include "resources.hpp"
+#include "sector.hpp"
+#include "camera.hpp"
+#include "particles.hpp"
+#include "main.hpp"
+#include "video/drawing_context.hpp"
+#include "audio/sound_manager.hpp"
 
 Fireworks::Fireworks()
 {
@@ -41,7 +38,7 @@ Fireworks::~Fireworks()
 }
 
 void
-Fireworks::action(float )
+Fireworks::update(float )
 {
     if(timer.check()) {
         Sector* sector = Sector::current();
@@ -49,12 +46,12 @@ Fireworks::action(float )
         pos += Vector(SCREEN_WIDTH * ((float) rand() / RAND_MAX),
                       SCREEN_HEIGHT/2 * ((float) rand() / RAND_MAX));
 
-        int red = rand() % 255;
-        int green = rand() % red;
+        float red = static_cast<float>(rand() % 255) / 255.0;
+        float green = static_cast<float>(rand() % ((int) red*255)) / 255.0;
         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("sounds/fireworks.wav");
         timer.start(((float) rand() / RAND_MAX) + .5);
     }
 }