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

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

diff --git a/src/trigger/door.hpp b/src/trigger/door.hpp
index 925edd6..0e93611 100644 (file)
--- a/src/trigger/door.hpp
+++ b/src/trigger/door.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  Copyright (C) 2006 Matthias Braun <matze@braunis.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,30 +12,23 @@
 //  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.
-
-#ifndef SUPERTUX_DOOR_H
-#define SUPERTUX_DOOR_H
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <string>
+#ifndef HEADER_SUPERTUX_TRIGGER_DOOR_HPP
+#define HEADER_SUPERTUX_TRIGGER_DOOR_HPP
 
-#include "video/surface.hpp"
 #include "sprite/sprite.hpp"
-#include "trigger_base.hpp"
-#include "serializable.hpp"
-#include "timer.hpp"
-#include "object/player.hpp"
+#include "trigger/trigger_base.hpp"
+
+class Player;
 
-class Door : public TriggerBase, public Serializable
+class Door : public TriggerBase
 {
 public:
-  Door(const lisp::Lisp& reader);
+  Door(const Reader& reader);
   Door(int x, int y, std::string sector, std::string spawnpoint);
   virtual ~Door();
 
-  virtual void write(lisp::Writer& writer);
-
   virtual void update(float elapsed_time);
   virtual void draw(DrawingContext& context);
   virtual void event(Player& player, EventType type);
@@ -51,11 +42,14 @@ private:
     CLOSING
   };
 
+private:
   DoorState state; /**< current state of the door */
   std::string target_sector; /**< target sector to teleport to */
   std::string target_spawnpoint; /**< target spawnpoint to teleport to */
-  Sprite* sprite; /**< "door" sprite to render */
+  std::auto_ptr<Sprite> sprite; /**< "door" sprite to render */
   Timer stay_open_timer; /**< time until door will close again */
 };
 
 #endif
+
+/* EOF */