summaryrefslogtreecommitdiff
path: root/src/gui/menuwindow.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/menuwindow.cpp')
-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;