X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fsupertux%2Flevel.cpp;h=386cd3f1179cb340c9d22dcece08475452be28a4;hb=5c7020e504303cf18e472283ab614ef08ad43b2c;hp=2a3674e0188a568c9da2540213d1851985316ceb;hpb=a52595afbb418f560e9a23ef59e0fb7661d2d995;p=supertux.git diff --git a/src/supertux/level.cpp b/src/supertux/level.cpp index 2a3674e01..386cd3f11 100644 --- a/src/supertux/level.cpp +++ b/src/supertux/level.cpp @@ -191,15 +191,14 @@ Level::get_total_coins() int total_coins = 0; for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i) { Sector* sector = *i; - for(Sector::GameObjects::iterator o = sector->gameobjects.begin(); - o != sector->gameobjects.end(); ++o) { - Coin* coin = dynamic_cast (*o); + for(auto o = sector->gameobjects.begin(); o != sector->gameobjects.end(); ++o) { + Coin* coin = dynamic_cast(o->get()); if(coin) { total_coins++; continue; } - BonusBlock *block = dynamic_cast (*o); + BonusBlock *block = dynamic_cast(o->get()); if(block) { if (block->contents == BonusBlock::CONTENT_COIN) @@ -214,7 +213,7 @@ Level::get_total_coins() continue; } } - GoldBomb *goldbomb = dynamic_cast (*o); + GoldBomb *goldbomb = dynamic_cast(o->get()); if(goldbomb) total_coins += 10; } @@ -235,7 +234,7 @@ int Level::get_total_secrets() { int total_secrets = 0; - for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i) + for(auto i = sectors.begin(); i != sectors.end(); ++i) total_secrets += (*i)->get_total_count(); return total_secrets; }