X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fworldmap.h;h=01d0bfa26acbd869a8d9a713477825d16797ac81;hb=073795dd0afc7d7e4c093db5f83fc26c10501d61;hp=c2a7154a887bfe311047cff41687c11958f6d970;hpb=599adb53dbdfdcc4ac4e4dfab1e0868ff0412110;p=supertux.git diff --git a/src/worldmap.h b/src/worldmap.h index c2a7154a8..01d0bfa26 100644 --- a/src/worldmap.h +++ b/src/worldmap.h @@ -16,72 +16,43 @@ // 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 #include #include -#include "musicref.h" - -namespace WorldMapNS { - -struct Point -{ - Point() : x(0), y(0) {} - - Point(const Point& pos) - : x(pos.x), y(pos.y) {} - - Point& operator=(const Point& pos) - { x = pos.x; - y = pos.y; - return *this; } +#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" - Point(int x_, int y_) - : x(x_), y(y_) {} - - int x; - int y; -}; - -class Tile -{ -public: - Tile(); - ~Tile(); - - Surface* sprite; +namespace SuperTux { + class Menu; +} - // Directions in which Tux is allowed to walk from this tile - bool north; - bool east; - bool south; - bool west; +extern Menu* worldmap_menu; - /** Stop on this tile or walk over it? */ - bool stop; +namespace WorldMapNS { - /** When set automatically turn directions when walked over such a - tile (ie. walk smoothly a curve) */ - bool auto_walk; +enum WorldMapMenuIDs { + MNID_RETURNWORLDMAP, + MNID_QUITWORLDMAP }; -class TileManager -{ -private: - typedef std::vector Tiles; - Tiles tiles; - -public: - TileManager(); - ~TileManager(); - - Tile* get(int i); +// For one way tiles +enum { + BOTH_WAYS, + NORTH_SOUTH_WAY, + SOUTH_NORTH_WAY, + EAST_WEST_WAY, + WEST_EAST_WAY }; -enum Direction { NONE, WEST, EAST, NORTH, SOUTH }; +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); @@ -101,7 +72,7 @@ private: Direction input_direction; Direction direction; - Point tile_pos; + Vector tile_pos; /** Length by which tux is away from its current tile, length is in input_direction direction */ float offset; @@ -112,15 +83,15 @@ public: Tux(WorldMap* worldmap_); ~Tux(); - void draw(const Point& offset); - void update(float delta); + void draw(DrawingContext& context, const Vector& offset); + void action(float elapsed_time); - void set_direction(Direction d) { input_direction = d; } + void set_direction(Direction dir); bool is_moving() const { return moving; } - Point get_pos(); - Point get_tile_pos() const { return tile_pos; } - void set_tile_pos(Point p) { tile_pos = p; } + Vector get_pos(); + Vector get_tile_pos() const { return tile_pos; } + void set_tile_pos(Vector p) { tile_pos = p; } }; /** */ @@ -131,9 +102,10 @@ private: bool quit; - Surface* level_sprite; Surface* leveldot_green; Surface* leveldot_red; + Surface* messagedot; + Surface* teleporterdot; std::string name; std::string music; @@ -141,18 +113,65 @@ private: std::vector tilemap; int width; int height; + + int start_x; + int start_y; TileManager* tile_manager; public: + struct SpecialTile + { + Vector pos; + + /** Optional flags: */ + + /** Position to swap to player */ + Vector teleport_dest; + + /** Message to show in the Map */ + std::string map_message; + bool passive_message; + + /** Hide special tile */ + bool invisible; + + /** Only applies actions (ie. passive messages) when going to that direction */ + bool apply_action_north; + bool apply_action_east; + bool apply_action_south; + bool apply_action_west; + }; + struct Level { - int x; - int y; + Vector pos; + std::string name; std::string title; bool solved; + /** Statistics for level tiles */ + Statistics statistics; + + /** Optional flags: */ + + /** Check if this level should be vertically flipped */ + bool vertical_flip; + + /** Filename of the extro text to show once the level is + successfully completed */ + std::string extro_filename; + + /** Go to this world */ + std::string next_worldmap; + + /** Quit the worldmap */ + bool quit_worldmap; + + /** If false, disables the auto walking after finishing a level */ + bool auto_path; + // Directions which are walkable from this level bool north; bool east; @@ -160,21 +179,39 @@ public: bool west; }; + /** Variables to deal with the passive map messages */ + Timer2 passive_message_timer; + std::string passive_message; + private: + std::string map_filename; + std::string levels_path; + + typedef std::vector SpecialTiles; + SpecialTiles special_tiles; + typedef std::vector Levels; Levels levels; MusicRef song; - Direction input_direction; bool enter_level; - Point offset; + Vector offset; std::string savegame_file; + + std::string intro_filename; + bool intro_displayed; + + void get_level_title(Level& level); - void get_level_title(Levels::pointer level); + void draw_status(DrawingContext& context); + + // to avoid calculating total stats all the time. This way only + // when need, it is calculated. + Statistics total_stats; + void calculate_total_stats(); - void draw_status(); public: WorldMap(); ~WorldMap(); @@ -187,23 +224,44 @@ public: void get_input(); /** Update Tux position */ - void update(); + void update(float delta); /** Draw one frame */ - void draw(const Point& offset); + void draw(DrawingContext& context, const Vector& offset); + + Vector get_next_tile(Vector pos, Direction direction); + const Tile* at(Vector pos); - Point get_next_tile(Point pos, Direction direction); - Tile* at(Point pos); WorldMap::Level* at_level(); + WorldMap::SpecialTile* at_special_tile(); /** Check if it is possible to walk from \a pos into \a direction, if possible, write the new position to \a new_pos */ - bool path_ok(Direction direction, Point pos, Point* new_pos); + bool path_ok(Direction direction, Vector pos, Vector* new_pos); + /* Save map to slot */ void savegame(const std::string& filename); + /* Load map from slot + You should call set_map_filename() before this */ void loadgame(const std::string& filename); + /* Load map directly from file */ + void loadmap(const std::string& filename); + + const std::string& get_world_title() const + { return name; } + + const int& get_start_x() const + { return start_x; } + + const int& get_start_y() const + { return start_y; } + + void set_map_filename(std::string filename) + { map_filename = filename; } + private: void on_escape_press(); + void parse_special_tiles(const lisp::Lisp* lisp); }; } // namespace WorldMapNS