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

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

diff --git a/src/math/vector.hpp b/src/math/vector.hpp
index 817bb4d..97f9a5d 100644 (file)
--- a/src/math/vector.hpp
+++ b/src/math/vector.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,35 +12,34 @@
 //  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 SUPERTUX_VECTOR_H
-#define SUPERTUX_VECTOR_H
+#ifndef HEADER_SUPERTUX_MATH_VECTOR_HPP
+#define HEADER_SUPERTUX_MATH_VECTOR_HPP
 
 /** Simple two dimensional vector. */
 class Vector
 {
 public:
   Vector(float nx, float ny)
-      : x(nx), y(ny)
+    : x(nx), y(ny)
   { }
   Vector(const Vector& other)
-      : x(other.x), y(other.y)
+    : x(other.x), y(other.y)
   { }
   Vector()
-      : x(0), y(0)
+    : x(0), y(0)
   { }
 
   bool operator ==(const Vector& other) const
-    {
-      return x == other.x && y == other.y;
-    }
+  {
+    return x == other.x && y == other.y;
+  }
 
   bool operator !=(const Vector& other) const
-    {
-      return !(x == other.x && y == other.y);
-    }
+  {
+    return !(x == other.x && y == other.y);
+  }
 
   const Vector& operator=(const Vector& other)
   {
@@ -52,29 +49,29 @@ public:
   }
 
   Vector operator+(const Vector& other) const
-    {
-      return Vector(x + other.x, y + other.y);
-    }
+  {
+    return Vector(x + other.x, y + other.y);
+  }
 
   Vector operator-(const Vector& other) const
-    {
-      return Vector(x - other.x, y - other.y);
-    }
+  {
+    return Vector(x - other.x, y - other.y);
+  }
 
   Vector operator*(float s) const
-    {
-      return Vector(x * s, y * s);
-    }
+  {
+    return Vector(x * s, y * s);
+  }
 
   Vector operator/(float s) const
-    {
-      return Vector(x / s, y / s);
-    }
+  {
+    return Vector(x / s, y / s);
+  }
 
   Vector operator-() const
-    {
-      return Vector(-x, -y);
-    }
+  {
+    return Vector(-x, -y);
+  }
 
   const Vector& operator +=(const Vector& other)
   {
@@ -106,9 +103,9 @@ public:
 
   /// Scalar product of 2 vectors
   float operator*(const Vector& other) const
-    {
-      return x*other.x + y*other.y;
-    }
+  {
+    return x*other.x + y*other.y;
+  }
 
   float norm() const;
   Vector unit() const;
@@ -120,3 +117,5 @@ public:
 };
 
 #endif
+
+/* EOF */