X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Ftrampoline.hpp;h=8f846c6557985fe6e99f8b0891231dc7e25a610d;hb=a113d3bd1feddd510e3b2852b0d42522735eee40;hp=f856ca017ba957012d7a03605e0ab60035e61539;hpb=ff4c6994b952e26b854461d739eb3bcbfc30719f;p=supertux.git diff --git a/src/object/trampoline.hpp b/src/object/trampoline.hpp index f856ca017..8f846c655 100644 --- a/src/object/trampoline.hpp +++ b/src/object/trampoline.hpp @@ -25,27 +25,26 @@ #include "object/portable.hpp" #include "physic.hpp" -/** +/** * Jumping on a trampolin makes tux jump higher. */ -class Trampoline : public MovingSprite, +class Trampoline : public MovingSprite, public Portable - + { public: Trampoline(const lisp::Lisp& reader); - + HitResponse collision(GameObject& other, const CollisionHit& hit); void collision_solid( const CollisionHit& hit ); void update( float elapsed_time ); void grab( MovingObject&, const Vector& pos, Direction ); void ungrab(MovingObject& , Direction ); - + private: Physic physic; bool on_ground; }; #endif -