upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-18 16:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #2135: Honour the show_all_units_in_help preference during scenarios

Browse Source 
Adding this overload removes a silent type conversion from 'enum scope'
to 'hk_scopes' (std::bitset<3>) in the src/help/help_impl.cpp callsite.
This commit is contained in:
josteph 2017-10-30 01:34:44 +00:00 committed by Jyrki Vesterinen
parent e0efa082d7
commit b43194ba2e
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/hotkey/hotkey_command.cpp
View File

@ -320,6 +320,11 @@ void set_active_scopes(hk_scopes s)
scope_active_ = s;
}
bool is_scope_active(scope s)
{
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);
///