X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftile_manager.cpp;h=5e941d0b34290af9814ee064de6be837fd554c84;hb=87b7bf0359f2fb87234fdc9241c9e02320175daa;hp=2bf90bfed8f170f17dd56a089c4d0d2731db9bf3;hpb=fd8c5a479875510f3171ad1e07a4ba4a375de2b8;p=supertux.git diff --git a/src/tile_manager.cpp b/src/tile_manager.cpp index 2bf90bfed..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) { @@ -56,8 +56,7 @@ void TileManager::load_tileset(std::string filename) } 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)