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

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

diff --git a/src/trigger/scripttrigger.cpp b/src/trigger/scripttrigger.cpp
index db1e308..439ec11 100644 (file)
--- a/src/trigger/scripttrigger.cpp
+++ b/src/trigger/scripttrigger.cpp
@@ -47,13 +47,13 @@ ScriptTrigger::ScriptTrigger(const Reader& reader) :
     triggerevent = EVENT_TOUCH;
 }
 
-ScriptTrigger::ScriptTrigger(const Vector& pos, const std::string& script) :
+ScriptTrigger::ScriptTrigger(const Vector& pos, const std::string& script_) :
   triggerevent(),
   script()
 {
   bbox.set_pos(pos);
   bbox.set_size(32, 32);
-  this->script = script;
+  this->script = script_;
   triggerevent = EVENT_TOUCH;
 }