summaryrefslogtreecommitdiff
path: root/src/monster.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/monster.h')
-rw-r--r--src/monster.h15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/monster.h b/src/monster.h
index 5251d37e..34a2f237 100644
--- a/src/monster.h
+++ b/src/monster.h
@@ -30,7 +30,7 @@ class Text;
class Monster : public Being
{
public:
- Monster(Uint32 id, Uint16 job, Map *map);
+ Monster(int id, Uint16 job, Map *map);
~Monster();
@@ -49,21 +49,24 @@ class Monster : public Being
* Handles an attack of another being by this monster. Plays a hit or
* miss sound when appropriate.
*
- * @param victim The attacked being.
- * @param damage The amount of damage dealt (0 means miss).
+ * @param victim the victim being
+ * @param damage the amount of damage dealt (0 means miss)
+ * @param type the attack type
*/
#ifdef TMWSERV_SUPPORT
virtual void handleAttack();
#else
- virtual void handleAttack(Being *victim, int damage);
+ virtual void handleAttack(Being *victim, int damage, AttackType type);
#endif
/**
* Puts a damage bubble above this monster and plays the hurt sound
*
- * @param amount The amount of damage.
+ * @param attacker the attacking being
+ * @param damage the amount of damage recieved (0 means miss)
+ * @param type the attack type
*/
- virtual void takeDamage(int amount);
+ virtual void takeDamage(Being *attacker, int amount, AttackType type);
/**
* Returns the MonsterInfo, with static data about this monster.