fixed broken 1-time animations in sprites, fixed collision code returning no-collisio...

[supertux.git] / src / tile_manager.h

diff --git a/src/tile_manager.h b/src/tile_manager.h
index 3e9052f..2faa362 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());
-    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
@@ -80,5 +89,3 @@ class TileManager
 };
 
 #endif
-
-/* EOF */