X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fworldmap%2Fspecial_tile.hpp;h=991ab3bb3e4cd6b298d1300eae19d51cb9de9a83;hb=e449041f97af574103b20cca6d45c06d71677a98;hp=b2ea7ffd213fc0e6d25ef3ba428d6c628288cbfc;hpb=12a28b64dcce9c7ff706451b4f3aecd201cc8a5f;p=supertux.git diff --git a/src/worldmap/special_tile.hpp b/src/worldmap/special_tile.hpp index b2ea7ffd2..991ab3bb3 100644 --- a/src/worldmap/special_tile.hpp +++ b/src/worldmap/special_tile.hpp @@ -1,5 +1,5 @@ // SuperTux -// Copyright (C) 2004 Ingo Ruhnke +// Copyright (C) 2004 Ingo Ruhnke // Copyright (C) 2006 Christoph Sommer // // This program is free software: you can redistribute it and/or modify @@ -21,18 +21,17 @@ #include #include -#include "lisp/lisp.hpp" #include "math/vector.hpp" +#include "sprite/sprite_ptr.hpp" #include "supertux/game_object.hpp" +#include "util/reader_fwd.hpp" -class Sprite; - -namespace WorldMapNS { +namespace worldmap { class SpecialTile : public GameObject { public: - SpecialTile(const lisp::Lisp* lisp); + SpecialTile(const Reader& lisp); virtual ~SpecialTile(); virtual void draw(DrawingContext& context); @@ -42,7 +41,7 @@ public: Vector pos; /** Sprite to render instead of guessing what image to draw */ - std::auto_ptr sprite; + SpritePtr sprite; /** Message to show in the Map */ std::string map_message; @@ -61,7 +60,7 @@ public: bool apply_action_west; }; -} // namespace WorldMapNS +} // namespace worldmap #endif