X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fworldmap.cpp;h=68ad20bf040c9242303b2ef9309a0e40be11e03d;hb=6254318eb0911aea47180e566d9b251debb518dd;hp=facad2f2a4d3c37c8902c0f0c4dde35b54d07749;hpb=653dde07aac34a890623e72ca15ebfaf9be83a0b;p=supertux.git diff --git a/src/worldmap.cpp b/src/worldmap.cpp index facad2f2a..68ad20bf0 100644 --- a/src/worldmap.cpp +++ b/src/worldmap.cpp @@ -20,15 +20,24 @@ #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 "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" + +Menu* worldmap_menu = 0; namespace WorldMapNS { @@ -36,18 +45,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 +64,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,26 +81,24 @@ 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::instance_ = 0; - TileManager::TileManager() { - std::string stwt_filename = datadir + "images/worldmap/antarctica.stwt"; + 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); + Termination::abort("Couldn't load file", stwt_filename); if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-worldmap-tiles") == 0) { @@ -112,19 +119,21 @@ TileManager::TileManager() 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_string("image", &filename); + 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); + true); if (id >= int(tiles.size())) tiles.resize(id+1); @@ -143,6 +152,14 @@ TileManager::TileManager() { assert(0); } + + lisp_free(root_obj); +} + +TileManager::~TileManager() +{ + for(std::vector::iterator i = tiles.begin(); i != tiles.end(); ++i) + delete *i; } Tile* @@ -152,28 +169,53 @@ TileManager::get(int i) return tiles[i]; } +//--------------------------------------------------------------------------- + Tux::Tux(WorldMap* worldmap_) : worldmap(worldmap_) { - sprite = new Surface(datadir + "/images/worldmap/tux.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() +{ + delete smalltux_sprite; + delete firetux_sprite; + delete largetux_sprite; } void -Tux::draw(const Point& offset) +Tux::draw(DrawingContext& context, const Vector& offset) { - Point pos = get_pos(); - sprite->draw(pos.x + offset.x, - pos.y + offset.y); + Vector pos = get_pos(); + switch (player_status.bonus) + { + case PlayerStatus::GROWUP_BONUS: + context.draw_surface(largetux_sprite, + Vector(pos.x + offset.x, pos.y + offset.y - 10), LAYER_OBJECTS); + break; + case PlayerStatus::FLOWER_BONUS: + context.draw_surface(firetux_sprite, + Vector(pos.x + offset.x, pos.y + offset.y - 10), LAYER_OBJECTS); + break; + case PlayerStatus::NO_BONUS: + 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; @@ -181,45 +223,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; @@ -229,7 +278,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); @@ -246,62 +294,127 @@ 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()) + if (worldmap->at(tile_pos)->stop || worldmap->at_special_tile()) { stop(); } else { + if (worldmap->at(tile_pos)->auto_walk || direction != input_direction) + { // Turn to a new direction + Tile* tile = worldmap->at(tile_pos); + + 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(); + } } } } } } -WorldMap::WorldMap() +//--------------------------------------------------------------------------- +Tile::Tile() +{ +} + +Tile::~Tile() { - tux = new Tux(this); + delete sprite; +} +//--------------------------------------------------------------------------- + +WorldMap::WorldMap() +{ + tile_manager = new TileManager(); + //tux = new Tux(this); + width = 20; height = 15; + + start_x = 4; + start_y = 5; + + level_sprite = new Surface(datadir + "/images/worldmap/levelmarker.png", true); + leveldot_green = new Surface(datadir + "/images/worldmap/leveldot_green.png", true); + leveldot_red = new Surface(datadir + "/images/worldmap/leveldot_red.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(); } WorldMap::~WorldMap() { delete tux; + delete tile_manager; + + delete level_sprite; + delete leveldot_green; + delete leveldot_red; } 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); @@ -313,42 +426,79 @@ 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; - - reader.read_string("name", &level.name); - reader.read_int("x", &level.x); - reader.read_int("y", &level.y); - - get_level_title(&level); // get level's title + special_tile.north = true; + special_tile.east = true; + special_tile.south = true; + special_tile.west = true; + + reader.read_string("extro-filename", special_tile.extro_filename); + reader.read_string("map-message", special_tile.display_map_message); + reader.read_string("next-world", special_tile.next_worldmap); + reader.read_string("level", special_tile.level_name, true); + reader.read_int("x", special_tile.x); + reader.read_int("y", special_tile.y); + special_tile.auto_path = true; + reader.read_bool("auto-path", special_tile.auto_path); + special_tile.swap_x = special_tile.swap_y = -1; + reader.read_int("swap-x", special_tile.swap_x); + reader.read_int("swap-y", special_tile.swap_y); + special_tile.vertical_flip = false; + reader.read_bool("flip-special_tile", special_tile.vertical_flip); + special_tile.quit_worldmap = false; + reader.read_bool("exit-game", special_tile.quit_worldmap); + + special_tiles.push_back(special_tile); + } - levels.push_back(level); + /* 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; + + 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); + special_tile.vertical_flip = false; + special_tile.swap_x = special_tile.swap_y = -1; + + special_tiles.push_back(special_tile); } cur = lisp_cdr(cur); @@ -362,38 +512,25 @@ WorldMap::load_map() cur = lisp_cdr(cur); } } + + 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 = ""; - -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; - } - -lisp_stream_t stream; -lisp_stream_init_file (&stream, fi); -root_obj = lisp_read (&stream); + /** get special_tile's title */ + special_tile.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()); - } - -if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-level") == 0) - { - LispReader reader(lisp_cdr(root_obj)); - reader.read_string("name", &level->title); - } + LispReader* reader = LispReader::load(datadir + "/levels/" + special_tile.level_name, "supertux-level"); + if(!reader) + { + std::cerr << "Error: Could not open special_tile file. Ignoring...\n"; + return; + } -fclose(fi); + reader->read_string("name", special_tile.title, true); + delete reader; } void @@ -401,7 +538,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); } @@ -410,7 +550,6 @@ void WorldMap::get_input() { enter_level = false; - input_direction = NONE; SDL_Event event; while (SDL_PollEvent(&event)) @@ -424,7 +563,7 @@ WorldMap::get_input() switch(event.type) { case SDL_QUIT: - st_abort("Received window close", ""); + Termination::abort("Received window close", ""); break; case SDL_KEYDOWN: @@ -437,6 +576,20 @@ 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; } @@ -446,16 +599,16 @@ WorldMap::get_input() 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; @@ -471,47 +624,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); @@ -524,19 +663,19 @@ WorldMap::path_ok(Direction direction, Point old_pos, Point* new_pos) { // 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; @@ -544,59 +683,159 @@ WorldMap::path_ok(Direction direction, Point old_pos, Point* new_pos) } void -WorldMap::update() +WorldMap::update(float delta) { 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) { - if (level->x == tux->get_tile_pos().x && - level->y == tux->get_tile_pos().y) + 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 (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); switch (session.run()) { - case GameSession::LEVEL_FINISHED: - level->solved = true; + case GameSession::ES_LEVEL_FINISHED: + { + level_finished = true; + bool old_level_state = special_tile->solved; + special_tile->solved = true; + + 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; + + 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 = D_NONE; + + Tile* tile = at(tux->get_tile_pos()); + + 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 != D_NONE) + { + tux->set_direction(dir); + //tux->update(delta); + } + + 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) + 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.score = old_player_status.score; + 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 */ + /* 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 + special_tile 1 */ + char str[80]; + + DrawingContext context; + context.draw_gradient(Color (200,240,220), Color(200,200,220), + LAYER_BACKGROUND0); + + context.draw_text_center(blue_text, _("GAMEOVER"), + Vector(0, 200), LAYER_FOREGROUND1); + + sprintf(str, _("SCORE: %d"), player_status.score); + context.draw_text_center(gold_text, str, + Vector(0, 230), LAYER_FOREGROUND1); + + sprintf(str, _("COINS: %d"), player_status.distros); + context.draw_text_center(gold_text, str, + Vector(0, screen->w - 32), LAYER_FOREGROUND1); + + context.do_drawing(); + + SDL_Event event; + wait_for_event(event,2000,5000,true); + quit = true; + 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->swap_x != -1 && special_tile->swap_y != -1) + { + // TODO: add an effect, like a camera scrolling, or at least, a fading + tux->set_tile_pos(Vector(special_tile->swap_x, special_tile->swap_y)); + } + 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(0.33f); + tux->action(delta); +// tux->set_direction(input_direction); } Menu* menu = Menu::current(); @@ -610,11 +849,6 @@ WorldMap::update() { 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; @@ -628,20 +862,22 @@ WorldMap::update() } Tile* -WorldMap::at(Point p) +WorldMap::at(Vector p) { assert(p.x >= 0 && p.x < width && p.y >= 0 && p.y < height); - return TileManager::instance()->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) @@ -653,63 +889,90 @@ 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)); + context.draw_surface(tile->sprite, + Vector(x*32 + offset.x, y*32 + offset.y), LAYER_TILES); } - for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) + for(SpecialTiles::iterator i = special_tiles.begin(); i != special_tiles.end(); ++i) { + if(i->level_name.empty()) + 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", player_status.score); + + context.draw_text(white_text, _("SCORE"), Vector(0, 0), LAYER_FOREGROUND1); + context.draw_text(gold_text, str, Vector(96, 0), 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), + LAYER_FOREGROUND1); + context.draw_text(gold_text, str, Vector(screen->w/2 + (16*5)/2, 0), + 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), + LAYER_FOREGROUND1); + context.draw_surface(tux_life, Vector(screen->w - + gold_text->get_text_width("9"), 0), 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), + 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_center(white_text, i->title, + Vector(0, screen->h - white_text->get_height() - 30), + LAYER_FOREGROUND1); + } + + /* Display a message in the map, if any as been selected */ + if(!i->display_map_message.empty()) + context.draw_text_center(gold_text, i->display_map_message, + Vector(0, screen->h - white_text->get_height() - 60), + LAYER_FOREGROUND1); break; } } @@ -723,46 +986,67 @@ 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; - while(!quit) { - Point tux_pos = tux->get_pos(); - if (1) - { - offset.x = -tux_pos.x + screen->w/2; - offset.y = -tux_pos.y + screen->h/2; + last_update_time = update_time = Ticks::get(); - if (offset.x > 0) offset.x = 0; - if (offset.y > 0) offset.y = 0; + DrawingContext context; + while(!quit) + { + float delta = ((float)(update_time-last_update_time))/100.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; - } + delta *= 1.3f; - draw(offset); - get_input(); - update(); + if (delta > 10.0f) + delta = .3f; + + last_update_time = update_time; + update_time = Ticks::get(); - if(Menu::current()) - { - Menu::current()->draw(); - mouse_cursor->draw(); - } - flipscreen(); + Vector tux_pos = tux->get_pos(); + if (1) + { + 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(delta); + + if(Menu::current()) + { + Menu::current()->draw(context); + mouse_cursor->draw(context); + } - SDL_Delay(20); - } + context.do_drawing(); + + SDL_Delay(20); + } } 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) + for(SpecialTiles::iterator i = special_tiles.begin(); i != special_tiles.end(); ++i) { if (i->solved) ++nb_solved_levels; @@ -770,19 +1054,21 @@ WorldMap::savegame(const std::string& filename) out << "(supertux-savegame\n" << " (version 1)\n" - << " (title \"Icyisland - " << nb_solved_levels << "/" << levels.size() << "\")\n" + << " (title \"" << name << " - " << nb_solved_levels << "/" << special_tiles.size() << "\")\n" + << " (map \"" << map_filename << "\")\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 << ")" - << " (back \"" << direction_to_string(tux->back_direction) << "\"))\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) + 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" + out << " (level (name \"" << i->level_name << "\")\n" << " (solved #t))\n"; } } @@ -796,67 +1082,99 @@ WorldMap::loadgame(const std::string& filename) { std::cout << "loadgame: " << filename << std::endl; savegame_file = filename; + map_filename = "icyisland.stwm"; - if (access(filename.c_str(), F_OK) == 0) + if (access(filename.c_str(), F_OK) != 0) { - lisp_object_t* cur = lisp_read_from_file(filename); + load_map(); + 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; + } - if (strcmp(lisp_symbol(lisp_car(cur)), "supertux-savegame") != 0) - return; + lisp_object_t* cur = savegame; - 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 (strcmp(lisp_symbol(lisp_car(cur)), "supertux-savegame") != 0) + { + load_map(); + return; + } - if (player_status.lives < 0) - player_status.lives = START_LIVES; + cur = lisp_cdr(cur); + LispReader reader(cur); - lisp_object_t* tux_cur = 0; - if (reader.read_lisp("tux", &tux_cur)) - { - Point p; - std::string back_str = "none"; + /* Get the Map filename and then load it before setting special_tile settings */ + reader.read_string("map", map_filename); + load_map(); - 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->back_direction = string_to_direction(back_str); - tux->set_tile_pos(p); - } + 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)) + { + Vector p; + std::string back_str = "none"; + std::string bonus_str = "none"; + + LispReader tux_reader(tux_cur); + 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); + tux->set_tile_pos(p); + } - lisp_object_t* level_cur = 0; - if (reader.read_lisp("levels", &level_cur)) + lisp_object_t* level_cur = 0; + if (reader.read_lisp("levels", level_cur)) + { + while(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)); + 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) - { - std::string name; - bool solved = false; + if (strcmp(lisp_symbol(sym), "level") == 0) + { + std::string name; + bool solved = false; - LispReader level_reader(data); - level_reader.read_string("name", &name); - level_reader.read_bool("solved", &solved); + LispReader level_reader(data); + level_reader.read_string("name", name, true); + level_reader.read_bool("solved", solved); - for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) - { - if (name == i->name) - i->solved = solved; - } + for(SpecialTiles::iterator i = special_tiles.begin(); i != special_tiles.end(); ++i) + { + if (name == i->level_name) + i->solved = solved; } - - level_cur = lisp_cdr(level_cur); } + + level_cur = lisp_cdr(level_cur); } } + + lisp_free(savegame); +} + +void +WorldMap::loadmap(const std::string& filename) +{ + savegame_file = ""; + map_filename = filename; + load_map(); } } // namespace WorldMapNS