Let Tux bounce off badguys when he's invincible. This let's us bounce off guys like...

[supertux.git] / src / worldmap / worldmap.hpp

diff --git a/src/worldmap/worldmap.hpp b/src/worldmap/worldmap.hpp
index 9a089cb..75d8f8f 100644 (file)
--- 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,7 @@
 #include "tile_manager.hpp"
 #include "game_object.hpp"
 #include "console.hpp"
+#include "../level.hpp"
 
 class Sprite;
 class Menu;
@@ -43,7 +43,7 @@ class TileMap;
 namespace WorldMapNS {
 
 class Tux;
-class Level;
+class LevelTile;
 class SpecialTile;
 class SpriteChange;
 
@@ -78,6 +78,7 @@ private:
 
   std::string name;
   std::string music;
+  std::string init_script;
 
   typedef std::vector<GameObject*> GameObjects;
   GameObjects game_objects;
@@ -96,8 +97,8 @@ 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;
@@ -105,6 +106,10 @@ private:
 
   Statistics total_stats;
 
+  HSQOBJECT worldmap_table;
+  typedef std::vector<HSQOBJECT> ScriptList;
+  ScriptList scripts;      
+
 public:
   WorldMap(const std::string& filename);
   ~WorldMap();
@@ -115,6 +120,7 @@ public:
   { return current_; }
 
   virtual void setup();
+  virtual void leave();
 
   /** Update worldmap state */
   virtual void update(float delta);
@@ -131,9 +137,9 @@ 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);
 
@@ -153,9 +159,15 @@ 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);
     
 private:
-  void get_level_title(Level& level);
+  void get_level_title(LevelTile& level);
   void draw_status(DrawingContext& context);
   void calculate_total_stats();