summaryrefslogtreecommitdiff
path: root/src/gui/itemcontainer.cpp
diff options
context:
space:
mode:
authorBlue <bluesansdouze@gmail.com>2009-05-18 01:19:32 +0200
committerBlue <bluesansdouze@gmail.com>2009-05-18 01:19:32 +0200
commit7b76f0e8c4c489254d7519e2916b951601423801 (patch)
treee4430176f02eeec32ebb56b42933b6416e7895df /src/gui/itemcontainer.cpp
parent22685431a23b05d66af28abda488d0891b1c0a34 (diff)
parentaaec4d115cd0048bbc4bed3d8b1d33492b2a51fa (diff)
downloadmana-client-7b76f0e8c4c489254d7519e2916b951601423801.tar.gz
mana-client-7b76f0e8c4c489254d7519e2916b951601423801.tar.bz2
mana-client-7b76f0e8c4c489254d7519e2916b951601423801.tar.xz
mana-client-7b76f0e8c4c489254d7519e2916b951601423801.zip
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src/gui/itemcontainer.cpp')
-rw-r--r--src/gui/itemcontainer.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index 54aa818b..d8ae6e20 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -23,6 +23,7 @@
#include "gui/chat.h"
#include "gui/itempopup.h"
+#include "gui/outfitwindow.h"
#include "gui/palette.h"
#include "gui/sdlinput.h"
#include "gui/viewport.h"
@@ -162,6 +163,7 @@ void ItemContainer::selectNone()
{
setSelectedIndex(-1);
mSelectionStatus = SEL_NONE;
+ outfitWindow->setItemSelected(-1);
}
void ItemContainer::setSelectedIndex(int newIndex)
@@ -260,6 +262,8 @@ void ItemContainer::mousePressed(gcn::MouseEvent &event)
mSelectionStatus = SEL_SELECTING;
itemShortcut->setItemSelected(item->getId());
+ if (item->isEquipment())
+ outfitWindow->setItemSelected(item->getId());
}
else
{