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

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

diff --git a/src/worldmap/tux.hpp b/src/worldmap/tux.hpp
index ebecefe..745f505 100644 (file)
--- a/src/worldmap/tux.hpp
+++ b/src/worldmap/tux.hpp
@@ -1,13 +1,11 @@
-//  $Id$
-//
 //  SuperTux -  A Jump'n Run
 //  Copyright (C) 2004 Ingo Ruhnke <grumbel@gmx.de>
 //  Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.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
@@ -15,19 +13,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.
-#ifndef __WORLDMAP_TUX_HPP__
-#define __WORLDMAP_TUX_HPP__
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef HEADER_SUPERTUX_WORLDMAP_TUX_HPP
+#define HEADER_SUPERTUX_WORLDMAP_TUX_HPP
 
-#include <memory>
-#include "game_object.hpp"
-#include "worldmap.hpp"
+#include "worldmap/worldmap.hpp"
 
 class Sprite;
 
-namespace WorldMapNS
-{
+namespace WorldMapNS {
 
 class WorldMap;
 
@@ -50,8 +45,8 @@ private:
 
   bool ghost_mode;
 
+private:
   void stop();
-
   bool canWalk(int tile_data, Direction dir); /**< check if we can leave a tile (with given "tile_data") in direction "dir" */
   void updateInputDirection(); /**< if controller was pressed, update input_direction */
   void tryStartWalking(); /**< try starting to walk in input_direction */
@@ -74,8 +69,14 @@ public:
   Vector get_pos();
   Vector get_tile_pos() const { return tile_pos; }
   void  set_tile_pos(Vector p) { tile_pos = p; }
+
+private:
+  Tux(const Tux&);
+  Tux& operator=(const Tux&);
 };
 
-}
+} // namespace WorldMapNS
 
 #endif
+
+/* EOF */