X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fstar.cpp;h=316f572d39ea07ebb9e0fe88b2d940d87b37f6e5;hb=1dfbd27a41341f26775ca4e2b9ca4864f5744a6f;hp=39724b8d7556ba58d89a8c5581cd3020945d46b7;hpb=15c5a91ee89272dfda3666e2fed67e06d650d0bf;p=supertux.git

diff --git a/src/object/star.cpp b/src/object/star.cpp
index 39724b8d7..316f572d3 100644
--- a/src/object/star.cpp
+++ b/src/object/star.cpp
@@ -26,14 +26,14 @@
 #include "sprite/sprite_manager.hpp"
 #include "video/drawing_context.hpp"
 
-static const float INITIALJUMP = 400;
+static const float INITIALJUMP = -400;
 static const float SPEED = 150;
-static const float JUMPSPEED = 300;
+static const float JUMPSPEED = -300;
 
-Star::Star(const Vector& pos)
+Star::Star(const Vector& pos, Direction direction)
 	: MovingSprite(pos, "images/powerups/star/star.sprite", LAYER_OBJECTS, COLGROUP_MOVING)
 {
-  physic.set_velocity(SPEED, INITIALJUMP);
+  physic.set_velocity((direction == LEFT) ? -SPEED : SPEED, INITIALJUMP);
 }
 
 void
@@ -42,21 +42,21 @@ Star::update(float elapsed_time)
   movement = physic.get_movement(elapsed_time);
 }
 
-HitResponse
-Star::collision(GameObject& other, const CollisionHit& hit)
+void
+Star::collision_solid(const CollisionHit& hit)
 {
-  if(other.get_flags() & FLAG_SOLID) {
-    if(hit.normal.y < -.5) { // ground
-      physic.set_velocity_y(JUMPSPEED);
-    } else if(hit.normal.y > .5) { // roof
-      physic.set_velocity_y(0);
-    } else { // bumped left or right
-      physic.set_velocity_x(-physic.get_velocity_x());
-    }
-
-    return CONTINUE;
+  if(hit.bottom) {
+    physic.set_velocity_y(JUMPSPEED);
+  } else if(hit.top) {
+    physic.set_velocity_y(0);
+  } else if(hit.left || hit.right) {
+    physic.set_velocity_x(-physic.get_velocity_x());
   }
-  
+}
+
+HitResponse
+Star::collision(GameObject& other, const CollisionHit& )
+{
   Player* player = dynamic_cast<Player*> (&other);
   if(player) {
     player->make_invincible();
@@ -66,4 +66,3 @@ Star::collision(GameObject& other, const CollisionHit& hit)
 
   return FORCE_MOVE;
 }
-