summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIra Rice <irarice@gmail.com>2009-01-05 21:01:20 -0700
committerIra Rice <irarice@gmail.com>2009-01-05 21:01:20 -0700
commit210af5c1a97dc565430803f5a295134d9b3046bc (patch)
tree3eb0fff4130143080c58f9872e577d9a848be21a
parent999b87a31b42bfc65b721054a947c54cc720ec6f (diff)
downloadmana-client-210af5c1a97dc565430803f5a295134d9b3046bc.tar.gz
mana-client-210af5c1a97dc565430803f5a295134d9b3046bc.tar.bz2
mana-client-210af5c1a97dc565430803f5a295134d9b3046bc.tar.xz
mana-client-210af5c1a97dc565430803f5a295134d9b3046bc.zip
Added emote window button.
Signed-off-by: Ira Rice <irarice@gmail.com>
-rw-r--r--src/gui/menuwindow.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp
index 79281631..56bc48fd 100644
--- a/src/gui/menuwindow.cpp
+++ b/src/gui/menuwindow.cpp
@@ -31,6 +31,7 @@ extern Window *chatWindow;
extern Window *equipmentWindow;
extern Window *inventoryWindow;
extern Window *itemShortcutWindow;
+extern Window *smileyWindow;
extern Window *setupWindow;
extern Window *skillDialog;
extern Window *statusWindow;
@@ -62,6 +63,7 @@ MenuWindow::MenuWindow():
"Inventory",
"Skills",
"Shortcut",
+ "Emote",
"Setup",
0
};
@@ -114,6 +116,10 @@ void MenuWindowListener::action(const gcn::ActionEvent &event)
{
window = itemShortcutWindow;
}
+ else if (event.getId() == "Emote")
+ {
+ window = smileyWindow;
+ }
else if (event.getId() == "Setup")
{
window = setupWindow;