X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fworldmap.h;h=01d0bfa26acbd869a8d9a713477825d16797ac81;hb=073795dd0afc7d7e4c093db5f83fc26c10501d61;hp=f44ba506064c68736cfd0c97da02bd06a50adbd0;hpb=1db9b1a8cf477ba8a676eb2046342ae02c3d3b96;p=supertux.git

diff --git a/src/worldmap.h b/src/worldmap.h
index f44ba5060..01d0bfa26 100644
--- a/src/worldmap.h
+++ b/src/worldmap.h
@@ -16,7 +16,6 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
 #ifndef SUPERTUX_WORLDMAP_H
 #define SUPERTUX_WORLDMAP_H
 
@@ -26,8 +25,14 @@
 #include "math/vector.h"
 #include "audio/musicref.h"
 #include "video/screen.h"
+#include "lisp/lisp.h"
 #include "statistics.h"
-#include "special/timer.h"
+#include "timer.h"
+#include "tile_manager.h"
+
+namespace SuperTux {
+  class Menu;
+}
 
 extern Menu* worldmap_menu;
 
@@ -36,7 +41,7 @@ namespace WorldMapNS {
 enum WorldMapMenuIDs {
   MNID_RETURNWORLDMAP,
   MNID_QUITWORLDMAP
-  };
+};
 
 // For one way tiles
 enum {
@@ -45,47 +50,6 @@ enum {
   SOUTH_NORTH_WAY,
   EAST_WEST_WAY,
   WEST_EAST_WAY
-  };
-
-class Tile
-{
-public:
-  Tile();
-  ~Tile();
-
-  void draw(DrawingContext& context, Vector pos);
-
-  std::vector<Surface*> images;
-  int anim_speed;
-
-  // Directions in which Tux is allowed to walk from this tile
-  bool north;
-  bool east;
-  bool south;
-  bool west;
-
-  /** One way tile */
-  int one_way;
-
-  /** 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
-{
-private:
-  typedef std::vector<Tile*> Tiles;
-  Tiles tiles;
-
-public:
-  TileManager();
-  ~TileManager();
-
-  Tile* get(int i);
 };
 
 enum Direction { D_NONE, D_WEST, D_EAST, D_NORTH, D_SOUTH };
@@ -216,11 +180,12 @@ public:
   };
 
   /** Variables to deal with the passive map messages */
-  Timer passive_message_timer;
+  Timer2 passive_message_timer;
   std::string passive_message;
 
 private:
   std::string map_filename;
+  std::string levels_path;
 
   typedef std::vector<SpecialTile> SpecialTiles;
   SpecialTiles special_tiles;
@@ -234,6 +199,9 @@ private:
 
   Vector offset;
   std::string savegame_file;
+  
+  std::string intro_filename;
+  bool intro_displayed;
 
   void get_level_title(Level& level);
 
@@ -244,8 +212,6 @@ private:
   Statistics total_stats;
   void calculate_total_stats();
 
-  Timer frame_timer;
-
 public:
   WorldMap();
   ~WorldMap();
@@ -264,7 +230,7 @@ public:
   void draw(DrawingContext& context, const Vector& offset);
 
   Vector get_next_tile(Vector pos, Direction direction);
-  Tile* at(Vector pos);
+  const Tile* at(Vector pos);
 
   WorldMap::Level* at_level();
   WorldMap::SpecialTile* at_special_tile();
@@ -295,6 +261,7 @@ public:
 
 private:
   void on_escape_press();
+  void parse_special_tiles(const lisp::Lisp* lisp);
 };
 
 } // namespace WorldMapNS