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

rewrite team::change_controller_by_wml to use nonthrowing functions

Browse Source 
we use enum.parse() instead of lexical_cast so that we don't have to
catch bad_enum_cast anymore.
This commit is contained in:
gfgtdf 2016-02-28 18:48:21 +01:00
parent 0d2fe9b322
commit 4a1b330279
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/team.cpp
View File

@ -510,26 +510,24 @@ namespace
void team::change_controller_by_wml(const std::string& new_controller_string)
{
try
{
CONTROLLER new_controller = lexical_cast<CONTROLLER> (new_controller_string);
if(new_controller == CONTROLLER::EMPTY && resources::controller->current_side() == this->side()) {
//We don't allow changing the currently active side to "null" controlled.
throw bad_enum_cast(new_controller_string, "CONTROLLER"); //catched below
}
config choice = synced_context::ask_server_choice(controller_server_choice(new_controller, *this));
if(!new_controller.parse(choice["controller"])) {
ERR_NG << "recieved an invalid controller string from the server" << choice["controller"] << std::endl;
}
if(!resources::controller->is_replay()) {
set_local(choice["is_local"].to_bool());
}
change_controller(new_controller);
}
catch(const bad_enum_cast&)
{
CONTROLLER new_controller;
if(!new_controller.parse(new_controller_string)) {
ERR_NG << "ignored attempt to change controller to " << new_controller_string << std::endl;
return;
}
if(new_controller == CONTROLLER::EMPTY && resources::controller->current_side() == this->side()) {
ERR_NG << "ignored attempt to change the currently playing side's controller to 'null'" << std::endl;
return;
}
config choice = synced_context::ask_server_choice(controller_server_choice(new_controller, *this));
if(!new_controller.parse(choice["controller"])) {
//TODO: this should be more than a ERR_NG message.
ERR_NG << "recieved an invalid controller string from the server" << choice["controller"] << std::endl;
}
if(!resources::controller->is_replay()) {
set_local(choice["is_local"].to_bool());
}
change_controller(new_controller);
}
void team::change_team(const std::string &name, const t_string &user_name)