X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Ftrampoline.hpp;h=6e94f7629b22882f82c854357d2c98874fda9d1e;hb=555d1b7bebb45326d82d934e07463209837309b0;hp=f856ca017ba957012d7a03605e0ab60035e61539;hpb=6a38ca588956d34a22bda9ef1beb53582610b4b5;p=supertux.git

diff --git a/src/object/trampoline.hpp b/src/object/trampoline.hpp
index f856ca017..6e94f7629 100644
--- a/src/object/trampoline.hpp
+++ b/src/object/trampoline.hpp
@@ -1,6 +1,6 @@
 //  $Id$
 //
-//  SuperTux - Trampolin
+//  SuperTux - Trampoline
 //  Copyright (C) 2006 Wolfgang Becker <uafr@gmx.de>
 //
 //  This program is free software; you can redistribute it and/or
@@ -22,30 +22,27 @@
 
 #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.
+/**
+ * Jumping on a trampoline makes tux jump higher.
  */
-class Trampoline : public MovingSprite, 
-                   public Portable
-                 
+class Trampoline : public Rock
 {
 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 collision_solid(const CollisionHit& hit);
+  void update(float elapsed_time);
+
+  void grab(MovingObject&, const Vector& pos, Direction);
+  void ungrab(MovingObject&, Direction);
+  bool is_portable() const;
 
-  void grab( MovingObject&, const Vector& pos, Direction );
-  void ungrab(MovingObject& , Direction );
-  
 private:
-  Physic physic;
-  bool on_ground;
+  bool portable;
+
 };
 
 #endif
-