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

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

diff --git a/src/object/display_effect.cpp b/src/object/display_effect.cpp
index ef46f6e..e884a2b 100644 (file)
--- a/src/object/display_effect.cpp
+++ b/src/object/display_effect.cpp
@@ -22,18 +22,18 @@
 
 static const float BORDER_SIZE = 75;
 
-DisplayEffect::DisplayEffect(std::string name) :
-  screen_fade(NO_FADE), 
-  screen_fadetime(0), 
+DisplayEffect::DisplayEffect(const std::string& name_) :
+  screen_fade(NO_FADE),
+  screen_fadetime(0),
   screen_fading(0),
-  border_fade(NO_FADE), 
-  border_fadetime(0), 
+  border_fade(NO_FADE),
+  border_fadetime(0),
   border_fading(),
-  border_size(0), 
+  border_size(0),
   black(false),
   borders(false)
 {
-  this->name = name;
+  this->name = name_;
 }
 
 DisplayEffect::~DisplayEffect()
@@ -44,14 +44,14 @@ void
 DisplayEffect::expose(HSQUIRRELVM vm, SQInteger table_idx)
 {
   if (name.empty()) return;
-  expose_object(vm, table_idx, dynamic_cast<Scripting::DisplayEffect *>(this), name, false);
+  expose_object(vm, table_idx, dynamic_cast<scripting::DisplayEffect *>(this), name, false);
 }
 
 void
 DisplayEffect::unexpose(HSQUIRRELVM vm, SQInteger table_idx)
 {
   if (name.empty()) return;
-  Scripting::unexpose_object(vm, table_idx, name);
+  scripting::unexpose_object(vm, table_idx, name);
 }
 
 void