X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Frock.hpp;h=099d7caced33b8dc9c892a055e16dc4c97087e38;hb=4587bd9c8fc5cbb20f1e442de76bc06571ab56ba;hp=207095e78a2bde8a01b2041c694c8d8e6e2f48a1;hpb=2892ebda09d24c977547159e34abf0244884b89e;p=supertux.git

diff --git a/src/object/rock.hpp b/src/object/rock.hpp
index 207095e78..099d7cace 100644
--- a/src/object/rock.hpp
+++ b/src/object/rock.hpp
@@ -28,22 +28,25 @@
 
 class Sprite;
 
-class Rock : public MovingSprite, public Portable, public Serializable
+class Rock : public MovingSprite, public Portable, protected UsesPhysic, public Serializable
 {
 public:
   Rock(const lisp::Lisp& reader);
+  Rock(const lisp::Lisp& reader, std::string spritename);
   virtual Rock* clone() const { return new Rock(*this); }
 
   void collision_solid(const CollisionHit& hit);
   HitResponse collision(GameObject& other, const CollisionHit& hit);
   void update(float elapsed_time);
   void write(lisp::Writer& writer);
-    
+
   void grab(MovingObject& object, const Vector& pos, Direction dir);
+  void ungrab(MovingObject& object, Direction dir);
 
-private:
+protected:
+  bool on_ground;
   bool grabbed;
-  Physic physic;
+  Vector last_movement;
 };
 
 #endif