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

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

diff --git a/src/worldmap/special_tile.cpp b/src/worldmap/special_tile.cpp
index a8e5616..3022214 100644 (file)
--- a/src/worldmap/special_tile.cpp
+++ b/src/worldmap/special_tile.cpp
@@ -1,13 +1,11 @@
-//  $Id$
-//
 //  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,17 +13,15 @@
 //  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/>.
 #include <config.h>
 
-#include "worldmap/special_tile.hpp"
-#include "sprite/sprite_manager.hpp"
 #include "sprite/sprite.hpp"
+#include "sprite/sprite_manager.hpp"
 #include "video/drawing_context.hpp"
+#include "worldmap/special_tile.hpp"
 
-namespace WorldMapNS
-{
+namespace WorldMapNS {
 
 SpecialTile::SpecialTile(const lisp::Lisp* lisp)
   : passive_message(false), invisible(false),
@@ -39,7 +35,7 @@ SpecialTile::SpecialTile(const lisp::Lisp* lisp)
   if(!invisible) {
     std::string spritefile = "";
     lisp->get("sprite", spritefile);
-    sprite.reset(sprite_manager->create(spritefile));
+    sprite = sprite_manager->create(spritefile);
   }
 
   lisp->get("map-message", map_message);
@@ -83,3 +79,5 @@ SpecialTile::update(float )
 }
 
 }
+
+/* EOF */