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

[supertux.git] / src / worldmap / spawn_point.hpp

diff --git a/src/worldmap/spawn_point.hpp b/src/worldmap/spawn_point.hpp
index 9d0d625..0a6237b 100644 (file)
--- a/src/worldmap/spawn_point.hpp
+++ b/src/worldmap/spawn_point.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux - Worldmap Spawnpoint
 //  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,30 +12,32 @@
 //  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 __WORLDMAP_SPAWN_POINT_H__
-#define __WORLDMAP_SPAWN_POINT_H__
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef HEADER_SUPERTUX_WORLDMAP_SPAWN_POINT_HPP
+#define HEADER_SUPERTUX_WORLDMAP_SPAWN_POINT_HPP
 
 #include <string>
-#include "math/vector.hpp"
+
 #include "lisp/lisp.hpp"
-#include "game_object.hpp"
+#include "math/vector.hpp"
+#include "supertux/game_object.hpp"
 #include "worldmap/direction.hpp"
 
-namespace WorldMapNS
-{
+namespace WorldMapNS {
 
 class SpawnPoint
 {
 public:
-    SpawnPoint(const lisp::Lisp* lisp);
+  SpawnPoint(const lisp::Lisp* lisp);
 
-    std::string name;
-    Vector pos;
-    Direction auto_dir; /**< automatically start walking in this direction */
+  std::string name;
+  Vector pos;
+  Direction auto_dir; /**< automatically start walking in this direction */
 };
 
 }
 
 #endif
+
+/* EOF */