From 009cfa4b2959bf89370e9d271f2244ef5446f3a0 Mon Sep 17 00:00:00 2001 From: Chuck Miller Date: Fri, 12 Nov 2010 20:58:30 -0500 Subject: Change NPC handling in the net code Instead of using events to invoke netcode, invoke netcode directly and have it send events Reviewed-by: Freeyorp --- src/net/manaserv/npchandler.cpp | 137 +++++++++++++++++++++++++--------------- src/net/manaserv/npchandler.h | 21 ++++-- src/net/npchandler.h | 16 +++++ src/net/tmwa/npchandler.cpp | 121 +++++++++++++++++++++-------------- src/net/tmwa/npchandler.h | 21 ++++-- 5 files changed, 212 insertions(+), 104 deletions(-) (limited to 'src/net') diff --git a/src/net/manaserv/npchandler.cpp b/src/net/manaserv/npchandler.cpp index 403dedb6..9620f7c1 100644 --- a/src/net/manaserv/npchandler.cpp +++ b/src/net/manaserv/npchandler.cpp @@ -51,8 +51,6 @@ NpcHandler::NpcHandler() }; handledMessages = _messages; npcHandler = this; - - listen(CHANNEL_NPC); } void NpcHandler::handleMessage(Net::MessageIn &msg) @@ -129,54 +127,6 @@ void NpcHandler::handleMessage(Net::MessageIn &msg) delete event; } -void NpcHandler::event(Channels channel, const Mana::Event &event) -{ - if (channel == CHANNEL_NPC) - { - if (event.getName() == EVENT_DOTALK) - { - MessageOut msg(PGMSG_NPC_TALK); - msg.writeInt16(event.getInt("npcId")); - gameServerConnection->send(msg); - } - else if (event.getName() == EVENT_DONEXT || - event.getName() == EVENT_DOCLOSE) - { - MessageOut msg(PGMSG_NPC_TALK_NEXT); - msg.writeInt16(event.getInt("npcId")); - gameServerConnection->send(msg); - } - else if (event.getName() == EVENT_DOMENU) - { - MessageOut msg(PGMSG_NPC_SELECT); - msg.writeInt16(event.getInt("npcId")); - msg.writeInt8(event.getInt("choice")); - gameServerConnection->send(msg); - } - else if (event.getName() == EVENT_DOINTEGERINPUT) - { - MessageOut msg(PGMSG_NPC_NUMBER); - msg.writeInt16(event.getInt("npcId")); - msg.writeInt32(event.getInt("value")); - gameServerConnection->send(msg); - } - else if (event.getName() == EVENT_DOSTRINGINPUT) - { - MessageOut msg(PGMSG_NPC_STRING); - msg.writeInt16(event.getInt("npcId")); - msg.writeString(event.getString("value")); - gameServerConnection->send(msg); - } - else if (event.getName() == EVENT_DOSENDLETTER) - { - MessageOut msg(PGMSG_NPC_POST_SEND); - msg.writeString(event.getString("recipient")); - msg.writeString(event.getString("text")); - gameServerConnection->send(msg); - } - } -} - void NpcHandler::startShopping(int beingId) { // TODO @@ -213,4 +163,91 @@ void NpcHandler::endShopping(int beingId) // TODO } +void NpcHandler::talk(int npcId) +{ + MessageOut msg(PGMSG_NPC_TALK); + msg.writeInt16(npcId); + gameServerConnection->send(msg); + + Mana::Event event(EVENT_TALKSENT); + event.setInt("npcId", npcId); + event.trigger(CHANNEL_NPC); +} + +void NpcHandler::nextDialog(int npcId) +{ + MessageOut msg(PGMSG_NPC_TALK_NEXT); + msg.writeInt16(npcId); + gameServerConnection->send(msg); + + Mana::Event event(EVENT_NEXTSENT); + event.setInt("npcId", npcId); + event.trigger(CHANNEL_NPC); +} + +void NpcHandler::closeDialog(int npcId) +{ + MessageOut msg(PGMSG_NPC_TALK_NEXT); + msg.writeInt16(npcId); + gameServerConnection->send(msg); + + Mana::Event event(EVENT_CLOSESENT); + event.setInt("npcId", npcId); + event.trigger(CHANNEL_NPC); +} + +void NpcHandler::menuSelect(int npcId, int choice) +{ + MessageOut msg(PGMSG_NPC_SELECT); + msg.writeInt16(npcId); + msg.writeInt8(choice); + gameServerConnection->send(msg); + + Mana::Event event(EVENT_MENUSENT); + event.setInt("npcId", npcId); + event.setInt("choice", choice); + event.trigger(CHANNEL_NPC); +} + +void NpcHandler::integerInput(int npcId, int value) +{ + MessageOut msg(PGMSG_NPC_NUMBER); + msg.writeInt16(npcId); + msg.writeInt32(value); + gameServerConnection->send(msg); + + Mana::Event event(EVENT_INTEGERINPUTSENT); + event.setInt("npcId", npcId); + event.setInt("value", value); + event.trigger(CHANNEL_NPC); +} + +void NpcHandler::stringInput(int npcId, const std::string &value) +{ + MessageOut msg(PGMSG_NPC_STRING); + msg.writeInt16(npcId); + msg.writeString(value); + gameServerConnection->send(msg); + + Mana::Event event(EVENT_STRINGINPUTSENT); + event.setInt("npcId", npcId); + event.setString("value", value); + event.trigger(CHANNEL_NPC); +} + +void NpcHandler::sendLetter(int npcId, const std::string &recipient, + const std::string &text) +{ + MessageOut msg(PGMSG_NPC_POST_SEND); + msg.writeString(recipient); + msg.writeString(text); + gameServerConnection->send(msg); + + Mana::Event event(EVENT_SENDLETTERSENT); + event.setInt("npcId", npcId); + event.setString("recipient", recipient); + event.setString("text", text); + event.trigger(CHANNEL_NPC); +} + } // namespace ManaServ diff --git a/src/net/manaserv/npchandler.h b/src/net/manaserv/npchandler.h index 397d3569..cb8fd67d 100644 --- a/src/net/manaserv/npchandler.h +++ b/src/net/manaserv/npchandler.h @@ -32,16 +32,13 @@ namespace ManaServ { -class NpcHandler : public MessageHandler, public Net::NpcHandler, - public Mana::Listener +class NpcHandler : public MessageHandler, public Net::NpcHandler { public: NpcHandler(); void handleMessage(Net::MessageIn &msg); - void event(Channels channel, const Mana::Event &event); - void startShopping(int beingId); void buy(int beingId); @@ -53,6 +50,22 @@ class NpcHandler : public MessageHandler, public Net::NpcHandler, void sellItem(int beingId, int itemId, int amount); void endShopping(int beingId); + + void talk(int npcId); + + void nextDialog(int npcId); + + void closeDialog(int npcId); + + void menuSelect(int npcId, int choice); + + void integerInput(int npcId, int value); + + void stringInput(int npcId, const std::string &value); + + void sendLetter(int npcId, const std::string &recipient, + const std::string &text); + }; } // namespace ManaServ diff --git a/src/net/npchandler.h b/src/net/npchandler.h index fb8ab7ec..35535c61 100644 --- a/src/net/npchandler.h +++ b/src/net/npchandler.h @@ -42,6 +42,22 @@ class NpcHandler virtual void sellItem(int beingId, int itemId, int amount) = 0; virtual void endShopping(int beingId) = 0; + + virtual void talk(int npcId) = 0; + + virtual void nextDialog(int npcId) = 0; + + virtual void closeDialog(int npcId) = 0; + + virtual void menuSelect(int npcId, int choice) = 0; + + virtual void integerInput(int npcId, int value) = 0; + + virtual void stringInput(int npcId, const std::string &value) = 0; + + virtual void sendLetter(int npcId, const std::string &recipient, + const std::string &text) = 0; + }; } // namespace Net diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp index 1b12b63f..337226a9 100644 --- a/src/net/tmwa/npchandler.cpp +++ b/src/net/tmwa/npchandler.cpp @@ -68,8 +68,6 @@ NpcHandler::NpcHandler() }; handledMessages = _messages; npcHandler = this; - - listen(CHANNEL_NPC); } void NpcHandler::handleMessage(Net::MessageIn &msg) @@ -133,50 +131,6 @@ void NpcHandler::handleMessage(Net::MessageIn &msg) player_node->setAction(Being::STAND); } -void NpcHandler::event(Channels channel, const Mana::Event &event) -{ - if (channel == CHANNEL_NPC) - { - if (event.getName() == EVENT_DOTALK) - { - MessageOut outMsg(CMSG_NPC_TALK); - outMsg.writeInt32(event.getInt("npcId")); - outMsg.writeInt8(0); // Unused - } - else if (event.getName() == EVENT_DONEXT) - { - MessageOut outMsg(CMSG_NPC_NEXT_REQUEST); - outMsg.writeInt32(event.getInt("npcId")); - } - else if (event.getName() == EVENT_DOCLOSE) - { - MessageOut outMsg(CMSG_NPC_CLOSE); - outMsg.writeInt32(event.getInt("npcId")); - } - else if (event.getName() == EVENT_DOMENU) - { - MessageOut outMsg(CMSG_NPC_LIST_CHOICE); - outMsg.writeInt32(event.getInt("npcId")); - outMsg.writeInt8(event.getInt("choice")); - } - else if (event.getName() == EVENT_DOINTEGERINPUT) - { - MessageOut outMsg(CMSG_NPC_INT_RESPONSE); - outMsg.writeInt32(event.getInt("npcId")); - outMsg.writeInt32(event.getInt("value")); - } - else if (event.getName() == EVENT_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::startShopping(int beingId) { // TODO @@ -217,4 +171,79 @@ void NpcHandler::endShopping(int beingId) // TODO } +void NpcHandler::talk(int npcId) +{ + MessageOut outMsg(CMSG_NPC_TALK); + outMsg.writeInt32(npcId); + outMsg.writeInt8(0); // Unused + + Mana::Event event(EVENT_TALKSENT); + event.setInt("npcId", npcId); + event.trigger(CHANNEL_NPC); +} + +void NpcHandler::nextDialog(int npcId) +{ + MessageOut outMsg(CMSG_NPC_NEXT_REQUEST); + outMsg.writeInt32(npcId); + + Mana::Event event(EVENT_NEXTSENT); + event.setInt("npcId", npcId); + event.trigger(CHANNEL_NPC); +} + +void NpcHandler::closeDialog(int npcId) +{ + MessageOut outMsg(CMSG_NPC_CLOSE); + outMsg.writeInt32(npcId); + + Mana::Event event(EVENT_CLOSESENT); + event.setInt("npcId", npcId); + event.trigger(CHANNEL_NPC); +} + +void NpcHandler::menuSelect(int npcId, int choice) +{ + MessageOut outMsg(CMSG_NPC_LIST_CHOICE); + outMsg.writeInt32(npcId); + outMsg.writeInt8(choice); + + Mana::Event event(EVENT_MENUSENT); + event.setInt("npcId", npcId); + event.setInt("choice", choice); + event.trigger(CHANNEL_NPC); +} + +void NpcHandler::integerInput(int npcId, int value) +{ + MessageOut outMsg(CMSG_NPC_INT_RESPONSE); + outMsg.writeInt32(npcId); + outMsg.writeInt32(value); + + Mana::Event event(EVENT_INTEGERINPUTSENT); + event.setInt("npcId", npcId); + event.setInt("value", value); + event.trigger(CHANNEL_NPC); +} + +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 + + Mana::Event event(EVENT_STRINGINPUTSENT); + event.setInt("npcId", npcId); + event.setString("value", value); + event.trigger(CHANNEL_NPC); +} + +void NpcHandler::sendLetter(int npcId, const std::string &recipient, + const std::string &text) +{ + //NOTE: eA doesn't have letters +} + } // namespace TmwAthena diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h index 9fcb0041..1e933418 100644 --- a/src/net/tmwa/npchandler.h +++ b/src/net/tmwa/npchandler.h @@ -32,16 +32,13 @@ namespace TmwAthena { -class NpcHandler : public MessageHandler, public Net::NpcHandler, - public Mana::Listener +class NpcHandler : public MessageHandler, public Net::NpcHandler { public: NpcHandler(); void handleMessage(Net::MessageIn &msg); - void event(Channels channel, const Mana::Event &event); - void startShopping(int beingId); void buy(int beingId); @@ -53,6 +50,22 @@ class NpcHandler : public MessageHandler, public Net::NpcHandler, void sellItem(int beingId, int itemId, int amount); void endShopping(int beingId); + + void talk(int npcId); + + void nextDialog(int npcId); + + void closeDialog(int npcId); + + void menuSelect(int npcId, int choice); + + void integerInput(int npcId, int value); + + void stringInput(int npcId, const std::string &value); + + void sendLetter(int npcId, const std::string &recipient, + const std::string &text); + }; } // namespace TmwAthena -- cgit v1.2.3-70-g09d2