X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fworldmap.cpp;h=9fe482fa03144ac63207556e014cb50889032d1a;hb=2236c2d6e68a9a3bbff4dd2953f868ee2aae8f6a;hp=961b637136629a128847a0113b784040176b2153;hpb=e153dbd4e932d55775a898ed3055e50ea3ac3542;p=supertux.git diff --git a/src/worldmap.cpp b/src/worldmap.cpp index 961b63713..9fe482fa0 100644 --- a/src/worldmap.cpp +++ b/src/worldmap.cpp @@ -20,15 +20,28 @@ #include #include #include -#include -#include "globals.h" -#include "texture.h" -#include "screen.h" -#include "lispreader.h" +#include +#include + +#include "app/globals.h" +#include "video/surface.h" +#include "video/screen.h" +#include "video/drawing_context.h" +#include "utils/lispreader.h" +#include "utils/lispwriter.h" +#include "special/frame_rate.h" #include "gameloop.h" -#include "setup.h" +#include "app/setup.h" +#include "sector.h" #include "worldmap.h" +#include "audio/sound_manager.h" #include "resources.h" +#include "app/gettext.h" +#include "misc.h" + +#define map_message_TIME 2800 + +Menu* worldmap_menu = 0; namespace WorldMapNS { @@ -36,18 +49,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 +68,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,15 +85,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; + return D_NONE; } TileManager::TileManager() @@ -89,7 +102,7 @@ TileManager::TileManager() lisp_object_t* root_obj = lisp_read_from_file(stwt_filename); if (!root_obj) - st_abort("Couldn't load file", stwt_filename); + Termination::abort("Couldn't load file", stwt_filename); if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-worldmap-tiles") == 0) { @@ -102,29 +115,70 @@ TileManager::TileManager() 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->north = tile->east = tile->south = 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); + reader.read_int("id", id); + + std::string temp; + reader.read_string("possible-directions", temp); + if(!temp.empty()) + { + tile->north = tile->east = tile->south = tile->west = false; + if(temp.find("north") != std::string::npos) + tile->north = true; + if(temp.find("south") != std::string::npos) + tile->south = true; + if(temp.find("east") != std::string::npos) + tile->east = true; + if(temp.find("west") != std::string::npos) + tile->west = true; + } + + /* For backward compatibility */ + 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("one-way", temp); + tile->one_way = BOTH_WAYS; + if(!temp.empty()) + { + if(temp == "north-south") + tile->one_way = NORTH_SOUTH_WAY; + else if(temp == "south-north") + tile->one_way = SOUTH_NORTH_WAY; + else if(temp == "east-west") + tile->one_way = EAST_WEST_WAY; + else if(temp == "west-east") + tile->one_way = WEST_EAST_WAY; + } + + std::vector filenames; + reader.read_string_vector("image", filenames); + + if(filenames.size() == 0) + std::cerr << "Warning: no image specified for tile " << id + << ".\nIgnoring...\n" << std::endl; + + for(int i = 0; i < filenames.size(); i++) + { + Surface* image = new Surface( + datadir + "/images/worldmap/" + filenames[i], true); + tile->images.push_back(image); + } + + tile->anim_speed = 25; + reader.read_int("anim-speed", tile->anim_speed); + if (id >= int(tiles.size())) tiles.resize(id+1); @@ -165,16 +219,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 +239,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,45 +268,52 @@ 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(); + WorldMap::SpecialTile* special_tile = worldmap->at_special_tile(); // We got a new direction, so lets start walking when possible - Point next_tile; - if ((!level || level->solved) + Vector next_tile; + if ((!special_tile || special_tile->solved || special_tile->level_name.empty()) && worldmap->path_ok(input_direction, tile_pos, &next_tile)) { tile_pos = next_tile; @@ -262,7 +323,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); @@ -279,49 +339,89 @@ Tux::update(float delta) { // 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)->stop || (special_tile && + !special_tile->passive_message)) { + if(special_tile && !special_tile->map_message.empty() && + !special_tile->passive_message) + worldmap->passive_message_timer.stop(); stop(); } else { - if (worldmap->at(tile_pos)->auto_walk) + if (worldmap->at(tile_pos)->auto_walk || direction != input_direction) { // 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; + + if(direction != input_direction && + ((tile->north && input_direction == D_NORTH) || + (tile->south && input_direction == D_SOUTH) || + (tile->east && input_direction == D_EAST) || + (tile->west && input_direction == D_WEST))) + { // player has changed direction during auto-movement + direction = input_direction; + back_direction = reverse_dir(direction); + } + else if(direction != input_direction) + { // player has changed to impossible tile back_direction = reverse_dir(direction); + stop(); } else { + Direction dir = D_NONE; + + if (tile->north && back_direction != D_NORTH) + dir = D_NORTH; + else if (tile->south && back_direction != D_SOUTH) + dir = D_SOUTH; + else if (tile->east && back_direction != D_EAST) + dir = D_EAST; + else if (tile->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(); + } } } } @@ -335,7 +435,31 @@ Tile::Tile() Tile::~Tile() { - delete sprite; + for(std::vector::iterator i = images.begin(); i != images.end(); i++) + delete *i; +} + + +void +Tile::draw(DrawingContext& context, Vector pos) +{ + // same code as from tile_manager.cpp draw_tile() + + if(!images.size()) + return; + + if(images.size() > 1) + { + size_t frame + = ((global_frame_counter*25) / anim_speed) % images.size(); + +std::cerr << "frame: " << frame << std::endl; + context.draw_surface(images[frame], pos, LAYER_TILES); + } + else if (images.size() == 1) + { + context.draw_surface(images[0], pos, LAYER_TILES); + } } //--------------------------------------------------------------------------- @@ -343,22 +467,28 @@ Tile::~Tile() WorldMap::WorldMap() { tile_manager = new TileManager(); - tux = new Tux(this); - + //tux = new Tux(this); + width = 20; height = 15; + + start_x = 4; + start_y = 5; + + 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); - 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); - - input_direction = NONE; enter_level = false; - name = ""; + name = ""; music = "SALCON.MOD"; - load_map(); + global_frame_counter = 0; + frame_timer.init(true); + + total_stats.reset(); } WorldMap::~WorldMap() @@ -366,20 +496,20 @@ 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); + lisp_object_t* root_obj = lisp_read_from_file(datadir + "/levels/worldmap/" + map_filename); if (!root_obj) - st_abort("Couldn't load file", filename); - + Termination::abort("Couldn't load file", datadir + "/levels/worldmap/" + map_filename); + if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-worldmap") == 0) { lisp_object_t* cur = lisp_cdr(root_obj); @@ -391,43 +521,117 @@ WorldMap::load_map() 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); + 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); + reader.read_string("name", name, true); + reader.read_string("music", music); + reader.read_int("start_pos_x", start_x); + reader.read_int("start_pos_y", start_y); } - else if (strcmp(lisp_symbol(lisp_car(element)), "levels") == 0) + else if (strcmp(lisp_symbol(lisp_car(element)), "special-tiles") == 0 || + 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) + + if (strcmp(lisp_symbol(lisp_car(element)), "special-tile") == 0) { - Level level; + SpecialTile special_tile; LispReader reader(lisp_cdr(element)); - level.solved = false; + special_tile.solved = false; - level.north = true; - level.east = true; - level.south = true; - level.west = true; + special_tile.north = true; + special_tile.east = true; + special_tile.south = true; + special_tile.west = true; + + reader.read_int("x", special_tile.x); + reader.read_int("y", special_tile.y); + reader.read_string("level", special_tile.level_name, false); + + special_tile.vertical_flip = false; + reader.read_bool("vertical-flip", special_tile.vertical_flip); + + special_tile.map_message.erase(); + reader.read_string("map-message", special_tile.map_message); + special_tile.passive_message = false; + reader.read_bool("passive-message", special_tile.passive_message); + + special_tile.teleport_dest_x = special_tile.teleport_dest_y = -1; + reader.read_int("teleport-to-x", special_tile.teleport_dest_x); + reader.read_int("teleport-to-y", special_tile.teleport_dest_y); + + special_tile.invisible = false; + reader.read_bool("invisible-tile", special_tile.invisible); + + special_tile.apply_action_north = special_tile.apply_action_south = + special_tile.apply_action_east = special_tile.apply_action_west = + true; + std::string apply_direction; + reader.read_string("apply-to-direction", apply_direction); + if(!apply_direction.empty()) + { + special_tile.apply_action_north = special_tile.apply_action_south = + special_tile.apply_action_east = 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; + } + + reader.read_string("extro-filename", special_tile.extro_filename); + reader.read_string("next-world", special_tile.next_worldmap); + special_tile.quit_worldmap = false; + reader.read_bool("exit-game", special_tile.quit_worldmap); + + special_tile.auto_path = true; + reader.read_bool("auto-path", special_tile.auto_path); + + special_tiles.push_back(special_tile); + } + + /* Kept for backward compability */ + else if (strcmp(lisp_symbol(lisp_car(element)), "level") == 0) + { + SpecialTile special_tile; + LispReader reader(lisp_cdr(element)); + special_tile.solved = false; + + special_tile.north = true; + special_tile.east = true; + special_tile.south = true; + special_tile.west = true; + + special_tile.invisible = false; - 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); + special_tile.apply_action_north = special_tile.apply_action_south = + special_tile.apply_action_east = special_tile.apply_action_west = + true; + special_tile.vertical_flip = false; + special_tile.teleport_dest_x = special_tile.teleport_dest_y = -1; - get_level_title(&level); // get level's title + reader.read_string("extro-filename", special_tile.extro_filename); + if(!special_tile.extro_filename.empty()) + special_tile.quit_worldmap = true; + reader.read_string("name", special_tile.level_name, true); + reader.read_int("x", special_tile.x); + reader.read_int("y", special_tile.y); - levels.push_back(level); + + special_tiles.push_back(special_tile); } cur = lisp_cdr(cur); @@ -443,40 +647,35 @@ WorldMap::load_map() } lisp_free(root_obj); + tux = new Tux(this); } -void WorldMap::get_level_title(Levels::pointer level) +void WorldMap::get_level_title(SpecialTile& special_tile) { - /** get level's title */ - level->title = ""; + /** get special_tile's title */ + special_tile.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()); + LispReader* reader = LispReader::load(datadir + "/levels/" + special_tile.level_name, "supertux-level"); + if(!reader) + { + std::cerr << "Error: Could not open level file. Ignoring...\n"; return; - } - - lisp_stream_t stream; - lisp_stream_init_file (&stream, fi); - root_obj = lisp_read (&stream); - - 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()); - } - - if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-level") == 0) - { - LispReader reader(lisp_cdr(root_obj)); - reader.read_string("name", &level->title); - } + } - lisp_free(root_obj); + reader->read_string("name", special_tile.title, true); + delete reader; +} - fclose(fi); +void WorldMap::calculate_total_stats() +{ + total_stats.reset(); + for(SpecialTiles::iterator i = special_tiles.begin(); i != special_tiles.end(); ++i) + { + if (!i->level_name.empty() && i->solved) + { + total_stats += i->statistics; + } + } } void @@ -484,7 +683,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,7 +695,6 @@ void WorldMap::get_input() { enter_level = false; - input_direction = NONE; SDL_Event event; while (SDL_PollEvent(&event)) @@ -507,7 +708,7 @@ WorldMap::get_input() switch(event.type) { case SDL_QUIT: - st_abort("Received window close", ""); + Termination::abort("Received window close", ""); break; case SDL_KEYDOWN: @@ -520,25 +721,51 @@ WorldMap::get_input() case SDLK_RETURN: enter_level = true; break; + + case SDLK_LEFT: + tux->set_direction(D_WEST); + break; + case SDLK_RIGHT: + tux->set_direction(D_EAST); + break; + case SDLK_UP: + tux->set_direction(D_NORTH); + break; + case SDLK_DOWN: + tux->set_direction(D_SOUTH); + break; + default: break; } 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 +781,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); @@ -603,23 +816,33 @@ WorldMap::path_ok(Direction direction, Point old_pos, Point* new_pos) { // New position is outsite the tilemap return false; } + else if(at(*new_pos)->one_way != BOTH_WAYS) + { +std::cerr << "one way only\n"; + if((at(*new_pos)->one_way == NORTH_SOUTH_WAY && direction != D_SOUTH) || + (at(*new_pos)->one_way == SOUTH_NORTH_WAY && direction != D_NORTH) || + (at(*new_pos)->one_way == EAST_WEST_WAY && direction != D_WEST) || + (at(*new_pos)->one_way == WEST_EAST_WAY && direction != D_EAST)) + return false; + return true; + } else { // Check if we the tile allows us to go to new_pos switch(direction) { - case WEST: + case D_WEST: return (at(old_pos)->west && at(*new_pos)->east); - case EAST: + case D_EAST: return (at(old_pos)->east && at(*new_pos)->west); - case NORTH: + case D_NORTH: return (at(old_pos)->north && at(*new_pos)->south); - case SOUTH: + case D_SOUTH: return (at(old_pos)->south && at(*new_pos)->north); - case NONE: + case D_NONE: assert(!"path_ok() can't work if direction is NONE"); } return false; @@ -629,101 +852,168 @@ WorldMap::path_ok(Direction direction, Point old_pos, Point* new_pos) void WorldMap::update(float delta) { + if(!frame_timer.check()) + { + frame_timer.start(25); + global_frame_counter++; + } + if (enter_level && !tux->is_moving()) { - Level* level = at_level(); - if (level) + bool level_finished = true; + SpecialTile* special_tile = at_special_tile(); + if (!special_tile) + { + std::cout << "Nothing to enter at: " + << tux->get_tile_pos().x << ", " << tux->get_tile_pos().y << std::endl; + return; + } + + + if(!special_tile->level_name.empty()) { - if (level->x == tux->get_tile_pos().x && - level->y == tux->get_tile_pos().y) + if (special_tile->x == tux->get_tile_pos().x && + special_tile->y == tux->get_tile_pos().y) { - std::cout << "Enter the current level: " << level->name << std::endl;; - GameSession session(datadir + "/levels/" + level->name, - 1, ST_GL_LOAD_LEVEL_FILE); + PlayerStatus old_player_status = player_status; + + std::cout << "Enter the current level: " << special_tile->level_name << std::endl; + // do a shriking fade to the special_tile + shrink_fade(Vector((special_tile->x*32 + 16 + offset.x),(special_tile->y*32 + 16 + + offset.y)), 500); + GameSession session(datadir + "/levels/" + special_tile->level_name, + ST_GL_LOAD_LEVEL_FILE, special_tile->vertical_flip, + &special_tile->statistics); switch (session.run()) { - case GameSession::LEVEL_FINISHED: + case GameSession::ES_LEVEL_FINISHED: { - bool old_level_state = level->solved; - level->solved = true; + level_finished = true; + bool old_level_state = special_tile->solved; + special_tile->solved = true; + + // deal with statistics + special_tile->statistics.merge(global_stats); + calculate_total_stats(); - if (session.get_world()->get_tux()->got_coffee) + 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_world()->get_tux()->size == BIG) + else if (session.get_current_sector()->player->size == BIG) player_status.bonus = PlayerStatus::GROWUP_BONUS; else player_status.bonus = PlayerStatus::NO_BONUS; - if (old_level_state != level->solved) + if (old_level_state != special_tile->solved && special_tile->auto_path) { // Try to detect the next direction to which we should walk // FIXME: Mostly a hack - Direction dir = NONE; + Direction dir = D_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 (tile->north && tux->back_direction != D_NORTH) + dir = D_NORTH; + else if (tile->south && tux->back_direction != D_SOUTH) + dir = D_SOUTH; + else if (tile->east && tux->back_direction != D_EAST) + dir = D_EAST; + else if (tile->west && tux->back_direction != D_WEST) + dir = D_WEST; - if (dir != NONE) + if (dir != D_NONE) { tux->set_direction(dir); - tux->update(delta); + //tux->update(delta); } std::cout << "Walk to dir: " << dir << std::endl; } - - 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; - } } 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) + case GameSession::ES_LEVEL_ABORT: + level_finished = false; + /* In case the player's abort the special_tile, 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::GAME_OVER: + 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(); + + SDL_Event event; + wait_for_event(event,2000,6000,true); + quit = true; - player_status.bonus = PlayerStatus::NO_BONUS; + player_status.reset(); break; - case GameSession::NONE: + } + case GameSession::ES_NONE: + assert(false); // Should never be reached break; } - music_manager->play_music(song); + SoundManager::get()->play_music(song); Menu::set_current(0); if (!savegame_file.empty()) savegame(savegame_file); - return; } } - else + /* The porpose of the next checking is that if the player lost + the special_tile (in case there is one), don't show anything */ + if(level_finished) { - std::cout << "Nothing to enter at: " - << tux->get_tile_pos().x << ", " << tux->get_tile_pos().y << std::endl; + if (!special_tile->extro_filename.empty()) + { + // Display a text file + display_text_file(special_tile->extro_filename, SCROLL_SPEED_MESSAGE, white_big_text , white_text, white_small_text, blue_text ); + } + if (special_tile->teleport_dest_x != -1 && special_tile->teleport_dest_y != -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(Vector(special_tile->teleport_dest_x, special_tile->teleport_dest_y)); + SDL_Delay(1000); + } + if (!special_tile->next_worldmap.empty()) + { + // Load given worldmap + loadmap(special_tile->next_worldmap); + } + if (special_tile->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 +1027,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; @@ -755,20 +1040,22 @@ WorldMap::update(float delta) } Tile* -WorldMap::at(Point p) +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* -WorldMap::at_level() +WorldMap::SpecialTile* +WorldMap::at_special_tile() { - for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) + for(SpecialTiles::iterator i = special_tiles.begin(); i != special_tiles.end(); ++i) { if (i->x == tux->get_tile_pos().x && i->y == tux->get_tile_pos().y) @@ -780,67 +1067,112 @@ 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); + Tile* tile = at(Vector(x, y)); + tile->draw(context, Vector(x*32 + offset.x, y*32 + offset.y)); } - for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) + for(SpecialTiles::iterator i = special_tiles.begin(); i != special_tiles.end(); ++i) { + if(i->invisible) + continue; + if(i->level_name.empty()) + { + if (i->teleport_dest_x != -1 && i->teleport_dest_y != -1) + context.draw_surface(teleporterdot, + Vector(i->x*32 + offset.x, i->y*32 + offset.y), LAYER_TILES+1); + + else if (!i->map_message.empty() && !i->passive_message) + context.draw_surface(messagedot, + Vector(i->x*32 + offset.x, i->y*32 + offset.y), LAYER_TILES+1); + + continue; + } + if (i->solved) - leveldot_green->draw(i->x*32 + offset.x, - i->y*32 + offset.y); + context.draw_surface(leveldot_green, + Vector(i->x*32 + offset.x, i->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->x*32 + offset.x, i->y*32 + offset.y), LAYER_TILES+1); } - tux->draw(offset); - draw_status(); + 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) + for(SpecialTiles::iterator i = special_tiles.begin(); i != special_tiles.end(); ++i) { if (i->x == tux->get_tile_pos().x && i->y == tux->get_tile_pos().y) { - white_text->draw_align(i->title.c_str(), screen->w/2, screen->h, A_HMIDDLE, A_BOTTOM); + if(!i->level_name.empty()) + { + 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); + } + + /* 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,24 +1182,27 @@ 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; + FrameRate frame_rate(10); + frame_rate.set_frame_limit(false); - last_update_time = update_time = st_get_ticks(); + frame_rate.start(); + DrawingContext context; while(!quit) { - float delta = ((float)(update_time-last_update_time))/100.0; + float delta = frame_rate.get(); delta *= 1.3f; - last_update_time = update_time; - update_time = st_get_ticks(); + if (delta > 10.0f) + delta = .3f; + + frame_rate.update(); - Point tux_pos = tux->get_pos(); + Vector tux_pos = tux->get_pos(); if (1) { offset.x = -tux_pos.x + screen->w/2; @@ -880,16 +1215,17 @@ WorldMap::display() if (offset.y < screen->h - height*32) offset.y = screen->h - height*32; } - draw(offset); + draw(context, offset); get_input(); update(delta); - + if(Menu::current()) { - Menu::current()->draw(); - mouse_cursor->draw(); + Menu::current()->draw(context); + mouse_cursor->draw(context); } - flipscreen(); + + context.do_drawing(); SDL_Delay(20); } @@ -898,38 +1234,64 @@ WorldMap::display() void WorldMap::savegame(const std::string& filename) { + if(filename == "") + return; + std::cout << "savegame: " << filename << std::endl; - std::ofstream out(filename.c_str()); - int nb_solved_levels = 0; - for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) + std::ofstream file(filename.c_str(), std::ios::out); + LispWriter* writer = new LispWriter(file); + + int nb_solved_levels = 0, total_levels = 0; + for(SpecialTiles::iterator i = special_tiles.begin(); i != special_tiles.end(); ++i) { + if(!i->level_name.empty()) + ++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); - 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) + writer->write_comment("Worldmap save file"); + + writer->start_list("supertux-savegame"); + + 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_int("lives", player_status.lives); + writer->write_int("distros", player_status.lives); + + writer->start_list("tux"); + + 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)); + writer->write_string("bonus", bonus_to_string(player_status.bonus)); + + writer->end_list("tux"); + + writer->start_list("levels"); + + for(SpecialTiles::iterator i = special_tiles.begin(); i != special_tiles.end(); ++i) { - if (i->solved) + if (i->solved && !i->level_name.empty()) { - out << " (level (name \"" << i->name << "\")\n" - << " (solved #t))\n"; + writer->start_list("level"); + + writer->write_string("name", i->level_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 @@ -939,42 +1301,57 @@ WorldMap::loadgame(const std::string& filename) savegame_file = filename; if (access(filename.c_str(), F_OK) != 0) + { + load_map(); + + player_status.reset(); + return; + } lisp_object_t* savegame = lisp_read_from_file(filename); if (!savegame) { std::cout << "WorldMap:loadgame: File not found: " << filename << std::endl; + load_map(); return; } lisp_object_t* cur = savegame; if (strcmp(lisp_symbol(lisp_car(cur)), "supertux-savegame") != 0) + { + load_map(); 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); + /* Get the Map filename and then load it before setting special_tile settings */ + std::string cur_map_filename = map_filename; + reader.read_string("map", map_filename); + if(cur_map_filename != map_filename) + load_map(); + + reader.read_int("lives", player_status.lives); + 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)) + 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_reader.read_float("x", p.x); + tux_reader.read_float("y", p.y); + tux_reader.read_string("back", back_str); + tux_reader.read_string("bonus", bonus_str); player_status.bonus = string_to_bonus(bonus_str); tux->back_direction = string_to_direction(back_str); @@ -982,7 +1359,7 @@ WorldMap::loadgame(const std::string& filename) } lisp_object_t* level_cur = 0; - if (reader.read_lisp("levels", &level_cur)) + if (reader.read_lisp("levels", level_cur)) { while(level_cur) { @@ -995,13 +1372,17 @@ WorldMap::loadgame(const std::string& filename) bool solved = false; LispReader level_reader(data); - level_reader.read_string("name", &name); - level_reader.read_bool("solved", &solved); + level_reader.read_string("name", name); + level_reader.read_bool("solved", solved); - for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) + for(SpecialTiles::iterator i = special_tiles.begin(); i != special_tiles.end(); ++i) { - if (name == i->name) + if (name == i->level_name) + { i->solved = solved; + i->statistics.parse(level_reader); + break; + } } } @@ -1010,6 +1391,16 @@ WorldMap::loadgame(const std::string& filename) } lisp_free(savegame); + + calculate_total_stats(); +} + +void +WorldMap::loadmap(const std::string& filename) +{ + savegame_file = ""; + map_filename = filename; + load_map(); } } // namespace WorldMapNS