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

[supertux.git] / src / trigger / door.cpp

diff --git a/src/trigger/door.cpp b/src/trigger/door.cpp
index 3ee067c..2bb4f71 100644 (file)
--- a/src/trigger/door.cpp
+++ b/src/trigger/door.cpp
@@ -130,7 +130,7 @@ Door::event(Player& , EventType type)
 }
 
 HitResponse
-Door::collision(GameObject& other, const CollisionHit& hit)
+Door::collision(GameObject& other, const CollisionHit& hit_)
 {
   switch (state) {
     case CLOSED:
@@ -159,7 +159,7 @@ Door::collision(GameObject& other, const CollisionHit& hit)
       break;
   }
 
-  return TriggerBase::collision(other, hit);
+  return TriggerBase::collision(other, hit_);
 }
 
 /* EOF */