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

[supertux.git] / src / object / moving_sprite.cpp

diff --git a/src/object/moving_sprite.cpp b/src/object/moving_sprite.cpp
index b98972f..a9d877a 100644 (file)
--- a/src/object/moving_sprite.cpp
+++ b/src/object/moving_sprite.cpp
@@ -21,11 +21,11 @@
 
 #include <stdexcept>
 
-MovingSprite::MovingSprite(const Vector& pos, const std::string& sprite_name, 
-                           int layer, CollisionGroup collision_group) :
-  sprite_name(sprite_name), 
+MovingSprite::MovingSprite(const Vector& pos, const std::string& sprite_name_,
+                           int layer_, CollisionGroup collision_group) :
+  sprite_name(sprite_name_),
   sprite(),
-  layer(layer)
+  layer(layer_)
 {
   bbox.set_pos(pos);
   sprite = sprite_manager->create(sprite_name);
@@ -33,10 +33,10 @@ MovingSprite::MovingSprite(const Vector& pos, const std::string& sprite_name,
   set_group(collision_group);
 }
 
-MovingSprite::MovingSprite(const Reader& reader, const Vector& pos, int layer, CollisionGroup collision_group) :
-  sprite_name(), 
+MovingSprite::MovingSprite(const Reader& reader, const Vector& pos, int layer_, CollisionGroup collision_group) :
+  sprite_name(),
   sprite(),
-  layer(layer)
+  layer(layer_)
 {
   bbox.set_pos(pos);
   if (!reader.get("sprite", sprite_name))
@@ -47,10 +47,10 @@ MovingSprite::MovingSprite(const Reader& reader, const Vector& pos, int layer, C
   set_group(collision_group);
 }
 
-MovingSprite::MovingSprite(const Reader& reader, const std::string& sprite_name, int layer, CollisionGroup collision_group) :
-  sprite_name(sprite_name), 
+MovingSprite::MovingSprite(const Reader& reader, const std::string& sprite_name_, int layer_, CollisionGroup collision_group) :
+  sprite_name(sprite_name_),
   sprite(),
-  layer(layer)
+  layer(layer_)
 {
   reader.get("x", bbox.p1.x);
   reader.get("y", bbox.p1.y);
@@ -61,10 +61,10 @@ MovingSprite::MovingSprite(const Reader& reader, const std::string& sprite_name,
   set_group(collision_group);
 }
 
-MovingSprite::MovingSprite(const Reader& reader, int layer, CollisionGroup collision_group) :
+MovingSprite::MovingSprite(const Reader& reader, int layer_, CollisionGroup collision_group) :
   sprite_name(),
   sprite(),
-  layer(layer)
+  layer(layer_)
 {
   reader.get("x", bbox.p1.x);
   reader.get("y", bbox.p1.y);
@@ -77,7 +77,7 @@ MovingSprite::MovingSprite(const Reader& reader, int layer, CollisionGroup colli
 }
 
 MovingSprite::MovingSprite(const MovingSprite& other) :
-  MovingObject(other), 
+  MovingObject(other),
   sprite_name(),
   sprite(),
   layer(other.layer)
@@ -124,10 +124,10 @@ MovingSprite::set_action(const std::string& action, int loops)
 void
 MovingSprite::set_action_centered(const std::string& action, int loops)
 {
-  Vector old_size = bbox.get_size();
+  Vector old_size = bbox.get_size().as_vector();
   sprite->set_action(action, loops);
   set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height());
-  set_pos(get_pos() - (bbox.get_size() - old_size) / 2);
+  set_pos(get_pos() - (bbox.get_size().as_vector() - old_size) / 2);
 }
 
 void