- added support for variable width fonts (not fully finished, needs some more cleanup...

[supertux.git] / src / level.cpp

diff --git a/src/level.cpp b/src/level.cpp
index dccfbd8..c0f5b25 100644 (file)
--- a/src/level.cpp
+++ b/src/level.cpp
@@ -44,6 +44,7 @@
 #include "object/camera.hpp"
 #include "object/tilemap.hpp"
 #include "object/coin.hpp"
+#include "object/block.hpp"
 
 using namespace std;
 
@@ -90,10 +91,9 @@ Level::load(const std::string& filepath)
         add_sector(sector);
       } else {
         log_warning << "Unknown token '" << token << "' in level file" << std::endl;
-        continue;
       }
     }
-    
+
   } catch(std::exception& e) {
     std::stringstream msg;
     msg << "Problem when reading level '" << filepath << "': " << e.what();
@@ -184,7 +184,6 @@ Level::get_sector(size_t num)
 int
 Level::get_total_coins()
 {
-  // FIXME not really correct as coins can also be inside blocks...
   int total_coins = 0;
   for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i) {
     Sector* sector = *i;
@@ -192,7 +191,27 @@ Level::get_total_coins()
         o != sector->gameobjects.end(); ++o) {
       Coin* coin = dynamic_cast<Coin*> (*o);
       if(coin)
+      {
         total_coins++;
+        continue;
+      }
+      BonusBlock *block = dynamic_cast<BonusBlock*> (*o);
+      if(block)
+      {
+        if (block->contents == BonusBlock::CONTENT_COIN)
+        {
+          total_coins++;
+          continue;
+        }
+#if 0
+        // FIXME: do we want this? q.v. src/object/oneup.cpp
+        else if (block->contents == BonusBlock::CONTENT_1UP)
+        {
+          total_coins += 100;
+          continue;
+        }
+#endif
+      }
     }
   }
   return total_coins;