X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fworldmap%2Fspecial_tile.cpp;h=9fba90b465185ff49afb2bf6246b4fa385ec3362;hb=ce804ee356a732b967f5db8183fc70be27ca8ecc;hp=3022214e69cf12172ef7900a365b12fbae59c925;hpb=08813a74da6ac1fd045a105e4e8105f1d7f716f0;p=supertux.git

diff --git a/src/worldmap/special_tile.cpp b/src/worldmap/special_tile.cpp
index 3022214e6..9fba90b46 100644
--- a/src/worldmap/special_tile.cpp
+++ b/src/worldmap/special_tile.cpp
@@ -18,32 +18,40 @@
 
 #include "sprite/sprite.hpp"
 #include "sprite/sprite_manager.hpp"
+#include "util/reader.hpp"
 #include "video/drawing_context.hpp"
 #include "worldmap/special_tile.hpp"
 
 namespace WorldMapNS {
 
-SpecialTile::SpecialTile(const lisp::Lisp* lisp)
-  : passive_message(false), invisible(false),
-    apply_action_north(true), apply_action_east(true),
-    apply_action_south(true), apply_action_west(true)
+SpecialTile::SpecialTile(const Reader& lisp) :
+  pos(),
+  sprite(),
+  map_message(),
+  passive_message(false), 
+  script(),
+  invisible(false),
+  apply_action_north(true), 
+  apply_action_east(true),
+  apply_action_south(true), 
+  apply_action_west(true)
 {
-  lisp->get("x", pos.x);
-  lisp->get("y", pos.y);
-  lisp->get("invisible-tile", invisible);
+  lisp.get("x", pos.x);
+  lisp.get("y", pos.y);
+  lisp.get("invisible-tile", invisible);
 
   if(!invisible) {
     std::string spritefile = "";
-    lisp->get("sprite", spritefile);
+    lisp.get("sprite", spritefile);
     sprite = sprite_manager->create(spritefile);
   }
 
-  lisp->get("map-message", map_message);
-  lisp->get("passive-message", passive_message);
-  lisp->get("script", script);
+  lisp.get("map-message", map_message);
+  lisp.get("passive-message", passive_message);
+  lisp.get("script", script);
 
   std::string apply_direction;
-  lisp->get("apply-to-direction", apply_direction);
+  lisp.get("apply-to-direction", apply_direction);
   if(!apply_direction.empty()) {
     apply_action_north = false;
     apply_action_south = false;