X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fworldmap.h;h=80585ea226b66f255347f4f3e7820c9214a76b87;hb=c43ea9b0d5372718888138ea2cc4abcd5acb5299;hp=2018d85b28a67d14670ed8b3617dbd0265228abb;hpb=00fb759c2385ff08caf38e916c2d0ba8cafc8a41;p=supertux.git

diff --git a/src/worldmap.h b/src/worldmap.h
index 2018d85b2..80585ea22 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,10 @@
 #include "math/vector.h"
 #include "audio/musicref.h"
 #include "video/screen.h"
+#include "lisp/lisp.h"
 #include "statistics.h"
 #include "timer.h"
+#include "tile_manager.h"
 
 namespace SuperTux {
   class Menu;
@@ -40,7 +41,7 @@ namespace WorldMapNS {
 enum WorldMapMenuIDs {
   MNID_RETURNWORLDMAP,
   MNID_QUITWORLDMAP
-  };
+};
 
 // For one way tiles
 enum {
@@ -49,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;
-  float anim_fps;
-
-  // 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 };
@@ -266,7 +226,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();
@@ -297,6 +257,7 @@ public:
 
 private:
   void on_escape_press();
+  void parse_special_tiles(const lisp::Lisp* lisp);
 };
 
 } // namespace WorldMapNS