X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Frock.hpp;h=099d7caced33b8dc9c892a055e16dc4c97087e38;hb=4587bd9c8fc5cbb20f1e442de76bc06571ab56ba;hp=fb1fb0ca06afa45c6402970ab1d9657f7c16a5bf;hpb=7e8b3b067e71c7467fba587438c1bf7259f7ae6e;p=supertux.git diff --git a/src/object/rock.hpp b/src/object/rock.hpp index fb1fb0ca0..099d7cace 100644 --- 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,9 @@ 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; };