Klaus Denker's widescreen_fixes.patch:

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

diff --git a/src/worldmap/worldmap.hpp b/src/worldmap/worldmap.hpp
index 9bf35b2..c0f7dc6 100644 (file)
--- a/src/worldmap/worldmap.hpp
+++ b/src/worldmap/worldmap.hpp
@@ -36,10 +36,11 @@
 #include "worldmap/special_tile.hpp"
 #include "worldmap/sprite_change.hpp"
 #include "worldmap/teleporter.hpp"
+#include "worldmap/spawn_point.hpp"
+#include "worldmap/direction.hpp"
 
 class Sprite;
 class Menu;
-class SpawnPoint;
 class GameObject;
 class TileMap;
 
@@ -59,8 +60,6 @@ enum {
   WEST_EAST_WAY
 };
 
-enum Direction { D_NONE, D_WEST, D_EAST, D_NORTH, D_SOUTH };
-
 std::string direction_to_string(Direction d);
 Direction   string_to_direction(const std::string& d);
 Direction reverse_dir(Direction d);
@@ -86,9 +85,9 @@ private:
   typedef std::vector<GameObject*> GameObjects;
   GameObjects game_objects;
   TileMap* solids;
-  
+
   std::auto_ptr<TileManager> tile_manager;
-  
+
 public:
   /** Variables to deal with the passive map messages */
   Timer passive_message_timer;
@@ -112,10 +111,13 @@ private:
 
   HSQOBJECT worldmap_table;
   typedef std::vector<HSQOBJECT> ScriptList;
-  ScriptList scripts;   
+  ScriptList scripts;
 
+  Color ambient_light;
   std::string force_spawnpoint; /**< if set, spawnpoint will be forced to this value */
 
+  bool in_level;
+
 public:
   WorldMap(const std::string& filename, const std::string& force_spawnpoint = "");
   ~WorldMap();
@@ -168,14 +170,14 @@ public:
   { return name; }
 
   /**
-   * runs a script in the context of the worldmap (and keeps a reference to 
+   * 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 current world's path
+   * filename is relative to data root path
    */
   void change(const std::string& filename, const std::string& force_spawnpoint="");
 
@@ -189,9 +191,8 @@ private:
   void draw_status(DrawingContext& context);
   void calculate_total_stats();
 
-  void load(const std::string& filename);  
+  void load(const std::string& filename);
   void on_escape_press();
-
 };
 
 } // namespace WorldMapNS