diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-05-18 19:47:28 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-05-18 19:47:28 +0300 |
commit | 7da95c7f4da447876458a0b1a17736b9a2865844 (patch) | |
tree | 4b6ac0ab5bc32a11234a5363de95d0cfec8cb7d5 /src/gui/windows/inventorywindow.cpp | |
parent | 515ce6c1413b5e3da131f3e4997abdc39c003a2c (diff) | |
download | mv-7da95c7f4da447876458a0b1a17736b9a2865844.tar.gz mv-7da95c7f4da447876458a0b1a17736b9a2865844.tar.bz2 mv-7da95c7f4da447876458a0b1a17736b9a2865844.tar.xz mv-7da95c7f4da447876458a0b1a17736b9a2865844.zip |
Move inputaction into separate file.
Diffstat (limited to 'src/gui/windows/inventorywindow.cpp')
-rw-r--r-- | src/gui/windows/inventorywindow.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index ee920f8a1..2049d2a12 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -396,7 +396,7 @@ void InventoryWindow::action(const ActionEvent &event) return; if (inputManager.isActionActive(static_cast<int>( - Input::KEY_STOP_ATTACK))) + InputAction::STOP_ATTACK))) { PlayerInfo::dropItem(item, item->getQuantity(), true); } @@ -445,11 +445,11 @@ void InventoryWindow::mouseClicked(MouseEvent &event) gui->resetClickCount(); const bool mod = (isStorageActive() && inputManager.isActionActive( - static_cast<int>(Input::KEY_STOP_ATTACK))); + static_cast<int>(InputAction::STOP_ATTACK))); const bool mod2 = (tradeWindow && tradeWindow->isWindowVisible() && inputManager.isActionActive(static_cast<int>( - Input::KEY_STOP_ATTACK))); + InputAction::STOP_ATTACK))); if (!mod && !mod2 && event.getButton() == MouseButton::RIGHT) { @@ -584,13 +584,13 @@ void InventoryWindow::mouseExited(MouseEvent &event A_UNUSED) void InventoryWindow::keyPressed(KeyEvent &event) { - if (event.getActionId() == static_cast<int>(Input::KEY_GUI_MOD)) + if (event.getActionId() == static_cast<int>(InputAction::GUI_MOD)) mSplit = true; } void InventoryWindow::keyReleased(KeyEvent &event) { - if (event.getActionId() == static_cast<int>(Input::KEY_GUI_MOD)) + if (event.getActionId() == static_cast<int>(InputAction::GUI_MOD)) mSplit = false; } |