summaryrefslogtreecommitdiff
path: root/src/gui/inventorywindow.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-01-30 23:59:09 +0300
committerAndrei Karas <akaras@inbox.ru>2012-01-30 23:59:09 +0300
commitcc87cce57186c59fdf49a9f46d216063757638ec (patch)
tree6499daff872f9464c53a390bb6bd0543d4639226 /src/gui/inventorywindow.cpp
parent0fc75f671dace65f1ed8d5b6a66b17b9ab15a9c2 (diff)
downloadmv-cc87cce57186c59fdf49a9f46d216063757638ec.tar.gz
mv-cc87cce57186c59fdf49a9f46d216063757638ec.tar.bz2
mv-cc87cce57186c59fdf49a9f46d216063757638ec.tar.xz
mv-cc87cce57186c59fdf49a9f46d216063757638ec.zip
Rename isKeyActive to isActionActive om keyboard config class.
Diffstat (limited to 'src/gui/inventorywindow.cpp')
-rw-r--r--src/gui/inventorywindow.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 4a54f5fb2..23f1e6fcf 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -346,7 +346,7 @@ void InventoryWindow::action(const gcn::ActionEvent &event)
}
else
{
- if (keyboard.isKeyActive(keyboard.KEY_MOD))
+ if (keyboard.isActionActive(keyboard.KEY_MOD))
{
Net::getInventoryHandler()->dropItem(
item, item->getQuantity());
@@ -386,11 +386,11 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
{
Window::mouseClicked(event);
- const bool mod = (isStorageActive() && keyboard.isKeyActive(
+ const bool mod = (isStorageActive() && keyboard.isActionActive(
keyboard.KEY_MOD));
const bool mod2 = (tradeWindow && tradeWindow->isVisible()
- && keyboard.isKeyActive(keyboard.KEY_MOD));
+ && keyboard.isActionActive(keyboard.KEY_MOD));
if (!mod && !mod2 && event.getButton() == gcn::MouseEvent::RIGHT)
{