From 912a1e7adc650d20b0302a3dfe45816b5e541bc7 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Fri, 21 Dec 2012 11:04:08 +0000 Subject: Refactored the TakeDamage API to take equipped weapon and armor into consideration (PvP untested) http://forum.mc-server.org/showthread.php?tid=625 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1087 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Mobs/PassiveMonster.h | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'source/Mobs/PassiveMonster.h') diff --git a/source/Mobs/PassiveMonster.h b/source/Mobs/PassiveMonster.h index 1265dc737..14a4e9d24 100644 --- a/source/Mobs/PassiveMonster.h +++ b/source/Mobs/PassiveMonster.h @@ -1,14 +1,26 @@ + #pragma once #include "Monster.h" -class cPassiveMonster : public cMonster + + + + +class cPassiveMonster : + public cMonster { + typedef cMonster super; + public: - cPassiveMonster(); - ~cPassiveMonster(); + cPassiveMonster(void); + + virtual void Tick(float a_Dt) override; + + /// When hit by someone, run away + virtual void DoTakeDamage(TakeDamageInfo & a_TDI) override; +} ; + + - virtual void Tick(float a_Dt); - virtual void TakeDamage(int a_Damage, cEntity* a_Instigator); -}; -- cgit v1.2.3