X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fworldmap.cpp;h=59da5f234c9cbb7f5357f94a44bae1fde7b7ed27;hb=073795dd0afc7d7e4c093db5f83fc26c10501d61;hp=961b637136629a128847a0113b784040176b2153;hpb=e153dbd4e932d55775a898ed3055e50ea3ac3542;p=supertux.git diff --git a/src/worldmap.cpp b/src/worldmap.cpp index 961b63713..59da5f234 100644 --- a/src/worldmap.cpp +++ b/src/worldmap.cpp @@ -16,19 +16,41 @@ // 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. +#include #include #include #include -#include -#include "globals.h" -#include "texture.h" -#include "screen.h" -#include "lispreader.h" +#include +#include +#include +#include + +#include "app/globals.h" +#include "app/gettext.h" +#include "app/setup.h" +#include "video/surface.h" +#include "video/screen.h" +#include "video/drawing_context.h" +#include "special/frame_rate.h" +#include "audio/sound_manager.h" +#include "lisp/parser.h" +#include "lisp/lisp.h" +#include "lisp/list_iterator.h" +#include "lisp/writer.h" #include "gameloop.h" -#include "setup.h" +#include "sector.h" #include "worldmap.h" #include "resources.h" +#include "misc.h" +#include "player_status.h" +#include "textscroller.h" + +#define map_message_TIME 2.8 + +Menu* worldmap_menu = 0; + +static const float TUXSPEED = 200; namespace WorldMapNS { @@ -36,18 +58,18 @@ Direction reverse_dir(Direction direction) { switch(direction) { - case WEST: - return EAST; - case EAST: - return WEST; - case NORTH: - return SOUTH; - case SOUTH: - return NORTH; - case NONE: - return NONE; + case D_WEST: + return D_EAST; + case D_EAST: + return D_WEST; + case D_NORTH: + return D_SOUTH; + case D_SOUTH: + return D_NORTH; + case D_NONE: + return D_NONE; } - return NONE; + return D_NONE; } std::string @@ -55,13 +77,13 @@ direction_to_string(Direction direction) { switch(direction) { - case WEST: + case D_WEST: return "west"; - case EAST: + case D_EAST: return "east"; - case NORTH: + case D_NORTH: return "north"; - case SOUTH: + case D_SOUTH: return "south"; default: return "none"; @@ -72,92 +94,15 @@ Direction string_to_direction(const std::string& directory) { if (directory == "west") - return WEST; + return D_WEST; else if (directory == "east") - return EAST; + return D_EAST; else if (directory == "north") - return NORTH; + return D_NORTH; else if (directory == "south") - return SOUTH; + return D_SOUTH; else - return NONE; -} - -TileManager::TileManager() -{ - std::string stwt_filename = datadir + "/images/worldmap/antarctica.stwt"; - lisp_object_t* root_obj = lisp_read_from_file(stwt_filename); - - if (!root_obj) - st_abort("Couldn't load file", stwt_filename); - - if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-worldmap-tiles") == 0) - { - lisp_object_t* cur = lisp_cdr(root_obj); - - while(!lisp_nil_p(cur)) - { - lisp_object_t* element = lisp_car(cur); - - if (strcmp(lisp_symbol(lisp_car(element)), "tile") == 0) - { - int id = 0; - std::string filename = ""; - - Tile* tile = new Tile; - tile->north = true; - tile->east = true; - tile->south = true; - tile->west = true; - tile->stop = true; - tile->auto_walk = false; - - LispReader reader(lisp_cdr(element)); - reader.read_int("id", &id); - reader.read_bool("north", &tile->north); - reader.read_bool("south", &tile->south); - reader.read_bool("west", &tile->west); - reader.read_bool("east", &tile->east); - reader.read_bool("stop", &tile->stop); - reader.read_bool("auto-walk", &tile->auto_walk); - reader.read_string("image", &filename); - - tile->sprite = new Surface( - datadir + "/images/worldmap/" + filename, - USE_ALPHA); - - if (id >= int(tiles.size())) - tiles.resize(id+1); - - tiles[id] = tile; - } - else - { - puts("Unhandled symbol"); - } - - cur = lisp_cdr(cur); - } - } - else - { - assert(0); - } - - lisp_free(root_obj); -} - -TileManager::~TileManager() -{ - for(std::vector::iterator i = tiles.begin(); i != tiles.end(); ++i) - delete *i; -} - -Tile* -TileManager::get(int i) -{ - assert(i >=0 && i < int(tiles.size())); - return tiles[i]; + return D_NONE; } //--------------------------------------------------------------------------- @@ -165,16 +110,16 @@ TileManager::get(int i) Tux::Tux(WorldMap* worldmap_) : worldmap(worldmap_) { - largetux_sprite = new Surface(datadir + "/images/worldmap/tux.png", USE_ALPHA); - firetux_sprite = new Surface(datadir + "/images/worldmap/firetux.png", USE_ALPHA); - smalltux_sprite = new Surface(datadir + "/images/worldmap/smalltux.png", USE_ALPHA); + largetux_sprite = new Surface(datadir + "/images/worldmap/tux.png", true); + firetux_sprite = new Surface(datadir + "/images/worldmap/firetux.png", true); + smalltux_sprite = new Surface(datadir + "/images/worldmap/smalltux.png", true); offset = 0; moving = false; - tile_pos.x = 4; - tile_pos.y = 5; - direction = NONE; - input_direction = NONE; + tile_pos.x = worldmap->get_start_x(); + tile_pos.y = worldmap->get_start_y(); + direction = D_NONE; + input_direction = D_NONE; } Tux::~Tux() @@ -185,28 +130,28 @@ Tux::~Tux() } void -Tux::draw(const Point& offset) +Tux::draw(DrawingContext& context, const Vector& offset) { - Point pos = get_pos(); + Vector pos = get_pos(); switch (player_status.bonus) { case PlayerStatus::GROWUP_BONUS: - largetux_sprite->draw(pos.x + offset.x, - pos.y + offset.y - 10); + context.draw_surface(largetux_sprite, + Vector(pos.x + offset.x, pos.y + offset.y - 10), LAYER_OBJECTS); break; case PlayerStatus::FLOWER_BONUS: - firetux_sprite->draw(pos.x + offset.x, - pos.y + offset.y - 10); + context.draw_surface(firetux_sprite, + Vector(pos.x + offset.x, pos.y + offset.y - 10), LAYER_OBJECTS); break; case PlayerStatus::NO_BONUS: - smalltux_sprite->draw(pos.x + offset.x, - pos.y + offset.y - 10); + context.draw_surface(smalltux_sprite, + Vector(pos.x + offset.x, pos.y + offset.y - 10), LAYER_OBJECTS); break; } } -Point +Vector Tux::get_pos() { float x = tile_pos.x * 32; @@ -214,44 +159,51 @@ Tux::get_pos() switch(direction) { - case WEST: + case D_WEST: x -= offset - 32; break; - case EAST: + case D_EAST: x += offset - 32; break; - case NORTH: + case D_NORTH: y -= offset - 32; break; - case SOUTH: + case D_SOUTH: y += offset - 32; break; - case NONE: + case D_NONE: break; } - return Point((int)x, (int)y); + return Vector((int)x, (int)y); } void Tux::stop() { offset = 0; - direction = NONE; + direction = D_NONE; + input_direction = D_NONE; moving = false; } void -Tux::update(float delta) +Tux::set_direction(Direction dir) +{ +input_direction = dir; +} + +void +Tux::action(float delta) { if (!moving) { - if (input_direction != NONE) + if (input_direction != D_NONE) { WorldMap::Level* level = worldmap->at_level(); // We got a new direction, so lets start walking when possible - Point next_tile; + Vector next_tile; if ((!level || level->solved) && worldmap->path_ok(input_direction, tile_pos, &next_tile)) { @@ -262,7 +214,6 @@ Tux::update(float delta) } else if (input_direction == back_direction) { - std::cout << "Back triggered" << std::endl; moving = true; direction = input_direction; tile_pos = worldmap->get_next_tile(tile_pos, direction); @@ -272,56 +223,106 @@ Tux::update(float delta) } else { - // Let tux walk a few pixels (20 pixel/sec) - offset += 20.0f * delta; + // Let tux walk + offset += TUXSPEED * delta; if (offset > 32) { // We reached the next tile, so we check what to do now offset -= 32; - if (worldmap->at(tile_pos)->stop || worldmap->at_level()) + WorldMap::SpecialTile* special_tile = worldmap->at_special_tile(); + if(special_tile && special_tile->passive_message) + { // direction and the apply_action_ are opposites, since they "see" + // directions in a different way + if((direction == D_NORTH && special_tile->apply_action_south) || + (direction == D_SOUTH && special_tile->apply_action_north) || + (direction == D_WEST && special_tile->apply_action_east) || + (direction == D_EAST && special_tile->apply_action_west)) + { + worldmap->passive_message = special_tile->map_message; + worldmap->passive_message_timer.start(map_message_TIME); + } + } + + if (worldmap->at(tile_pos)->getData() & Tile::WORLDMAP_STOP || + (special_tile && !special_tile->passive_message) || + worldmap->at_level()) { + if(special_tile && !special_tile->map_message.empty() && + !special_tile->passive_message) + worldmap->passive_message_timer.start(0); stop(); } else { - if (worldmap->at(tile_pos)->auto_walk) - { // Turn to a new direction - Tile* tile = worldmap->at(tile_pos); - Direction dir = NONE; - - if (tile->north && back_direction != NORTH) - dir = NORTH; - else if (tile->south && back_direction != SOUTH) - dir = SOUTH; - else if (tile->east && back_direction != EAST) - dir = EAST; - else if (tile->west && back_direction != WEST) - dir = WEST; - - if (dir != NONE) - { - direction = dir; + const Tile* tile = worldmap->at(tile_pos); + if (direction != input_direction) + { + // Turn to a new direction + const Tile* tile = worldmap->at(tile_pos); + + if((tile->getData() & Tile::WORLDMAP_NORTH + && input_direction == D_NORTH) || + (tile->getData() & Tile::WORLDMAP_SOUTH + && input_direction == D_SOUTH) || + (tile->getData() & Tile::WORLDMAP_EAST + && input_direction == D_EAST) || + (tile->getData() & Tile::WORLDMAP_WEST + && input_direction == D_WEST)) + { // player has changed direction during auto-movement + direction = input_direction; back_direction = reverse_dir(direction); } else - { - // Should never be reached if tiledata is good + { // player has changed to impossible tile + back_direction = reverse_dir(direction); stop(); - return; } } + else + { + Direction dir = D_NONE; + + if (tile->getData() & Tile::WORLDMAP_NORTH + && back_direction != D_NORTH) + dir = D_NORTH; + else if (tile->getData() & Tile::WORLDMAP_SOUTH + && back_direction != D_SOUTH) + dir = D_SOUTH; + else if (tile->getData() & Tile::WORLDMAP_EAST + && back_direction != D_EAST) + dir = D_EAST; + else if (tile->getData() & Tile::WORLDMAP_WEST + && back_direction != D_WEST) + dir = D_WEST; + + if (dir != D_NONE) + { + direction = dir; + input_direction = direction; + back_direction = reverse_dir(direction); + } + else + { + // Should never be reached if tiledata is good + stop(); + return; + } + } // Walk automatically to the next tile - Point next_tile; - if (worldmap->path_ok(direction, tile_pos, &next_tile)) + if(direction != D_NONE) { + Vector next_tile; + if (worldmap->path_ok(direction, tile_pos, &next_tile)) + { tile_pos = next_tile; - } - else - { + } + else + { puts("Tilemap data is buggy"); stop(); + } } } } @@ -329,36 +330,31 @@ Tux::update(float delta) } //--------------------------------------------------------------------------- -Tile::Tile() -{ -} - -Tile::~Tile() -{ - delete sprite; -} - -//--------------------------------------------------------------------------- WorldMap::WorldMap() { - tile_manager = new TileManager(); - tux = new Tux(this); - + tile_manager = new TileManager("images/worldmap/antarctica.stwt"); + width = 20; height = 15; + + start_x = 4; + start_y = 5; - level_sprite = new Surface(datadir + "/images/worldmap/levelmarker.png", USE_ALPHA); - leveldot_green = new Surface(datadir + "/images/worldmap/leveldot_green.png", USE_ALPHA); - leveldot_red = new Surface(datadir + "/images/worldmap/leveldot_red.png", USE_ALPHA); + tux = new Tux(this); + + leveldot_green = new Surface(datadir + "/images/worldmap/leveldot_green.png", true); + leveldot_red = new Surface(datadir + "/images/worldmap/leveldot_red.png", true); + messagedot = new Surface(datadir + "/images/worldmap/messagedot.png", true); + teleporterdot = new Surface(datadir + "/images/worldmap/teleporterdot.png", true); - input_direction = NONE; enter_level = false; - name = ""; - music = "SALCON.MOD"; + name = ""; + music = "salcon.mod"; + intro_displayed = false; - load_map(); + total_stats.reset(); } WorldMap::~WorldMap() @@ -366,117 +362,171 @@ WorldMap::~WorldMap() delete tux; delete tile_manager; - delete level_sprite; delete leveldot_green; delete leveldot_red; + delete messagedot; + delete teleporterdot; } +// Don't forget to set map_filename before calling this void WorldMap::load_map() { - std::string filename = datadir + "/levels/default/worldmap.stwm"; - - lisp_object_t* root_obj = lisp_read_from_file(filename); - if (!root_obj) - st_abort("Couldn't load file", filename); - - if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-worldmap") == 0) - { - lisp_object_t* cur = lisp_cdr(root_obj); + levels_path = FileSystem::dirname(map_filename); + + try { + lisp::Parser parser; + std::string filename = get_resource_filename(map_filename); + std::auto_ptr root (parser.parse(filename)); + + const lisp::Lisp* lisp = root->get_lisp("supertux-worldmap"); + if(!lisp) + throw new std::runtime_error("file isn't a supertux-worldmap file."); + + lisp::ListIterator iter(lisp); + while(iter.next()) { + if(iter.item() == "tilemap") { + if(tilemap.size() > 0) + throw new std::runtime_error("multiple tilemaps specified"); + + const lisp::Lisp* tilemap_lisp = iter.lisp(); + tilemap_lisp->get("width", width); + tilemap_lisp->get("height", height); + tilemap_lisp->get_vector("data", tilemap); + } else if(iter.item() == "properties") { + const lisp::Lisp* props = iter.lisp(); + props->get("name", name); + props->get("music", music); + props->get("intro-filename", intro_filename); + props->get("start_pos_x", start_x); + props->get("start_pos_y", start_y); + } else if(iter.item() == "special-tiles") { + parse_special_tiles(iter.lisp()); + } else { + std::cerr << "Unknown token '" << iter.item() << "' in worldmap.\n"; + } + } - while(!lisp_nil_p(cur)) - { - lisp_object_t* element = lisp_car(cur); + delete tux; + tux = new Tux(this); + } catch(std::exception& e) { + std::stringstream msg; + msg << "Problem when parsing worldmap '" << map_filename << "': " << + e.what(); + throw std::runtime_error(msg.str()); + } +} - if (strcmp(lisp_symbol(lisp_car(element)), "tilemap") == 0) - { - LispReader reader(lisp_cdr(element)); - reader.read_int("width", &width); - reader.read_int("height", &height); - reader.read_int_vector("data", &tilemap); - } - else if (strcmp(lisp_symbol(lisp_car(element)), "properties") == 0) - { - LispReader reader(lisp_cdr(element)); - reader.read_string("name", &name); - reader.read_string("music", &music); - } - else if (strcmp(lisp_symbol(lisp_car(element)), "levels") == 0) - { - lisp_object_t* cur = lisp_cdr(element); - - while(!lisp_nil_p(cur)) - { - lisp_object_t* element = lisp_car(cur); - - if (strcmp(lisp_symbol(lisp_car(element)), "level") == 0) - { - Level level; - LispReader reader(lisp_cdr(element)); - level.solved = false; +void +WorldMap::parse_special_tiles(const lisp::Lisp* lisp) +{ + lisp::ListIterator iter(lisp); + while(iter.next()) { + if(iter.item() == "special-tile") { + SpecialTile special_tile; + + const lisp::Lisp* lisp = iter.lisp(); + lisp->get("x", special_tile.pos.x); + lisp->get("y", special_tile.pos.y); + lisp->get("map-message", special_tile.map_message); + special_tile.passive_message = false; + lisp->get("passive-message", special_tile.passive_message); + special_tile.teleport_dest = Vector(-1,-1); + lisp->get("teleport-to-x", special_tile.teleport_dest.x); + lisp->get("teleport-to-y", special_tile.teleport_dest.y); + special_tile.invisible = false; + lisp->get("invisible-tile", special_tile.invisible); + + special_tile.apply_action_north = true; + special_tile.apply_action_south = true; + special_tile.apply_action_east = true; + special_tile.apply_action_west = true; + + std::string apply_direction; + lisp->get("apply-to-direction", apply_direction); + if(!apply_direction.empty()) { + special_tile.apply_action_north = false; + special_tile.apply_action_south = false; + special_tile.apply_action_east = false; + special_tile.apply_action_west = false; + if(apply_direction.find("north") != std::string::npos) + special_tile.apply_action_north = true; + if(apply_direction.find("south") != std::string::npos) + special_tile.apply_action_south = true; + if(apply_direction.find("east") != std::string::npos) + special_tile.apply_action_east = true; + if(apply_direction.find("west") != std::string::npos) + special_tile.apply_action_west = true; + } + + special_tiles.push_back(special_tile); + } else if(iter.item() == "level") { + Level level; + + lisp::Lisp* level_lisp = iter.lisp(); + level.solved = false; - level.north = true; - level.east = true; - level.south = true; - level.west = true; + level.north = true; + level.east = true; + level.south = true; + level.west = true; - reader.read_string("extro-filename", &level.extro_filename); - reader.read_string("name", &level.name); - reader.read_int("x", &level.x); - reader.read_int("y", &level.y); + level_lisp->get("extro-filename", level.extro_filename); + level_lisp->get("next-worldmap", level.next_worldmap); - get_level_title(&level); // get level's title + level.quit_worldmap = false; + level_lisp->get("quit-worldmap", level.quit_worldmap); - levels.push_back(level); - } - - cur = lisp_cdr(cur); - } - } - else - { - - } - - cur = lisp_cdr(cur); - } - } + level_lisp->get("name", level.name); + level_lisp->get("x", level.pos.x); + level_lisp->get("y", level.pos.y); - lisp_free(root_obj); -} + level.auto_path = true; + level_lisp->get("auto-path", level.auto_path); -void WorldMap::get_level_title(Levels::pointer level) -{ - /** get level's title */ - level->title = ""; - - FILE * fi; - lisp_object_t* root_obj = 0; - fi = fopen((datadir + "/levels/" + level->name).c_str(), "r"); - if (fi == NULL) - { - perror((datadir + "/levels/" + level->name).c_str()); - return; + level.vertical_flip = false; + level_lisp->get("vertical-flip", level.vertical_flip); + + levels.push_back(level); + } else { + std::cerr << "Unknown token '" << iter.item() << + "' in worldmap special-tiles list."; + } } +} - lisp_stream_t stream; - lisp_stream_init_file (&stream, fi); - root_obj = lisp_read (&stream); +void +WorldMap::get_level_title(Level& level) +{ + /** get special_tile's title */ + level.title = ""; - if (root_obj->type == LISP_TYPE_EOF || root_obj->type == LISP_TYPE_PARSE_ERROR) - { - printf("World: Parse Error in file %s", level->name.c_str()); - } + try { + lisp::Parser parser; + std::auto_ptr root ( + parser.parse(get_resource_filename(levels_path + level.name))); - if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-level") == 0) - { - LispReader reader(lisp_cdr(root_obj)); - reader.read_string("name", &level->title); + const lisp::Lisp* level_lisp = root->get_lisp("supertux-level"); + if(!level_lisp) + return; + + level_lisp->get("name", level.title); + } catch(std::exception& e) { + std::cerr << "Problem when reading leveltitle: " << e.what() << "\n"; + return; } +} - lisp_free(root_obj); - - fclose(fi); +void WorldMap::calculate_total_stats() +{ + total_stats.reset(); + for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) + { + if (i->solved) + { + total_stats += i->statistics; + } + } } void @@ -484,7 +534,10 @@ WorldMap::on_escape_press() { // Show or hide the menu if(!Menu::current()) + { Menu::set_current(worldmap_menu); + tux->set_direction(D_NONE); // stop tux movement when menu is called + } else Menu::set_current(0); } @@ -493,8 +546,8 @@ void WorldMap::get_input() { enter_level = false; - input_direction = NONE; - + SDLKey key; + SDL_Event event; while (SDL_PollEvent(&event)) { @@ -507,38 +560,54 @@ WorldMap::get_input() switch(event.type) { case SDL_QUIT: - st_abort("Received window close", ""); + Termination::abort("Received window close", ""); break; case SDL_KEYDOWN: - switch(event.key.keysym.sym) - { - case SDLK_ESCAPE: - on_escape_press(); - break; - case SDLK_LCTRL: - case SDLK_RETURN: - enter_level = true; - break; - default: - break; - } + key = event.key.keysym.sym; + + if(key == SDLK_ESCAPE) + on_escape_press(); + else if(key == SDLK_RETURN || key == keymap.power) + enter_level = true; + else if(key == SDLK_LEFT || key == keymap.power) + tux->set_direction(D_WEST); + else if(key == SDLK_RIGHT || key == keymap.right) + tux->set_direction(D_EAST); + else if(key == SDLK_UP || key == keymap.up || + key == keymap.jump) + // there might be ppl that use jump as up key + tux->set_direction(D_NORTH); + else if(key == SDLK_DOWN || key == keymap.down) + tux->set_direction(D_SOUTH); + break; + + case SDL_JOYHATMOTION: + if(event.jhat.value & SDL_HAT_UP) { + tux->set_direction(D_NORTH); + } else if(event.jhat.value & SDL_HAT_DOWN) { + tux->set_direction(D_SOUTH); + } else if(event.jhat.value & SDL_HAT_LEFT) { + tux->set_direction(D_WEST); + } else if(event.jhat.value & SDL_HAT_RIGHT) { + tux->set_direction(D_EAST); + } break; case SDL_JOYAXISMOTION: if (event.jaxis.axis == joystick_keymap.x_axis) { if (event.jaxis.value < -joystick_keymap.dead_zone) - input_direction = WEST; + tux->set_direction(D_WEST); else if (event.jaxis.value > joystick_keymap.dead_zone) - input_direction = EAST; + tux->set_direction(D_EAST); } else if (event.jaxis.axis == joystick_keymap.y_axis) { if (event.jaxis.value > joystick_keymap.dead_zone) - input_direction = SOUTH; + tux->set_direction(D_SOUTH); else if (event.jaxis.value < -joystick_keymap.dead_zone) - input_direction = NORTH; + tux->set_direction(D_NORTH); } break; @@ -554,47 +623,33 @@ WorldMap::get_input() } } } - - if (!Menu::current()) - { - Uint8 *keystate = SDL_GetKeyState(NULL); - - if (keystate[SDLK_LEFT]) - input_direction = WEST; - else if (keystate[SDLK_RIGHT]) - input_direction = EAST; - else if (keystate[SDLK_UP]) - input_direction = NORTH; - else if (keystate[SDLK_DOWN]) - input_direction = SOUTH; - } } -Point -WorldMap::get_next_tile(Point pos, Direction direction) +Vector +WorldMap::get_next_tile(Vector pos, Direction direction) { switch(direction) { - case WEST: + case D_WEST: pos.x -= 1; break; - case EAST: + case D_EAST: pos.x += 1; break; - case NORTH: + case D_NORTH: pos.y -= 1; break; - case SOUTH: + case D_SOUTH: pos.y += 1; break; - case NONE: + case D_NONE: break; } return pos; } bool -WorldMap::path_ok(Direction direction, Point old_pos, Point* new_pos) +WorldMap::path_ok(Direction direction, Vector old_pos, Vector* new_pos) { *new_pos = get_next_tile(old_pos, direction); @@ -604,22 +659,26 @@ WorldMap::path_ok(Direction direction, Point old_pos, Point* new_pos) return false; } else - { // Check if we the tile allows us to go to new_pos + { // Check if the tile allows us to go to new_pos switch(direction) { - case WEST: - return (at(old_pos)->west && at(*new_pos)->east); + case D_WEST: + return (at(old_pos)->getData() & Tile::WORLDMAP_WEST + && at(*new_pos)->getData() & Tile::WORLDMAP_EAST); - case EAST: - return (at(old_pos)->east && at(*new_pos)->west); + case D_EAST: + return (at(old_pos)->getData() & Tile::WORLDMAP_EAST + && at(*new_pos)->getData() & Tile::WORLDMAP_WEST); - case NORTH: - return (at(old_pos)->north && at(*new_pos)->south); + case D_NORTH: + return (at(old_pos)->getData() & Tile::WORLDMAP_NORTH + && at(*new_pos)->getData() & Tile::WORLDMAP_SOUTH); - case SOUTH: - return (at(old_pos)->south && at(*new_pos)->north); + case D_SOUTH: + return (at(old_pos)->getData() & Tile::WORLDMAP_SOUTH + && at(*new_pos)->getData() & Tile::WORLDMAP_NORTH); - case NONE: + case D_NONE: assert(!"path_ok() can't work if direction is NONE"); } return false; @@ -631,99 +690,168 @@ WorldMap::update(float delta) { if (enter_level && !tux->is_moving()) { + /* Check special tile action */ + SpecialTile* special_tile = at_special_tile(); + if(special_tile) + { + if (special_tile->teleport_dest != Vector(-1,-1)) + { + // TODO: an animation, camera scrolling or a fading would be a nice touch + SoundManager::get()->play_sound(IDToSound(SND_WARP)); + tux->back_direction = D_NONE; + tux->set_tile_pos(special_tile->teleport_dest); + SDL_Delay(1000); + } + } + + /* Check level action */ + bool level_finished = true; Level* level = at_level(); - if (level) + if (!level) + { + std::cout << "No level to enter at: " + << tux->get_tile_pos().x << ", " << tux->get_tile_pos().y + << std::endl; + return; + } + + + if (level->pos == tux->get_tile_pos()) { - if (level->x == tux->get_tile_pos().x && - level->y == tux->get_tile_pos().y) + PlayerStatus old_player_status = player_status; + + std::cout << "Enter the current level: " << level->name << std::endl; + // do a shriking fade to the level + shrink_fade(Vector((level->pos.x*32 + 16 + offset.x), + (level->pos.y*32 + 16 + offset.y)), 500); + GameSession session(get_resource_filename(levels_path + level->name), + ST_GL_LOAD_LEVEL_FILE, &level->statistics); + + switch (session.run()) { - std::cout << "Enter the current level: " << level->name << std::endl;; - GameSession session(datadir + "/levels/" + level->name, - 1, ST_GL_LOAD_LEVEL_FILE); + case GameSession::ES_LEVEL_FINISHED: + { + level_finished = true; + bool old_level_state = level->solved; + level->solved = true; + + // deal with statistics + level->statistics.merge(global_stats); + calculate_total_stats(); + + if (session.get_current_sector()->player->got_power != + session.get_current_sector()->player->NONE_POWER) + player_status.bonus = PlayerStatus::FLOWER_BONUS; + else if (session.get_current_sector()->player->size == BIG) + player_status.bonus = PlayerStatus::GROWUP_BONUS; + else + player_status.bonus = PlayerStatus::NO_BONUS; - switch (session.run()) - { - case GameSession::LEVEL_FINISHED: - { - bool old_level_state = level->solved; - level->solved = true; - - if (session.get_world()->get_tux()->got_coffee) - player_status.bonus = PlayerStatus::FLOWER_BONUS; - else if (session.get_world()->get_tux()->size == BIG) - player_status.bonus = PlayerStatus::GROWUP_BONUS; - else - player_status.bonus = PlayerStatus::NO_BONUS; - - if (old_level_state != level->solved) - { // Try to detect the next direction to which we should walk - // FIXME: Mostly a hack - Direction dir = NONE; - - Tile* tile = at(tux->get_tile_pos()); - - if (tile->north && tux->back_direction != NORTH) - dir = NORTH; - else if (tile->south && tux->back_direction != SOUTH) - dir = SOUTH; - else if (tile->east && tux->back_direction != EAST) - dir = EAST; - else if (tile->west && tux->back_direction != WEST) - dir = WEST; - - if (dir != NONE) - { - tux->set_direction(dir); - tux->update(delta); - } - - std::cout << "Walk to dir: " << dir << std::endl; + if (old_level_state != level->solved && level->auto_path) + { // Try to detect the next direction to which we should walk + // FIXME: Mostly a hack + Direction dir = D_NONE; + + const Tile* tile = at(tux->get_tile_pos()); + + if (tile->getData() & Tile::WORLDMAP_NORTH + && tux->back_direction != D_NORTH) + dir = D_NORTH; + else if (tile->getData() & Tile::WORLDMAP_SOUTH + && tux->back_direction != D_SOUTH) + dir = D_SOUTH; + else if (tile->getData() & Tile::WORLDMAP_EAST + && tux->back_direction != D_EAST) + dir = D_EAST; + else if (tile->getData() & Tile::WORLDMAP_WEST + && tux->back_direction != D_WEST) + dir = D_WEST; + + if (dir != D_NONE) + { + tux->set_direction(dir); + //tux->update(delta); } - if (!level->extro_filename.empty()) - { // Display final credits and go back to the main menu - display_text_file(level->extro_filename, - "/images/background/arctis2.jpg"); - quit = true; - } + std::cout << "Walk to dir: " << dir << std::endl; } + } - break; - case GameSession::LEVEL_ABORT: - // Reseting the player_status might be a worthy - // consideration, but I don't think we need it - // 'cause only the bad players will use it to - // 'cheat' a few items and that isn't necesarry a - // bad thing (ie. better they continue that way, - // then stop playing the game all together since it - // is to hard) - break; - case GameSession::GAME_OVER: - quit = true; - player_status.bonus = PlayerStatus::NO_BONUS; - break; - case GameSession::NONE: - // Should never be reached - break; - } + break; + case GameSession::ES_LEVEL_ABORT: + level_finished = false; + /* In case the player's abort the level, keep it using the old + status. But the minimum lives and no bonus. */ + player_status.distros = old_player_status.distros; + player_status.lives = std::min(old_player_status.lives, player_status.lives); + player_status.bonus = player_status.NO_BONUS; + + break; + case GameSession::ES_GAME_OVER: + { + level_finished = false; + /* draw an end screen */ + /* TODO: in the future, this should make a dialog a la SuperMario, asking + if the player wants to restart the world map with no score and from + level 1 */ + char str[80]; + + DrawingContext context; + context.draw_gradient(Color (200,240,220), Color(200,200,220), + LAYER_BACKGROUND0); + + context.draw_text(blue_text, _("GAMEOVER"), + Vector(screen->w/2, 200), CENTER_ALLIGN, LAYER_FOREGROUND1); + + sprintf(str, _("COINS: %d"), player_status.distros); + context.draw_text(gold_text, str, + Vector(screen->w/2, screen->w - 32), CENTER_ALLIGN, + LAYER_FOREGROUND1); + + total_stats.draw_message_info(context, _("Total Statistics")); + + context.do_drawing(); - music_manager->play_music(song); - Menu::set_current(0); - if (!savegame_file.empty()) - savegame(savegame_file); - return; + SDL_Event event; + wait_for_event(event,2000,6000,true); + + quit = true; + player_status.reset(); + break; + } + case GameSession::ES_NONE: + assert(false); + // Should never be reached + break; } + + SoundManager::get()->play_music(song); + Menu::set_current(0); + if (!savegame_file.empty()) + savegame(savegame_file); } - else - { - std::cout << "Nothing to enter at: " - << tux->get_tile_pos().x << ", " << tux->get_tile_pos().y << std::endl; + /* The porpose of the next checking is that if the player lost + the level (in case there is one), don't show anything */ + if(level_finished) { + if (!level->extro_filename.empty()) { + // Display a text file + std::string filename = levels_path + level->extro_filename; + display_text_file(filename); + } + + if (!level->next_worldmap.empty()) + { + // Load given worldmap + loadmap(level->next_worldmap); + } + if (level->quit_worldmap) + quit = true; } } else { - tux->set_direction(input_direction); - tux->update(delta); + tux->action(delta); +// tux->set_direction(input_direction); } Menu* menu = Menu::current(); @@ -737,11 +865,6 @@ WorldMap::update(float delta) { case MNID_RETURNWORLDMAP: // Return to game break; - case MNID_SAVEGAME: - if (!savegame_file.empty()) - savegame(savegame_file); - break; - case MNID_QUITWORLDMAP: // Quit Worldmap quit = true; break; @@ -754,15 +877,17 @@ WorldMap::update(float delta) } } -Tile* -WorldMap::at(Point p) +const Tile* +WorldMap::at(Vector p) { assert(p.x >= 0 && p.x < width && p.y >= 0 && p.y < height); - return tile_manager->get(tilemap[width * p.y + p.x]); + int x = int(p.x); + int y = int(p.y); + return tile_manager->get(tilemap[width * y + x]); } WorldMap::Level* @@ -770,8 +895,19 @@ WorldMap::at_level() { for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) { - if (i->x == tux->get_tile_pos().x && - i->y == tux->get_tile_pos().y) + if (i->pos == tux->get_tile_pos()) + return &*i; + } + + return 0; +} + +WorldMap::SpecialTile* +WorldMap::at_special_tile() +{ + for(SpecialTiles::iterator i = special_tiles.begin(); i != special_tiles.end(); ++i) + { + if (i->pos == tux->get_tile_pos()) return &*i; } @@ -780,67 +916,116 @@ WorldMap::at_level() void -WorldMap::draw(const Point& offset) +WorldMap::draw(DrawingContext& context, const Vector& offset) { for(int y = 0; y < height; ++y) for(int x = 0; x < width; ++x) { - Tile* tile = at(Point(x, y)); - tile->sprite->draw(x*32 + offset.x, - y*32 + offset.y); + const Tile* tile = at(Vector(x, y)); + tile->draw(context, Vector(x*32 + offset.x, y*32 + offset.y), + LAYER_TILES); } - + for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) { if (i->solved) - leveldot_green->draw(i->x*32 + offset.x, - i->y*32 + offset.y); + context.draw_surface(leveldot_green, + Vector(i->pos.x*32 + offset.x, i->pos.y*32 + offset.y), LAYER_TILES+1); else - leveldot_red->draw(i->x*32 + offset.x, - i->y*32 + offset.y); + context.draw_surface(leveldot_red, + Vector(i->pos.x*32 + offset.x, i->pos.y*32 + offset.y), LAYER_TILES+1); } - tux->draw(offset); - draw_status(); + for(SpecialTiles::iterator i = special_tiles.begin(); i != special_tiles.end(); ++i) + { + if(i->invisible) + continue; + + if (i->teleport_dest != Vector(-1, -1)) + context.draw_surface(teleporterdot, + Vector(i->pos.x*32 + offset.x, i->pos.y*32 + offset.y), LAYER_TILES+1); + + else if (!i->map_message.empty() && !i->passive_message) + context.draw_surface(messagedot, + Vector(i->pos.x*32 + offset.x, i->pos.y*32 + offset.y), LAYER_TILES+1); + } + + tux->draw(context, offset); + draw_status(context); } void -WorldMap::draw_status() +WorldMap::draw_status(DrawingContext& context) { char str[80]; - sprintf(str, "%d", player_status.score); - white_text->draw("SCORE", 0, 0); - gold_text->draw(str, 96, 0); + sprintf(str, " %d", total_stats.get_points(SCORE_STAT)); + + context.draw_text(white_text, _("SCORE"), Vector(0, 0), LEFT_ALLIGN, LAYER_FOREGROUND1); + context.draw_text(gold_text, str, Vector(96, 0), LEFT_ALLIGN, LAYER_FOREGROUND1); sprintf(str, "%d", player_status.distros); - white_text->draw_align("COINS", 320-64, 0, A_LEFT, A_TOP); - gold_text->draw_align(str, 320+64, 0, A_RIGHT, A_TOP); + context.draw_text(white_text, _("COINS"), Vector(screen->w/2 - 16*5, 0), + LEFT_ALLIGN, LAYER_FOREGROUND1); + context.draw_text(gold_text, str, Vector(screen->w/2 + (16*5)/2, 0), + LEFT_ALLIGN, LAYER_FOREGROUND1); - white_text->draw("LIVES", 480, 0); if (player_status.lives >= 5) { sprintf(str, "%dx", player_status.lives); - gold_text->draw(str, 585, 0); - tux_life->draw(565+(18*3), 0); + context.draw_text(gold_text, str, + Vector(screen->w - gold_text->get_text_width(str) - tux_life->w, 0), + LEFT_ALLIGN, LAYER_FOREGROUND1); + context.draw_surface(tux_life, Vector(screen->w - + gold_text->get_text_width("9"), 0), LEFT_ALLIGN, LAYER_FOREGROUND1); } else { for(int i= 0; i < player_status.lives; ++i) - tux_life->draw(565+(18*i),0); + context.draw_surface(tux_life, + Vector(screen->w - tux_life->w*4 + (tux_life->w*i), 0), + LAYER_FOREGROUND1); } + context.draw_text(white_text, _("LIVES"), + Vector(screen->w - white_text->get_text_width(_("LIVES")) - white_text->get_text_width(" 99"), 0), + LEFT_ALLIGN, LAYER_FOREGROUND1); if (!tux->is_moving()) { for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) { - if (i->x == tux->get_tile_pos().x && - i->y == tux->get_tile_pos().y) + if (i->pos == tux->get_tile_pos()) + { + if(i->title == "") + get_level_title(*i); + + context.draw_text(white_text, i->title, + Vector(screen->w/2, + screen->h - white_text->get_height() - 30), + CENTER_ALLIGN, LAYER_FOREGROUND1); + + i->statistics.draw_worldmap_info(context); + break; + } + } + for(SpecialTiles::iterator i = special_tiles.begin(); i != special_tiles.end(); ++i) + { + if (i->pos == tux->get_tile_pos()) { - white_text->draw_align(i->title.c_str(), screen->w/2, screen->h, A_HMIDDLE, A_BOTTOM); + /* Display an in-map message in the map, if any as been selected */ + if(!i->map_message.empty() && !i->passive_message) + context.draw_text(gold_text, i->map_message, + Vector(screen->w/2, + screen->h - white_text->get_height() - 60), + CENTER_ALLIGN, LAYER_FOREGROUND1); break; } } } + /* Display a passive message in the map, if needed */ + if(passive_message_timer.check()) + context.draw_text(gold_text, passive_message, + Vector(screen->w/2, screen->h - white_text->get_height() - 60), + CENTER_ALLIGN, LAYER_FOREGROUND1); } void @@ -850,86 +1035,109 @@ WorldMap::display() quit = false; - song = music_manager->load_music(datadir + "/music/" + music); - music_manager->play_music(song); + song = SoundManager::get()->load_music(datadir + "/music/" + music); + SoundManager::get()->play_music(song); - unsigned int last_update_time; - unsigned int update_time; + if(!intro_displayed && intro_filename != "") { + std::string filename = levels_path + intro_filename; + display_text_file(filename); + intro_displayed = true; + } - last_update_time = update_time = st_get_ticks(); + Uint32 lastticks = SDL_GetTicks(); + DrawingContext context; + while(!quit) { + Uint32 ticks = SDL_GetTicks(); + float elapsed_time = float(ticks - lastticks) / 1000; + global_time += elapsed_time; + lastticks = ticks; + + // 40 fps minimum + if(elapsed_time > .025) + elapsed_time = .025; + + Vector tux_pos = tux->get_pos(); + + offset.x = -tux_pos.x + screen->w/2; + offset.y = -tux_pos.y + screen->h/2; + + if (offset.x > 0) offset.x = 0; + if (offset.y > 0) offset.y = 0; + + if (offset.x < screen->w - width*32) offset.x = screen->w - width*32; + if (offset.y < screen->h - height*32) offset.y = screen->h - height*32; + + draw(context, offset); + get_input(); + update(elapsed_time); + + if(Menu::current()) { + Menu::current()->draw(context); + mouse_cursor->draw(context); + } - while(!quit) - { - float delta = ((float)(update_time-last_update_time))/100.0; + context.do_drawing(); + } +} - delta *= 1.3f; +void +WorldMap::savegame(const std::string& filename) +{ + if(filename == "") + return; - last_update_time = update_time; - update_time = st_get_ticks(); + std::ofstream file(filename.c_str(), std::ios::out); + lisp::Writer writer(file); - Point tux_pos = tux->get_pos(); - if (1) - { - offset.x = -tux_pos.x + screen->w/2; - offset.y = -tux_pos.y + screen->h/2; + int nb_solved_levels = 0, total_levels = 0; + for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) { + ++total_levels; + if (i->solved) + ++nb_solved_levels; + } + char nb_solved_levels_str[80], total_levels_str[80]; + sprintf(nb_solved_levels_str, "%d", nb_solved_levels); + sprintf(total_levels_str, "%d", total_levels); - if (offset.x > 0) offset.x = 0; - if (offset.y > 0) offset.y = 0; + writer.write_comment("Worldmap save file"); - if (offset.x < screen->w - width*32) offset.x = screen->w - width*32; - if (offset.y < screen->h - height*32) offset.y = screen->h - height*32; - } + writer.start_list("supertux-savegame"); - draw(offset); - get_input(); - update(delta); + writer.write_int("version", 1); + writer.write_string("title", + std::string(name + " - " + nb_solved_levels_str+"/"+total_levels_str)); + writer.write_string("map", map_filename); + writer.write_bool("intro-displayed", intro_displayed); - if(Menu::current()) - { - Menu::current()->draw(); - mouse_cursor->draw(); - } - flipscreen(); + writer.start_list("tux"); - SDL_Delay(20); - } -} + writer.write_float("x", tux->get_tile_pos().x); + writer.write_float("y", tux->get_tile_pos().y); + writer.write_string("back", direction_to_string(tux->back_direction)); + player_status.write(writer); + writer.write_string("back", direction_to_string(tux->back_direction)); -void -WorldMap::savegame(const std::string& filename) -{ - std::cout << "savegame: " << filename << std::endl; - std::ofstream out(filename.c_str()); + writer.end_list("tux"); - int nb_solved_levels = 0; - for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) - { - if (i->solved) - ++nb_solved_levels; - } + writer.start_list("levels"); - out << "(supertux-savegame\n" - << " (version 1)\n" - << " (title \"Icyisland - " << nb_solved_levels << "/" << levels.size() << "\")\n" - << " (lives " << player_status.lives << ")\n" - << " (score " << player_status.score << ")\n" - << " (distros " << player_status.distros << ")\n" - << " (tux (x " << tux->get_tile_pos().x << ") (y " << tux->get_tile_pos().y << ")\n" - << " (back \"" << direction_to_string(tux->back_direction) << "\")\n" - << " (bonus \"" << bonus_to_string(player_status.bonus) << "\"))\n" - << " (levels\n"; - for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) { if (i->solved) { - out << " (level (name \"" << i->name << "\")\n" - << " (solved #t))\n"; + writer.start_list("level"); + + writer.write_string("name", i->name); + writer.write_bool("solved", true); + i->statistics.write(writer); + + writer.end_list("level"); } } - out << " )\n" - << " )\n\n;; EOF ;;" << std::endl; + writer.end_list("levels"); + + writer.end_list("supertux-savegame"); } void @@ -938,83 +1146,84 @@ WorldMap::loadgame(const std::string& filename) std::cout << "loadgame: " << filename << std::endl; savegame_file = filename; - if (access(filename.c_str(), F_OK) != 0) - return; + try { + lisp::Parser parser; + std::auto_ptr root (parser.parse(filename)); - lisp_object_t* savegame = lisp_read_from_file(filename); - if (!savegame) + const lisp::Lisp* savegame = root->get_lisp("supertux-savegame"); + if(!savegame) + throw std::runtime_error("File is not a supertux-savegame file."); + + /* Get the Map filename and then load it before setting level settings */ + std::string cur_map_filename = map_filename; + savegame->get("map", map_filename); + load_map(); + + savegame->get("intro-displayed", intro_displayed); + savegame->get("lives", player_status.lives); + savegame->get("distros", player_status.distros); + savegame->get("max-score-multiplier", player_status.max_score_multiplier); + if (player_status.lives < 0) + player_status.reset(); + + const lisp::Lisp* tux_lisp = savegame->get_lisp("tux"); + if(tux) { - std::cout << "WorldMap:loadgame: File not found: " << filename << std::endl; - return; - } - - lisp_object_t* cur = savegame; - - if (strcmp(lisp_symbol(lisp_car(cur)), "supertux-savegame") != 0) - return; - - cur = lisp_cdr(cur); - LispReader reader(cur); - - reader.read_int("lives", &player_status.lives); - reader.read_int("score", &player_status.score); - reader.read_int("distros", &player_status.distros); - - if (player_status.lives < 0) - player_status.lives = START_LIVES; - - lisp_object_t* tux_cur = 0; - if (reader.read_lisp("tux", &tux_cur)) - { - Point p; + Vector p; std::string back_str = "none"; - std::string bonus_str = "none"; - LispReader tux_reader(tux_cur); - tux_reader.read_int("x", &p.x); - tux_reader.read_int("y", &p.y); - tux_reader.read_string("back", &back_str); - tux_reader.read_string("bonus", &bonus_str); + tux_lisp->get("x", p.x); + tux_lisp->get("y", p.y); + tux_lisp->get("back", back_str); + player_status.read(*tux_lisp); - player_status.bonus = string_to_bonus(bonus_str); tux->back_direction = string_to_direction(back_str); tux->set_tile_pos(p); } - lisp_object_t* level_cur = 0; - if (reader.read_lisp("levels", &level_cur)) - { - while(level_cur) - { - lisp_object_t* sym = lisp_car(lisp_car(level_cur)); - lisp_object_t* data = lisp_cdr(lisp_car(level_cur)); - - if (strcmp(lisp_symbol(sym), "level") == 0) + const lisp::Lisp* levels_lisp = savegame->get_lisp("levels"); + if(levels_lisp) { + lisp::ListIterator iter(levels_lisp); + while(iter.next()) { + if(iter.item() == "level") { + std::string name; + bool solved = false; + + const lisp::Lisp* level = iter.lisp(); + level->get("name", name); + level->get("solved", solved); + + for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) + { + if (name == i->name) { - std::string name; - bool solved = false; - - LispReader level_reader(data); - level_reader.read_string("name", &name); - level_reader.read_bool("solved", &solved); - - for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) - { - if (name == i->name) - i->solved = solved; - } + i->solved = solved; + i->statistics.parse(*level); + break; } - - level_cur = lisp_cdr(level_cur); + } + } else { + std::cerr << "Unknown token '" << iter.item() + << "' in levels block in worldmap.\n"; } + } } - - lisp_free(savegame); -} + } catch(std::exception& e) { + std::cerr << "Problem loading game '" << filename << "': " << e.what() + << "\n"; + load_map(); + player_status.reset(); + } -} // namespace WorldMapNS + calculate_total_stats(); +} -/* Local Variables: */ -/* mode:c++ */ -/* End: */ +void +WorldMap::loadmap(const std::string& filename) +{ + savegame_file = ""; + map_filename = filename; + load_map(); +} +} // namespace WorldMapNS