X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fworldmap.cpp;h=2896d64148f820ba9ffed3c072ea524cf4aa0722;hb=5c14f6f384eff76491d494b4c157abf2ff776d49;hp=87d1d626ef1e5479683e9139c020383d1177daa8;hpb=63ccedcdc3dd65f3677c012f3d3e6e6233e5b002;p=supertux.git diff --git a/src/worldmap.cpp b/src/worldmap.cpp index 87d1d626e..2896d6414 100644 --- a/src/worldmap.cpp +++ b/src/worldmap.cpp @@ -25,6 +25,7 @@ #include #include #include +#include #include "gettext.hpp" #include "video/surface.hpp" @@ -52,6 +53,7 @@ #include "object/background.hpp" #include "object/tilemap.hpp" #include "scripting/script_interpreter.hpp" +#include "exceptions.hpp" Menu* worldmap_menu = 0; @@ -116,7 +118,7 @@ string_to_direction(const std::string& directory) Tux::Tux(WorldMap* worldmap_) : worldmap(worldmap_) { - tux_sprite = sprite_manager->create("worldmaptux"); + tux_sprite = sprite_manager->create("images/worldmap/common/tux.sprite"); offset = 0; moving = false; @@ -132,21 +134,21 @@ Tux::~Tux() void Tux::draw(DrawingContext& context) { - switch (player_status.bonus) { + switch (player_status->bonus) { case GROWUP_BONUS: - tux_sprite->set_action("large"); + tux_sprite->set_action(moving ? "large-walking" : "large-stop"); break; case FIRE_BONUS: - tux_sprite->set_action("fire"); + tux_sprite->set_action(moving ? "fire-walking" : "fire-stop"); break; case NO_BONUS: - tux_sprite->set_action("small"); + tux_sprite->set_action(moving ? "small-walking" : "small-stop"); break; default: -#ifdef DBEUG +#ifdef DEBUG std::cerr << "Bonus type not handled in worldmap.\n"; #endif - tux_sprite->set_action("large"); + tux_sprite->set_action("large-stop"); break; } @@ -352,13 +354,11 @@ WorldMap::WorldMap() tux = new Tux(this); add_object(tux); - leveldot_green= new Surface("images/tiles/worldmap/leveldot_green.png", true); - leveldot_red = new Surface("images/tiles/worldmap/leveldot_red.png", true); - messagedot = new Surface("images/tiles/worldmap/messagedot.png", true); - teleporterdot = new Surface("images/tiles/worldmap/teleporterdot.png", true); + messagedot = new Surface("images/worldmap/common/messagedot.png"); + teleporterdot = new Surface("images/worldmap/common/teleporterdot.png"); name = ""; - music = "salcon.ogg"; + music = "music/salcon.ogg"; intro_displayed = false; total_stats.reset(); @@ -371,11 +371,13 @@ WorldMap::~WorldMap() i != spawn_points.end(); ++i) { delete *i; } - + for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) { + Level& level = *i; + delete level.sprite; + } + delete tile_manager; - delete leveldot_green; - delete leveldot_red; delete messagedot; delete teleporterdot; } @@ -516,6 +518,10 @@ WorldMap::parse_level_tile(const lisp::Lisp* level_lisp) level.south = true; level.west = true; + std::string sprite = "images/worldmap/common/leveldot.sprite"; + level_lisp->get("sprite", sprite); + level.sprite = sprite_manager->create(sprite); + level_lisp->get("extro-script", level.extro_script); level_lisp->get("next-worldmap", level.next_worldmap); @@ -523,6 +529,17 @@ WorldMap::parse_level_tile(const lisp::Lisp* level_lisp) level_lisp->get("quit-worldmap", level.quit_worldmap); level_lisp->get("name", level.name); + + if (!PHYSFS_exists((levels_path + level.name).c_str())) + { + // Do we want to bail out instead...? We might get messages from modders + // who can't make their levels run because they're too dumb to watch + // their terminals... + std::cerr << "Error: level file '" << level.name + << "' does not exist and will not be added to the worldmap." << std::endl; + return; + } + level_lisp->get("x", level.pos.x); level_lisp->get("y", level.pos.y); @@ -591,7 +608,7 @@ WorldMap::get_input() Menu::current()->event(event); main_controller->process_event(event); if(event.type == SDL_QUIT) - throw std::runtime_error("Received window close"); + throw graceful_shutdown(); } } @@ -735,7 +752,8 @@ WorldMap::update(float delta) if (level->pos == tux->get_tile_pos()) { sound_manager->stop_music(); - PlayerStatus old_player_status = player_status; + PlayerStatus old_player_status; + old_player_status = *player_status; // do a shriking fade to the level shrink_fade(Vector((level->pos.x*32 + 16 + offset.x), @@ -750,6 +768,7 @@ WorldMap::update(float delta) level_finished = true; bool old_level_state = level->solved; level->solved = true; + level->sprite->set_action("solved"); // deal with statistics level->statistics.merge(global_stats); @@ -787,9 +806,9 @@ WorldMap::update(float delta) 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; + player_status->coins = old_player_status.coins; + player_status->lives = std::min(old_player_status.lives, player_status->lives); + player_status->bonus = NO_BONUS; break; case GameSession::ES_GAME_OVER: @@ -808,7 +827,7 @@ WorldMap::update(float delta) context.draw_text(blue_text, _("GAMEOVER"), Vector(SCREEN_WIDTH/2, 200), CENTER_ALLIGN, LAYER_FOREGROUND1); - sprintf(str, _("COINS: %d"), player_status.coins); + sprintf(str, _("COINS: %d"), player_status->coins); context.draw_text(gold_text, str, Vector(SCREEN_WIDTH/2, SCREEN_WIDTH - 32), CENTER_ALLIGN, LAYER_FOREGROUND1); @@ -820,7 +839,7 @@ WorldMap::update(float delta) wait_for_event(2.0, 6.0); quit = true; - player_status.reset(); + player_status->reset(); break; } case GameSession::ES_NONE: @@ -829,7 +848,7 @@ WorldMap::update(float delta) break; } - sound_manager->play_music(std::string("music/") + music); + sound_manager->play_music(music); Menu::set_current(0); if (!savegame_file.empty()) savegame(savegame_file); @@ -905,12 +924,8 @@ WorldMap::draw(DrawingContext& 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); + const Level& level = *i; + level.sprite->draw(context, level.pos*32 + Vector(16, 16), LAYER_TILES+1); } for(SpecialTiles::iterator i = special_tiles.begin(); i != special_tiles.end(); ++i) @@ -936,7 +951,7 @@ WorldMap::draw_status(DrawingContext& context) context.push_transform(); context.set_translation(Vector(0, 0)); - player_status.draw(context); + player_status->draw(context); if (!tux->is_moving()) { @@ -986,7 +1001,7 @@ WorldMap::display() quit = false; - sound_manager->play_music(std::string("music/") + music); + sound_manager->play_music(music); if(!intro_displayed && intro_script != "") { try { @@ -1008,7 +1023,7 @@ WorldMap::display() while(!quit) { Uint32 ticks = SDL_GetTicks(); float elapsed_time = float(ticks - lastticks) / 1000; - global_time += elapsed_time; + game_time += elapsed_time; lastticks = ticks; // 40 fps minimum // TODO use same code as in GameSession here @@ -1051,6 +1066,19 @@ WorldMap::savegame(const std::string& filename) if(filename == "") return; + std::string dir = FileSystem::dirname(filename); + if(PHYSFS_exists(dir.c_str()) == 0 && PHYSFS_mkdir(dir.c_str()) != 0) { + std::ostringstream msg; + msg << "Couldn't create directory '" << dir << "' for savegame:" + << PHYSFS_getLastError(); + throw std::runtime_error(msg.str()); + } + if(!PHYSFS_isDirectory(dir.c_str())) { + std::ostringstream msg; + msg << "'" << dir << "' is not a directory."; + throw std::runtime_error(msg.str()); + } + lisp::Writer writer(filename); int nb_solved_levels = 0, total_levels = 0; @@ -1078,7 +1106,7 @@ WorldMap::savegame(const std::string& filename) 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); + player_status->write(writer); writer.write_string("back", direction_to_string(tux->back_direction)); writer.end_list("tux"); @@ -1109,74 +1137,84 @@ WorldMap::loadgame(const std::string& filename) { std::cout << "loadgame: " << filename << std::endl; savegame_file = filename; - - try { - lisp::Parser parser; - std::auto_ptr root (parser.parse(filename)); - 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"; + if (PHYSFS_exists(filename.c_str())) // savegame exists + { + try { + lisp::Parser parser; + + std::auto_ptr root (parser.parse(filename)); + + 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"; - tux_lisp->get("x", p.x); - tux_lisp->get("y", p.y); - tux_lisp->get("back", back_str); - player_status.read(*tux_lisp); + tux_lisp->get("x", p.x); + tux_lisp->get("y", p.y); + tux_lisp->get("back", back_str); + player_status->read(*tux_lisp); - tux->back_direction = string_to_direction(back_str); - tux->set_tile_pos(p); - } + tux->back_direction = string_to_direction(back_str); + tux->set_tile_pos(p); + } - const lisp::Lisp* levels_lisp = savegame->get_lisp("levels"); - if(levels_lisp) { - lisp::ListIterator iter(levels_lisp); - while(iter.next()) { - if(iter.item() == "level") { - std::string name; - bool solved = false; + const lisp::Lisp* levels_lisp = savegame->get_lisp("levels"); + if(levels_lisp) { + lisp::ListIterator iter(levels_lisp); + while(iter.next()) { + if(iter.item() == "level") { + std::string name; + bool solved = false; - const lisp::Lisp* level = iter.lisp(); - level->get("name", name); - level->get("solved", solved); + const lisp::Lisp* level = iter.lisp(); + level->get("name", name); + level->get("solved", solved); - for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) - { - if (name == i->name) + for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) { - i->solved = solved; - i->statistics.parse(*level); - break; + if (name == i->name) + { + i->solved = solved; + i->sprite->set_action(solved ? "solved" : "default"); + i->statistics.parse(*level); + break; + } } + } else { + std::cerr << "Unknown token '" << iter.item() + << "' in levels block in worldmap.\n"; } - } else { - std::cerr << "Unknown token '" << iter.item() - << "' in levels block in worldmap.\n"; } } + } catch(std::exception& e) { + std::cerr << "Problem loading game '" << filename << "': " << e.what() + << "\n"; + load_map(); + player_status->reset(); } - } catch(std::exception& e) { - std::cerr << "Problem loading game '" << filename << "': " << e.what() - << "\n"; - load_map(); - player_status.reset(); + } + else + { + load_map(); + player_status->reset(); } calculate_total_stats();