X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fworldmap.cpp;h=9f0c0c3498b007f797cd43f27bd165ffe8985ace;hb=d2593ddcb69f1de8553b81b9052c1a7d70e47e3a;hp=5c0910193d00e5158cb9dcda33f8be4e75491a00;hpb=0acb7e4b13d8f4a61ff354502429b1263b0a831f;p=supertux.git diff --git a/src/worldmap.cpp b/src/worldmap.cpp index 5c0910193..9f0c0c349 100644 --- a/src/worldmap.cpp +++ b/src/worldmap.cpp @@ -16,33 +16,48 @@ // 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 +#include #include -#include "app/globals.h" +#include "gettext.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 "app/setup.h" +#include "sprite/sprite_manager.h" +#include "audio/sound_manager.h" +#include "lisp/parser.h" +#include "lisp/lisp.h" +#include "lisp/list_iterator.h" +#include "lisp/writer.h" +#include "game_session.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 +#include "player_status.h" +#include "textscroller.h" +#include "main.h" +#include "spawn_point.h" +#include "file_system.h" +#include "gui/menu.h" +#include "gui/mousecursor.h" +#include "control/joystickkeyboardcontroller.h" +#include "object/background.h" +#include "object/tilemap.h" +#include "scripting/script_interpreter.h" Menu* worldmap_menu = 0; +static const float TUXSPEED = 200; +static const float map_message_TIME = 2.8; + namespace WorldMapNS { Direction reverse_dir(Direction direction) @@ -96,155 +111,46 @@ string_to_direction(const std::string& directory) return D_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) - Termination::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 = tile->east = tile->south = tile->west = true; - tile->stop = true; - tile->auto_walk = false; - - LispReader reader(lisp_cdr(element)); - 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("image", filename); - - 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; - } - - tile->sprite = new Surface( - datadir + "/images/worldmap/" + filename, - true); - - 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]; -} - //--------------------------------------------------------------------------- Tux::Tux(WorldMap* worldmap_) : worldmap(worldmap_) { - 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); - + tux_sprite = sprite_manager->create("worldmaptux"); + offset = 0; moving = false; - 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; + delete tux_sprite; } void -Tux::draw(DrawingContext& context, const Vector& offset) +Tux::draw(DrawingContext& context) { - 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); + switch (player_status.bonus) { + case GROWUP_BONUS: + tux_sprite->set_action("large"); break; - case PlayerStatus::FLOWER_BONUS: - context.draw_surface(firetux_sprite, - Vector(pos.x + offset.x, pos.y + offset.y - 10), LAYER_OBJECTS); + case FIRE_BONUS: + tux_sprite->set_action("fire"); break; - case PlayerStatus::NO_BONUS: - context.draw_surface(smalltux_sprite, - Vector(pos.x + offset.x, pos.y + offset.y - 10), LAYER_OBJECTS); + case NO_BONUS: + tux_sprite->set_action("small"); break; - } + default: +#ifdef DBEUG + std::cerr << "Bonus type not handled in worldmap.\n"; +#endif + tux_sprite->set_action("large"); + break; + } + + tux_sprite->draw(context, get_pos(), LAYER_OBJECTS); } @@ -272,7 +178,7 @@ Tux::get_pos() break; } - return Vector((int)x, (int)y); + return Vector(x, y); } void @@ -287,21 +193,31 @@ Tux::stop() void Tux::set_direction(Direction dir) { -input_direction = dir; + input_direction = dir; } void -Tux::action(float delta) +Tux::update(float delta) { - if (!moving) + // check controller + if(main_controller->pressed(Controller::UP)) + input_direction = D_NORTH; + else if(main_controller->pressed(Controller::DOWN)) + input_direction = D_SOUTH; + else if(main_controller->pressed(Controller::LEFT)) + input_direction = D_WEST; + else if(main_controller->pressed(Controller::RIGHT)) + input_direction = D_EAST; + + if(!moving) { if (input_direction != D_NONE) { - WorldMap::SpecialTile* special_tile = worldmap->at_special_tile(); + WorldMap::Level* level = worldmap->at_level(); // We got a new direction, so lets start walking when possible Vector next_tile; - if ((!special_tile || special_tile->solved || special_tile->level_name.empty()) + if ((!level || level->solved) && worldmap->path_ok(input_direction, tile_pos, &next_tile)) { tile_pos = next_tile; @@ -320,8 +236,8 @@ Tux::action(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 @@ -341,61 +257,71 @@ Tux::action(float delta) } } - if (worldmap->at(tile_pos)->stop || (special_tile && - !special_tile->passive_message)) + 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.stop(); + worldmap->passive_message_timer.start(0); 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))) + 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 if(direction != input_direction) - { // player has changed to impossible tile + direction = input_direction; 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; + { // player has changed to impossible tile back_direction = reverse_dir(direction); - } - else - { - // Should never be reached if tiledata is good 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 if(direction != D_NONE) @@ -417,42 +343,39 @@ Tux::action(float delta) } //--------------------------------------------------------------------------- -Tile::Tile() -{ -} - -Tile::~Tile() -{ - delete sprite; -} - -//--------------------------------------------------------------------------- WorldMap::WorldMap() + : tux(0), solids(0) { - tile_manager = new TileManager(); - //tux = new Tux(this); - - width = 20; - height = 15; + tile_manager = new TileManager("images/worldmap.strf"); - 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); - - enter_level = false; + tux = new Tux(this); + add_object(tux); + + leveldot_green + = new Surface(datadir + "/images/tiles/worldmap/leveldot_green.png", true); + leveldot_red + = new Surface(datadir + "/images/tiles/worldmap/leveldot_red.png", true); + messagedot + = new Surface(datadir + "/images/tiles/worldmap/messagedot.png", true); + teleporterdot + = new Surface(datadir + "/images/tiles/worldmap/teleporterdot.png", true); name = ""; - music = "SALCON.MOD"; + music = "salcon.mod"; + intro_displayed = false; + + total_stats.reset(); } WorldMap::~WorldMap() { - delete tux; + clear_objects(); + for(SpawnPoints::iterator i = spawn_points.begin(); + i != spawn_points.end(); ++i) { + delete *i; + } + delete tile_manager; delete leveldot_green; @@ -462,174 +385,189 @@ WorldMap::~WorldMap() } void +WorldMap::add_object(GameObject* object) +{ + TileMap* tilemap = dynamic_cast (object); + if(tilemap != 0 && tilemap->is_solid()) { + solids = tilemap; + } + + game_objects.push_back(object); +} + +void +WorldMap::clear_objects() +{ + for(GameObjects::iterator i = game_objects.begin(); + i != game_objects.end(); ++i) + delete *i; + game_objects.clear(); + solids = 0; + tux = new Tux(this); + add_object(tux); +} + +// Don't forget to set map_filename before calling this +void WorldMap::load_map() { - lisp_object_t* root_obj = lisp_read_from_file(datadir + "/levels/worldmap/" + map_filename); - if (!root_obj) - Termination::abort("Couldn't load file", datadir + "/levels/worldmap/" + map_filename); + 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."); + + clear_objects(); + lisp::ListIterator iter(lisp); + while(iter.next()) { + if(iter.item() == "tilemap") { + add_object(new TileMap(*(iter.lisp()), tile_manager)); + } else if(iter.item() == "background") { + add_object(new Background(*(iter.lisp()))); + } else if(iter.item() == "properties") { + const lisp::Lisp* props = iter.lisp(); + props->get("name", name); + props->get("music", music); + } else if(iter.item() == "intro-script") { + iter.value()->get(intro_script); + } else if(iter.item() == "spawnpoint") { + SpawnPoint* sp = new SpawnPoint(iter.lisp()); + spawn_points.push_back(sp); + } else if(iter.item() == "level") { + parse_level_tile(iter.lisp()); + } else if(iter.item() == "special-tile") { + parse_special_tile(iter.lisp()); + } else { + std::cerr << "Unknown token '" << iter.item() << "' in worldmap.\n"; + } + } + if(solids == 0) + throw std::runtime_error("No solid tilemap specified"); + + // search for main spawnpoint + for(SpawnPoints::iterator i = spawn_points.begin(); + i != spawn_points.end(); ++i) { + SpawnPoint* sp = *i; + if(sp->name == "main") { + Vector p = sp->pos; + tux->set_tile_pos(p); + break; + } + } - if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-worldmap") == 0) - { - lisp_object_t* cur = lisp_cdr(root_obj); + } catch(std::exception& e) { + std::stringstream msg; + msg << "Problem when parsing worldmap '" << map_filename << "': " << + e.what(); + throw std::runtime_error(msg.str()); + } +} - while(!lisp_nil_p(cur)) - { - lisp_object_t* element = lisp_car(cur); +void +WorldMap::parse_special_tile(const lisp::Lisp* lisp) +{ + SpecialTile special_tile; + + 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); +} - 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, 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)), "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)), "special-tile") == 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_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); - } +void +WorldMap::parse_level_tile(const lisp::Lisp* level_lisp) +{ + Level 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; - - special_tile.invisible = false; - - 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; - - 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_tiles.push_back(special_tile); - } + level.solved = false; - cur = lisp_cdr(cur); - } - } - else - { - - } - - cur = lisp_cdr(cur); - } - } + level.north = true; + level.east = true; + level.south = true; + level.west = true; - lisp_free(root_obj); - tux = new Tux(this); + level_lisp->get("extro-script", level.extro_script); + level_lisp->get("next-worldmap", level.next_worldmap); + + level.quit_worldmap = false; + level_lisp->get("quit-worldmap", level.quit_worldmap); + + level_lisp->get("name", level.name); + level_lisp->get("x", level.pos.x); + level_lisp->get("y", level.pos.y); + + level.auto_path = true; + level_lisp->get("auto-path", level.auto_path); + + level.vertical_flip = false; + level_lisp->get("vertical-flip", level.vertical_flip); + + levels.push_back(level); } -void WorldMap::get_level_title(SpecialTile& special_tile) +void +WorldMap::get_level_title(Level& level) { /** get special_tile's title */ - special_tile.title = ""; + level.title = ""; - 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; - } + try { + lisp::Parser parser; + std::auto_ptr root ( + parser.parse(get_resource_filename(levels_path + level.name))); - reader->read_string("name", special_tile.title, true); - delete reader; + 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; + } } void WorldMap::calculate_total_stats() { total_stats.reset(); - for(SpecialTiles::iterator i = special_tiles.begin(); i != special_tiles.end(); ++i) + for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) { - if (!i->level_name.empty() && i->solved) + if (i->solved) { total_stats += i->statistics; } @@ -640,112 +578,33 @@ void WorldMap::on_escape_press() { // Show or hide the menu - if(!Menu::current()) - { - Menu::set_current(worldmap_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); + } else { + Menu::set_current(0); + } } void WorldMap::get_input() { - enter_level = false; - - SDL_Event event; - while (SDL_PollEvent(&event)) - { - if (Menu::current()) - { - Menu::current()->event(event); - } - else - { - switch(event.type) - { - case SDL_QUIT: - 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; - - 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) - tux->set_direction(D_WEST); - else if (event.jaxis.value > joystick_keymap.dead_zone) - tux->set_direction(D_EAST); - } - else if (event.jaxis.axis == joystick_keymap.y_axis) - { - if (event.jaxis.value > joystick_keymap.dead_zone) - tux->set_direction(D_SOUTH); - else if (event.jaxis.value < -joystick_keymap.dead_zone) - tux->set_direction(D_NORTH); - } - break; - - case SDL_JOYBUTTONDOWN: - if (event.jbutton.button == joystick_keymap.b_button) - enter_level = true; - else if (event.jbutton.button == joystick_keymap.start_button) - on_escape_press(); - break; + main_controller->update(); - default: - break; - } - } - } + SDL_Event event; + while (SDL_PollEvent(&event)) { + if (Menu::current()) + Menu::current()->event(event); + main_controller->process_event(event); + if(event.type == SDL_QUIT) + throw std::runtime_error("Received window close"); + } } Vector WorldMap::get_next_tile(Vector pos, Direction direction) { - switch(direction) - { + switch(direction) { case D_WEST: pos.x -= 1; break; @@ -760,7 +619,7 @@ WorldMap::get_next_tile(Vector pos, Direction direction) break; case D_NONE: break; - } + } return pos; } @@ -769,36 +628,30 @@ WorldMap::path_ok(Direction direction, Vector old_pos, Vector* new_pos) { *new_pos = get_next_tile(old_pos, direction); - if (!(new_pos->x >= 0 && new_pos->x < width - && new_pos->y >= 0 && new_pos->y < height)) + if (!(new_pos->x >= 0 && new_pos->x < solids->get_width() + && new_pos->y >= 0 && new_pos->y < solids->get_height())) { // 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 + { // Check if the tile allows us to go to new_pos switch(direction) { case D_WEST: - return (at(old_pos)->west && at(*new_pos)->east); + return (at(old_pos)->getData() & Tile::WORLDMAP_WEST + && at(*new_pos)->getData() & Tile::WORLDMAP_EAST); case D_EAST: - return (at(old_pos)->east && at(*new_pos)->west); + return (at(old_pos)->getData() & Tile::WORLDMAP_EAST + && at(*new_pos)->getData() & Tile::WORLDMAP_WEST); case D_NORTH: - return (at(old_pos)->north && at(*new_pos)->south); + return (at(old_pos)->getData() & Tile::WORLDMAP_NORTH + && at(*new_pos)->getData() & Tile::WORLDMAP_SOUTH); case D_SOUTH: - return (at(old_pos)->south && at(*new_pos)->north); + return (at(old_pos)->getData() & Tile::WORLDMAP_SOUTH + && at(*new_pos)->getData() & Tile::WORLDMAP_NORTH); case D_NONE: assert(!"path_ok() can't work if direction is NONE"); @@ -810,202 +663,229 @@ std::cerr << "one way only\n"; void WorldMap::update(float delta) { + Menu* menu = Menu::current(); + if(menu) { + menu->update(); + + if(menu == worldmap_menu) { + switch (worldmap_menu->check()) + { + case MNID_RETURNWORLDMAP: // Return to game + Menu::set_current(0); + break; + case MNID_QUITWORLDMAP: // Quit Worldmap + quit = true; + break; + } + } else if(menu == options_menu) { + process_options_menu(); + } + + return; + } + + // update GameObjects + for(GameObjects::iterator i = game_objects.begin(); + i != game_objects.end(); ++i) { + GameObject* object = *i; + object->update(delta); + } + // remove old GameObjects + for(GameObjects::iterator i = game_objects.begin(); + i != game_objects.end(); ) { + GameObject* object = *i; + if(!object->is_valid()) { + delete object; + i = game_objects.erase(i); + } else { + ++i; + } + } + + bool enter_level = false; + if(main_controller->pressed(Controller::ACTION) + || main_controller->pressed(Controller::JUMP) + || main_controller->pressed(Controller::MENU_SELECT)) + enter_level = true; + if(main_controller->pressed(Controller::PAUSE_MENU)) + on_escape_press(); + if (enter_level && !tux->is_moving()) { - bool level_finished = true; + /* Check special tile action */ SpecialTile* special_tile = at_special_tile(); - if (!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 + sound_manager->play_sound("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) { - std::cout << "Nothing to enter at: " - << tux->get_tile_pos().x << ", " << tux->get_tile_pos().y << std::endl; + std::cout << "No level to enter at: " + << tux->get_tile_pos().x << ", " << tux->get_tile_pos().y + << std::endl; return; } - if(!special_tile->level_name.empty()) + if (level->pos == tux->get_tile_pos()) { - if (special_tile->x == tux->get_tile_pos().x && - special_tile->y == tux->get_tile_pos().y) + PlayerStatus old_player_status = player_status; + + // 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()) { - PlayerStatus old_player_status = player_status; + case GameSession::ES_LEVEL_FINISHED: + { + level_finished = true; + bool old_level_state = level->solved; + level->solved = true; - 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); + // deal with statistics + level->statistics.merge(global_stats); + calculate_total_stats(); - switch (session.run()) - { - case GameSession::ES_LEVEL_FINISHED: - { - 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_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; + 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); } } + } - break; - 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::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]; + 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.coins = old_player_status.coins; + player_status.lives = std::min(old_player_status.lives, player_status.lives); + player_status.bonus = NO_BONUS; - DrawingContext context; - context.draw_gradient(Color (200,240,220), Color(200,200,220), - LAYER_BACKGROUND0); + 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]; - context.draw_text_center(blue_text, _("GAMEOVER"), - Vector(0, 200), LAYER_FOREGROUND1); + DrawingContext context; + context.draw_gradient(Color (200,240,220), Color(200,200,220), + LAYER_BACKGROUND0); -// sprintf(str, _("SCORE: %d"), total_stats.get_points(SCORE_STAT)); -// context.draw_text_center(gold_text, str, -// Vector(0, 230), LAYER_FOREGROUND1); + context.draw_text(blue_text, _("GAMEOVER"), + Vector(SCREEN_WIDTH/2, 200), CENTER_ALLIGN, LAYER_FOREGROUND1); - sprintf(str, _("COINS: %d"), player_status.distros); - context.draw_text_center(gold_text, str, - Vector(0, screen->w - 32), LAYER_FOREGROUND1); + sprintf(str, _("COINS: %d"), player_status.coins); + context.draw_text(gold_text, str, + Vector(SCREEN_WIDTH/2, SCREEN_WIDTH - 32), CENTER_ALLIGN, + LAYER_FOREGROUND1); - total_stats.draw_message_info(context, _("Total Statistics")); + total_stats.draw_message_info(context, _("Total Statistics")); - context.do_drawing(); - - SDL_Event event; - wait_for_event(event,2000,6000,true); + context.do_drawing(); - quit = true; - player_status.reset(); - break; - } - case GameSession::ES_NONE: - assert(false); - // Should never be reached - break; - } + wait_for_event(2.0, 6.0); - SoundManager::get()->play_music(song); - Menu::set_current(0); - if (!savegame_file.empty()) - savegame(savegame_file); + quit = true; + player_status.reset(); + break; + } + case GameSession::ES_NONE: + assert(false); + // Should never be reached + break; } + + sound_manager->play_music(song); + Menu::set_current(0); + if (!savegame_file.empty()) + savegame(savegame_file); } /* 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) - { - 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); + the level (in case there is one), don't show anything */ + if(level_finished) { + if (level->extro_script != "") { + try { + std::auto_ptr interpreter + (new ScriptInterpreter(levels_path)); + std::istringstream in(level->extro_script); + interpreter->load_script(in, "level-extro-script"); + interpreter->start_script(); + add_object(interpreter.release()); + } catch(std::exception& e) { + std::cerr << "Couldn't run level-extro-script:" << e.what() << "\n"; } - if (!special_tile->next_worldmap.empty()) + } + + if (!level->next_worldmap.empty()) { // Load given worldmap - loadmap(special_tile->next_worldmap); + loadmap(level->next_worldmap); } - if (special_tile->quit_worldmap) + if (level->quit_worldmap) quit = true; } } else { - tux->action(delta); // tux->set_direction(input_direction); } - - Menu* menu = Menu::current(); - if(menu) - { - menu->action(); - - if(menu == worldmap_menu) - { - switch (worldmap_menu->check()) - { - case MNID_RETURNWORLDMAP: // Return to game - break; - case MNID_QUITWORLDMAP: // Quit Worldmap - quit = true; - break; - } - } - else if(menu == options_menu) - { - process_options_menu(); - } - } } -Tile* +const Tile* WorldMap::at(Vector p) { - assert(p.x >= 0 - && p.x < width - && p.y >= 0 - && p.y < height); - - int x = int(p.x); - int y = int(p.y); - return tile_manager->get(tilemap[width * y + x]); + return solids->get_tile((int) p.x, (int) p.y); +} + +WorldMap::Level* +WorldMap::at_level() +{ + for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) + { + if (i->pos == tux->get_tile_pos()) + return &*i; + } + + return 0; } WorldMap::SpecialTile* @@ -1013,123 +893,96 @@ WorldMap::at_special_tile() { 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) + if (i->pos == tux->get_tile_pos()) return &*i; } return 0; } - void -WorldMap::draw(DrawingContext& context, const Vector& offset) +WorldMap::draw(DrawingContext& context) { - for(int y = 0; y < height; ++y) - for(int x = 0; x < width; ++x) - { - Tile* tile = at(Vector(x, y)); - context.draw_surface(tile->sprite, - Vector(x*32 + offset.x, y*32 + offset.y), LAYER_TILES); - } + for(GameObjects::iterator i = game_objects.begin(); + i != game_objects.end(); ++i) { + GameObject* object = *i; + object->draw(context); + } + for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) + { + if (i->solved) + context.draw_surface(leveldot_green, + Vector(i->pos.x*32, i->pos.y*32), LAYER_TILES+1); + else + context.draw_surface(leveldot_red, + Vector(i->pos.x*32, i->pos.y*32), LAYER_TILES+1); + } + 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->teleport_dest != Vector(-1, -1)) + context.draw_surface(teleporterdot, + Vector(i->pos.x*32, i->pos.y*32), LAYER_TILES+1); - if (i->solved) - context.draw_surface(leveldot_green, - Vector(i->x*32 + offset.x, i->y*32 + offset.y), LAYER_TILES+1); - else - context.draw_surface(leveldot_red, - 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->pos.x*32, i->pos.y*32), LAYER_TILES+1); } - tux->draw(context, offset); draw_status(context); } void WorldMap::draw_status(DrawingContext& context) { - char str[80]; - sprintf(str, " %d", total_stats.get_points(SCORE_STAT)); - - 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); - 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); - - if (player_status.lives >= 5) - { - sprintf(str, "%dx", player_status.lives); - 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) - 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); + context.push_transform(); + context.set_translation(Vector(0, 0)); + + player_status.draw(context); if (!tux->is_moving()) { - for(SpecialTiles::iterator i = special_tiles.begin(); i != special_tiles.end(); ++i) + 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->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); + if(i->title == "") + get_level_title(*i); - i->statistics.draw_worldmap_info(context); - } + context.draw_text(white_text, i->title, + Vector(SCREEN_WIDTH/2, + SCREEN_HEIGHT - white_text->get_height() - 30), + CENTER_ALLIGN, LAYER_FOREGROUND1); - /* Display an in-map message in the map, if any as been selected */ + 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()) + { + /* Display an in-map message in the map, if any as been selected */ if(!i->map_message.empty() && !i->passive_message) - context.draw_text_center(gold_text, i->map_message, - Vector(0, screen->h - white_text->get_height() - 60), - LAYER_FOREGROUND1); + context.draw_text(gold_text, i->map_message, + Vector(SCREEN_WIDTH/2, + SCREEN_HEIGHT - 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_center(gold_text, passive_message, - Vector(0, screen->h - white_text->get_height() - 60), - LAYER_FOREGROUND1); + if(passive_message_timer.started()) + context.draw_text(gold_text, passive_message, + Vector(SCREEN_WIDTH/2, SCREEN_HEIGHT - white_text->get_height() - 60), + CENTER_ALLIGN, LAYER_FOREGROUND1); + + context.pop_transform(); } void @@ -1139,53 +992,64 @@ WorldMap::display() quit = false; - song = SoundManager::get()->load_music(datadir + "/music/" + music); - SoundManager::get()->play_music(song); - - FrameRate frame_rate(10); - frame_rate.set_frame_limit(false); - - frame_rate.start(); + song = sound_manager->load_music(datadir + "/music/" + music); + sound_manager->play_music(song); + + if(!intro_displayed && intro_script != "") { + try { + std::auto_ptr interpreter + (new ScriptInterpreter(levels_path)); + std::istringstream in(intro_script); + interpreter->load_script(in, "worldmap-intro-script"); + interpreter->start_script(); + add_object(interpreter.release()); + } catch(std::exception& e) { + std::cerr << "Couldn't execute worldmap-intro-script: " + << e.what() << "\n"; + } + + intro_displayed = true; + } + Uint32 lastticks = SDL_GetTicks(); DrawingContext context; - while(!quit) - { - float delta = frame_rate.get(); - - delta *= 1.3f; - - if (delta > 10.0f) - delta = .3f; - - frame_rate.update(); - - 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); + while(!quit) { + Uint32 ticks = SDL_GetTicks(); + float elapsed_time = float(ticks - lastticks) / 1000; + global_time += elapsed_time; + lastticks = ticks; + + // 40 fps minimum // TODO use same code as in GameSession here + if(elapsed_time > .025) + elapsed_time = .025; + + Vector tux_pos = tux->get_pos(); + offset.x = tux_pos.x - SCREEN_WIDTH/2; + offset.y = tux_pos.y - SCREEN_HEIGHT/2; + + if (offset.x < 0) + offset.x = 0; + if (offset.y < 0) + offset.y = 0; + + if (offset.x > solids->get_width()*32 - SCREEN_WIDTH) + offset.x = solids->get_width()*32 - SCREEN_WIDTH; + if (offset.y > solids->get_height()*32 - SCREEN_HEIGHT) + offset.y = solids->get_height()*32 - SCREEN_HEIGHT; + + context.push_transform(); + context.set_translation(offset); + draw(context); + context.pop_transform(); + get_input(); + update(elapsed_time); - if(Menu::current()) - { - Menu::current()->draw(context); - mouse_cursor->draw(context); - } - - context.do_drawing(); - - SDL_Delay(20); + if(Menu::current()) { + Menu::current()->draw(context); } + + context.do_drawing(); + } } void @@ -1194,61 +1058,58 @@ WorldMap::savegame(const std::string& filename) if(filename == "") return; - std::cout << "savegame: " << filename << std::endl; - - std::ofstream file(filename.c_str(), std::ios::out); - LispWriter* writer = new LispWriter(file); + std::ofstream file(filename.c_str(), std::ios::out); + lisp::Writer writer(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; - } + 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); - writer->write_comment("Worldmap save file"); + writer.write_comment("Worldmap save file"); - writer->start_list("supertux-savegame"); + 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.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); - writer->start_list("tux"); + 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.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)); - writer->end_list("tux"); + writer.end_list("tux"); - writer->start_list("levels"); + writer.start_list("levels"); - for(SpecialTiles::iterator i = special_tiles.begin(); i != special_tiles.end(); ++i) + for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) { - if (i->solved && !i->level_name.empty()) + if (i->solved) { - writer->start_list("level"); + writer.start_list("level"); - writer->write_string("name", i->level_name); - writer->write_bool("solved", true); - i->statistics.write(*writer); + writer.write_string("name", i->name); + writer.write_bool("solved", true); + i->statistics.write(writer); - writer->end_list("level"); + writer.end_list("level"); } } - writer->end_list("levels"); + writer.end_list("levels"); - writer->end_list("supertux-savegame"); + writer.end_list("supertux-savegame"); } void @@ -1256,94 +1117,75 @@ 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) - { - load_map(); - return; - } + try { + lisp::Parser parser; + std::auto_ptr root (parser.parse(filename)); - 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); - - /* Get the Map filename and then load it before setting special_tile settings */ - reader.read_string("map", 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)) + 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("coins", player_status.coins); + 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) { 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); + 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) - { - std::string name; - bool solved = false; + 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; - LispReader level_reader(data); - level_reader.read_string("name", name); - level_reader.read_bool("solved", solved); + const lisp::Lisp* level = iter.lisp(); + level->get("name", name); + level->get("solved", solved); - for(SpecialTiles::iterator i = special_tiles.begin(); i != special_tiles.end(); ++i) - { - if (name == i->level_name) - { - i->solved = solved; - i->statistics.parse(level_reader); - break; - } - } + for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) + { + if (name == i->name) + { + 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(); + } calculate_total_stats(); } @@ -1357,8 +1199,3 @@ WorldMap::loadmap(const std::string& filename) } } // namespace WorldMapNS - -/* Local Variables: */ -/* mode:c++ */ -/* End: */ -