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

fix OOS in case that [do_command] was used on the wrong client.

Browse source
This commit is contained in:
gfgtdf 2017-01-17 19:58:58 +01:00
parent 02b39fff53
commit 954fe05eed
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/game_events/action_wml.cpp
View file

@ -290,6 +290,11 @@ WML_HANDLER_FUNCTION(do_command,, cfg)
ERR_NG << "[do_command] called too early, only allowed at START or later" << std::endl;
return;
}
if(!resources::controller->current_team().is_local() && synced_context::get_synced_state() == synced_context::UNSYNCED)
{
ERR_NG << "[do_command] can only be used from clients that control the currently playing side" << std::endl;
return;
}
for(vconfig::all_children_iterator i = cfg.ordered_begin(); i != cfg.ordered_end(); ++i)
{
if(allowed_tags.find( i.get_key()) == allowed_tags.end()) {
@ -302,9 +307,6 @@ WML_HANDLER_FUNCTION(do_command,, cfg)
// TODO: afaik run_in_synced_context_if_not_already thows exceptions when the executed action end the scenario or the turn.
// This could cause problems, specially when its unclear whether that excetion is caught by lua or not...
// TODO: What happens when this command is run on a client that doesnt control the currentl playing side?
// I couldn't find any code that gives a proper error message in that case.
//Note that this fires related events and everthing else that also happen normally.
//have to watch out with the undo stack, therefore forbid [auto_shroud] and [update_shroud] here...
synced_context::run_in_synced_context_if_not_already(