Fixed problems with pedestral after typo fixes

[supertux.git] / src / math / rect.hpp

diff --git a/src/math/rect.hpp b/src/math/rect.hpp
index f7179a9..1fd5dcb 100644 (file)
--- a/src/math/rect.hpp
+++ b/src/math/rect.hpp
@@ -1,3 +1,22 @@
+//  $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 distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  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.
+
 #ifndef __RECT_H__
 #define __RECT_H__
 
@@ -6,8 +25,8 @@
 
 /** This class represents a rectangle.
  * (Implementation Note) We're using upper left and lower right point instead of
- * upper left and width/height here, because that makes the collision dectection
- * a little bit efficienter.
+ * upper left and width/height here, because that makes the collision detection
+ * a little bit more efficient.
  */
 class Rect
 {
@@ -64,7 +83,11 @@ public:
   {
     set_width(width);
     set_height(height);
-  }                                         
+  }
+  Vector get_size()
+  {
+    return Vector(get_width(), get_height());
+  }
 
   void move(const Vector& v)
   {
@@ -72,11 +95,11 @@ public:
     p2 += v;
   }
 
-  bool inside(const Vector& v) const
+  bool contains(const Vector& v) const
   {
     return v.x >= p1.x && v.y >= p1.y && v.x < p2.x && v.y < p2.y;
   }
-  bool inside(const Rect& other) const
+  bool contains(const Rect& other) const
   {
     if(p1.x >= other.p2.x || other.p1.x >= p2.x)
       return false;
@@ -85,8 +108,8 @@ public:
 
     return true;
   }
-   
-  // leave these 2 public to safe the headaches of set/get functions for such
+
+  // leave these two public to save the headaches of set/get functions for such
   // simple things :)
 
   /// upper left edge
@@ -96,4 +119,3 @@ public:
 };
 
 #endif
-