summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-05-14 10:32:17 -0600
committerJared Adams <jaxad0127@gmail.com>2009-05-14 10:32:48 -0600
commit2032ca0fb1fd6b59c025180b673e6760d9c12bdc (patch)
tree043e8783ce04dcdaf802a79d5992b5197feb3db4 /src/gui
parent39e06227df101a73aa5b9078a3afb6a7a71b89ba (diff)
downloadmana-2032ca0fb1fd6b59c025180b673e6760d9c12bdc.tar.gz
mana-2032ca0fb1fd6b59c025180b673e6760d9c12bdc.tar.bz2
mana-2032ca0fb1fd6b59c025180b673e6760d9c12bdc.tar.xz
mana-2032ca0fb1fd6b59c025180b673e6760d9c12bdc.zip
Add QOAL's outfit window
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/itemcontainer.cpp4
-rw-r--r--src/gui/windowmenu.cpp7
2 files changed, 10 insertions, 1 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
{
diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp
index 5e33a4ed..d66aa602 100644
--- a/src/gui/windowmenu.cpp
+++ b/src/gui/windowmenu.cpp
@@ -47,7 +47,7 @@ extern Window *buddyWindow;
extern Window *guildWindow;
extern Window *magicDialog;
#endif
-
+extern Window *outfitWindow;
WindowMenu::WindowMenu():
mEmotePopup(0)
@@ -56,6 +56,7 @@ WindowMenu::WindowMenu():
static const char *buttonNames[] =
{
":-)",
+ N_("Outfits"),
N_("Status"),
N_("Equipment"),
N_("Inventory"),
@@ -114,6 +115,10 @@ void WindowMenu::action(const gcn::ActionEvent &event)
mEmotePopup = 0;
}
}
+ else if (event.getId() == "Outfits")
+ {
+ window = outfitWindow;
+ }
else if (event.getId() == "Status")
{
window = statusWindow;