Previous commit causes the branch to no longer compile

This commit is contained in:
Mark de Wever 2007-01-25 21:26:47 +00:00
parent ff93186fee
commit 755d50d50a

View File

@ -141,12 +141,12 @@ LEVEL_RESULT play_game(display& disp, game_state& state, const config& game_conf
} else {
//This game was started from a savegame
LOG_G << "loading snapshot...\n";
starting_pos = gamestate.starting_pos;
scenario = &gamestate.snapshot;
starting_pos = state.starting_pos;
scenario = &state.snapshot;
// when starting wesnoth --multiplayer there might be
// no variables which leads to a segfault
if(gamestate.snapshot.child("variables") != NULL) {
gamestate.variables = *gamestate.snapshot.child("variables");
if(state.snapshot.child("variables") != NULL) {
state.variables = *state.snapshot.child("variables");
}
}