X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fworldmap%2Fworldmap.cpp;h=23c99d8b3b161bf991a78ea3b46ac2474dd0a4aa;hb=57763c519b16bf063add4b46bf2856873de9db61;hp=ba81b1e6cf7b7f360040f381cca6834f008ca0d8;hpb=6141e1672ec08427b989ca245508f0c1648ce68b;p=supertux.git diff --git a/src/worldmap/worldmap.cpp b/src/worldmap/worldmap.cpp index ba81b1e6c..23c99d8b3 100644 --- a/src/worldmap/worldmap.cpp +++ b/src/worldmap/worldmap.cpp @@ -132,10 +132,10 @@ WorldMap::WorldMap(const std::string& filename, const std::string& force_spawnpo : tux(0), solids(0), force_spawnpoint(force_spawnpoint) { tile_manager.reset(new TileManager("images/worldmap.strf")); - + tux = new Tux(this); add_object(tux); - + name = ""; music = "music/salcon.ogg"; @@ -165,7 +165,7 @@ WorldMap::WorldMap(const std::string& filename, const std::string& force_spawnpo throw Scripting::SquirrelError(global_vm, "Couldn't get table from stack"); sq_addref(global_vm, &worldmap_table); - sq_pop(global_vm, 1); + sq_pop(global_vm, 1); } WorldMap::~WorldMap() @@ -180,7 +180,7 @@ WorldMap::~WorldMap() sq_release(global_vm, &worldmap_table); sq_collectgarbage(global_vm); - + if(current_ == this) current_ = NULL; @@ -247,11 +247,11 @@ WorldMap::load(const std::string& filename) throw std::runtime_error("file isn't a supertux-level file."); lisp->get("name", name); - + const lisp::Lisp* sector = lisp->get_lisp("sector"); if(!sector) throw std::runtime_error("No sector sepcified in worldmap file."); - + lisp::ListIterator iter(sector); while(iter.next()) { if(iter.item() == "tilemap") { @@ -290,7 +290,7 @@ WorldMap::load(const std::string& filename) if(solids == 0) throw std::runtime_error("No solid tilemap specified"); - move_to_spawnpoint("main"); + move_to_spawnpoint("main"); } catch(std::exception& e) { std::stringstream msg; @@ -308,12 +308,12 @@ WorldMap::get_level_title(LevelTile& level) try { lisp::Parser parser; - std::auto_ptr root (parser.parse(levels_path + level.name)); + std::auto_ptr root (parser.parse(levels_path + level.get_name())); const lisp::Lisp* level_lisp = root->get_lisp("supertux-level"); if(!level_lisp) return; - + level_lisp->get("name", level.title); } catch(std::exception& e) { log_warning << "Problem when reading leveltitle: " << e.what() << std::endl; @@ -425,7 +425,7 @@ WorldMap::finished_level(Level* gamelevel) // 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()); // first, test for crossroads @@ -471,7 +471,7 @@ WorldMap::update(float delta) if(menu == worldmap_menu.get()) { switch (worldmap_menu->check()) { - case MNID_RETURNWORLDMAP: // Return to game + case MNID_RETURNWORLDMAP: // Return to game Menu::set_current(0); break; case MNID_QUITWORLDMAP: // Quit Worldmap @@ -524,26 +524,33 @@ WorldMap::update(float delta) enter_level = true; if(main_controller->pressed(Controller::PAUSE_MENU)) on_escape_press(); - + + // check for teleporters + Teleporter* teleporter = at_teleporter(tux->get_tile_pos()); + if (teleporter && (teleporter->automatic || (enter_level && (!tux->is_moving())))) { + enter_level = false; + if (teleporter->worldmap != "") { + change(teleporter->worldmap, teleporter->spawnpoint); + } else { + // TODO: an animation, camera scrolling or a fading would be a nice touch + sound_manager->play("sounds/warp.wav"); + tux->back_direction = D_NONE; + move_to_spawnpoint(teleporter->spawnpoint); + } + } + if (enter_level && !tux->is_moving()) { - /* Check special tile action */ - SpecialTile* special_tile = at_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("sounds/warp.wav"); - tux->back_direction = D_NONE; - tux->set_tile_pos(special_tile->teleport_dest); - SDL_Delay(1000); - } - } - /* Check level action */ LevelTile* level = at_level(); if (!level) { + //Respawn if player on a tile with no level and nowhere to go. + const Tile* tile = at(tux->get_tile_pos()); + if(!( tile->getData() & ( Tile::WORLDMAP_NORTH | Tile::WORLDMAP_SOUTH | Tile::WORLDMAP_WEST | Tile::WORLDMAP_EAST ))){ + log_warning << "Player at illegal position " << tux->get_tile_pos().x << ", " << tux->get_tile_pos().y << " respawning." << std::endl; + move_to_spawnpoint("main"); + return; + } log_warning << "No level to enter at: " << tux->get_tile_pos().x << ", " << tux->get_tile_pos().y << std::endl; return; } @@ -552,7 +559,7 @@ WorldMap::update(float delta) try { Vector shrinkpos = Vector(level->pos.x*32 + 16 - camera_offset.x, level->pos.y*32 + 16 - camera_offset.y); - std::string levelfile = levels_path + level->name; + std::string levelfile = levels_path + level->get_name(); main_loop->push_screen(new GameSession(levelfile, &level->statistics), new ShrinkFade(shrinkpos, 0.5)); } catch(std::exception& e) { @@ -591,7 +598,7 @@ WorldMap::at_special_tile() i != special_tiles.end(); ++i) { SpecialTile* special_tile = *i; if (special_tile->pos == tux->get_tile_pos()) - return special_tile; + return special_tile; } return NULL; @@ -626,13 +633,13 @@ 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; object->draw(context); } - + draw_status(context); context.pop_transform(); } @@ -642,13 +649,13 @@ WorldMap::draw_status(DrawingContext& context) { context.push_transform(); context.set_translation(Vector(0, 0)); - + player_status->draw(context); if (!tux->is_moving()) { for(LevelTiles::iterator i = levels.begin(); i != levels.end(); ++i) { LevelTile* level = *i; - + if (level->pos == tux->get_tile_pos()) { if(level->title == "") get_level_title(*level); @@ -657,7 +664,7 @@ WorldMap::draw_status(DrawingContext& context) Vector(SCREEN_WIDTH/2, SCREEN_HEIGHT - white_text->get_height() - 30), CENTER_ALLIGN, LAYER_FOREGROUND1); - + // if level is solved, draw level picture behind stats /* if (level->solved) { @@ -670,7 +677,7 @@ WorldMap::draw_status(DrawingContext& context) } } */ - + level->statistics.draw_worldmap_info(context); break; } @@ -679,22 +686,30 @@ WorldMap::draw_status(DrawingContext& context) for(SpecialTiles::iterator i = special_tiles.begin(); i != special_tiles.end(); ++i) { SpecialTile* special_tile = *i; - + if (special_tile->pos == tux->get_tile_pos()) { /* Display an in-map message in the map, if any as been selected */ if(!special_tile->map_message.empty() && !special_tile->passive_message) - context.draw_text(gold_text, special_tile->map_message, + context.draw_text(gold_text, special_tile->map_message, Vector(SCREEN_WIDTH/2, SCREEN_HEIGHT - white_text->get_height() - 60), CENTER_ALLIGN, LAYER_FOREGROUND1); break; } } + + // display teleporter messages + Teleporter* teleporter = at_teleporter(tux->get_tile_pos()); + if (teleporter && (teleporter->message != "")) { + Vector pos = Vector(SCREEN_WIDTH/2, SCREEN_HEIGHT - white_text->get_height() - 30); + context.draw_text(white_text, teleporter->message, pos, CENTER_ALLIGN, LAYER_FOREGROUND1); + } + } - + /* Display a passive message in the map, if needed */ if(passive_message_timer.started()) - context.draw_text(gold_text, passive_message, + context.draw_text(gold_text, passive_message, Vector(SCREEN_WIDTH/2, SCREEN_HEIGHT - white_text->get_height() - 60), CENTER_ALLIGN, LAYER_FOREGROUND1); @@ -710,12 +725,17 @@ WorldMap::setup() current_ = this; load_state(); - // if force_spawnpoint was set, move Tux there - if (force_spawnpoint != "") move_to_spawnpoint(force_spawnpoint); + // if force_spawnpoint was set, move Tux there, then clear force_spawnpoint + if (force_spawnpoint != "") { + move_to_spawnpoint(force_spawnpoint); + force_spawnpoint = ""; + } + + tux->setup(); // register worldmap_table as worldmap in scripting using namespace Scripting; - + sq_pushroottable(global_vm); sq_pushstring(global_vm, "worldmap", -1); sq_pushobject(global_vm, worldmap_table); @@ -784,7 +804,7 @@ static float read_float(HSQUIRRELVM vm, const char* name) msg << "Couldn't get float value for '" << name << "' from table"; throw Scripting::SquirrelError(vm, msg.str()); } - + float result; if(SQ_FAILED(sq_getfloat(vm, -1, &result))) { std::ostringstream msg; @@ -804,7 +824,7 @@ static std::string read_string(HSQUIRRELVM vm, const char* name) msg << "Couldn't get string value for '" << name << "' from table"; throw Scripting::SquirrelError(vm, msg.str()); } - + const char* result; if(SQ_FAILED(sq_getstring(vm, -1, &result))) { std::ostringstream msg; @@ -823,8 +843,8 @@ static bool read_bool(HSQUIRRELVM vm, const char* name) 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; @@ -840,7 +860,7 @@ void WorldMap::save_state() { using namespace Scripting; - + HSQUIRRELVM vm = global_vm; int oldtop = sq_gettop(vm); @@ -863,7 +883,7 @@ WorldMap::save_state() 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); @@ -875,32 +895,32 @@ WorldMap::save_state() // 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)); sq_createslot(vm, -3); - + // levels... sq_pushstring(vm, "levels", -1); sq_newtable(vm); for(LevelTiles::iterator i = levels.begin(); i != levels.end(); ++i) { LevelTile* level = *i; - + if (level->solved) { - sq_pushstring(vm, level->name.c_str(), -1); + sq_pushstring(vm, level->get_name().c_str(), -1); sq_newtable(vm); - store_bool(vm, "solved", true); + store_bool(vm, "solved", true); // TODO write statistics // i->statistics.write(writer); sq_createslot(vm, -3); } } - + sq_createslot(vm, -3); // push world into worlds table @@ -916,10 +936,10 @@ void WorldMap::load_state() { using namespace Scripting; - + HSQUIRRELVM vm = global_vm; int oldtop = sq_gettop(vm); - + try { // get state table sq_pushroottable(vm); @@ -958,7 +978,7 @@ WorldMap::load_state() for(LevelTiles::iterator i = levels.begin(); i != levels.end(); ++i) { LevelTile* level = *i; - sq_pushstring(vm, level->name.c_str(), -1); + sq_pushstring(vm, level->get_name().c_str(), -1); if(SQ_SUCCEEDED(sq_get(vm, -2))) { level->solved = read_bool(vm, "solved"); level->sprite->set_action(level->solved ? "solved" : "default"); @@ -986,7 +1006,7 @@ WorldMap::solved_level_count() size_t count = 0; for(LevelTiles::iterator i = levels.begin(); i != levels.end(); ++i) { LevelTile* level = *i; - + if(level->solved) count++; } @@ -1027,5 +1047,5 @@ WorldMap::run_script(std::istream& in, const std::string& sourcename) return vm; } - + } // namespace WorldMapNS