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, 9 insertions, 1 deletions

diff --git a/src/engine.h b/src/engine.h
index 7ad6d894..60b1f6c8 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -25,7 +25,9 @@
 #include <string>
 
 class Map;
+#ifdef EATHENA_SUPPORT
 class Network;
+#endif
 
 /**
  * Game engine. Actually hardly does anything anymore except keeping track of
@@ -37,7 +39,11 @@ class Engine
         /**
          * Constructor.
          */
+#ifdef EATHENA_SUPPORT
         Engine(Network *network);
+#else
+        Engine();
+#endif
 
         /**
          * Destructor.
@@ -57,13 +63,15 @@ class Engine
         void changeMap(const std::string &mapName);
 
         /**
-         * Performs engine logic.
+         * Performs engine logic. This method is called 100 times per second.
          */
         void logic();
 
     private:
         Map *mCurrentMap;
+#ifdef EATHENA_SUPPORT
         Network *mNetwork;
+#endif
         std::string mMapName;
 };