Made code -Wshadow clean, missed a bunch of issues in the last commit
[supertux.git] / src / object / pneumatic_platform.cpp
index cba9038..b295de8 100644 (file)
@@ -33,12 +33,12 @@ PneumaticPlatform::PneumaticPlatform(const Reader& reader) :
   start_y = get_pos().y;
 }
 
-PneumaticPlatform::PneumaticPlatform(PneumaticPlatform* master) :
-  MovingSprite(*master),
-  master(master),
+PneumaticPlatform::PneumaticPlatform(PneumaticPlatform* master_) :
+  MovingSprite(*master_),
+  master(master_),
   slave(this),
-  start_y(master->start_y),
-  offset_y(-master->offset_y),
+  start_y(master_->start_y),
+  offset_y(-master_->offset_y),
   speed_y(0),
   contacts()
 {