summaryrefslogtreecommitdiff
path: root/src/net/tmwa/npchandler.cpp
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-04-08 17:37:02 +0200
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-05-05 22:30:00 +0200
commit96abc4a9658b3318d0052dc5cd31a3c15d76a494 (patch)
treeff1d8e02b5020a08c01ab1605b0474a48eb77c42 /src/net/tmwa/npchandler.cpp
parente9eda63dcad0b842d637c13e415ef4f751ea2adf (diff)
downloadmana-client-96abc4a9658b3318d0052dc5cd31a3c15d76a494.tar.gz
mana-client-96abc4a9658b3318d0052dc5cd31a3c15d76a494.tar.bz2
mana-client-96abc4a9658b3318d0052dc5cd31a3c15d76a494.tar.xz
mana-client-96abc4a9658b3318d0052dc5cd31a3c15d76a494.zip
Removed the shared base classes of MessageIn and MessageOut
There wasn't a whole lot gained by sharing a common base class, and it makes extending the manaserv Message{In,Out} classes with a debugging mode unnecessarily complicated. Reviewed-by: Yohann Ferreira
Diffstat (limited to 'src/net/tmwa/npchandler.cpp')
-rw-r--r--src/net/tmwa/npchandler.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp
index 71f9ba2a..2b0a5b0a 100644
--- a/src/net/tmwa/npchandler.cpp
+++ b/src/net/tmwa/npchandler.cpp
@@ -25,11 +25,11 @@
#include "event.h"
#include "localplayer.h"
-#include "net/messagein.h"
-#include "net/messageout.h"
#include "net/net.h"
#include "net/npchandler.h"
+#include "net/tmwa/messagein.h"
+#include "net/tmwa/messageout.h"
#include "net/tmwa/protocol.h"
#include "utils/stringutils.h"
@@ -68,7 +68,7 @@ NpcHandler::NpcHandler()
npcHandler = this;
}
-void NpcHandler::handleMessage(Net::MessageIn &msg)
+void NpcHandler::handleMessage(MessageIn &msg)
{
if (msg.getId() == SMSG_NPC_CHOICE || msg.getId() == SMSG_NPC_MESSAGE)
{