1 files changed, 104 insertions, 115 deletions

diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp
index 5888c679..e1615fec 100644
--- a/src/net/tmwa/npchandler.cpp
+++ b/src/net/tmwa/npchandler.cpp
@@ -21,11 +21,9 @@
 
 #include "net/tmwa/npchandler.h"
 
-#include "beingmanager.h"
+#include "actorspritemanager.h"
+#include "event.h"
 #include "localplayer.h"
-#include "npc.h"
-
-#include "gui/npcdialog.h"
 
 #include "net/messagein.h"
 #include "net/messageout.h"
@@ -34,10 +32,27 @@
 
 #include "net/tmwa/protocol.h"
 
+#include "utils/stringutils.h"
+
 #include <SDL_types.h>
 
 extern Net::NpcHandler *npcHandler;
 
+static void parseMenu(Mana::Event *event, const std::string &options)
+{
+    std::istringstream iss(options);
+
+    int count = 0;
+    std::string tmp;
+    while (getline(iss, tmp, ':'))
+    {
+        count++;
+        event->setString("choice" + toString(count), tmp);
+    }
+
+    event->setInt("choiceCount", count);
+}
+
 namespace TmwAthena {
 
 NpcHandler::NpcHandler()
@@ -53,6 +68,8 @@ NpcHandler::NpcHandler()
     };
     handledMessages = _messages;
     npcHandler = this;
+
+    listen("NPC");
 }
 
 void NpcHandler::handleMessage(Net::MessageIn &msg)
@@ -63,126 +80,103 @@ void NpcHandler::handleMessage(Net::MessageIn &msg)
     }
 
     int npcId = msg.readInt32();
-    NpcDialogs::iterator diag = mNpcDialogs.find(npcId);
-    NpcDialog *dialog = 0;
-
-    if (diag == mNpcDialogs.end())
-    {
-        // Empty dialogs don't help
-        if (msg.getId() == SMSG_NPC_CLOSE)
-        {
-            closeDialog(npcId);
-            return;
-        }
-        else if (msg.getId() == SMSG_NPC_NEXT)
-        {
-            nextDialog(npcId);
-            return;
-        }
-        else
-        {
-            dialog = new NpcDialog(npcId);
-            Wrapper wrap;
-            wrap.dialog = dialog;
-            mNpcDialogs[npcId] = wrap;
-        }
-    }
-    else
-    {
-        dialog = diag->second.dialog;
-    }
+    Mana::Event *event = 0;
 
     switch (msg.getId())
     {
-        case SMSG_NPC_CHOICE:
-            dialog->choiceRequest();
-            dialog->parseListItems(msg.readString(msg.getLength() - 8));
-            break;
-
-        case SMSG_NPC_MESSAGE:
-            dialog->addText(msg.readString(msg.getLength() - 8));
-            break;
-
-         case SMSG_NPC_CLOSE:
-            // Show the close button
-            dialog->showCloseButton();
-            break;
-
-        case SMSG_NPC_NEXT:
-            // Show the next button
-            dialog->showNextButton();
-            break;
-
-        case SMSG_NPC_INT_INPUT:
-            // Request for an integer
-            dialog->integerRequest(0);
-            break;
-
-        case SMSG_NPC_STR_INPUT:
-            // Request for a string
-            dialog->textRequest("");
-            break;
+    case SMSG_NPC_CHOICE:
+        event = new Mana::Event("Menu");
+        event->setInt("id", npcId);
+        parseMenu(event, msg.readString(msg.getLength() - 8));
+        event->trigger("NPC");
+        break;
+
+    case SMSG_NPC_MESSAGE:
+        event = new Mana::Event("Message");
+        event->setInt("id", npcId);
+        event->setString("text", msg.readString(msg.getLength() - 8));
+        event->trigger("NPC");
+        break;
+
+     case SMSG_NPC_CLOSE:
+        // Show the close button
+        event = new Mana::Event("Close");
+        event->setInt("id", npcId);
+        event->trigger("NPC");
+        break;
+
+    case SMSG_NPC_NEXT:
+        // Show the next button
+        event = new Mana::Event("Next");
+        event->setInt("id", npcId);
+        event->trigger("NPC");
+        break;
+
+    case SMSG_NPC_INT_INPUT:
+        // Request for an integer
+        event = new Mana::Event("IntegerInput");
+        event->setInt("id", npcId);
+        event->trigger("NPC");
+        break;
+
+    case SMSG_NPC_STR_INPUT:
+        // Request for a string
+        event = new Mana::Event("StringInput");
+        event->setInt("id", npcId);
+        event->trigger("NPC");
+        break;
     }
 
