X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fparticlesystem_interactive.cpp;h=0a9228abc4a078aca837ecaeb552c73de75dd18b;hb=5f1c84ed5ce0ab5450f92082a9aaaa9ca0effc39;hp=edb2cbc059fe330fb6d4ca2f2cf979bdf96b7b89;hpb=86181b0a14d89cf45daf97199c3556c4dd1ee7b7;p=supertux.git

diff --git a/src/object/particlesystem_interactive.cpp b/src/object/particlesystem_interactive.cpp
index edb2cbc05..0a9228abc 100644
--- a/src/object/particlesystem_interactive.cpp
+++ b/src/object/particlesystem_interactive.cpp
@@ -1,7 +1,7 @@
-//  $Id: particlesystem.cpp 2470 2005-05-11 14:49:28Z wansti $
-// 
+//  $Id$
+//
 //  SuperTux
-//  Copyright (C) 2004 Matthias Braun <matze@braunis.de>
+//  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
@@ -12,10 +12,11 @@
 //  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, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include <config.h>
 
 #include <iostream>
@@ -37,6 +38,7 @@
 #include "object/camera.hpp"
 #include "object/rainsplash.hpp"
 #include "badguy/bomb.hpp"
+#include "random_generator.hpp"
 
 //TODO: Find a way to make rain collide with objects like bonus blocks
 //      Add an option to set rain strength
@@ -45,7 +47,7 @@ ParticleSystem_Interactive::ParticleSystem_Interactive()
 {
     virtual_width = SCREEN_WIDTH;
     virtual_height = SCREEN_HEIGHT;
-    layer = LAYER_TILES;
+    z_pos = 0;
 }
 
 ParticleSystem_Interactive::~ParticleSystem_Interactive()
@@ -63,7 +65,7 @@ void ParticleSystem_Interactive::draw(DrawingContext& context)
     std::vector<Particle*>::iterator i;
     for(i = particles.begin(); i != particles.end(); ++i) {
         Particle* particle = *i;
-        context.draw_surface(particle->texture, particle->pos, layer);
+        context.draw_surface(particle->texture, particle->pos, z_pos);
     }
 
     context.pop_transform();
@@ -151,12 +153,12 @@ RainParticleSystem::RainParticleSystem()
     size_t raindropcount = size_t(virtual_width/6.0);
     for(size_t i=0; i<raindropcount; ++i) {
         RainParticle* particle = new RainParticle;
-        particle->pos.x = rand() % int(virtual_width);
-        particle->pos.y = rand() % int(virtual_height);
-        int rainsize = rand() % 2;
+        particle->pos.x = systemRandom.rand(int(virtual_width));
+        particle->pos.y = systemRandom.rand(int(virtual_height));
+        int rainsize = systemRandom.rand(2);
         particle->texture = rainimages[rainsize];
         do {
-            particle->speed = (rainsize+1)*45 + (float(rand()%10)*.4);
+            particle->speed = (rainsize+1)*45 + systemRandom.randf(3.6);
         } while(particle->speed < 1);
         particle->speed *= 10; // gravity
 
@@ -167,14 +169,14 @@ RainParticleSystem::RainParticleSystem()
 void
 RainParticleSystem::parse(const lisp::Lisp& reader)
 {
-  reader.get("layer", layer);
+  reader.get("z-pos", z_pos);
 }
 
 void
 RainParticleSystem::write(lisp::Writer& writer)
 {
   writer.start_list("particles-rain");
-  writer.write_int("layer", layer);
+  writer.write_int("z-pos", z_pos);
   writer.end_list("particles-rain");
 }
 
@@ -213,7 +215,7 @@ void RainParticleSystem::update(float elapsed_time)
                 Sector::current()->add_object(new RainSplash(Vector(splash_x, splash_y),vertical));
               } */
             }
-            int new_x = (rand() % int(virtual_width)) + int(abs_x);
+            int new_x = systemRandom.rand(int(virtual_width)) + int(abs_x);
             int new_y = 0;
             //FIXME: Don't move particles over solid tiles
             particle->pos.x = new_x;
@@ -233,12 +235,12 @@ CometParticleSystem::CometParticleSystem()
     size_t cometcount = 2;
     for(size_t i=0; i<cometcount; ++i) {
         CometParticle* particle = new CometParticle;
-        particle->pos.x = rand() % int(virtual_width);
-        particle->pos.y = rand() % int(virtual_height);
-        int cometsize = rand() % 2;
+        particle->pos.x = systemRandom.rand(int(virtual_width));
+        particle->pos.y = systemRandom.rand(int(virtual_height));
+        int cometsize = systemRandom.rand(2);
         particle->texture = cometimages[cometsize];
         do {
-            particle->speed = (cometsize+1)*30 + (float(rand()%10)*.4);
+            particle->speed = (cometsize+1)*30 + systemRandom.randf(3.6);
         } while(particle->speed < 1);
         particle->speed *= 10; // gravity
 
@@ -249,14 +251,14 @@ CometParticleSystem::CometParticleSystem()
 void
 CometParticleSystem::parse(const lisp::Lisp& reader)
 {
-  reader.get("layer", layer);
+  reader.get("z-pos", z_pos);
 }
 
 void
 CometParticleSystem::write(lisp::Writer& writer)
 {
   writer.start_list("particles-comets");
-  writer.write_int("layer", layer);
+  writer.write_int("z-pos", z_pos);
   writer.end_list("particles-comets");
 }
 
@@ -282,7 +284,7 @@ void CometParticleSystem::update(float elapsed_time)
             if ((particle->pos.y <= SCREEN_HEIGHT + abs_y) && (col >= 1)) {
               Sector::current()->add_object(new Bomb(particle->pos, LEFT));
             }
-            int new_x = (rand() % int(virtual_width)) + int(abs_x);
+            int new_x = systemRandom.rand(int(virtual_width)) + int(abs_x);
             int new_y = 0;
             //FIXME: Don't move particles over solid tiles
             particle->pos.x = new_x;