[cppcheck] Part 1: Performance

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

diff --git a/src/object/particles.cpp b/src/object/particles.cpp
index 18432ea..a51da08 100644 (file)
--- a/src/object/particles.cpp
+++ b/src/object/particles.cpp
@@ -20,18 +20,18 @@
 
 #include "math/random_generator.hpp"
 #include "object/camera.hpp"
-#include "supertux/main.hpp"
+#include "supertux/globals.hpp"
 #include "supertux/sector.hpp"
 #include "video/drawing_context.hpp"
 
 Particles::Particles(const Vector& epicenter, int min_angle, int max_angle,
                      const Vector& initial_velocity, const Vector& acceleration, int number,
                      Color color_, int size_, float life_time, int drawing_layer_) :
-  accel(acceleration), 
+  accel(acceleration),
   timer(),
   live_forever(),
-  color(color_), 
-  size(size_), 
+  color(color_),
+  size(size_),
   drawing_layer(drawing_layer_),
   particles()
 {
@@ -48,7 +48,7 @@ Particles::Particles(const Vector& epicenter, int min_angle, int max_angle,
     Particle* particle = new Particle;
     particle->pos = epicenter;
 
-    float angle = systemRandom.rand(min_angle, max_angle)
+    float angle = graphicsRandom.rand(min_angle, max_angle)
       * (M_PI / 180);  // convert to radius (radians?)
     particle->vel.x = /*fabs*/(sin(angle)) * initial_velocity.x;
     //    if(angle >= M_PI && angle < M_PI*2)
@@ -65,7 +65,7 @@ Particles::~Particles()
 {
   // free particles
   for(std::vector<Particle*>::iterator i = particles.begin();
-      i < particles.end(); i++)
+      i < particles.end(); ++i)
     delete (*i);
 }
 
@@ -101,7 +101,7 @@ Particles::draw(DrawingContext& context)
 {
   // draw particles
   for(std::vector<Particle*>::iterator i = particles.begin();
-      i != particles.end(); i++) {
+      i != particles.end(); ++i) {
     context.draw_filled_rect((*i)->pos, Vector(size,size), color,drawing_layer);
   }
 }