X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Ftrampoline.hpp;h=c7653c0ea839a536890deaa23faec30ea2cc5846;hb=ca967dcf4ee89f99880355be00782d1cd047be6a;hp=c534f54c669de04c8528dfa09f9c1b40ebb5cfec;hpb=ab9eab4c870195c2b60ce76b77044c35b31e8806;p=supertux.git diff --git a/src/object/trampoline.hpp b/src/object/trampoline.hpp index c534f54c6..c7653c0ea 100644 --- a/src/object/trampoline.hpp +++ b/src/object/trampoline.hpp @@ -22,13 +22,12 @@ #include "moving_sprite.hpp" #include "lisp/lisp.hpp" -#include "object/portable.hpp" -#include "physic.hpp" +#include "object/rock.hpp" /** * Jumping on a trampolin makes tux jump higher. */ -class Trampoline : public MovingSprite, public Portable +class Trampoline : public Rock { public: Trampoline(const lisp::Lisp& reader); @@ -42,10 +41,8 @@ public: bool is_portable() const; private: - Physic physic; - bool on_ground; bool portable; - bool grabbed; + }; #endif