summaryrefslogtreecommitdiff
path: root/src/gui/inventorywindow.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-04-08 19:41:19 +0300
committerAndrei Karas <akaras@inbox.ru>2012-04-08 19:41:19 +0300
commit30ef016b0a14f36dc480284e2d775295b5501dd4 (patch)
treea269c0983efb8dc9160bfe10b1dba26a302aff0c /src/gui/inventorywindow.cpp
parent25a6eae7f4fb561bbf930be28ee09510b40ebc80 (diff)
downloadmanaverse-30ef016b0a14f36dc480284e2d775295b5501dd4.tar.gz
manaverse-30ef016b0a14f36dc480284e2d775295b5501dd4.tar.bz2
manaverse-30ef016b0a14f36dc480284e2d775295b5501dd4.tar.xz
manaverse-30ef016b0a14f36dc480284e2d775295b5501dd4.zip
Move most input code from keyboardconfig to inputmanager.
Diffstat (limited to 'src/gui/inventorywindow.cpp')
-rw-r--r--src/gui/inventorywindow.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 54b1801b8..f905bb5b9 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -26,6 +26,7 @@
#include "inventory.h"
#include "item.h"
#include "units.h"
+#include "inputmanager.h"
#include "keyboardconfig.h"
#include "playerinfo.h"
@@ -344,7 +345,7 @@ void InventoryWindow::action(const gcn::ActionEvent &event)
}
else
{
- if (keyboard.isActionActive(Input::KEY_MOD))
+ if (inputManager.isActionActive(Input::KEY_MOD))
{
Net::getInventoryHandler()->dropItem(
item, item->getQuantity());
@@ -389,11 +390,11 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
{
Window::mouseClicked(event);
- const bool mod = (isStorageActive() && keyboard.isActionActive(
+ const bool mod = (isStorageActive() && inputManager.isActionActive(
Input::KEY_MOD));
const bool mod2 = (tradeWindow && tradeWindow->isVisible()
- && keyboard.isActionActive(Input::KEY_MOD));
+ && inputManager.isActionActive(Input::KEY_MOD));
if (!mod && !mod2 && event.getButton() == gcn::MouseEvent::RIGHT)
{