X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ftile_manager.hpp;h=319b819108c3e0917eb618fbd5f1e32361664996;hb=29105e18dddff812201aec7872b1d232b68f9dbc;hp=5cd6fc2dc98011d6d7fe51c22bc2e8c2e8b5965d;hpb=67690e081c28b818e94796be284206326bc8a6b9;p=supertux.git diff --git a/src/tile_manager.hpp b/src/tile_manager.hpp index 5cd6fc2dc..319b81910 100644 --- a/src/tile_manager.hpp +++ b/src/tile_manager.hpp @@ -1,7 +1,8 @@ // $Id$ -// +// // SuperTux // Copyright (C) 2004 Tobias Glaesser +// Copyright (C) 2006 Matthias Braun // // 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 #include #include -#include "msg.hpp" +#include "log.hpp" #include "tile.hpp" struct TileGroup @@ -70,7 +71,7 @@ public: assert(id < tiles.size()); Tile* tile = tiles[id]; if(!tile) { - msg_warning << "Invalid tile: " << id << std::endl; + log_warning << "Invalid tile: " << id << std::endl; return tiles[0]; } @@ -96,4 +97,6 @@ public: } }; +extern TileManager* tile_manager; + #endif