X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fworldmap%2Fworldmap.hpp;h=ea847054b4b5df4a9c5f5964e36b99d4e6913559;hb=850855bb178f8325762e7c9b1db94118cd48ad5c;hp=9a089cb0d4154656d9ad73aab993fa1c47a9a7bd;hpb=fc73efa7ff699fe3c9c237845b6f4fda0d999862;p=supertux.git

diff --git a/src/worldmap/worldmap.hpp b/src/worldmap/worldmap.hpp
index 9a089cb0d..ea847054b 100644
--- a/src/worldmap/worldmap.hpp
+++ b/src/worldmap/worldmap.hpp
@@ -24,7 +24,6 @@
 #include <string>
 
 #include "math/vector.hpp"
-#include "video/screen.hpp"
 #include "lisp/lisp.hpp"
 #include "control/controller.hpp"
 #include "statistics.hpp"
@@ -33,6 +32,10 @@
 #include "tile_manager.hpp"
 #include "game_object.hpp"
 #include "console.hpp"
+#include "../level.hpp"
+#include "worldmap/special_tile.hpp"
+#include "worldmap/sprite_change.hpp"
+#include "worldmap/teleporter.hpp"
 
 class Sprite;
 class Menu;
@@ -43,7 +46,7 @@ class TileMap;
 namespace WorldMapNS {
 
 class Tux;
-class Level;
+class LevelTile;
 class SpecialTile;
 class SpriteChange;
 
@@ -78,6 +81,7 @@ private:
 
   std::string name;
   std::string music;
+  std::string init_script;
 
   typedef std::vector<GameObject*> GameObjects;
   GameObjects game_objects;
@@ -96,17 +100,24 @@ private:
 
   typedef std::vector<SpecialTile*> SpecialTiles;
   SpecialTiles special_tiles;
-  typedef std::vector<Level*> Levels;
-  Levels levels;
+  typedef std::vector<LevelTile*> LevelTiles;
+  LevelTiles levels;
   typedef std::vector<SpriteChange*> SpriteChanges;
   SpriteChanges sprite_changes;
   typedef std::vector<SpawnPoint*> SpawnPoints;
   SpawnPoints spawn_points;
+  std::vector<Teleporter*> teleporters;
 
   Statistics total_stats;
 
+  HSQOBJECT worldmap_table;
+  typedef std::vector<HSQOBJECT> ScriptList;
+  ScriptList scripts;   
+
+  std::string force_spawnpoint; /**< if set, spawnpoint will be forced to this value */
+
 public:
-  WorldMap(const std::string& filename);
+  WorldMap(const std::string& filename, const std::string& force_spawnpoint = "");
   ~WorldMap();
 
   void add_object(GameObject* object);
@@ -115,6 +126,7 @@ public:
   { return current_; }
 
   virtual void setup();
+  virtual void leave();
 
   /** Update worldmap state */
   virtual void update(float delta);
@@ -131,11 +143,12 @@ public:
    * gets called from the GameSession when a level has been successfully
    * finished
    */
-  void finished_level(const std::string& filename);
+  void finished_level(Level* level);
 
-  Level* at_level();
+  LevelTile* at_level();
   SpecialTile* at_special_tile();
   SpriteChange* at_sprite_change(const Vector& pos);
+  Teleporter* at_teleporter(const Vector& pos);
 
   /** Check if it is possible to walk from \a pos into \a direction,
       if possible, write the new position to \a new_pos */
@@ -153,16 +166,32 @@ public:
 
   const std::string& get_title() const
   { return name; }
-    
+
+  /**
+   * runs a script in the context of the worldmap (and keeps a reference to 
+   * the script (so the script gets destroyed when the worldmap is destroyed)
+   */
+  HSQUIRRELVM run_script(std::istream& in, const std::string& sourcename);
+
+  /**
+   * switch to another worldmap.
+   * filename is relative to data root path
+   */
+  void change(const std::string& filename, const std::string& force_spawnpoint="");
+
+  /**
+   * moves Tux to the given spawnpoint
+   */
+  void move_to_spawnpoint(const std::string& spawnpoint);
+
 private:
-  void get_level_title(Level& level);
+  void get_level_title(LevelTile& level);
   void draw_status(DrawingContext& context);
   void calculate_total_stats();
 
   void load(const std::string& filename);  
   void on_escape_press();
-  void parse_special_tile(const lisp::Lisp* lisp);
-  void parse_sprite_change(const lisp::Lisp* lisp);
+
 };
 
 } // namespace WorldMapNS