thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed Action constructor to take a pointer to the Keymap it belongs too, meaning Keymap::addAction is automatically called

Browse source 
svn-id: r33885
This commit is contained in:
Stephen Kennedy 2008-08-14 23:45:02 +00:00
parent 6d0ed23b44
commit c61294e70f
5 changed files with 29 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

27
backends/keymapper/action.cpp
View file

@ -28,29 +28,18 @@
namespace Common {
Action::Action(int32 i, String des,
ActionCategory cat, ActionType typ,
int pri, int grp, int flg) {
id = i;
description = des;
category = cat;
type = typ;
priority = pri;
group = grp;
flags = flg;
_hwKey = 0;
_parent = 0;
}
void Action::setParent(Keymap *parent) {
_parent = parent;
Action::Action(Keymap *boss, int32 i, String des, ActionCategory cat,
ActionType typ, int pri, int grp, int flg)
: _boss(boss), id(i), description(des), category(cat), type(typ),
priority(pri), group(grp), flags(flg), _hwKey(0) {
assert(_boss);
_boss->addAction(this);
}
void Action::mapKey(const HardwareKey *key) {
assert(_parent);
if (_hwKey) _parent->unregisterMapping(this);
if (_hwKey) _boss->unregisterMapping(this);
_hwKey = key;
if (_hwKey) _parent->registerMapping(this, _hwKey);
if (_hwKey) _boss->registerMapping(this, _hwKey);
}
const HardwareKey *Action::getMappedKey() const {