X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fworldmap%2Fspecial_tile.cpp;h=9fba90b465185ff49afb2bf6246b4fa385ec3362;hb=24fc5a4c6959f07a6925dd2ab1af3da7fd982007;hp=9bc419d72f75fd1e18b514e481b5aedae3d38d7c;hpb=12a28b64dcce9c7ff706451b4f3aecd201cc8a5f;p=supertux.git diff --git a/src/worldmap/special_tile.cpp b/src/worldmap/special_tile.cpp index 9bc419d72..9fba90b46 100644 --- a/src/worldmap/special_tile.cpp +++ b/src/worldmap/special_tile.cpp @@ -18,12 +18,13 @@ #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) : +SpecialTile::SpecialTile(const Reader& lisp) : pos(), sprite(), map_message(), @@ -35,22 +36,22 @@ SpecialTile::SpecialTile(const lisp::Lisp* lisp) : 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;