Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

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

diff --git a/src/object/text_object.hpp b/src/object/text_object.hpp
index c0e35b3..0e27c26 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,22 +12,22 @@
 //  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"
+#include "supertux/game_object.hpp"
+#include "supertux/script_interface.hpp"
 #include "video/color.hpp"
 
 class Font;
 
 /** 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;
@@ -93,3 +91,5 @@ private:
 };
 
 #endif
+
+/* EOF */