#include "supertux/tile_manager.hpp"
#include <limits>
-#include <memory>
#include "lisp/list_iterator.hpp"
#include "supertux/tile_set.hpp"
-TileManager* tile_manager = NULL;
-TileSet* current_tileset = NULL;
-
-TileManager::TileManager()
+TileManager::TileManager() :
+ tilesets()
{
}
if(i != tilesets.end())
return i->second;
- std::auto_ptr<TileSet> tileset (new TileSet(filename));
+ std::unique_ptr<TileSet> tileset (new TileSet(filename));
tilesets.insert(std::make_pair(filename, tileset.get()));
return tileset.release();
TileSet* TileManager::parse_tileset_definition(const Reader& reader)
{
- std::auto_ptr<TileSet> result(new TileSet());
+ std::unique_ptr<TileSet> result(new TileSet());
lisp::ListIterator iter(&reader);
while(iter.next()) {