Fix for #453 (Menu frame lingers)

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

diff --git a/src/worldmap/worldmap.hpp b/src/worldmap/worldmap.hpp
index 9263307..87c83a9 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,20 +60,24 @@ 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);
 
 /**
- * Screen that displays a worldmap
+ * Screen that runs a WorldMap, which lets the player choose a Level.
  */
 class WorldMap : public Screen
 {
+  static Color level_title_color;
+  static Color message_color;
+  static Color teleporter_message_color;
 private:
   Tux* tux;
 
+  TileSet *tileset;
+  bool     free_tileset;
+
   static WorldMap* current_;
 
   std::auto_ptr<Menu> worldmap_menu;
@@ -85,9 +90,7 @@ private:
 
   typedef std::vector<GameObject*> GameObjects;
   GameObjects game_objects;
-  TileMap* solids;
-
-  std::auto_ptr<TileManager> tile_manager;
+  std::list<TileMap*> solid_tilemaps;
 
 public:
   /** Variables to deal with the passive map messages */
@@ -114,13 +117,23 @@ private:
   typedef std::vector<HSQOBJECT> ScriptList;
   ScriptList scripts;
 
+  Color ambient_light;
   std::string force_spawnpoint; /**< if set, spawnpoint will be forced to this value */
 
+  bool in_level;
+
+  /* variables to track panning to a spawn point */
+  Vector pan_pos;
+  bool panning;
+
 public:
   WorldMap(const std::string& filename, const std::string& force_spawnpoint = "");
   ~WorldMap();
 
   void add_object(GameObject* object);
+  
+  void try_expose(GameObject* object);
+  void try_unexpose(GameObject* object);
 
   static WorldMap* current()
   { return current_; }
@@ -134,7 +147,18 @@ public:
   virtual void draw(DrawingContext& context);
 
   Vector get_next_tile(Vector pos, Direction direction);
-  const Tile* at(Vector pos);
+
+  /**
+   * gets a bitfield of Tile::WORLDMAP_NORTH | Tile::WORLDMAP_WEST | ... values, 
+   * which indicates the directions Tux can move to when at the given position.
+   */
+  int available_directions_at(Vector pos);
+
+  /**
+   * returns a bitfield representing the union of all Tile::WORLDMAP_XXX values 
+   * of all solid tiles at the given position
+   */
+  int tile_data_at(Vector pos);
 
   size_t level_count();
   size_t solved_level_count();
@@ -145,6 +169,9 @@ public:
    */
   void finished_level(Level* level);
 
+  /** returns current Tux incarnation */
+  Tux* get_tux() { return tux; }
+
   LevelTile* at_level();
   SpecialTile* at_special_tile();
   SpriteChange* at_sprite_change(const Vector& pos);
@@ -182,7 +209,17 @@ public:
   /**
    * moves Tux to the given spawnpoint
    */
-  void move_to_spawnpoint(const std::string& spawnpoint);
+  void move_to_spawnpoint(const std::string& spawnpoint, bool pan =false);
+
+  /**
+   * returns the width (in tiles) of a worldmap
+   */
+  float get_width() const;
+
+  /**
+   * returns the height (in tiles) of a worldmap
+   */
+  float get_height() const;
 
 private:
   void get_level_title(LevelTile& level);
@@ -192,6 +229,8 @@ private:
   void load(const std::string& filename);
   void on_escape_press();
 
+  Vector get_camera_pos_for_tux();
+  void clamp_camera_position(Vector& c);
 };
 
 } // namespace WorldMapNS