X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftile.cpp;h=9e0d39bdd27d6a0fcc30799d66813be05987ff96;hb=657fc40723665c04b3150946f5bd66b6b0af9230;hp=900fc5b4c5bd423601c4fbc67ddd37e7333fe39b;hpb=e4659ed25323e8e988d2826ff2082fac602e682c;p=supertux.git diff --git a/src/tile.cpp b/src/tile.cpp index 900fc5b4c..9e0d39bdd 100644 --- a/src/tile.cpp +++ b/src/tile.cpp @@ -18,17 +18,18 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA // 02111-1307, USA. + #include +#include "tile.hpp" + #include #include #include #include #include "lisp/lisp.hpp" -#include "tile.hpp" #include "tile_set.hpp" -#include "resources.hpp" #include "timer.hpp" #include "math/vector.hpp" #include "video/drawing_context.hpp" @@ -105,9 +106,19 @@ Tile::parse(const lisp::Lisp& reader) attributes |= SOLID | SLOPE; } - const lisp::Lisp* images = reader.get_lisp("images"); + const lisp::Lisp* images; +#ifdef DEBUG + images = reader.get_lisp("editor-images"); if(images) parse_images(*images); + else { +#endif /*DEBUG*/ + images = reader.get_lisp("images"); + if(images) + parse_images(*images); +#ifdef DEBUG + } +#endif /*DEBUG*/ correct_attributes(); return id;