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

Allowed usage of [message]side_for=...

Browse source 
...when it targets the active side. (Fix for bug #17368.)
This commit is contained in:
Guillaume Melquiond 2010-12-22 07:38:43 +00:00
parent faf64021c0
commit 226a947841
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/game_events.cpp
View file

@ -2496,12 +2496,12 @@ WML_HANDLER_FUNCTION(message, event_info, cfg)
std::string side_for_raw = cfg["side_for"];
if (!side_for_raw.empty())
{
if (has_input) {
lg::wml_error << "[message]side_for= can only be used for messages that don't query any user input.\n";
return;
}
bool side_for_show = false;
/* Always ignore side_for when the message has some input
boxes, but display the error message only if side_for is
used for an inactive side. */
bool side_for_show = has_input;
if (has_input && side_for_raw != str_cast(resources::controller->current_side()))
lg::wml_error << "[message]side_for= cannot query any user input out of turn.\n";
std::vector<std::string> side_for =
utils::split(side_for_raw, ',', utils::STRIP_SPACES | utils::REMOVE_EMPTY);