X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Frock.hpp;h=099d7caced33b8dc9c892a055e16dc4c97087e38;hb=4587bd9c8fc5cbb20f1e442de76bc06571ab56ba;hp=8ce1cb40be1afc9231bf479231421e77c743c3ae;hpb=a113d3bd1feddd510e3b2852b0d42522735eee40;p=supertux.git diff --git a/src/object/rock.hpp b/src/object/rock.hpp index 8ce1cb40b..099d7cace 100644 --- a/src/object/rock.hpp +++ b/src/object/rock.hpp @@ -28,10 +28,11 @@ 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); @@ -42,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