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

Removed the unused config variable,

Browse source 
it is a part of the removed support for scopes saving in different tag names.
This commit is contained in:
Fabian Müller 2012-09-23 18:16:01 +00:00
parent f1640860f8
commit b56df83d08
3 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/editor/editor_main.cpp
View file

@ -31,7 +31,7 @@ EXIT_STATUS start(const config& game_conf, CVideo& video, const std::string& fil
{
EXIT_STATUS e = EXIT_ERROR;
try {
hotkey::scope_changer h_(game_conf);
hotkey::scope_changer h_;
hotkey::deactivate_all_scopes();
hotkey::set_scope_active(hotkey::SCOPE_GENERAL);
hotkey::set_scope_active(hotkey::SCOPE_EDITOR);

13
src/hotkeys.cpp
View file

@ -572,20 +572,13 @@ manager::~manager()
wipe();
}
scope_changer::scope_changer(const config& cfg)
: cfg_(cfg)
, prev_scope_active_(scope_active_)
{
manager::wipe();
manager::init();
}
scope_changer::scope_changer()
: prev_scope_active_(scope_active_)
{}
scope_changer::~scope_changer()
{
scope_active_.swap(prev_scope_active_);
manager::wipe();
manager::init();
load_hotkeys(cfg_, false);
}
void clear_hotkeys(const std::string& command)

3
src/hotkeys.hpp
View file

@ -257,10 +257,9 @@ public:
class scope_changer {
public:
scope_changer(const config& cfg);
scope_changer();
~scope_changer();
private:
const config& cfg_;
std::vector<bool> prev_scope_active_;
};