X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Fanchor_point.hpp;h=3030ca1ddc385faf806c972c90fc7fd2eb703cbd;hb=d097f456b8ab4f42058545bdd4f8f676d151e974;hp=5b8baee3b240b666dee2827bbdb1322b29d3f8bb;hpb=a113d3bd1feddd510e3b2852b0d42522735eee40;p=supertux.git

diff --git a/src/object/anchor_point.hpp b/src/object/anchor_point.hpp
index 5b8baee3b..3030ca1dd 100644
--- a/src/object/anchor_point.hpp
+++ b/src/object/anchor_point.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,16 +12,16 @@
 //  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 __ANCHOR_POINT_HPP__
-#define __ANCHOR_POINT_HPP__
+#ifndef HEADER_SUPERTUX_OBJECT_ANCHOR_POINT_HPP
+#define HEADER_SUPERTUX_OBJECT_ANCHOR_POINT_HPP
 
 #include <string>
+
 #include "math/vector.hpp"
 
-class Rect;
+class Rectf;
 
 enum AnchorPoint {
   ANCHOR_H_MASK = 0x00f0,
@@ -37,13 +35,15 @@ enum AnchorPoint {
   ANCHOR_TOP_LEFT = ANCHOR_TOP | ANCHOR_LEFT,
   ANCHOR_TOP_RIGHT = ANCHOR_TOP | ANCHOR_RIGHT,
   ANCHOR_BOTTOM_LEFT = ANCHOR_BOTTOM | ANCHOR_LEFT,
-  ANCHOR_BOTTOM_RIGHT = ANCHOR_BOTTOM | ANCHOR_RIGHT,
+  ANCHOR_BOTTOM_RIGHT = ANCHOR_BOTTOM | ANCHOR_RIGHT
 };
 
 std::string anchor_point_to_string(AnchorPoint point);
 AnchorPoint string_to_anchor_point(const std::string& str);
-Vector get_anchor_pos(const Rect& rect, AnchorPoint point);
-Vector get_anchor_pos(const Rect& destrect, float width, float height,
+Vector get_anchor_pos(const Rectf& rect, AnchorPoint point);
+Vector get_anchor_pos(const Rectf& destrect, float width, float height,
                       AnchorPoint point);
 
 #endif
+
+/* EOF */