Updated svn:externals

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

diff --git a/src/worldmap/tux.hpp b/src/worldmap/tux.hpp
index 6519785..4c36042 100644 (file)
--- a/src/worldmap/tux.hpp
+++ b/src/worldmap/tux.hpp
@@ -50,15 +50,15 @@ private:
 
   void stop();
 
-  bool canWalk(const Tile* tile, Direction dir); /**< check if we can leave "tile" in direction "dir" */
+  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 */
   void tryContinueWalking(float elapsed_time); /**< try to continue walking in current direction */
 
-public: 
+public:
   Tux(WorldMap* worldmap_);
   ~Tux();
-  
+
   void setup(); /**< called prior to first update */
   void draw(DrawingContext& context);
   void update(float elapsed_time);
@@ -67,11 +67,10 @@ public:
 
   bool is_moving() const { return moving; }
   Vector get_pos();
-  Vector get_tile_pos() const { return tile_pos; } 
-  void  set_tile_pos(Vector p) { tile_pos = p; } 
+  Vector get_tile_pos() const { return tile_pos; }
+  void  set_tile_pos(Vector p) { tile_pos = p; }
 };
 
 }
 
 #endif
-