2 files changed, 39 insertions, 0 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 18f034e67..9a3f7f753 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -1097,6 +1097,43 @@ void PopupMenu::addWindowMenu(const Window *const window)
     }
 }
 
+void PopupMenu::showEmoteType()
+{
+    setMousePos();
+
+    mBrowserBox->clearRows();
+    // TRANSLATORS: popup menu header
+    mBrowserBox->addRow(_("Show emotes for:"));
+
+    // TRANSLATORS: popup menu item
+    // TRANSLATORS: show emotes for player
+    mBrowserBox->addRow("/setemotetype player", _("Player"));
+
+    // TRANSLATORS: popup menu item
+    // TRANSLATORS: show emotes for pet
+    mBrowserBox->addRow("/setemotetype pet", _("Pet"));
+
+#ifdef EATHENA_SUPPORT
+    if (serverFeatures->haveServerPets())
+    {
+        // TRANSLATORS: popup menu item
+        // TRANSLATORS: show emotes for homuncules
+        mBrowserBox->addRow("/setemotetype homun", _("Homunculus"));
+
+        // TRANSLATORS: popup menu item
+        // TRANSLATORS: show emotes for mercenary
+        mBrowserBox->addRow("/setemotetype merc", _("Mercenary"));
+    }
+#endif
+    mBrowserBox->addRow("##3---");
+
+    // TRANSLATORS: popup menu item
+    // TRANSLATORS: close menu
+    mBrowserBox->addRow("cancel", _("Cancel"));
+
+    showPopup(mX, mY);
+}
+
 void PopupMenu::handleLink(const std::string &link,
                            MouseEvent *event A_UNUSED)
 {
diff --git a/src/gui/popups/popupmenu.h b/src/gui/popups/popupmenu.h
index b69a0f588..dc53312f4 100644
--- a/src/gui/popups/popupmenu.h
+++ b/src/gui/popups/popupmenu.h
@@ -167,6 +167,8 @@ class PopupMenu final : public Popup, public LinkHandler
         void showCraftPopup();
 #endif
 
+        void showEmoteType();
+
         /**
          * Handles link action.
          */