Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

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

diff --git a/src/object/fireworks.cpp b/src/object/fireworks.cpp
index a6ff565..e943c56 100644 (file)
--- a/src/object/fireworks.cpp
+++ b/src/object/fireworks.cpp
@@ -1,19 +1,32 @@
-#include <config.h>
+//  SuperTux
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#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 "audio/sound_manager.hpp"
+#include "math/random_generator.hpp"
+#include "object/camera.hpp"
+#include "object/fireworks.hpp"
+#include "object/particles.hpp"
+#include "supertux/main.hpp"
+#include "supertux/sector.hpp"
+#include "video/drawing_context.hpp"
 
 Fireworks::Fireworks()
 {
-  timer.start(.2);
+  timer.start(.2f);
+  sound_manager->preload("sounds/fireworks.wav");
 }
 
 Fireworks::~Fireworks()
@@ -21,25 +34,31 @@ Fireworks::~Fireworks()
 }
 
 void
-Fireworks::action(float )
+Fireworks::update(float )
 {
-    if(timer.check()) {
-        Sector* sector = Sector::current();
-        Vector pos = sector->camera->get_translation();
-        pos += Vector(screen->w * ((float) rand() / RAND_MAX),
-                      screen->h/2 * ((float) rand() / RAND_MAX));
+  if(timer.check()) {
+    Sector* sector = Sector::current();
+    Vector pos = sector->camera->get_translation();
+    pos += Vector(systemRandom.randf(SCREEN_WIDTH),
+                  systemRandom.randf(SCREEN_HEIGHT/2));
 
-        int red = rand() % 255;
-        int green = rand() % red;
-        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));
-        SoundManager::get()->play_sound(IDToSound(SND_FIREWORKS));
-        timer.start(((float) rand() / RAND_MAX) + .5);
-    }
+    float red = systemRandom.randf(1.0);
+    float green = systemRandom.randf(1.0);
+    //float red = 0.7;
+    //float green = 0.9;
+    (void) red;
+    (void) green;
+    sector->add_object(new Particles(pos, 0, 360, Vector(140, 140),
+                                     Vector(0, 0), 45, Color(red, green, 0), 3, 1.3f,
+                                     LAYER_FOREGROUND1+1));
+    sound_manager->play("sounds/fireworks.wav");
+    timer.start(systemRandom.randf(1.0, 1.5));
+  }
 }
 
 void
 Fireworks::draw(DrawingContext& )
 {
 }
+
+/* EOF */