X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftile_manager.cpp;h=5e941d0b34290af9814ee064de6be837fd554c84;hb=c1583b50b204a0c9e50c7b7750db50d24ff5f6fa;hp=0c8024508cacc0cfe6ae8af04ee8fe6e09758905;hpb=4a54087f52d6a8a2e5b4c498e772685bb0885991;p=supertux.git diff --git a/src/tile_manager.cpp b/src/tile_manager.cpp index 0c8024508..5e941d0b3 100644 --- a/src/tile_manager.cpp +++ b/src/tile_manager.cpp @@ -22,13 +22,13 @@ #include #include #include -#include "video/drawing_context.h" -#include "lisp/lisp.h" -#include "lisp/parser.h" -#include "lisp/list_iterator.h" -#include "tile.h" -#include "tile_manager.h" -#include "resources.h" +#include "video/drawing_context.hpp" +#include "lisp/lisp.hpp" +#include "lisp/parser.hpp" +#include "lisp/list_iterator.hpp" +#include "tile.hpp" +#include "tile_manager.hpp" +#include "resources.hpp" TileManager::TileManager(const std::string& filename) { @@ -54,10 +54,9 @@ void TileManager::load_tileset(std::string filename) } else { tiles_path = filename.substr(0, t+1); } - + lisp::Parser parser; - std::auto_ptr root (parser.parse( - get_resource_filename(filename))); + std::auto_ptr root (parser.parse(filename)); const lisp::Lisp* tiles_lisp = root->get_lisp("supertux-tiles"); if(!tiles_lisp)