X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fsupertux%2Ftile_manager.cpp;h=0b8ff046a0c54dddaef92ab726fc86416dbe07eb;hb=f79ead8440107e01c4845315d8532e29497b1068;hp=a6873de36ebed9b5d5501441919a2b50f66e2d1a;hpb=08813a74da6ac1fd045a105e4e8105f1d7f716f0;p=supertux.git

diff --git a/src/supertux/tile_manager.cpp b/src/supertux/tile_manager.cpp
index a6873de36..0b8ff046a 100644
--- a/src/supertux/tile_manager.cpp
+++ b/src/supertux/tile_manager.cpp
@@ -18,15 +18,12 @@
 #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()
 {
 }
 
@@ -40,7 +37,7 @@ TileSet* TileManager::get_tileset(const std::string &filename)
   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();
@@ -48,7 +45,7 @@ TileSet* TileManager::get_tileset(const std::string &filename)
 
 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()) {