Moved Tux' and Badguys' sprites from sprites.strf to individual .sprite files

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

diff --git a/src/object/rock.cpp b/src/object/rock.cpp
index 0600b11..ea1ed64 100644 (file)
--- a/src/object/rock.cpp
+++ b/src/object/rock.cpp
@@ -34,7 +34,7 @@ Rock::Rock(const lisp::Lisp& reader)
   bbox.set_size(31.8, 31.8);
   sprite = sprite_manager->create("rock");
   grabbed = false;
-  flags |= FLAG_SOLID;
+  flags |= FLAG_SOLID | FLAG_PORTABLE;
 }
 
 Rock::~Rock()
@@ -56,7 +56,6 @@ Rock::write(lisp::Writer& writer)
 void
 Rock::draw(DrawingContext& context)
 {
-
   sprite->draw(context, get_pos(), LAYER_OBJECTS);
 }
 
@@ -65,12 +64,12 @@ Rock::update(float elapsed_time)
 {
   if(!grabbed) {
     flags |= FLAG_SOLID;
-    flags &= ~FLAG_NO_COLLDET;
+    set_group(COLGROUP_MOVING);
     movement = physic.get_movement(elapsed_time);
   } else {
     physic.set_velocity(0, 0);
     flags &= ~FLAG_SOLID;
-    flags |= FLAG_NO_COLLDET;
+    set_group(COLGROUP_DISABLED);
   }
   
   grabbed = false;
@@ -79,19 +78,20 @@ Rock::update(float elapsed_time)
 HitResponse
 Rock::collision(GameObject& object, const CollisionHit& )
 {
-  if(grabbed)
+  if(grabbed) {
     return FORCE_MOVE;
+  }
 
   if(object.get_flags() & FLAG_SOLID) {
-      physic.set_velocity(0, 0);
-      return CONTINUE;
+    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;