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/PassiveAggressiveMonster.h | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'source/Mobs/PassiveAggressiveMonster.h') diff --git a/source/Mobs/PassiveAggressiveMonster.h b/source/Mobs/PassiveAggressiveMonster.h index 972d2a11d..e6e50677d 100644 --- a/source/Mobs/PassiveAggressiveMonster.h +++ b/source/Mobs/PassiveAggressiveMonster.h @@ -1,13 +1,23 @@ + #pragma once #include "AggressiveMonster.h" -class cPassiveAggressiveMonster : public cAggressiveMonster + + + + +class cPassiveAggressiveMonster : + public cAggressiveMonster { + typedef cAggressiveMonster super; + public: - cPassiveAggressiveMonster(); - ~cPassiveAggressiveMonster(); + cPassiveAggressiveMonster(void); + + virtual void DoTakeDamage(TakeDamageInfo & a_TDI) override; +} ; + + + - virtual void TakeDamage(int a_Damage, cEntity* a_Instigator); - void EventSeePlayer(cEntity *a_Entity); -}; -- cgit v1.2.3