Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

[supertux.git] / src / trigger / climbable.hpp

diff --git a/src/trigger/climbable.hpp b/src/trigger/climbable.hpp
index 359985f..3e45484 100644 (file)
--- a/src/trigger/climbable.hpp
+++ b/src/trigger/climbable.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux - Climbable area
 //  Copyright (C) 2007 Christoph Sommer <christoph.sommer@2007.expires.deltadevelopment.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,28 +12,27 @@
 //  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 __CLIMBABLE_H__
-#define __CLIMBABLE_H__
+#ifndef HEADER_SUPERTUX_TRIGGER_CLIMBABLE_HPP
+#define HEADER_SUPERTUX_TRIGGER_CLIMBABLE_HPP
 
-#include "trigger_base.hpp"
-#include "serializable.hpp"
-#include "resources.hpp"
+#include "supertux/resources.hpp"
+#include "supertux/timer.hpp"
+#include "trigger/trigger_base.hpp"
+#include "util/reader_fwd.hpp"
 #include "video/drawing_context.hpp"
-#include "timer.hpp"
-#include "object/player.hpp"
 
-class Climbable : public TriggerBase, public Serializable
+class Player;
+
+class Climbable : public TriggerBase
 {
   static Color text_color;
 public:
-  Climbable(const lisp::Lisp& reader);
+  Climbable(const Reader& reader);
   Climbable(const Rect& area);
   ~Climbable();
 
-  void write(lisp::Writer& writer);
   void event(Player& player, EventType type);
   void update(float elapsed_time);
   void draw(DrawingContext& context);
@@ -48,6 +45,12 @@ public:
 protected:
   Player* climbed_by; /**< set to player who's currently climbing us, null if nobody is */
   Timer activate_try_timer; /**< try to correct mis-alignment while this timer runs */
+
+private:
+  Climbable(const Climbable&);
+  Climbable& operator=(const Climbable&);
 };
 
 #endif
+
+/* EOF */