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

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

diff --git a/src/object/infoblock.cpp b/src/object/infoblock.cpp
index 4269829..3996070 100644 (file)
--- a/src/object/infoblock.cpp
+++ b/src/object/infoblock.cpp
@@ -95,14 +95,15 @@ InfoBlock::hit(Player& player)
 }
 
 HitResponse
-InfoBlock::collision(GameObject& other, const CollisionHit& hit){
-
-       Player* player = dynamic_cast<Player*> (&other);
-       if (player) {
-               if (player->does_buttjump)
-                       InfoBlock::hit(*player);
-       }
-       return Block::collision(other, hit);
+InfoBlock::collision(GameObject& other, const CollisionHit& hit_)
+{
+  Player* player = dynamic_cast<Player*> (&other);
+  if (player) 
+  {
+    if (player->does_buttjump)
+      InfoBlock::hit(*player);
+  }
+  return Block::collision(other, hit_);
 }
 
 Player*