Changed the way the scrolling was calculated. Instead of calculating it relatively...

[supertux.git] / src / worldmap.h

diff --git a/src/worldmap.h b/src/worldmap.h
index eab9e7e..a4898fb 100644 (file)
--- a/src/worldmap.h
+++ b/src/worldmap.h
@@ -23,7 +23,7 @@
 #include <vector>
 #include <string>
 
-#include <SDL_mixer.h>
+#include "musicref.h"
 
 namespace WorldMapNS {
 
@@ -46,8 +46,12 @@ struct Point
   int y;
 };
 
-struct Tile
+class Tile
 {
+public:
+  Tile();
+  ~Tile();
+  
   Surface* sprite;
 
   // Directions in which Tux is allowed to walk from this tile
@@ -58,6 +62,10 @@ struct Tile
 
   /** Stop on this tile or walk over it? */
   bool stop;
+
+  /** When set automatically turn directions when walked over such a
+      tile (ie. walk smoothly a curve) */
+  bool auto_walk;
 };
 
 class TileManager
@@ -65,13 +73,11 @@ class TileManager
 private:
   typedef std::vector<Tile*> Tiles;
   Tiles tiles;
-  static TileManager* instance_ ;
 
- TileManager();
 public:
-  static TileManager* instance() { return instance_ ? instance_ : instance_ = new TileManager(); }
+  TileManager();
+  ~TileManager();
 
-  void load();
   Tile* get(int i);
 };
 
@@ -89,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;
@@ -102,6 +110,7 @@ private:
   void stop();
 public: 
   Tux(WorldMap* worldmap_);
+  ~Tux();
   
   void draw(const Point& offset);
   void update(float delta);
@@ -133,6 +142,8 @@ private:
   int width;
   int height;
 
+  TileManager* tile_manager;
+
 public:
   struct Level
   {
@@ -142,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;
@@ -153,7 +168,7 @@ private:
   typedef std::vector<Level> Levels;
   Levels levels;
 
-  Mix_Music* song;
+  MusicRef song;
 
   Direction input_direction;
   bool enter_level;
@@ -176,7 +191,7 @@ public:
   void get_input();
 
   /** Update Tux position */
-  void update();
+  void update(float delta);
 
   /** Draw one frame */
   void draw(const Point& offset);