Remove NpcDialog references from netcode

Reviewed-by: Chuck Miller

3 files changed, 63 insertions, 88 deletions

diff --git a/src/net/manaserv/npchandler.cpp b/src/net/manaserv/npchandler.cpp
index 509f26e1..09dccffe 100644
--- a/src/net/manaserv/npchandler.cpp
+++ b/src/net/manaserv/npchandler.cpp
@@ -22,15 +22,15 @@
 #include "net/manaserv/npchandler.h"
 
 #include "actorspritemanager.h"
-
-#include "gui/npcdialog.h"
-#include "gui/npcpostdialog.h"
+#include "eventmanager.h"
 
 #include "net/manaserv/connection.h"
 #include "net/manaserv/messagein.h"
 #include "net/manaserv/messageout.h"
 #include "net/manaserv/protocol.h"
 
+#include "utils/stringutils.h"
+
 extern Net::NpcHandler *npcHandler;
 
 namespace ManaServ {
@@ -61,70 +61,70 @@ void NpcHandler::handleMessage(Net::MessageIn &msg)
         return;
     }
 
-    int npcId = being->getId();
-    NpcDialogs::iterator diag = mNpcDialogs.find(npcId);
-    NpcDialog *dialog;
-
-    if (diag == mNpcDialogs.end())
-    {
-        if (msg.getId() == GPMSG_NPC_ERROR || msg.getId() == GPMSG_NPC_CLOSE)
-            return; // Dialog is pointless in these cases
-
-        dialog = new NpcDialog(npcId);
-        Wrapper wrap;
-        wrap.dialog = dialog;
-        mNpcDialogs[npcId] = wrap;
-    }
-    else
-    {
-        dialog = diag->second.dialog;
-    }
+    int npcId = being->getId(), count = 0;
+    Mana::Event *event = 0;
 
     switch (msg.getId())
     {
-        case GPMSG_NPC_CHOICE:
-            dialog->choiceRequest();
-            while (msg.getUnreadLength())
-            {
-                dialog->addChoice(msg.readString());
-            }
-            break;
-
-        case GPMSG_NPC_NUMBER:
-        {
-            int min_num = msg.readInt32();
-            int max_num = msg.readInt32();
-            dialog->integerRequest(msg.readInt32(), min_num, max_num);
-            break;
-        }
-
-        case GPMSG_NPC_STRING:
-            dialog->textRequest("");
-            break;
-
-        case GPMSG_NPC_POST:
+    case GPMSG_NPC_CHOICE:
+        event = new Mana::Event("Menu");
+        event->setInt("id", npcId);
+        while (msg.getUnreadLength())
         {
-            new NpcPostDialog(npcId);
-            break;
+            count++;
+            event->setString("choice" + toString(count), msg.readString());
         }
-
-        case GPMSG_NPC_ERROR:
-            dialog->close();
-            if (diag != mNpcDialogs.end())
-            {
-                mNpcDialogs.erase(diag);
-            }
-            break;
-
-        case GPMSG_NPC_MESSAGE:
-            dialog->addText(msg.readString(msg.getUnreadLength()));
-            dialog->showNextButton();
-            break;
-
-        case GPMSG_NPC_CLOSE:
-            dialog->showCloseButton();
-            break;
+        event->setInt("choiceCount", count);
+        Mana::EventManager::trigger("NPC", *event);
+        break;
+
+    case GPMSG_NPC_NUMBER:
+        event = new Mana::Event("IntegerInput");
+        event->setInt("id", npcId);
+        event->setInt("min", msg.readInt32());
+        event->setInt("max", msg.readInt32());
+        event->setInt("default", msg.readInt32());
+        Mana::EventManager::trigger("NPC", *event);
+        break;
+
+    case GPMSG_NPC_STRING:
+        event = new Mana::Event("StringInput");
+        event->setInt("id", npcId);
+        Mana::EventManager::trigger("NPC", *event);
+        break;
+
+    case GPMSG_NPC_POST:
+        event = new Mana::Event("Post");
+        event->setInt("id", npcId);
+        Mana::EventManager::trigger("NPC", *event);
+        break;
+
+    case GPMSG_NPC_ERROR:
+        event = new Mana::Event("End");
+        event->setInt("id", npcId);
+        Mana::EventManager::trigger("NPC", *event);
+        break;
+
+    case GPMSG_NPC_MESSAGE:
+        event = new Mana::Event("Message");
+        event->setInt("id", npcId);
+        event->setString("text", msg.readString(msg.getUnreadLength()));
+        Mana::EventManager::trigger("NPC", *event);
+        delete event;
+
+        event = new Mana::Event("Next");
+        event->setInt("id", npcId);
+        Mana::EventManager::trigger("NPC", *event);
+        break;
+
+    case GPMSG_NPC_CLOSE:
+        event = new Mana::Event("Close");
+        event->setInt("id", npcId);
+        Mana::EventManager::trigger("NPC", *event);
+        break;
     }
