X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftile_manager.h;h=2faa36224382c09295cfd810e62639983d5d2743;hb=6e843b1780f62f45b7021bd8c38181aa211588ee;hp=3e9052f671cc026f125bb41489dfacd0160e15f2;hpb=d46c78c842ab4090a3f46e560c891234167f124b;p=supertux.git

diff --git a/src/tile_manager.h b/src/tile_manager.h
index 3e9052f67..2faa36224 100644
--- 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 */