X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftile_manager.cpp;h=bbc3cffe73d1fd28c20835192a57f531e6f5eedc;hb=7504b8ef1155259916f0e38eeb74a6024bb1d85b;hp=d301867e3c7c1d93a4ddfa67f439b8ab179706ef;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git diff --git a/src/tile_manager.cpp b/src/tile_manager.cpp index d301867e3..bbc3cffe7 100644 --- a/src/tile_manager.cpp +++ b/src/tile_manager.cpp @@ -35,6 +35,8 @@ #include "tile_manager.hpp" #include "resources.hpp" +TileManager* tile_manager = NULL; + TileManager::TileManager(const std::string& filename) { #ifdef DEBUG @@ -65,7 +67,7 @@ void TileManager::load_tileset(std::string filename) } else { tiles_path = filename.substr(0, t+1); } - + lisp::Parser parser; std::auto_ptr root (parser.parse(filename)); @@ -99,7 +101,7 @@ void TileManager::load_tileset(std::string filename) std::string image; // width and height of the image in tile units, this is used for two - // purposes: + // purposes: // a) so we don't have to load the image here to know its dimensions // b) so that the resulting 'tiles' entry is more robust, // ie. enlarging the image won't break the tile id mapping @@ -135,7 +137,7 @@ void TileManager::load_tileset(std::string filename) tiles[ids[i]] = tile; } } - + } else if(iter.item() == "properties") { // deprecated } else { @@ -143,4 +145,3 @@ void TileManager::load_tileset(std::string filename) } } } -