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

Merge branch 'master' of github.com:wesnoth/wesnoth

Browse source
This commit is contained in:
Alexander van Gessel 2017-10-30 21:18:07 +01:00
commit 0ca1ae27c1
4 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog
View file

@ -11,6 +11,8 @@ Version 1.13.10+dev:
author can't accidentally use them and make an add-on that breaks on
GNU/Linux and macOS.
* File paths are now case sensitive even on Windows.
* Miscellaneous and bug fixes:
* Fixed ingame help showing units you haven't encountered (bug #2135)
Version 1.13.10:
* Add-ons client:

2
players_changelog
View file

@ -5,6 +5,8 @@ changelog: https://github.com/wesnoth/wesnoth/blob/master/changelog
Version 1.13.10+dev:
* Language and i18n:
* Updated translations: Chinese (Simplified).
* Miscellaneous and bug fixes:
* Fixed ingame help showing units you haven't encountered (bug #2135)
Version 1.13.10:

6
src/hotkey/hotkey_command.cpp
View file

@ -320,6 +320,12 @@ void set_active_scopes(hk_scopes s)
scope_active_ = s;
}
bool is_scope_active(scope s)
{
assert(s < SCOPE_COUNT);
return scope_active_[s];
}
bool is_scope_active(hk_scopes s)
{
// s is a copy because we need one

1
src/hotkey/hotkey_command.hpp
View file

@ -280,6 +280,7 @@ const hotkey_command& get_hotkey_null();
void deactivate_all_scopes();
void set_scope_active(scope s, bool set = true);
void set_active_scopes(hk_scopes s);
bool is_scope_active(scope s);
bool is_scope_active(hk_scopes s);
///