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

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

diff --git a/src/worldmap/teleporter.cpp b/src/worldmap/teleporter.cpp
index d1a7ffb..b4425ed 100644 (file)
--- a/src/worldmap/teleporter.cpp
+++ b/src/worldmap/teleporter.cpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux - Teleporter Worldmap Tile
 //  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
@@ -14,17 +12,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/teleporter.hpp"
-#include "sprite/sprite_manager.hpp"
 #include "sprite/sprite.hpp"
+#include "sprite/sprite_manager.hpp"
 #include "video/drawing_context.hpp"
+#include "worldmap/teleporter.hpp"
 
-namespace WorldMapNS
-{
+namespace WorldMapNS {
 
 Teleporter::Teleporter(const lisp::Lisp* lisp)
   : automatic(false)
@@ -34,7 +30,7 @@ Teleporter::Teleporter(const lisp::Lisp* lisp)
 
   std::string spritefile = "";
   if (lisp->get("sprite", spritefile)) {
-    sprite.reset(sprite_manager->create(spritefile));
+    sprite = sprite_manager->create(spritefile);
   }
 
   lisp->get("worldmap", worldmap);
@@ -55,3 +51,5 @@ Teleporter::update(float )
 }
 
 }
+
+/* EOF */