upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-02 20:01:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

MP Create Game: fixed settings polluting loaded of saved games

Browse Source 
This gives game loading a separate retval to avoid the settings specified in the dialog from overriding
those provided by the saved game.
This commit is contained in:
Charles Dang 2016-10-16 17:38:04 +11:00
parent ae18397608
commit afa4bf8ea9
3 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game_initialization/multiplayer.cpp
View File

@ -573,7 +573,7 @@ static void enter_create_mode(CVideo& video, const config& game_config,
dlg.show(video);
if(dlg.get_retval() == gui2::twindow::OK) {
if(dlg.get_retval() != gui2::twindow::CANCEL) {
enter_configure_mode(video, game_config, state, wesnothd_connection, li, local_players_only);
} else if(wesnothd_connection) {
wesnothd_connection->send_data(config("refresh_lobby"));

47
src/gui/dialogs/multiplayer/mp_create_game.cpp
View File

@ -54,6 +54,9 @@
namespace gui2
{
// Special retval value for loading a game
static const int LOAD_GAME = 100;
// Shorthand
namespace prefs = preferences;
@ -573,25 +576,6 @@ void tmp_create_game::regenerate_random_map(twindow& window)
update_details(window);
}
void tmp_create_game::load_game_callback(twindow& window)
{
try {
savegame::loadgame load(window.video(), cfg_, create_engine_.get_state());
if(!load.load_multiplayer_game()) {
return ;
}
if(load.data().cancel_orders) {
create_engine_.get_state().cancel_orders();
}
create_engine_.prepare_for_saved_game();
window.set_retval(twindow::OK);
} catch(config::error&) {}
}
int tmp_create_game::convert_to_game_filtered_index(const int initial_index)
{
const std::vector<size_t>& filtered_indices = create_engine_.get_filtered_level_indices(create_engine_.current_level_type());
@ -716,10 +700,24 @@ void tmp_create_game::update_map_settings(twindow& window)
}
}
void tmp_create_game::load_game_callback(twindow& window)
{
savegame::loadgame load(window.video(), cfg_, create_engine_.get_state());
if(!load.load_multiplayer_game()) {
return;
}
if(load.data().cancel_orders) {
create_engine_.get_state().cancel_orders();
}
window.set_retval(LOAD_GAME);
}
bool tmp_create_game::dialog_exit_hook(twindow&) {
if(create_engine_.get_state().mp_settings().saved_game ||
(create_engine_.current_level_type() != ng::level::TYPE::CAMPAIGN &&
create_engine_.current_level_type() != ng::level::TYPE::SP_CAMPAIGN)
if(create_engine_.current_level_type() != ng::level::TYPE::CAMPAIGN &&
create_engine_.current_level_type() != ng::level::TYPE::SP_CAMPAIGN
) {
return true;
}
@ -734,6 +732,11 @@ void tmp_create_game::post_show(twindow& window)
// Show all tabs so that find_widget works correctly
find_widget<tstacked_widget>(&window, "pager", false).select_layer(-1);
if(get_retval() == LOAD_GAME) {
create_engine_.prepare_for_saved_game();
return;
}
if(get_retval() == twindow::OK) {
preferences::set_modifications(create_engine_.active_mods());
preferences::set_level_type(create_engine_.current_level_type().v);

5
src/gui/dialogs/multiplayer/mp_create_game.hpp
View File

@ -122,6 +122,11 @@ private:
void update_details(twindow& window);
void update_map_settings(twindow& window);
/**
* Dialog exit hook to bring up the difficulty dialog when starting a campaign.
* This only fires when the retval is OK (ie, creating a game), meaning it does not fire
* when loading a saved game.
*/
bool dialog_exit_hook(twindow&);
int convert_to_game_filtered_index(const int initial_index);