diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-01-30 22:10:01 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-01-31 01:06:49 +0300 |
| commit | ec5a06754164bb2f77d3627990f896c040fc1c76 (patch) | |
| tree | cad8586f26675a80d7dae4c878a7436ac73feefd /src/gui/windows | |
| parent | 5015c59af9d28b3a3bbedfd54b3827dd96597efa (diff) | |
| download | plus-ec5a06754164bb2f77d3627990f896c040fc1c76.tar.gz plus-ec5a06754164bb2f77d3627990f896c040fc1c76.tar.bz2 plus-ec5a06754164bb2f77d3627990f896c040fc1c76.tar.xz plus-ec5a06754164bb2f77d3627990f896c040fc1c76.zip | |
Combine "Mod" and "Stop attack" keys.
Remove old "Mod" key because it conflicting with "Stop attack"
Diffstat (limited to 'src/gui/windows')
| -rw-r--r-- | src/gui/windows/inventorywindow.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index da91b84be..02b30aed7 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -425,7 +425,8 @@ void InventoryWindow::action(const gcn::ActionEvent &event) if (PlayerInfo::isItemProtected(item->getId())) return; - if (inputManager.isActionActive(static_cast<int>(Input::KEY_MOD))) + if (inputManager.isActionActive(static_cast<int>( + Input::KEY_STOP_ATTACK))) { PlayerInfo::dropItem(item, item->getQuantity(), true); } @@ -474,10 +475,11 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event) gui->resetClickCount(); const bool mod = (isStorageActive() && inputManager.isActionActive( - static_cast<int>(Input::KEY_MOD))); + static_cast<int>(Input::KEY_STOP_ATTACK))); const bool mod2 = (tradeWindow && tradeWindow->isWindowVisible() - && inputManager.isActionActive(static_cast<int>(Input::KEY_MOD))); + && inputManager.isActionActive(static_cast<int>( + Input::KEY_STOP_ATTACK))); if (!mod && !mod2 && event.getButton() == gcn::MouseEvent::RIGHT) { |