diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-01-30 23:59:09 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-01-30 23:59:09 +0300 |
| commit | cc87cce57186c59fdf49a9f46d216063757638ec (patch) | |
| tree | 6499daff872f9464c53a390bb6bd0543d4639226 /src/gui/viewport.cpp | |
| parent | 0fc75f671dace65f1ed8d5b6a66b17b9ab15a9c2 (diff) | |
| download | plus-cc87cce57186c59fdf49a9f46d216063757638ec.tar.gz plus-cc87cce57186c59fdf49a9f46d216063757638ec.tar.bz2 plus-cc87cce57186c59fdf49a9f46d216063757638ec.tar.xz plus-cc87cce57186c59fdf49a9f46d216063757638ec.zip | |
Rename isKeyActive to isActionActive om keyboard config class.
Diffstat (limited to 'src/gui/viewport.cpp')
| -rw-r--r-- | src/gui/viewport.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index f4c6c315f..7ff2c8850 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -497,16 +497,16 @@ void Viewport::mousePressed(gcn::MouseEvent &event) } } else if (player_node->withinAttackRange(mHoverBeing) || - keyboard.isKeyActive(keyboard.KEY_ATTACK)) + keyboard.isActionActive(keyboard.KEY_ATTACK)) { if (player_node != mHoverBeing) { player_node->attack(mHoverBeing, - !keyboard.isKeyActive(keyboard.KEY_TARGET)); + !keyboard.isActionActive(keyboard.KEY_TARGET)); return; } } - else if (!keyboard.isKeyActive(keyboard.KEY_ATTACK)) + else if (!keyboard.isActionActive(keyboard.KEY_ATTACK)) { if (player_node != mHoverBeing) { @@ -522,7 +522,7 @@ void Viewport::mousePressed(gcn::MouseEvent &event) player_node->pickUp(mHoverItem); } // Just walk around - else if (!keyboard.isKeyActive(keyboard.KEY_ATTACK)) + else if (!keyboard.isActionActive(keyboard.KEY_ATTACK)) { player_node->stopAttack(); player_node->cancelFollow(); |