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

diff --git a/src/monster.h b/src/monster.h
index 8d7f8ae7..5251d37e 100644
--- a/src/monster.h
+++ b/src/monster.h
@@ -34,9 +34,11 @@ class Monster : public Being
 
         ~Monster();
 
+#ifdef EATHENA_SUPPORT
         virtual void logic();
+#endif
 
-        virtual void setAction(Action action);
+        virtual void setAction(Action action, int attackType = 0);
 
         virtual Type getType() const;
 
@@ -50,7 +52,11 @@ class Monster : public Being
          * @param victim The attacked being.
          * @param damage The amount of damage dealt (0 means miss).
          */
+#ifdef TMWSERV_SUPPORT
+        virtual void handleAttack();
+#else
         virtual void handleAttack(Being *victim, int damage);
+#endif
 
         /**
          * Puts a damage bubble above this monster and plays the hurt sound
@@ -69,8 +75,20 @@ class Monster : public Being
          */
         void showName(bool show);
 
+        /**
+         * Gets the way the monster is blocked by other objects
+         */
+        virtual unsigned char getWalkMask() const
+        { return 0x83; } // blocked by walls, other monsters and players ( bin 1000 0011)
+
     protected:
         /**
+         * Gets the way the monster blocks pathfinding for other objects
+         */
+        virtual Map::BlockType getBlockType() const
+        { return Map::BLOCKTYPE_MONSTER; }
+
+        /**
          * Update the text when the monster moves
          */
         void updateCoords();