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

diff --git a/src/object/trampoline.hpp b/src/object/trampoline.hpp
index f856ca017..27cea23cb 100644
--- a/src/object/trampoline.hpp
+++ b/src/object/trampoline.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
-//  SuperTux - Trampolin
+//  SuperTux - Trampoline
 //  Copyright (C) 2006 Wolfgang Becker <uafr@gmx.de>
 //
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,38 +12,34 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef SUPERTUX_TRAMPOLINE_H
-#define SUPERTUX_TRAMPOLINE_H
+#ifndef HEADER_SUPERTUX_OBJECT_TRAMPOLINE_HPP
+#define HEADER_SUPERTUX_OBJECT_TRAMPOLINE_HPP
 
-#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);
-  
+  Trampoline(const Reader& 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
 
+/* EOF */