Make it build with -DCOMPILE_AMALGATION=ON. Still not certain how intern_draw/next_po...

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

diff --git a/src/object/star.cpp b/src/object/star.cpp
index 9e7932a..f421d43 100644 (file)
--- a/src/object/star.cpp
+++ b/src/object/star.cpp
@@ -18,14 +18,14 @@
 #include "object/star.hpp"
 
 static const float INITIALJUMP = -400;
-static const float SPEED = 150;
-static const float JUMPSPEED = -300;
+static const float STAR_SPEED = 150;
+static const float JUMPSTAR_SPEED = -300;
 
 Star::Star(const Vector& pos, Direction direction) :
   MovingSprite(pos, "images/powerups/star/star.sprite", LAYER_OBJECTS, COLGROUP_MOVING),
   physic()
 {
-  physic.set_velocity((direction == LEFT) ? -SPEED : SPEED, INITIALJUMP);
+  physic.set_velocity((direction == LEFT) ? -STAR_SPEED : STAR_SPEED, INITIALJUMP);
 }
 
 void
@@ -38,7 +38,7 @@ void
 Star::collision_solid(const CollisionHit& hit)
 {
   if(hit.bottom) {
-    physic.set_velocity_y(JUMPSPEED);
+    physic.set_velocity_y(JUMPSTAR_SPEED);
   } else if(hit.top) {
     physic.set_velocity_y(0);
   } else if(hit.left || hit.right) {