diff options
| author | Joshua Langley <joshlangley[at]optusnet.com.au> | 2007-08-21 15:11:19 +0000 |
|---|---|---|
| committer | Joshua Langley <joshlangley[at]optusnet.com.au> | 2007-08-21 15:11:19 +0000 |
| commit | 0f8e80bcfe92ca39803f0443cf4b30e3f9171eb9 (patch) | |
| tree | a07d923f09e8c9aa4a478e2bd572ab94edf09ae4 /src/gui/itemcontainer.cpp | |
| parent | 148b62c05337eaaaf3a1ead212b3792122812cee (diff) | |
| download | mana-0f8e80bcfe92ca39803f0443cf4b30e3f9171eb9.tar.gz mana-0f8e80bcfe92ca39803f0443cf4b30e3f9171eb9.tar.bz2 mana-0f8e80bcfe92ca39803f0443cf4b30e3f9171eb9.tar.xz mana-0f8e80bcfe92ca39803f0443cf4b30e3f9171eb9.zip | |
mantis id=118 - Added Item Shortcut Bar.
Diffstat (limited to 'src/gui/itemcontainer.cpp')
| -rw-r--r-- | src/gui/itemcontainer.cpp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp index 334770f8..43de8db3 100644 --- a/src/gui/itemcontainer.cpp +++ b/src/gui/itemcontainer.cpp @@ -30,6 +30,7 @@ #include "../graphics.h" #include "../inventory.h" #include "../item.h" +#include "../itemshortcut.h" #include "../log.h" #include "../resources/image.h" @@ -197,9 +198,18 @@ ItemContainer::mousePressed(gcn::MouseEvent &event) int my = event.getY(); int index = mx / gridWidth + ((my / gridHeight) * columns) + 2; - if (index > INVENTORY_SIZE) - index = INVENTORY_SIZE - 1; - - setSelectedItem(mInventory->getItem(index)); + itemShortcut->setItemSelected(NULL); + // Fix for old server, it should be: if (index >= mMaxItems) + if (index > mMaxItems + 1) + { + setSelectedItem(NULL); + return; + } + Item *item = mInventory->getItem(index); + setSelectedItem(item); + if (!item->isEquipment()) + { + itemShortcut->setItemSelected(item); + } } } |