[Super-tux-commit] supertux/src tile_manager.h,1.5,1.6
Brought to you by:
wkendrick
From: Ingo R. <gr...@us...> - 2004-11-23 16:49:24
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30254 Modified Files: tile_manager.h Log Message: let the TileManager always return a valid tile in case of error Index: tile_manager.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/tile_manager.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- tile_manager.h 20 Nov 2004 22:14:39 -0000 1.5 +++ tile_manager.h 23 Nov 2004 16:49:13 -0000 1.6 @@ -70,7 +70,16 @@ const Tile* get(uint32_t id) const { assert(id < tiles.size()); - return tiles[id]; + Tile* t = tiles[id]; + if (t) + { + return t; + } + else + { + std::cout << "TileManager: Invalid tile: " << id << std::endl; + return tiles[0]; + } } uint32_t get_max_tileid() const |