X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftile_manager.hpp;h=64906cf09035e4fc55d0a79b83119177c4578d90;hb=c655b296af60a436a8ce2bf0e6ede4f72eae0580;hp=66568ba57353bb52d8facbb9bc9c8daa9ac340cb;hpb=0f0e6a3689e5d810ec55b68ff455210b1081a021;p=supertux.git

diff --git a/src/tile_manager.hpp b/src/tile_manager.hpp
index 66568ba57..64906cf09 100644
--- a/src/tile_manager.hpp
+++ b/src/tile_manager.hpp
@@ -1,7 +1,8 @@
 //  $Id$
-// 
+//
 //  SuperTux
 //  Copyright (C) 2004 Tobias Glaesser <tobi.web@gmx.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -12,7 +13,7 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
@@ -28,7 +29,7 @@
 #include <iostream>
 #include <stdint.h>
 #include <assert.h>
-#include "msg.hpp"
+#include "log.hpp"
 #include "tile.hpp"
 
 struct TileGroup
@@ -52,7 +53,7 @@ private:
   std::set<TileGroup> tilegroups;
 
   std::string tiles_path;
-  
+
   void load_tileset(std::string filename);
 
 public:
@@ -70,13 +71,13 @@ public:
     assert(id < tiles.size());
     Tile* tile = tiles[id];
     if(!tile) {
-      msg_warning("Invalid tile: " << id);
+      log_warning << "Invalid tile: " << id << std::endl;
       return tiles[0];
     }
 
     if(tile->images.size() == 0 && tile->imagespecs.size() != 0)
       tile->load_images(tiles_path);
-    
+
     return tile;
   }
 
@@ -96,4 +97,6 @@ public:
   }
 };
 
+extern TileManager* tile_manager;
+
 #endif