upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-28 09:58:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add optional side filter to [scroll]

Browse Source
This commit is contained in:
Alexander van Gessel 2013-10-28 01:11:39 +01:00
parent f3d777360c
commit 4cde487458
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog
View File

@ -118,6 +118,7 @@ Version 1.11.6+dev:
* Allow numerical values for SideWML "controller" attribute.
* Allow WML menu items to use hotkeys alongside/instead of the menu.
* Really added sighted events for ambushing units.
* [scroll] now takes an optional side filter.
* Units:
* Gave the Death Knight proper skeletal resistances, as well as submerge.
* User interface:

10
src/game_events/action_wml.cpp
View File

@ -1815,9 +1815,13 @@ WML_HANDLER_FUNCTION(role, /*event_info*/, cfg)
WML_HANDLER_FUNCTION(scroll, /*event_info*/, cfg)
{
game_display &screen = *resources::screen;
screen.scroll(cfg["x"], cfg["y"], true);
screen.draw(true,true);
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()) {
game_display &screen = *resources::screen;
screen.scroll(cfg["x"], cfg["y"], true);
screen.draw(true,true);
}
}
/// Experimental data persistence