Updated addon repository URL and improved debug output on download

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

diff --git a/src/worldmap/teleporter.hpp b/src/worldmap/teleporter.hpp
index b9aa262..f0fa176 100644 (file)
--- a/src/worldmap/teleporter.hpp
+++ b/src/worldmap/teleporter.hpp
@@ -20,27 +20,28 @@
 #include <memory>
 #include <string>
 
-#include "lisp/lisp.hpp"
 #include "math/vector.hpp"
 #include "supertux/game_object.hpp"
+#include "util/reader_fwd.hpp"
 
 class Sprite;
 
-namespace WorldMapNS {
+namespace worldmap {
 
 class Teleporter : public GameObject
 {
 public:
-  Teleporter(const lisp::Lisp* lisp);
+  Teleporter(const Reader& lisp);
 
   virtual void draw(DrawingContext& context);
   virtual void update(float elapsed_time);
 
+public:
   /** Position (in tiles, not pixels) */
   Vector pos;
 
   /** Sprite to render, or 0 for no sprite */
-  std::auto_ptr<Sprite> sprite;
+  SpritePtr sprite;
 
   /** Worldmap filename (relative to data root) to teleport to. Leave empty to use current word */
   std::string worldmap;
@@ -53,10 +54,9 @@ public:
 
   /** optional map message to display */
   std::string message;
-
 };
 
-}
+} // namespace worldmap
 
 #endif