projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updated dispenser -- can summon mriceblock, snowball, bouncing_snowball and mrbomb now
[supertux.git]
/
src
/
tile_manager.h
diff --git
a/src/tile_manager.h
b/src/tile_manager.h
index
3e9052f
..
6c2e8cc
100644
(file)
--- a/
src/tile_manager.h
+++ b/
src/tile_manager.h
@@
-70,7
+70,16
@@
class TileManager
const Tile* get(uint32_t id) const
{
assert(id < tiles.size());
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
}
uint32_t get_max_tileid() const