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 b5e0862..4a36b71 100644 (file)
--- a/src/object/text_object.hpp
+++ b/src/object/text_object.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,23 +12,24 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef __TEXTOBJECT_H__
-#define __TEXTOBJECT_H__
+#ifndef HEADER_SUPERTUX_OBJECT_TEXT_OBJECT_HPP
+#define HEADER_SUPERTUX_OBJECT_TEXT_OBJECT_HPP
 
-#include "game_object.hpp"
+#include "object/anchor_point.hpp"
 #include "scripting/text.hpp"
-#include "script_interface.hpp"
-#include "anchor_point.hpp"
-
-class Font;
+#include "supertux/game_object.hpp"
+#include "supertux/script_interface.hpp"
+#include "video/color.hpp"
+#include "video/font_ptr.hpp"
 
 /** A text object intended for scripts that want to tell a story */
-class TextObject : public GameObject, public Scripting::Text,
+class TextObject : public GameObject,
+                   public scripting::Text,
                    public ScriptInterface
 {
+  static Color default_color;
 public:
   TextObject(std::string name = "");
   virtual ~TextObject();
@@ -46,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;
@@ -69,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();
@@ -80,7 +79,7 @@ public:
   void update(float elapsed_time);
 
 private:
-  Font* font;
+  FontPtr font;
   std::string text;
   float fading;
   float fadetime;
@@ -88,6 +87,12 @@ private:
   bool centered;
   AnchorPoint anchor;
   Vector pos;
+
+private:
+  TextObject(const TextObject&);
+  TextObject& operator=(const TextObject&);
 };
 
 #endif
+
+/* EOF */