Merged gravity patch by T. Goya

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

diff --git a/src/object/rock.hpp b/src/object/rock.hpp
index 5bbc514..099d7ca 100644 (file)
--- a/src/object/rock.hpp
+++ b/src/object/rock.hpp
@@ -28,7 +28,7 @@
 
 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);
@@ -43,10 +43,10 @@ public:
   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