Const'ify methods in sector.cpp

[supertux.git] / src / supertux / level.cpp

diff --git a/src/supertux/level.cpp b/src/supertux/level.cpp
index 00d3335..311ec12 100644 (file)
--- a/src/supertux/level.cpp
+++ b/src/supertux/level.cpp
@@ -32,8 +32,8 @@
 using namespace std;
 
 Level::Level() :
-  name("noname"), 
-  author("Mr. X"), 
+  name("noname"),
+  author("Mr. X"),
   contact(),
   license(),
   filename(),
@@ -41,7 +41,7 @@ Level::Level() :
   sectors(),
   stats(),
   target_time(),
-  tileset(NULL), 
+  tileset(NULL),
   free_tileset(false)
 {
 }
@@ -70,14 +70,14 @@ Level::load(const std::string& filepath)
     level->get("version", version);
     if(version == 1) {
       log_info << "[" <<  filepath << "] level uses old format: version 1" << std::endl;
-      tileset = tile_manager->get_tileset("images/tiles.strf");
+      tileset = TileManager::current()->get_tileset("images/tiles.strf");
       load_old_format(*level);
       return;
     }
 
     const lisp::Lisp* tilesets_lisp = level->get_lisp("tilesets");
     if(tilesets_lisp != NULL) {
-      tileset      = tile_manager->parse_tileset_definition(*tilesets_lisp);
+      tileset      = TileManager::current()->parse_tileset_definition(*tilesets_lisp).release();
       free_tileset = true;
     }
     std::string tileset_name;
@@ -85,12 +85,12 @@ Level::load(const std::string& filepath)
       if(tileset != NULL) {
         log_warning << "[" <<  filepath << "] multiple tilesets specified in level" << std::endl;
       } else {
-        tileset = tile_manager->get_tileset(tileset_name);
+        tileset = TileManager::current()->get_tileset(tileset_name);
       }
     }
     /* load default tileset */
     if(tileset == NULL) {
-      tileset = tile_manager->get_tileset("images/tiles.strf");
+      tileset = TileManager::current()->get_tileset("images/tiles.strf");
     }
     current_tileset = tileset;
 
@@ -162,11 +162,11 @@ Level::add_sector(Sector* sector)
 }
 
 Sector*
-Level::get_sector(const std::string& name)
+Level::get_sector(const std::string& name_)
 {
   for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i) {
     Sector* sector = *i;
-    if(sector->get_name() == name)
+    if(sector->get_name() == name_)
       return sector;
   }
 
@@ -174,13 +174,13 @@ Level::get_sector(const std::string& name)
 }
 
 size_t
-Level::get_sector_count()
+Level::get_sector_count() const
 {
   return sectors.size();
 }
 
 Sector*
-Level::get_sector(size_t num)
+Level::get_sector(size_t num) const
 {
   return sectors.at(num);
 }
@@ -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<Coin*> (*o);
+    for(auto o = sector->gameobjects.begin(); o != sector->gameobjects.end(); ++o) {
+      Coin* coin = dynamic_cast<Coin*>(o->get());
       if(coin)
       {
         total_coins++;
         continue;
       }
-      BonusBlock *block = dynamic_cast<BonusBlock*> (*o);
+      BonusBlock *block = dynamic_cast<BonusBlock*>(o->get());
       if(block)
       {
         if (block->contents == BonusBlock::CONTENT_COIN)
@@ -214,7 +213,7 @@ Level::get_total_coins()
           continue;
         }
       }
-      GoldBomb *goldbomb = dynamic_cast<GoldBomb*> (*o);
+      GoldBomb *goldbomb = dynamic_cast<GoldBomb*>(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<SecretAreaTrigger>();
   return total_secrets;
 }