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/Witch.h | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'source/Mobs/Witch.h') diff --git a/source/Mobs/Witch.h b/source/Mobs/Witch.h index 303aa7595..2d21037bb 100644 --- a/source/Mobs/Witch.h +++ b/source/Mobs/Witch.h @@ -1,14 +1,25 @@ + #pragma once #include "AggressiveMonster.h" -class cWitch : public cAggressiveMonster + + + + +class cWitch : + public cAggressiveMonster { + typedef cAggressiveMonster super; + public: cWitch(); - ~cWitch(); - virtual bool IsA( const char* a_EntityType ); + virtual bool IsA(const char* a_EntityType) override; + + virtual void GetDrops(cItems & a_Drops, cPawn * a_Killer = NULL) override; +} ; + + + - virtual void KilledBy( cEntity* a_Killer ); -}; -- cgit v1.2.3