+    delete event;
+
     if (player_node->getCurrentAction() != Being::SIT)
         player_node->setAction(Being::STAND);
 }
 
-void NpcHandler::talk(int npcId)
+void NpcHandler::event(const std::string &channel, const Mana::Event &event)
 {
-    MessageOut outMsg(CMSG_NPC_TALK);
-    outMsg.writeInt32(npcId);
-    outMsg.writeInt8(0); // Unused
-}
-
-void NpcHandler::nextDialog(int npcId)
-{
-    MessageOut outMsg(CMSG_NPC_NEXT_REQUEST);
-    outMsg.writeInt32(npcId);
-}
-
-void NpcHandler::closeDialog(int npcId)
-{
-    MessageOut outMsg(CMSG_NPC_CLOSE);
-    outMsg.writeInt32(npcId);
-
-    NpcDialogs::iterator it = mNpcDialogs.find(npcId);
-    if (it != mNpcDialogs.end())
+    if (channel == "NPC")
     {
-        (*it).second.dialog->close();
-        mNpcDialogs.erase(it);
+        if (event.getName() == "doTalk")
+        {
+            MessageOut outMsg(CMSG_NPC_TALK);
+            outMsg.writeInt32(event.getInt("npcId"));
+            outMsg.writeInt8(0); // Unused
+        }
+        else if (event.getName() == "doNext")
+        {
+            MessageOut outMsg(CMSG_NPC_NEXT_REQUEST);
+            outMsg.writeInt32(event.getInt("npcId"));
+        }
+        else if (event.getName() == "doClose")
+        {
+            MessageOut outMsg(CMSG_NPC_CLOSE);
+            outMsg.writeInt32(event.getInt("npcId"));
+        }
+        else if (event.getName() == "doMenu")
+        {
+            MessageOut outMsg(CMSG_NPC_LIST_CHOICE);
+            outMsg.writeInt32(event.getInt("npcId"));
+            outMsg.writeInt8(event.getInt("choice"));
+        }
+        else if (event.getName() == "doIntegerInput")
+        {
+            MessageOut outMsg(CMSG_NPC_INT_RESPONSE);
+            outMsg.writeInt32(event.getInt("npcId"));
+            outMsg.writeInt32(event.getInt("value"));
+        }
+        else if (event.getName() == "doStringInput")
+        {
+            const std::string &value = event.getString("value");
+            MessageOut outMsg(CMSG_NPC_STR_RESPONSE);
+            outMsg.writeInt16(value.length() + 9);
+            outMsg.writeInt32(event.getInt("npcId"));
+            outMsg.writeString(value, value.length());
+            outMsg.writeInt8(0); // Prevent problems with string reading
+        }
     }
 }
 
-void NpcHandler::listInput(int npcId, int value)
-{
-    MessageOut outMsg(CMSG_NPC_LIST_CHOICE);
-    outMsg.writeInt32(npcId);
-    outMsg.writeInt8(value);
-}
-
-void NpcHandler::integerInput(int npcId, int value)
-{
-    MessageOut outMsg(CMSG_NPC_INT_RESPONSE);
-    outMsg.writeInt32(npcId);
-    outMsg.writeInt32(value);
-}
-
-void NpcHandler::stringInput(int npcId, const std::string &value)
-{
-    MessageOut outMsg(CMSG_NPC_STR_RESPONSE);
-    outMsg.writeInt16(value.length() + 9);
-    outMsg.writeInt32(npcId);
-    outMsg.writeString(value, value.length());
-    outMsg.writeInt8(0); // Prevent problems with string reading
-}
-
-void NpcHandler::sendLetter(int npcId, const std::string &recipient,
-                            const std::string &text)
-{
-    // TODO
-}
-
 void NpcHandler::startShopping(int beingId)
 {
     // TODO
@@ -223,9 +217,4 @@ void NpcHandler::endShopping(int beingId)
     // TODO
 }
 
-void NpcHandler::clearDialogs()
-{
-    mNpcDialogs.clear();
-}
-
 } // namespace TmwAthena