X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Frock.hpp;h=86a8e0e1bdae8f741021fb627d372beac382ce32;hb=ae7bd4f460fdd93934fc0abc9589758a49309bda;hp=13c084029f7c4a54d5aa1af613e285ba6504750c;hpb=69f64fa8857405af7d2aac44b88a86f233615d2b;p=supertux.git

diff --git a/src/object/rock.hpp b/src/object/rock.hpp
index 13c084029..86a8e0e1b 100644
--- a/src/object/rock.hpp
+++ b/src/object/rock.hpp
@@ -28,24 +28,26 @@
 
 class Sprite;
 
-class Rock : public MovingSprite, public Portable, public Serializable
+class Rock : public MovingSprite, public Portable, protected UsesPhysic, public Serializable
 {
 public:
+  Rock(const Vector& pos, std::string spritename);
   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