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

[supertux.git] / src / object / text_object.hpp

diff --git a/src/object/text_object.hpp b/src/object/text_object.hpp
index c8903e7..4a36b71 100644 (file)
--- a/src/object/text_object.hpp
+++ b/src/object/text_object.hpp
@@ -25,7 +25,7 @@
 #include "video/font_ptr.hpp"
 
 /** A text object intended for scripts that want to tell a story */
-class TextObject : public GameObject, 
+class TextObject : public GameObject,
                    public scripting::Text,
                    public ScriptInterface
 {
@@ -45,21 +45,21 @@ public:
   void set_centered(bool centered);
   bool is_visible();
 
-  void set_anchor_point(AnchorPoint anchor) {
-    this->anchor = anchor;
+  void set_anchor_point(AnchorPoint anchor_) {
+    this->anchor = anchor_;
   }
   AnchorPoint get_anchor_point() const {
     return anchor;
   }
 
-  void set_pos(const Vector& pos) {
-    this->pos = pos; 
-  } 
+  void set_pos(const Vector& pos_) {
+    this->pos = pos_;
+  }
   void set_pos(float x, float y) {
     set_pos(Vector(x, y));
   }
   const Vector& get_pos() const {
-    return pos; 
+    return pos;
   }
   float get_pos_x() {
     return pos.x;
@@ -68,8 +68,8 @@ public:
     return pos.y;
   }
 
-  void set_anchor_point(int anchor) {
-    set_anchor_point((AnchorPoint) anchor);
+  void set_anchor_point(int anchor_) {
+    set_anchor_point((AnchorPoint) anchor_);
   }
   int get_anchor_point() {
     return (int) get_anchor_point();