fix shrinking

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

diff --git a/src/object/rock.cpp b/src/object/rock.cpp
index e6862f3..2b17713 100644 (file)
--- a/src/object/rock.cpp
+++ b/src/object/rock.cpp
@@ -32,9 +32,10 @@ Rock::Rock(const lisp::Lisp& reader)
   reader.get("x", bbox.p1.x);
   reader.get("y", bbox.p1.y);
   bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("rock");
+  sprite = sprite_manager->create("images/objects/rock/rock.sprite");
   grabbed = false;
-  flags |= FLAG_SOLID;
+  flags |= FLAG_SOLID | FLAG_PORTABLE;
+  set_group(COLGROUP_MOVING);
 }
 
 Rock::~Rock()
@@ -56,7 +57,6 @@ Rock::write(lisp::Writer& writer)
 void
 Rock::draw(DrawingContext& context)
 {
-
   sprite->draw(context, get_pos(), LAYER_OBJECTS);
 }
 
@@ -65,7 +65,7 @@ Rock::update(float elapsed_time)
 {
   if(!grabbed) {
     flags |= FLAG_SOLID;
-    set_group(COLGROUP_STATIC);
+    set_group(COLGROUP_MOVING);
     movement = physic.get_movement(elapsed_time);
   } else {
     physic.set_velocity(0, 0);
@@ -74,24 +74,30 @@ Rock::update(float elapsed_time)
   }
   
   grabbed = false;
+  printf("%p - V %3.1f %3.1f - P %3.1f %3.1f\n", this,
+          physic.get_velocity().x, physic.get_velocity().y,
+          get_pos().x, get_pos().y);
 }
 
 HitResponse
-Rock::collision(GameObject& object, const CollisionHit& )
+Rock::collision(GameObject& object, const CollisionHit& hit)
 {
-  if(grabbed)
+  if(grabbed) {
     return FORCE_MOVE;
+  }
 
   if(object.get_flags() & FLAG_SOLID) {
-      physic.set_velocity(0, 0);
-      return CONTINUE;
+    printf("%p vs %p - %3.1f %3.1f D %3.1f\n", this, &object,
+        hit.normal.x, hit.normal.y, hit.depth);
+    physic.set_velocity(0, 0);
+    return CONTINUE;
   }
 
   return FORCE_MOVE;
 }
 
 void
-Rock::grab(MovingObject& , const Vector& pos)
+Rock::grab(MovingObject& , const Vector& pos, Direction)
 {
   movement = pos - get_pos();
   grabbed = true;