Merged the tmwserv client with the eAthena client

This merge involved major changes on both sides, and as such took
several weeks. Lots of things are expected to be broken now, however, we
now have a single code base to improve and extend, which can be compiled
to support either eAthena or tmwserv.

In the coming months, the plan is to work towards a client that supports
both eAthena and tmwserv, without needing to be recompiled.

Conflicts:
	Everywhere!

1 files changed, 8 insertions, 1 deletions

diff --git a/src/net/messagehandler.h b/src/net/messagehandler.h
index 45cdf8cd..261a8351 100644
--- a/src/net/messagehandler.h
+++ b/src/net/messagehandler.h
@@ -25,8 +25,13 @@
 #include <SDL_types.h>
 
 class MessageIn;
+#ifdef EATHENA_SUPPORT
 class Network;
+#endif
 
+/**
+ * \ingroup Network
+ */
 class MessageHandler
 {
     public:
@@ -35,12 +40,14 @@ class MessageHandler
         MessageHandler();
         virtual ~MessageHandler();
 
-        virtual void handleMessage(MessageIn *msg) =0;
+        virtual void handleMessage(MessageIn &msg) = 0;
 
+#ifdef EATHENA_SUPPORT
         void setNetwork(Network *network);
 
     protected:
         Network *mNetwork;
+#endif
 };
 
 #endif