Wreorder fix

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

diff --git a/src/worldmap/special_tile.cpp b/src/worldmap/special_tile.cpp
index 9bc419d..ccd3ea3 100644 (file)
--- a/src/worldmap/special_tile.cpp
+++ b/src/worldmap/special_tile.cpp
@@ -1,5 +1,5 @@
 //  SuperTux
-//  Copyright (C) 2004 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2004 Ingo Ruhnke <grumbel@gmail.com>
 //  Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>
 //
 //  This program is free software: you can redistribute it and/or modify
@@ -18,39 +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 {
+namespace worldmap {
 
-SpecialTile::SpecialTile(const lisp::Lisp* lisp) :
+SpecialTile::SpecialTile(const Reader& lisp) :
   pos(),
   sprite(),
   map_message(),
-  passive_message(false), 
+  passive_message(false),
   script(),
   invisible(false),
-  apply_action_north(true), 
+  apply_action_north(true),
   apply_action_east(true),
-  apply_action_south(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);
-    sprite = sprite_manager->create(spritefile);
+    lisp.get("sprite", spritefile);
+    sprite = SpriteManager::current()->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;