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

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

diff --git a/src/object/floating_image.cpp b/src/object/floating_image.cpp
index 0c19566..40d3740 100644 (file)
--- a/src/object/floating_image.cpp
+++ b/src/object/floating_image.cpp
@@ -67,17 +67,17 @@ FloatingImage::get_action()
 }
 
 void
-FloatingImage::fade_in(float fadetime)
+FloatingImage::fade_in(float fadetime_)
 {
-  this->fadetime = fadetime;
-  fading = fadetime;
+  this->fadetime = fadetime_;
+  fading = fadetime_;
 }
 
 void
-FloatingImage::fade_out(float fadetime)
+FloatingImage::fade_out(float fadetime_)
 {
-  this->fadetime = fadetime;
-  fading = -fadetime;
+  this->fadetime = fadetime_;
+  fading = -fadetime_;
 }
 
 void