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 | |
| parent | 5015c59af9d28b3a3bbedfd54b3827dd96597efa (diff) | |
| download | mv-ec5a06754164bb2f77d3627990f896c040fc1c76.tar.gz mv-ec5a06754164bb2f77d3627990f896c040fc1c76.tar.bz2 mv-ec5a06754164bb2f77d3627990f896c040fc1c76.tar.xz mv-ec5a06754164bb2f77d3627990f896c040fc1c76.zip | |
Combine "Mod" and "Stop attack" keys.
Remove old "Mod" key because it conflicting with "Stop attack"
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/setupactiondata.h | 8 | ||||
| -rw-r--r-- | src/gui/windows/inventorywindow.cpp | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/src/gui/setupactiondata.h b/src/gui/setupactiondata.h index b80052b30..2b9d694a8 100644 --- a/src/gui/setupactiondata.h +++ b/src/gui/setupactiondata.h @@ -96,7 +96,7 @@ static SetupActionData setupActionData0[] = }, { // TRANSLATORS: input action name - N_("Stop Attack"), + N_("Stop Attack / Modifier key"), Input::KEY_STOP_ATTACK, "", }, @@ -1368,12 +1368,6 @@ static SetupActionData setupActionData6[] = }, { // TRANSLATORS: input action name - N_("Modifier key"), - Input::KEY_MOD, - "", - }, - { - // TRANSLATORS: input action name N_("Show onscreen keyboard"), Input::KEY_SHOW_KEYBOARD, "", 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) { |