#include <unistd.h>
#include <physfs.h>
+#include "worldmap.hpp"
+
#include "gettext.hpp"
-#include "msg.hpp"
+#include "log.hpp"
+#include "mainloop.hpp"
#include "video/surface.hpp"
#include "video/screen.hpp"
#include "video/drawing_context.hpp"
#include "worldmap.hpp"
#include "resources.hpp"
#include "misc.hpp"
+#include "log.hpp"
+#include "world.hpp"
#include "player_status.hpp"
#include "textscroller.hpp"
#include "main.hpp"
#include "control/joystickkeyboardcontroller.hpp"
#include "object/background.hpp"
#include "object/tilemap.hpp"
-#include "scripting/script_interpreter.hpp"
-#include "exceptions.hpp"
+#include "scripting/squirrel_error.hpp"
+#include "scripting/wrapper_util.hpp"
Menu* worldmap_menu = 0;
namespace WorldMapNS {
+WorldMap* WorldMap::current_ = NULL;
+
Direction reverse_dir(Direction direction)
{
switch(direction)
tux_sprite->set_action(moving ? "small-walking" : "small-stop");
break;
default:
- msg_debug("Bonus type not handled in worldmap.");
+ log_debug << "Bonus type not handled in worldmap." << std::endl;
tux_sprite->set_action("large-stop");
break;
}
if (dir == D_NONE)
{
// Should never be reached if tiledata is good
- msg_warning("Could not determine where to walk next");
+ log_warning << "Could not determine where to walk next" << std::endl;
stop();
return;
}
}
else
{
- msg_warning("Tilemap data is buggy");
+ log_warning << "Tilemap data is buggy" << std::endl;
stop();
}
}
WorldMap::~WorldMap()
{
+ if(current_ == this)
+ current_ = NULL;
+
clear_objects();
for(SpawnPoints::iterator i = spawn_points.begin();
i != spawn_points.end(); ++i) {
parse_level_tile(iter.lisp());
} else if(iter.item() == "special-tile") {
parse_special_tile(iter.lisp());
+ } else if(iter.item() == "name") {
+ // skip
} else {
- msg_warning("Unknown token '" << iter.item() << "' in worldmap");
+ log_warning << "Unknown token '" << iter.item() << "' in worldmap" << std::endl;
}
}
if(solids == 0)
// 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...
- msg_warning("level file '" << level.name
- << "' does not exist and will not be added to the worldmap");
+ log_warning << "level file '" << level.name << "' does not exist and will not be added to the worldmap" << std::endl;
return;
}
level_lisp->get("name", level.title);
} catch(std::exception& e) {
- msg_warning("Problem when reading leveltitle: " << e.what());
+ log_warning << "Problem when reading leveltitle: " << e.what() << std::endl;
return;
}
}
}
}
-void
-WorldMap::get_input()
-{
- main_controller->update();
-
- 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 graceful_shutdown();
- }
-}
-
Vector
WorldMap::get_next_tile(Vector pos, Direction direction)
{
}
void
+WorldMap::finished_level(const std::string& filename)
+{
+ // TODO calculate level from filename?
+ (void) filename;
+ Level* level = at_level();
+
+ bool old_level_state = level->solved;
+ level->solved = true;
+ level->sprite->set_action("solved");
+
+ // deal with statistics
+ level->statistics.merge(global_stats);
+ calculate_total_stats();
+
+ save_state();
+ if(World::current() != NULL)
+ World::current()->save_state();
+
+ 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);
+ }
+ }
+
+ if (level->extro_script != "") {
+ /* TODO
+ try {
+ std::auto_ptr<ScriptInterpreter> interpreter
+ (new ScriptInterpreter(levels_path));
+ std::istringstream in(level->extro_script);
+ interpreter->run_script(in, "level-extro-script");
+ add_object(interpreter.release());
+ } catch(std::exception& e) {
+ log_fatal << "Couldn't run level-extro-script:" << e.what() << std::endl;
+ }
+ */
+ }
+
+ if (!level->next_worldmap.empty()) {
+ // Load given worldmap
+ loadmap(level->next_worldmap);
+ }
+
+ if (level->quit_worldmap)
+ main_loop->exit_screen();
+}
+
+void
WorldMap::update(float delta)
{
Menu* menu = Menu::current();
Menu::set_current(0);
break;
case MNID_QUITWORLDMAP: // Quit Worldmap
- quit = true;
+ main_loop->exit_screen();
break;
}
- } else if(menu == options_menu) {
- process_options_menu();
}
return;
GameObject* object = *i;
object->update(delta);
}
+
// remove old GameObjects
for(GameObjects::iterator i = game_objects.begin();
i != game_objects.end(); ) {
++i;
}
}
-
+
+ // position "camera"
+ Vector tux_pos = tux->get_pos();
+ camera_offset.x = tux_pos.x - SCREEN_WIDTH/2;
+ camera_offset.y = tux_pos.y - SCREEN_HEIGHT/2;
+
+ if (camera_offset.x < 0)
+ camera_offset.x = 0;
+ if (camera_offset.y < 0)
+ camera_offset.y = 0;
+
+ if (camera_offset.x > solids->get_width()*32 - SCREEN_WIDTH)
+ camera_offset.x = solids->get_width()*32 - SCREEN_WIDTH;
+ if (camera_offset.y > solids->get_height()*32 - SCREEN_HEIGHT)
+ camera_offset.y = solids->get_height()*32 - SCREEN_HEIGHT;
+
+ // handle input
bool enter_level = false;
if(main_controller->pressed(Controller::ACTION)
|| main_controller->pressed(Controller::JUMP)
}
/* Check level action */
- bool level_finished = true;
Level* level = at_level();
- if (!level)
- {
- msg_warning("No level to enter at: "
- << tux->get_tile_pos().x << ", " << tux->get_tile_pos().y);
+ if (!level) {
+ log_warning << "No level to enter at: " << tux->get_tile_pos().x << ", " << tux->get_tile_pos().y << std::endl;
return;
- }
-
-
- if (level->pos == tux->get_tile_pos())
- {
- sound_manager->stop_music();
- 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),
- (level->pos.y*32 + 16 + offset.y)), 500);
- GameSession session(levels_path + level->name,
- ST_GL_LOAD_LEVEL_FILE, &level->statistics);
-
- switch (session.run())
- {
- case GameSession::ES_LEVEL_FINISHED:
- {
- 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);
- calculate_total_stats();
-
- 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 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;
-
- break;
- case GameSession::ES_GAME_OVER:
- {
- level_finished = false;
- /* draw an end screen */
- /* TODO: in the future, this should make a dialog a la SuperMario, asking
- if the player wants to restart the world map with no score and from
- level 1 */
- char str[80];
-
- DrawingContext context;
- context.draw_gradient(Color (200,240,220), Color(200,200,220),
- LAYER_BACKGROUND0);
-
- context.draw_text(blue_text, _("GAMEOVER"),
- Vector(SCREEN_WIDTH/2, 200), CENTER_ALLIGN, 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"));
-
- context.do_drawing();
-
- wait_for_event(2.0, 6.0);
-
- quit = true;
- player_status->reset();
- break;
- }
- case GameSession::ES_NONE:
- assert(false);
- // Should never be reached
- break;
- }
-
- sound_manager->play_music(music);
- Menu::set_current(0);
- if (!savegame_file.empty())
- savegame(savegame_file);
- }
- /* The porpose of the next checking is that if the player lost
- the level (in case there is one), don't show anything */
- if(level_finished) {
- if (level->extro_script != "") {
- try {
- std::auto_ptr<ScriptInterpreter> interpreter
- (new ScriptInterpreter(levels_path));
- std::istringstream in(level->extro_script);
- interpreter->run_script(in, "level-extro-script");
- add_object(interpreter.release());
- } catch(std::exception& e) {
- msg_warning("Couldn't run level-extro-script:" << e.what());
- }
- }
+ }
- if (!level->next_worldmap.empty())
- {
- // Load given worldmap
- loadmap(level->next_worldmap);
- }
- if (level->quit_worldmap)
- quit = true;
+ if (level->pos == tux->get_tile_pos()) {
+ // 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);
+
+ try {
+ GameSession *session =
+ new GameSession(levels_path + level->name,
+ ST_GL_LOAD_LEVEL_FILE, &level->statistics);
+ main_loop->push_screen(session);
+ } catch(std::exception& e) {
+ log_fatal << "Couldn't load level: " << e.what() << std::endl;
}
+ }
}
else
{
void
WorldMap::draw(DrawingContext& context)
{
+ context.push_transform();
+ context.set_translation(camera_offset);
+
for(GameObjects::iterator i = game_objects.begin();
i != game_objects.end(); ++i) {
GameObject* object = *i;
}
draw_status(context);
+ context.pop_transform();
}
void
}
void
-WorldMap::display()
+WorldMap::setup()
{
- Menu::set_current(0);
+ sound_manager->play_music(music);
+ Menu::set_current(NULL);
- quit = false;
+ current_ = this;
+ load_state();
+}
- sound_manager->play_music(music);
+static void store_float(HSQUIRRELVM vm, const char* name, float val)
+{
+ sq_pushstring(vm, name, -1);
+ sq_pushfloat(vm, val);
+ if(SQ_FAILED(sq_createslot(vm, -3)))
+ throw Scripting::SquirrelError(vm, "Couldn't add float value to table");
+}
- if(!intro_displayed && intro_script != "") {
- try {
- std::auto_ptr<ScriptInterpreter> interpreter
- (new ScriptInterpreter(levels_path));
- std::istringstream in(intro_script);
- interpreter->run_script(in, "worldmap-intro-script");
- add_object(interpreter.release());
- } catch(std::exception& e) {
- msg_warning("Couldn't execute worldmap-intro-script: "
- << e.what());
- }
-
- intro_displayed = true;
- }
+/*
+static void store_int(HSQUIRRELVM vm, const char* name, int val)
+{
+ sq_pushstring(vm, name, -1);
+ sq_pushinteger(vm, val);
+ if(SQ_FAILED(sq_createslot(vm, -3)))
+ throw Scripting::SquirrelError(vm, "Couldn't add float value to table");
+}
+*/
- Uint32 lastticks = SDL_GetTicks();
- DrawingContext context;
- Console* console = new Console(&context);
- while(!quit) {
- Uint32 ticks = SDL_GetTicks();
- float elapsed_time = float(ticks - lastticks) / 1000;
- game_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);
- sound_manager->update();
-
- if(Menu::current()) {
- Menu::current()->draw(context);
- }
+static void store_string(HSQUIRRELVM vm, const char* name, const std::string& val)
+{
+ sq_pushstring(vm, name, -1);
+ sq_pushstring(vm, val.c_str(), val.length());
+ if(SQ_FAILED(sq_createslot(vm, -3)))
+ throw Scripting::SquirrelError(vm, "Couldn't add float value to table");
+}
- console->draw();
- context.do_drawing();
+static void store_bool(HSQUIRRELVM vm, const char* name, bool val)
+{
+ sq_pushstring(vm, name, -1);
+ sq_pushbool(vm, val ? SQTrue : SQFalse);
+ if(SQ_FAILED(sq_createslot(vm, -3)))
+ throw Scripting::SquirrelError(vm, "Couldn't add float value to table");
+}
+
+static float read_float(HSQUIRRELVM vm, const char* name)
+{
+ sq_pushstring(vm, name, -1);
+ if(SQ_FAILED(sq_get(vm, -2))) {
+ std::ostringstream msg;
+ msg << "Couldn't get float value for '" << name << "' from table";
+ throw Scripting::SquirrelError(vm, msg.str());
}
- delete console;
+ float result;
+ if(SQ_FAILED(sq_getfloat(vm, -1, &result))) {
+ std::ostringstream msg;
+ msg << "Couldn't get float value for '" << name << "' from table";
+ throw Scripting::SquirrelError(vm, msg.str());
+ }
+ sq_pop(vm, 1);
+
+ return result;
}
-void
-WorldMap::savegame(const std::string& filename)
+static std::string read_string(HSQUIRRELVM vm, const char* name)
{
- if(filename == "")
- return;
-
- std::string dir = FileSystem::dirname(filename);
- if(PHYSFS_exists(dir.c_str()) == 0 && PHYSFS_mkdir(dir.c_str()) != 0) {
+ sq_pushstring(vm, name, -1);
+ if(SQ_FAILED(sq_get(vm, -2))) {
std::ostringstream msg;
- msg << "Couldn't create directory '" << dir << "' for savegame:"
- << PHYSFS_getLastError();
- throw std::runtime_error(msg.str());
+ msg << "Couldn't get string value for '" << name << "' from table";
+ throw Scripting::SquirrelError(vm, msg.str());
}
- if(!PHYSFS_isDirectory(dir.c_str())) {
+
+ const char* result;
+ if(SQ_FAILED(sq_getstring(vm, -1, &result))) {
std::ostringstream msg;
- msg << "'" << dir << "' is not a directory.";
- throw std::runtime_error(msg.str());
+ msg << "Couldn't get string value for '" << name << "' from table";
+ throw Scripting::SquirrelError(vm, msg.str());
}
-
- lisp::Writer writer(filename);
+ sq_pop(vm, 1);
- int nb_solved_levels = 0, total_levels = 0;
- for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) {
- ++total_levels;
- if (i->solved)
- ++nb_solved_levels;
- }
- char nb_solved_levels_str[80], total_levels_str[80];
- sprintf(nb_solved_levels_str, "%d", nb_solved_levels);
- sprintf(total_levels_str, "%d", total_levels);
+ return std::string(result);
+}
- writer.write_comment("Worldmap save file");
+static bool read_bool(HSQUIRRELVM vm, const char* name)
+{
+ sq_pushstring(vm, name, -1);
+ if(SQ_FAILED(sq_get(vm, -2))) {
+ std::ostringstream msg;
+ msg << "Couldn't get bool value for '" << name << "' from table";
+ throw Scripting::SquirrelError(vm, msg.str());
+ }
+
+ SQBool result;
+ if(SQ_FAILED(sq_getbool(vm, -1, &result))) {
+ std::ostringstream msg;
+ msg << "Couldn't get bool value for '" << name << "' from table";
+ throw Scripting::SquirrelError(vm, msg.str());
+ }
+ sq_pop(vm, 1);
- writer.start_list("supertux-savegame");
+ return result == SQTrue;
+}
- 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);
+void
+WorldMap::save_state()
+{
+ HSQUIRRELVM vm = ScriptManager::instance->get_vm();
+ int oldtop = sq_gettop(vm);
- writer.start_list("tux");
+ try {
+ // get state table
+ sq_pushroottable(vm);
+ sq_pushstring(vm, "state", -1);
+ if(SQ_FAILED(sq_get(vm, -2)))
+ throw Scripting::SquirrelError(vm, "Couldn't get state table");
+
+ // get or create worlds table
+ sq_pushstring(vm, "worlds", -1);
+ if(SQ_FAILED(sq_get(vm, -2))) {
+ sq_pushstring(vm, "worlds", -1);
+ sq_newtable(vm);
+ if(SQ_FAILED(sq_createslot(vm, -3)))
+ throw Scripting::SquirrelError(vm, "Couldn't create state.worlds");
+
+ sq_pushstring(vm, "worlds", -1);
+ if(SQ_FAILED(sq_get(vm, -2)))
+ throw Scripting::SquirrelError(vm, "Couldn't create.get state.worlds");
+ }
+
+ sq_pushstring(vm, map_filename.c_str(), map_filename.length());
+ if(SQ_FAILED(sq_deleteslot(vm, -2, SQFalse)))
+ sq_pop(vm, 1);
- 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));
+ // construct new table for this worldmap
+ sq_pushstring(vm, map_filename.c_str(), map_filename.length());
+ sq_newtable(vm);
- writer.end_list("tux");
+ // store tux
+ sq_pushstring(vm, "tux", -1);
+ sq_newtable(vm);
+
+ store_float(vm, "x", tux->get_tile_pos().x);
+ store_float(vm, "y", tux->get_tile_pos().y);
+ store_string(vm, "back", direction_to_string(tux->back_direction));
- writer.start_list("levels");
+ sq_createslot(vm, -3);
+
+ // levels...
+ sq_pushstring(vm, "levels", -1);
+ sq_newtable(vm);
- for(Levels::iterator i = levels.begin(); i != levels.end(); ++i)
- {
- if (i->solved)
- {
- writer.start_list("level");
+ for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) {
+ if (i->solved) {
+ sq_pushstring(vm, i->name.c_str(), -1);
+ sq_newtable(vm);
- writer.write_string("name", i->name);
- writer.write_bool("solved", true);
- i->statistics.write(writer);
+ store_bool(vm, "solved", true);
+ // TODO write statistics
+ // i->statistics.write(writer);
- writer.end_list("level");
- }
- }
+ sq_createslot(vm, -3);
+ }
+ }
+
+ sq_createslot(vm, -3);
- writer.end_list("levels");
+ // push world into worlds table
+ sq_createslot(vm, -3);
+ } catch(std::exception& e) {
+ sq_settop(vm, oldtop);
+ }
- writer.end_list("supertux-savegame");
+ sq_settop(vm, oldtop);
}
void
-WorldMap::loadgame(const std::string& filename)
+WorldMap::load_state()
{
- msg_debug("loadgame: " << filename);
- savegame_file = filename;
-
- if (PHYSFS_exists(filename.c_str())) // savegame exists
- {
- try {
- lisp::Parser parser;
-
- std::auto_ptr<lisp::Lisp> 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->back_direction = string_to_direction(back_str);
- tux->set_tile_pos(p);
+ HSQUIRRELVM vm = ScriptManager::instance->get_vm();
+ int oldtop = sq_gettop(vm);
+
+ try {
+ // get state table
+ sq_pushroottable(vm);
+ sq_pushstring(vm, "state", -1);
+ if(SQ_FAILED(sq_get(vm, -2)))
+ throw Scripting::SquirrelError(vm, "Couldn't get state table");
+
+ // get worlds table
+ sq_pushstring(vm, "worlds", -1);
+ if(SQ_FAILED(sq_get(vm, -2)))
+ throw Scripting::SquirrelError(vm, "Couldn't get state.worlds");
+
+ // get table for our world
+ sq_pushstring(vm, map_filename.c_str(), map_filename.length());
+ if(SQ_FAILED(sq_get(vm, -2)))
+ throw Scripting::SquirrelError(vm, "Couldn't get state.world.mapfilename");
+
+ // load tux
+ sq_pushstring(vm, "tux", -1);
+ if(SQ_FAILED(sq_get(vm, -2)))
+ throw Scripting::SquirrelError(vm, "Couldn't get tux");
+
+ Vector p;
+ p.x = read_float(vm, "x");
+ p.y = read_float(vm, "y");
+ std::string back_str = read_string(vm, "back");
+ tux->back_direction = string_to_direction(back_str);
+ tux->set_tile_pos(p);
+
+ sq_pop(vm, 1);
+
+ // load levels
+ sq_pushstring(vm, "levels", -1);
+ if(SQ_FAILED(sq_get(vm, -2)))
+ throw Scripting::SquirrelError(vm, "Couldn't get levels");
+
+ for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) {
+ sq_pushstring(vm, i->name.c_str(), -1);
+ if(SQ_SUCCEEDED(sq_get(vm, -2))) {
+ i->solved = read_bool(vm, "solved");
+ i->sprite->set_action(i->solved ? "solved" : "default");
+ // i->statistics.parse(*level);
+ sq_pop(vm, 1);
}
+ }
+ sq_pop(vm, 1);
- 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;
+ } catch(std::exception& e) {
+ log_debug << "Not loading worldmap state: " << e.what() << std::endl;
+ }
+ sq_settop(vm, oldtop);
+}
- const lisp::Lisp* level = iter.lisp();
- level->get("name", name);
- level->get("solved", solved);
+size_t
+WorldMap::level_count()
+{
+ return levels.size();
+}
- for(Levels::iterator i = levels.begin(); i != levels.end(); ++i)
- {
- if (name == i->name)
- {
- i->solved = solved;
- i->sprite->set_action(solved ? "solved" : "default");
- i->statistics.parse(*level);
- break;
- }
- }
- } else {
- msg_warning("Unknown token '" << iter.item()
- << "' in levels block in worldmap");
- }
- }
- }
- } catch(std::exception& e) {
- msg_warning("Problem loading game '" << filename << "': " << e.what());
- load_map();
- player_status->reset();
- }
- }
- else
- {
- load_map();
- player_status->reset();
+size_t
+WorldMap::solved_level_count()
+{
+ size_t count = 0;
+ for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) {
+ if(i->solved)
+ count++;
}
- calculate_total_stats();
+ return count;
}
-
+
void
WorldMap::loadmap(const std::string& filename)
{
projects / supertux.git / blobdiff