Made code -Wshadow clean, missed a bunch of issues in the last commit

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

diff --git a/src/supertux/sector.cpp b/src/supertux/sector.cpp
index 4be9329..86491e1 100644 (file)
--- a/src/supertux/sector.cpp
+++ b/src/supertux/sector.cpp
@@ -54,6 +54,7 @@
 #include "supertux/level.hpp"
 #include "supertux/object_factory.hpp"
 #include "supertux/player_status.hpp"
+#include "supertux/savegame.hpp"
 #include "supertux/spawn_point.hpp"
 #include "supertux/tile.hpp"
 #include "trigger/sequence_trigger.hpp"
@@ -65,7 +66,7 @@ bool Sector::show_collrects = false;
 bool Sector::draw_solids_only = false;
 
 Sector::Sector(Level* parent) :
-  level(parent), 
+  level(parent),
   name(),
   bullets(),
   init_script(),
@@ -73,19 +74,19 @@ Sector::Sector(Level* parent) :
   currentmusic(LEVEL_MUSIC),
   sector_table(),
   scripts(),
-  ambient_light( 1.0f, 1.0f, 1.0f, 1.0f ), 
+  ambient_light( 1.0f, 1.0f, 1.0f, 1.0f ),
   gameobjects(),
   moving_objects(),
   spawnpoints(),
   portables(),
   music(),
-  gravity(10.0), 
-  player(0), 
+  gravity(10.0),
+  player(0),
   solid_tilemaps(),
-  camera(0), 
+  camera(0),
   effect(0)
 {
-  add_object(new Player(GameSession::current()->get_player_status(), "Tux"));
+  add_object(new Player(GameSession::current()->get_savegame().get_player_status(), "Tux"));
   add_object(new DisplayEffect("Effect"));
   add_object(new TextObject("Text"));
 
@@ -144,37 +145,37 @@ Sector::get_level()
 }
 
 GameObject*
-Sector::parse_object(const std::string& name, const Reader& reader)
+Sector::parse_object(const std::string& name_, const Reader& reader)
 {
-  if(name == "camera") {
-    Camera* camera = new Camera(this, "Camera");
-    camera->parse(reader);
-    return camera;
-  } else if(name == "particles-snow") {
+  if(name_ == "camera") {
+    Camera* camera_ = new Camera(this, "Camera");
+    camera_->parse(reader);
+    return camera_;
+  } else if(name_ == "particles-snow") {
     SnowParticleSystem* partsys = new SnowParticleSystem();
     partsys->parse(reader);
     return partsys;
-  } else if(name == "particles-rain") {
+  } else if(name_ == "particles-rain") {
     RainParticleSystem* partsys = new RainParticleSystem();
     partsys->parse(reader);
     return partsys;
-  } else if(name == "particles-comets") {
+  } else if(name_ == "particles-comets") {
     CometParticleSystem* partsys = new CometParticleSystem();
     partsys->parse(reader);
     return partsys;
-  } else if(name == "particles-ghosts") {
+  } else if(name_ == "particles-ghosts") {
     GhostParticleSystem* partsys = new GhostParticleSystem();
     partsys->parse(reader);
     return partsys;
-  } else if(name == "particles-clouds") {
+  } else if(name_ == "particles-clouds") {
     CloudParticleSystem* partsys = new CloudParticleSystem();
     partsys->parse(reader);
     return partsys;
-  } else if(name == "money") { // for compatibility with old maps
+  } else if(name_ == "money") { // for compatibility with old maps
     return new Jumpy(reader);
   } else {
     try {
-      return ObjectFactory::instance().create(name, reader);
+      return ObjectFactory::instance().create(name_, reader);
     } catch(std::exception& e) {
       log_warning << e.what() << "" << std::endl;
       return 0;
@@ -389,8 +390,8 @@ Sector::parse_old_format(const Reader& reader)
   }
 
   // add a camera
-  Camera* camera = new Camera(this, "Camera");
-  add_object(camera);
+  Camera* camera_ = new Camera(this, "Camera");
+  add_object(camera_);
 
   update_game_objects();
 
@@ -607,7 +608,7 @@ Sector::activate(const Vector& player_pos)
   camera->update(1);
   player->move(player->get_pos()+(Vector(32, 0)));
   camera->update(1);
-  
+
   update_game_objects();
 
   //Run default.nut just before init script
@@ -750,31 +751,31 @@ Sector::before_object_add(GameObject* object)
     solid_tilemaps.push_back(tilemap);
   }
 
-  Camera* camera = dynamic_cast<Camera*> (object);
-  if(camera != NULL) {
+  Camera* camera_ = dynamic_cast<Camera*> (object);
+  if(camera_ != NULL) {
     if(this->camera != 0) {
       log_warning << "Multiple cameras added. Ignoring" << std::endl;
       return false;
     }
-    this->camera = camera;
+    this->camera = camera_;
   }
 
-  Player* player = dynamic_cast<Player*> (object);
-  if(player != NULL) {
+  Player* player_ = dynamic_cast<Player*> (object);
+  if(player_ != NULL) {
     if(this->player != 0) {
       log_warning << "Multiple players added. Ignoring" << std::endl;
       return false;
     }
-    this->player = player;
+    this->player = player_;
   }
 
-  DisplayEffect* effect = dynamic_cast<DisplayEffect*> (object);
-  if(effect != NULL) {
+  DisplayEffect* effect_ = dynamic_cast<DisplayEffect*> (object);
+  if(effect_ != NULL) {
     if(this->effect != 0) {
       log_warning << "Multiple DisplayEffects added. Ignoring" << std::endl;
       return false;
     }
-    this->effect = effect;
+    this->effect = effect_;
   }
 
   if(_current == this) {
@@ -1013,7 +1014,7 @@ Sector::collision_tilemap(collision::Constraints* constraints,
         if(tile->is_slope ()) { // slope tile
           AATriangle triangle;
           int slope_data = tile->getData();
-          if (solids->get_drawing_effect() == VERTICAL_FLIP)
+          if (solids->get_drawing_effect() & VERTICAL_FLIP)
             slope_data = AATriangle::vertical_flip(slope_data);
           triangle = AATriangle(tile_bbox, slope_data);
 
@@ -1596,10 +1597,10 @@ Sector::get_ambient_blue()
 }
 
 void
-Sector::set_gravity(float gravity)
+Sector::set_gravity(float gravity_)
 {
   log_warning << "Changing a Sector's gravitational constant might have unforeseen side-effects" << std::endl;
-  this->gravity = gravity;
+  this->gravity = gravity_;
 }
 
 float