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

[supertux.git] / src / worldmap / special_tile.hpp

diff --git a/src/worldmap/special_tile.hpp b/src/worldmap/special_tile.hpp
index 068c01f..ee08f60 100644 (file)
--- a/src/worldmap/special_tile.hpp
+++ b/src/worldmap/special_tile.hpp
@@ -1,13 +1,11 @@
-//  $Id: worldmap.hpp 3327 2006-04-13 15:02:40Z ravu_al_hemio $
-//
 //  SuperTux
 //  Copyright (C) 2004 Ingo Ruhnke <grumbel@gmx.de>
 //  Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.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
@@ -15,21 +13,21 @@
 //  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 __WORLDMAP_SPECIAL_TILE_HPP__
-#define __WORLDMAP_SPECIAL_TILE_HPP__
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef HEADER_SUPERTUX_WORLDMAP_SPECIAL_TILE_HPP
+#define HEADER_SUPERTUX_WORLDMAP_SPECIAL_TILE_HPP
 
 #include <memory>
 #include <string>
-#include "game_object.hpp"
-#include "math/vector.hpp"
+
 #include "lisp/lisp.hpp"
+#include "math/vector.hpp"
+#include "supertux/game_object.hpp"
 
 class Sprite;
 
-namespace WorldMapNS
-{
+namespace WorldMapNS {
 
 class SpecialTile : public GameObject
 {
@@ -41,13 +39,10 @@ public:
   virtual void update(float elapsed_time);
 
   Vector pos;
-  
+
   /** Sprite to render instead of guessing what image to draw */
   std::auto_ptr<Sprite> sprite;
 
-  /** Position to swap to player */
-  Vector teleport_dest;
-
   /** Message to show in the Map */
   std::string map_message;
   bool passive_message;
@@ -69,3 +64,4 @@ public:
 
 #endif
 
+/* EOF */