- fixed 'When you jump into the roof or a bonus and fall back down you collide with...

[supertux.git] / src / worldmap.h

diff --git a/src/worldmap.h b/src/worldmap.h
index c2a7154..0fb1021 100644 (file)
--- a/src/worldmap.h
+++ b/src/worldmap.h
@@ -24,28 +24,10 @@
 #include <string>
 
 #include "musicref.h"
+#include "screen.h"
 
 namespace WorldMapNS {
 
-struct Point
-{
-  Point() : x(0), y(0) {}
-
-  Point(const Point& pos)
-    : x(pos.x), y(pos.y) {}
-
-  Point& operator=(const Point& pos)
-  { x = pos.x;
-    y = pos.y; 
-    return *this; }
-
-  Point(int x_, int y_)
-    : x(x_), y(y_) {}
-
-  int x;
-  int y;
-};
-
 class Tile
 {
 public:
@@ -81,7 +63,7 @@ public:
   Tile* get(int i);
 };
 
-enum Direction { NONE, WEST, EAST, NORTH, SOUTH };
+enum Direction { D_NONE, D_WEST, D_EAST, D_NORTH, D_SOUTH };
 
 std::string direction_to_string(Direction d);
 Direction   string_to_direction(const std::string& d);
@@ -153,6 +135,10 @@ public:
     std::string title;
     bool solved;
 
+    /** Filename of the extro text to show once the level is
+        successfully completed */
+    std::string extro_filename;
+
     // Directions which are walkable from this level
     bool north;
     bool east;
@@ -187,7 +173,7 @@ public:
   void get_input();
 
   /** Update Tux position */
-  void update();
+  void update(float delta);
 
   /** Draw one frame */
   void draw(const Point& offset);