+
+    delete event;
 }
 
 void NpcHandler::talk(int npcId)
@@ -146,13 +146,6 @@ void NpcHandler::closeDialog(int npcId)
     MessageOut msg(PGMSG_NPC_TALK_NEXT);
     msg.writeInt16(npcId);
     gameServerConnection->send(msg);
-
-    NpcDialogs::iterator it = mNpcDialogs.find(npcId);
-    if (it != mNpcDialogs.end())
-    {
-        (*it).second.dialog->close();
-        mNpcDialogs.erase(it);
-    }
 }
 
 void NpcHandler::listInput(int npcId, int value)
@@ -224,9 +217,4 @@ void NpcHandler::endShopping(int beingId)
     // TODO
 }
 
-void NpcHandler::clearDialogs()
-{
-    mNpcDialogs.clear();
-}
-
 } // namespace ManaServ
diff --git a/src/net/manaserv/npchandler.h b/src/net/manaserv/npchandler.h
index 689fdc1d..d66c1a48 100644
--- a/src/net/manaserv/npchandler.h
+++ b/src/net/manaserv/npchandler.h
@@ -28,8 +28,6 @@
 
 #include <map>
 
-class NpcDialog;
-
 namespace ManaServ {
 
 class NpcHandler : public MessageHandler, public Net::NpcHandler
@@ -65,15 +63,6 @@ class NpcHandler : public MessageHandler, public Net::NpcHandler
         void sellItem(int beingId, int itemId, int amount);
 
         void endShopping(int beingId);
-
-        void clearDialogs();
-
-    private:
-        typedef struct {
-            NpcDialog* dialog;
-        } Wrapper;
-        typedef std::map<int, Wrapper> NpcDialogs;
-        NpcDialogs mNpcDialogs;
 };
 
 } // namespace ManaServ
diff --git a/src/net/manaserv/playerhandler.cpp b/src/net/manaserv/playerhandler.cpp
index 696ec037..2028afd9 100644
--- a/src/net/manaserv/playerhandler.cpp
+++ b/src/net/manaserv/playerhandler.cpp
@@ -24,6 +24,7 @@
 
 #include "client.h"
 #include "effectmanager.h"
+#include "eventmanager.h"
 #include "game.h"
 #include "localplayer.h"
 #include "log.h"
@@ -41,7 +42,6 @@
 #include "net/manaserv/defines.h"
 #include "net/manaserv/messagein.h"
 #include "net/manaserv/messageout.h"
-#include "net/manaserv/npchandler.h"
 #include "net/manaserv/protocol.h"
 
 /**
@@ -60,9 +60,7 @@ void RespawnRequestListener::action(const gcn::ActionEvent &event)
 {
     Net::getPlayerHandler()->respawn();
 
-    ManaServ::NpcHandler *handler =
-            static_cast<ManaServ::NpcHandler*>(Net::getNpcHandler());
-    handler->clearDialogs();
+    Mana::EventManager::trigger("NPC", Mana::Event("CloseAll"));
 }
 
 extern Connection *gameServerConnection;