converted player to new object system

[supertux.git] / src / worldmap.h

diff --git a/src/worldmap.h b/src/worldmap.h
index 2bfe806..48e57d8 100644 (file)
--- a/src/worldmap.h
+++ b/src/worldmap.h
@@ -63,8 +63,9 @@ public:
   /** Stop on this tile or walk over it? */
   bool stop;
 
-  /** direction in which to automatically turn when walked on such a tile */
-  Direction auto_walk;
+  /** When set automatically turn directions when walked over such a
+      tile (ie. walk smoothly a curve) */
+  bool auto_walk;
 };
 
 class TileManager
@@ -80,7 +81,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);
@@ -94,7 +95,9 @@ public:
   Direction back_direction;
 private:
   WorldMap* worldmap;
-  Surface* sprite;
+  Surface* largetux_sprite;
+  Surface* firetux_sprite;
+  Surface* smalltux_sprite;
 
   Direction input_direction;
   Direction direction;
@@ -150,6 +153,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;
@@ -184,7 +191,7 @@ public:
   void get_input();
 
   /** Update Tux position */
-  void update();
+  void update(float delta);
 
   /** Draw one frame */
   void draw(const Point& offset);