commited Matzes Win32 patch

[supertux.git] / src / worldmap.h

diff --git a/src/worldmap.h b/src/worldmap.h
index b347bc9..9968ce0 100644 (file)
--- a/src/worldmap.h
+++ b/src/worldmap.h
@@ -23,6 +23,8 @@
 #include <vector>
 #include <string>
 
+#include <SDL_mixer.h>
+
 namespace WorldMapNS {
 
 struct Point
@@ -44,13 +46,6 @@ struct Point
   int y;
 };
 
-struct Level
-{
-  int x;
-  int y;
-  std::string name;
-};
-
 struct Tile
 {
   texture_type sprite;
@@ -128,6 +123,13 @@ private:
   int width;
   int height;
 
+  struct Level
+  {
+    int x;
+    int y;
+    std::string name;
+  };
+
   typedef std::vector<Level> Levels;
   Levels levels;
 
@@ -155,7 +157,10 @@ public:
 
   Point get_next_tile(Point pos, Direction direction);
   Tile* at(Point pos);
-  bool path_ok(Direction direction, Point old_pos, Point* new_pos);
+
+  /** Check if it is possible to walk from \a pos into \a direction,
+      if possible, write the new position to \a new_pos */
+  bool path_ok(Direction direction, Point pos, Point* new_pos);
 };
 
 } // namespace WorldMapNS