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

Fix [scroll] side filter behaviour

Browse source 
It now checks whether any of the matching sides is a local human,
rather whether they're the side whose turn it is.
This commit is contained in:
Alexander van Gessel 2013-10-28 12:37:39 +01:00
parent 87305c472b
commit 4fa7e06baf
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/game_events/action_wml.cpp
View file

@ -1816,8 +1816,14 @@ WML_HANDLER_FUNCTION(role, /*event_info*/, cfg)
WML_HANDLER_FUNCTION(scroll, /*event_info*/, cfg)
{
const std::vector<int> side_list = get_sides_vector(cfg);
if ((cfg["side"].empty() && !cfg.has_child("filter_side")) ||
std::find(side_list.begin(), side_list.end(), resources::controller->current_side()) != side_list.end()) {
bool side_match = false;
BOOST_FOREACH(int side, side_list) {
if((*resources::teams)[side-1].is_human()) {
side_match = true;
break;
}
}
if ((cfg["side"].empty() && !cfg.has_child("filter_side")) || side_match) {
game_display &screen = *resources::screen;
screen.scroll(cfg["x"], cfg["y"], true);
screen.draw(true,true);