X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fworldmap%2Fsprite_change.cpp;h=48c425ae2d9c4c1106b093d0d0fd9029402865b4;hb=18c69f4aa24d496f84a088d60c18b180c293dace;hp=18c10cf4122aa82ea2b6b1e0fc93103fc59701d0;hpb=7bb247564b8236e60384827137e57f328f9614f5;p=supertux.git diff --git a/src/worldmap/sprite_change.cpp b/src/worldmap/sprite_change.cpp index 18c10cf41..48c425ae2 100644 --- a/src/worldmap/sprite_change.cpp +++ b/src/worldmap/sprite_change.cpp @@ -17,12 +17,13 @@ #include "sprite/sprite.hpp" #include "sprite/sprite_manager.hpp" +#include "util/reader.hpp" #include "video/drawing_context.hpp" #include "worldmap/sprite_change.hpp" namespace WorldMapNS { -SpriteChange::SpriteChange(const lisp::Lisp* lisp) : +SpriteChange::SpriteChange(const Reader& lisp) : pos(), change_on_touch(false), sprite(), @@ -30,18 +31,18 @@ SpriteChange::SpriteChange(const lisp::Lisp* lisp) : stay_group(), in_stay_action(false) { - lisp->get("x", pos.x); - lisp->get("y", pos.y); - lisp->get("change-on-touch", change_on_touch); + lisp.get("x", pos.x); + lisp.get("y", pos.y); + lisp.get("change-on-touch", change_on_touch); std::string spritefile = ""; - lisp->get("sprite", spritefile); + lisp.get("sprite", spritefile); sprite = sprite_manager->create(spritefile); - lisp->get("stay-action", stay_action); - lisp->get("initial-stay-action", in_stay_action); + lisp.get("stay-action", stay_action); + lisp.get("initial-stay-action", in_stay_action); - lisp->get("stay-group", stay_group); + lisp.get("stay-group", stay_group); all_sprite_changes.push_back(this); }