//---------------------------------------------------------------------------
WorldMap::WorldMap(const std::string& filename, const std::string& force_spawnpoint)
- : tux(0), solids(0), ambient_light( 1.0f, 1.0f, 1.0f, 1.0f ), force_spawnpoint(force_spawnpoint)
+ : tux(0), solids(0), ambient_light( 1.0f, 1.0f, 1.0f, 1.0f ), force_spawnpoint(force_spawnpoint), in_level(false)
{
tile_manager.reset(new TileManager("images/worldmap.strf"));
{
using namespace Scripting;
+ save_state();
+
for(ScriptList::iterator i = scripts.begin();
i != scripts.end(); ++i) {
HSQOBJECT& object = *i;
calculate_total_stats();
save_state();
- if(World::current() != NULL)
- World::current()->save_state();
- if (old_level_state != level->solved && level->auto_path) {
+ if (old_level_state != level->solved) {
// 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());
+ int dirdata = tile->getData() & Tile::WORLDMAP_DIR_MASK;
// first, test for crossroads
- if (tile->getData() & Tile::WORLDMAP_CNSE || tile->getData() && Tile::WORLDMAP_CNSW
- || tile->getData() & Tile::WORLDMAP_CNEW || tile->getData() && Tile::WORLDMAP_CSEW
- || tile->getData() & Tile::WORLDMAP_CNSEW)
+ if (dirdata == Tile::WORLDMAP_CNSE ||
+ dirdata == Tile::WORLDMAP_CNSW ||
+ dirdata == Tile::WORLDMAP_CNEW ||
+ dirdata == Tile::WORLDMAP_CSEW ||
+ dirdata == Tile::WORLDMAP_CNSEW)
dir = D_NONE;
- else if (tile->getData() & Tile::WORLDMAP_NORTH
+ else if (dirdata & Tile::WORLDMAP_NORTH
&& tux->back_direction != D_NORTH)
dir = D_NORTH;
- else if (tile->getData() & Tile::WORLDMAP_SOUTH
+ else if (dirdata & Tile::WORLDMAP_SOUTH
&& tux->back_direction != D_SOUTH)
dir = D_SOUTH;
- else if (tile->getData() & Tile::WORLDMAP_EAST
+ else if (dirdata & Tile::WORLDMAP_EAST
&& tux->back_direction != D_EAST)
dir = D_EAST;
- else if (tile->getData() & Tile::WORLDMAP_WEST
+ else if (dirdata & Tile::WORLDMAP_WEST
&& tux->back_direction != D_WEST)
dir = D_WEST;
void
WorldMap::update(float delta)
{
- Menu* menu = Menu::current();
- if(menu != NULL) {
- menu->update();
+ if(!in_level) {
+ Menu* menu = Menu::current();
+ if(menu != NULL) {
+ menu->update();
- if(menu == worldmap_menu.get()) {
- switch (worldmap_menu->check())
- {
- case MNID_RETURNWORLDMAP: // Return to game
- Menu::set_current(0);
- break;
- case MNID_QUITWORLDMAP: // Quit Worldmap
- main_loop->exit_screen();
- break;
+ if(menu == worldmap_menu.get()) {
+ switch (worldmap_menu->check())
+ {
+ case MNID_RETURNWORLDMAP: // Return to game
+ Menu::set_current(0);
+ break;
+ case MNID_QUITWORLDMAP: // Quit Worldmap
+ main_loop->exit_screen();
+ break;
+ }
}
- }
- return;
- }
+ return;
+ }
- // update GameObjects
- for(size_t i = 0; i < game_objects.size(); ++i) {
- GameObject* object = game_objects[i];
- object->update(delta);
- }
+ // update GameObjects
+ for(size_t i = 0; i < game_objects.size(); ++i) {
+ GameObject* object = game_objects[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()) {
- object->unref();
- i = game_objects.erase(i);
- } else {
- ++i;
+ // remove old GameObjects
+ for(GameObjects::iterator i = game_objects.begin();
+ i != game_objects.end(); ) {
+ GameObject* object = *i;
+ if(!object->is_valid()) {
+ object->unref();
+ i = game_objects.erase(i);
+ } else {
+ ++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)
- || main_controller->pressed(Controller::MENU_SELECT))
- 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);
+ // 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)
+ || main_controller->pressed(Controller::MENU_SELECT)) {
+ /* some people define UP and JUMP on the same key... */
+ if(!main_controller->pressed(Controller::UP))
+ 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);
+ }
}
- }
- // check for auto-play levels
- LevelTile* level = at_level();
- if (level && (level->auto_play) && (!level->solved) && (!tux->is_moving())) {
- enter_level = true;
- level->solved = true;
- }
+ // check for auto-play levels
+ LevelTile* level = at_level();
+ if (level && (level->auto_play) && (!level->solved) && (!tux->is_moving())) {
+ enter_level = true;
+ }
- if (enter_level && !tux->is_moving())
- {
- /* 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");
+ if (enter_level && !tux->is_moving())
+ {
+ /* 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;
}
- 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()) {
- 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->get_name();
- main_loop->push_screen(new GameSession(levelfile, &level->statistics),
- new ShrinkFade(shrinkpos, 0.5));
- } catch(std::exception& e) {
- log_fatal << "Couldn't load level: " << e.what() << std::endl;
+ if (level->pos == tux->get_tile_pos()) {
+ 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->get_name();
+
+ // update state and savegame
+ save_state();
+
+ main_loop->push_screen(new GameSession(levelfile, &level->statistics),
+ new ShrinkFade(shrinkpos, 0.5));
+ in_level = true;
+ } catch(std::exception& e) {
+ log_fatal << "Couldn't load level: " << e.what() << std::endl;
+ }
}
}
- }
- else
- {
-// tux->set_direction(input_direction);
- }
+ else
+ {
+ // tux->set_direction(input_direction);
+ }
+ }
}
const Tile*
for(LevelTiles::iterator i = levels.begin(); i != levels.end(); ++i) {
LevelTile* level = *i;
- if (level->solved) {
- sq_pushstring(vm, level->get_name().c_str(), -1);
- sq_newtable(vm);
+ sq_pushstring(vm, level->get_name().c_str(), -1);
+ sq_newtable(vm);
- store_bool(vm, "solved", true);
- // TODO write statistics
- // i->statistics.write(writer);
+ store_bool(vm, "solved", level->solved);
+ // TODO write statistics
+ // i->statistics.write(writer);
- sq_createslot(vm, -3);
- }
+ sq_createslot(vm, -3);
}
sq_createslot(vm, -3);
}
sq_settop(vm, oldtop);
+
+ if(World::current() != NULL)
+ World::current()->save_state();
}
void
log_debug << "Not loading worldmap state: " << e.what() << std::endl;
}
sq_settop(vm, oldtop);
+
+ in_level = false;
}
size_t
projects / supertux.git / blobdiff