summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-05-26 23:56:16 +0200
committerYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-05-26 23:56:16 +0200
commit8766ae676d2f6b1642bf80f0b8dbe62a93ced2f7 (patch)
tree6a7a2da95cb90af2fc66986924b09a28725e75c9
parentb35aef2d924f03d85eb44a2465be5a745444eafd (diff)
downloadmana-8766ae676d2f6b1642bf80f0b8dbe62a93ced2f7.tar.gz
mana-8766ae676d2f6b1642bf80f0b8dbe62a93ced2f7.tar.bz2
mana-8766ae676d2f6b1642bf80f0b8dbe62a93ced2f7.tar.xz
mana-8766ae676d2f6b1642bf80f0b8dbe62a93ced2f7.zip
Fix compilation on gcc 4.6.1.
-rw-r--r--src/gui/inventorywindow.cpp2
-rw-r--r--src/gui/npcdialog.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 54215ffc..0dbeb352 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -243,7 +243,7 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
Item *item = mItems->getSelectedItem();
- if (event.getSource() == mItems && item && isDoubleClick((int)item))
+ if (event.getSource() == mItems && item && isDoubleClick(item->getInvIndex()))
{
if (isMainInventory() && item->getInfo().getActivatable())
diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp
index 5209d69b..61e2204d 100644
--- a/src/gui/npcdialog.cpp
+++ b/src/gui/npcdialog.cpp
@@ -407,7 +407,7 @@ void NpcDialog::mouseClicked(gcn::MouseEvent &mouseEvent)
{
action(gcn::ActionEvent(mButton, mButton->getActionEventId()));
}
- if (mouseEvent.getSource() == mTextBox && isDoubleClick((int)mTextBox))
+ if (mouseEvent.getSource() == mTextBox && isDoubleClick((int)(long)mTextBox))
{
if (mActionState == NPC_ACTION_NEXT || mActionState == NPC_ACTION_CLOSE)
action(gcn::ActionEvent(mButton, mButton->getActionEventId()));