0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes bug #8526 (autosave names messed up)

Browse source
This commit is contained in:
Jörg Hinrichs 2007-02-25 00:08:00 +00:00
parent e8c5503a5d
commit 707ab3d09c
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/playcampaign.cpp
View file

@ -128,7 +128,7 @@ LEVEL_RESULT play_game(display& disp, game_state& gamestate, const config& game_
//no => we are starting a fresh scenario
if(gamestate.snapshot.child("side") == NULL || !recorder.at_end()) {
//campaign or multiplayer?
//if the gamestate already contains a starting_pos, then we are
//if the gamestate already contains a starting_pos, then we are
//starting a fresh multiplayer game. Otherwise this is the start
//of a campaign scenario.
if(gamestate.starting_pos.empty() == false) {
@ -147,11 +147,15 @@ LEVEL_RESULT play_game(display& disp, game_state& gamestate, const config& game_
LOG_G << "loading snapshot...\n";
starting_pos = gamestate.starting_pos;
scenario = &gamestate.snapshot;
// when starting wesnoth --multiplayer there might be
// when starting wesnoth --multiplayer there might be
// no variables which leads to a segfault
if(gamestate.snapshot.child("variables") != NULL) {
gamestate.set_variables(*gamestate.snapshot.child("variables"));
}
//Replace game label with that from snapshot
if (!state.snapshot["label"].empty()){
state.label = state.snapshot["label"];
}
//get the current gold values of players so they don't start with the amount
//they had at the start of the scenario
const std::vector<config*>& player_cfg = gamestate.snapshot.get_children("player");
@ -229,7 +233,7 @@ LEVEL_RESULT play_game(display& disp, game_state& gamestate, const config& game_
if(map_data.empty() && (*scenario)["map"] != "") {
map_data = read_map((*scenario)["map"]);
}
//if the map should be randomly generated
if(map_data.empty() && (*scenario)["map_generation"] != "") {
const cursor::setter cursor_setter(cursor::WAIT);