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

Synced User Choice: fixed side= not being adjusted in unsynced contexts (fixes #2415)

Browse Source 
side=0 is supposed to default to the current playing side, but that was never set if
the context was unscyned.
This commit is contained in:
Charles Dang 2018-02-06 11:51:54 +11:00
parent 4c8b3edd6d
commit 35ae5c4ec8
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/synced_user_choice.cpp
View File

@ -153,6 +153,16 @@ config mp_sync::get_user_choice(const std::string &name, const mp_sync::user_cho
const int max_side = static_cast<int>(resources::gameboard->teams().size());
bool is_side_null_controlled;
/* side = 0 should default to the currently active side per definition. */
if(side < 1 || max_side < side) {
if(side != 0) {
ERR_REPLAY << "Invalid parameter for side in get_user_choice." << std::endl;
}
side = resources::controller->current_side();
LOG_REPLAY << " side changed to " << side << "\n";
}
if(!is_synced)
{
//we got called from inside lua's wesnoth.synchronize_choice or from a select event (or maybe a preload event?).
@ -174,18 +184,6 @@ config mp_sync::get_user_choice(const std::string &name, const mp_sync::user_cho
//For [message][option] and lua's sync_choice the scenario designer is responsible for that.
//For [get_global_variable] side is never null.
/*
side = 0 should default to the currently active side per definition.
*/
if ( side < 1 || max_side < side )
{
if(side != 0)
{
ERR_REPLAY << "Invalid parameter for side in get_user_choice." << std::endl;
}
side = resources::controller->current_side();
LOG_REPLAY << " side changed to " << side << "\n";
}
is_side_null_controlled = resources::gameboard->get_team(side).is_empty();
LOG_REPLAY << "get_user_choice_called with"