Implemented basic attack hit detection and damage notification.

1 files changed, 33 insertions, 1 deletions

diff --git a/src/object.h b/src/object.h
index 63d6c115..0b019239 100644
--- a/src/object.h
+++ b/src/object.h
@@ -30,6 +30,8 @@
 #include "point.h"
 #include "utils/countedptr.h"
 
+class MapComposite;
+
 enum
 {
     NEW_ON_MAP = 1,
@@ -37,6 +39,7 @@ enum
     ATTACK = 4
 };
 
+
 /**
  * Generic in-game object definition.
  * Base class for in-game objects.
@@ -133,10 +136,20 @@ class MovingObject: public Object
 {
     public:
         /**
+         * Directions, to be used as bitmask values
+         */
+        static const char DOWN = 1;
+        static const char LEFT = 2;
+        static const char UP = 4;
+        static const char RIGHT = 8;
+
+        /**
          * Proxy constructor.
          */
         MovingObject(int type, int id)
-          : Object(type), mPublicID(id),
+          : Object(type),
+            mDirection(DOWN),
+            mPublicID(id),
             mActionTime(0)
         {}
 
@@ -159,6 +172,19 @@ class MovingObject: public Object
         { return mOld; }
 
         /**
+         * Sete object direction
+         */
+        void setDirection(unsigned char direction)
+        { mDirection = direction; }
+
+        /**
+         * Gets object direction
+         */
+
+        unsigned char getDirection() const
+        { return mDirection; }
+
+        /**
          * Sets object speed.
          */
         void setSpeed(unsigned s)
@@ -170,6 +196,11 @@ class MovingObject: public Object
         void move();
 
         /**
+         * Performs an attack
+         */
+        virtual void performAttack (MapComposite* map) = 0;
+
+        /**
          * Get public ID.
          *
          * @return the public ID, 65535 if none yet.
@@ -186,6 +217,7 @@ class MovingObject: public Object
 
     protected:
         unsigned short mActionTime; /**< delay until next action */
+        unsigned char mDirection;   /**< Facing direction */
 
     private:
         unsigned short mPublicID; /**< Object ID sent to clients (unique with respect to the map) */