X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Flevel.cpp;h=f317b22ac1e72785cd5556ba5bc7df38c96a2b7d;hb=8def1b51aa9d94b719ce975b88cd58c936d7c06e;hp=fd954a707eef44b53dbaf1381ed54ef505c6bc08;hpb=d46c78c842ab4090a3f46e560c891234167f124b;p=supertux.git

diff --git a/src/level.cpp b/src/level.cpp
index fd954a707..f317b22ac 100644
--- a/src/level.cpp
+++ b/src/level.cpp
@@ -252,10 +252,22 @@ int
 Level::get_total_coins()
 {
   int total_coins = 0;
-  for(Sectors::iterator it = sectors.begin(); it != sectors.end(); ++it)
-    for(int x = 0; static_cast<unsigned int>(x) < it->second->solids->get_width(); x++)
-      for(int y = 0; static_cast<unsigned int>(y) < it->second->solids->get_height(); y++)
-        if(it->second->solids->get_tile(x,y)->attributes & Tile::COIN)
+  for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i) {
+    TileMap* solids = i->second->solids;
+    if(!solids) {
+      std::cerr << "Sector '" << i->first << "' contains no solids!?!\n";
+      continue;
+    }
+    for(size_t x = 0; x < solids->get_width(); ++x)
+      for(size_t y = 0; y < solids->get_height(); ++y) {
+        const Tile* tile = solids->get_tile(x, y);
+        if(tile == 0) {
+          std::cerr << "Invalid tile in sector '" << i->first << "'.\n";
+          continue;
+        }
+        if(tile->attributes & Tile::COIN)
           total_coins++;
+      }
+  }
   return total_coins;
 }