Generated particles need not have any randomness in either angle or v…

…elocity.
SuperTux · Nov 29, 2014 · cd21dc1 · cd21dc1
1 parent b09b702
commit cd21dc1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/object/fireworks.cpp b/src/object/fireworks.cpp
@@ -49,7 +49,7 @@ Fireworks::update(float )
     //float green = 0.9;
     (void) red;
     (void) green;
-    sector->add_object(std::make_shared<Particles>(pos, 0, 360, Vector(140, 140),
+    sector->add_object(std::make_shared<Particles>(pos, 0, 360, 140, 140,
                                                    Vector(0, 0), 45, Color(red, green, 0), 3, 1.3f,
                                                    LAYER_FOREGROUND1+1));
     SoundManager::current()->play("sounds/fireworks.wav");

diff --git a/src/object/particles.cpp b/src/object/particles.cpp
@@ -88,8 +88,10 @@ Particles::Particles(const Vector& epicenter, int min_angle, int max_angle,
     Particle* particle = new Particle;
     particle->pos = epicenter;
 
-    float velocity = graphicsRandom.rand(min_initial_velocity, max_initial_velocity);
-    float angle = graphicsRandom.rand(min_angle, max_angle) * (M_PI / 180);  // convert to radians
+    float velocity = (min_initial_velocity == max_initial_velocity) ? min_initial_velocity :
+                     graphicsRandom.rand(min_initial_velocity, max_initial_velocity);
+    float angle = (min_angle == max_angle) ? min_angle * (M_PI / 180) :
+                     graphicsRandom.rand(min_angle, max_angle) * (M_PI / 180);  // convert to radians
     // Note that angle defined as clockwise from vertical (up is zero degrees, right is 90 degrees)
     particle->vel.x = (sin(angle)) * velocity;
     particle->vel.y = (-cos(angle)) * velocity;