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

fix side_for in [message]s with input

Browse source 
the previous impleentation could casue OOS.
This commit is contained in:
gfgtdf 2015-09-16 16:16:55 +02:00
parent 0a8abb8328
commit 17b3c98a5e
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/game_events/action_wml.cpp
View file

@ -584,13 +584,11 @@ WML_HANDLER_FUNCTION(message, event_info, cfg)
}
// Check if this message is for this side
// handeling of side_for for messages with input is done below in the get_user_choice call
std::string side_for_raw = cfg["side_for"];
if (!side_for_raw.empty())
{
/* 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 (!side_for_raw.empty() && !has_input)
{.
bool side_for_show = false;
std::vector<std::string> side_for =
utils::split(side_for_raw, ',', utils::STRIP_SPACES | utils::REMOVE_EMPTY);