X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Ftrampoline.hpp;h=c7653c0ea839a536890deaa23faec30ea2cc5846;hb=ca967dcf4ee89f99880355be00782d1cd047be6a;hp=df751d8ff2cd84ba7a48fc967c509358a5f987be;hpb=fc3e6ecf693c3ccc10499a06c2c07e52cd95ebc9;p=supertux.git

diff --git a/src/object/trampoline.hpp b/src/object/trampoline.hpp
index df751d8ff..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);
@@ -37,15 +36,13 @@ public:
   void collision_solid(const CollisionHit& hit);
   void update(float elapsed_time);
 
-  void grab( MovingObject&, const Vector& pos, Direction );
-  void ungrab(MovingObject& , Direction );
+  void grab(MovingObject&, const Vector& pos, Direction);
+  void ungrab(MovingObject&, Direction);
   bool is_portable() const;
 
 private:
-  Physic physic;
-  bool on_ground;
   bool portable;
-  bool grabbed;
+
 };
 
 #endif