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

MP Load Game: don't set gamestate before verifying integrity of save (bug #24512)

Browse source 
The gamestate was being set even though the function returned false if the save was not a
multiplayer one, leading to an incorrect gamestate when a game was subsequently created.
This commit is contained in:
Charles Dang 2016-09-01 19:59:31 +11:00
parent 3f10cc72ad
commit 92b0b5d337
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/savegame.cpp
View file

@ -292,9 +292,12 @@ bool loadgame::load_multiplayer_game()
{
show_dialog();
if (filename_.empty())
if(filename_.empty()) {
return false;
}
// read_save_file needs to be called before we can verify the classification so the data has
// been populated. Since we do that, we report any errors in that process first.
std::string error_log;
{
cursor::setter cur(cursor::WAIT);
@ -302,8 +305,6 @@ bool loadgame::load_multiplayer_game()
read_save_file(filename_, load_config_, &error_log);
copy_era(load_config_);
gamestate_.set_data(load_config_);
}
if(!error_log.empty()) {
@ -318,11 +319,15 @@ bool loadgame::load_multiplayer_game()
return false;
}
if(gamestate_.classification().campaign_type != game_classification::CAMPAIGN_TYPE::MULTIPLAYER) {
// We want to verify the game classification before setting the data, so we don't check on
// gamestate_.classification() and instead construct a game_classification object manually.
if(game_classification(load_config_).campaign_type != game_classification::CAMPAIGN_TYPE::MULTIPLAYER) {
gui2::show_transient_error_message(video_, _("This is not a multiplayer save."));
return false;
}
set_gamestate();
return check_version_compatibility();
}