X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Frock.hpp;h=86a8e0e1bdae8f741021fb627d372beac382ce32;hb=ae7bd4f460fdd93934fc0abc9589758a49309bda;hp=fb1fb0ca06afa45c6402970ab1d9657f7c16a5bf;hpb=7e8b3b067e71c7467fba587438c1bf7259f7ae6e;p=supertux.git diff --git a/src/object/rock.hpp b/src/object/rock.hpp index fb1fb0ca0..86a8e0e1b 100644 --- a/src/object/rock.hpp +++ b/src/object/rock.hpp @@ -28,9 +28,10 @@ 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); } @@ -43,10 +44,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; };