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/Ghast.cpp | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) (limited to 'source/Mobs/Ghast.cpp') diff --git a/source/Mobs/Ghast.cpp b/source/Mobs/Ghast.cpp index 4993f25c0..3bcb5e4ab 100644 --- a/source/Mobs/Ghast.cpp +++ b/source/Mobs/Ghast.cpp @@ -7,7 +7,7 @@ -cGhast::cGhast() +cGhast::cGhast(void) { m_MobType = 56; GetMonsterConfig("Ghast"); @@ -17,31 +17,19 @@ cGhast::cGhast() -cGhast::~cGhast() +bool cGhast::IsA(const char * a_EntityType) { + return ((strcmp(a_EntityType, "cGhast") == 0) || super::IsA(a_EntityType)); } -bool cGhast::IsA( const char* a_EntityType ) +void cGhast::GetDrops(cItems & a_Drops, cPawn * a_Killer) { - if( strcmp( a_EntityType, "cGhast" ) == 0 ) return true; - return cMonster::IsA( a_EntityType ); -} - - - - - -void cGhast::KilledBy( cEntity* a_Killer ) -{ - cItems Drops; - AddRandomDropItem(Drops, 0, 2, E_ITEM_GUNPOWDER); - AddRandomDropItem(Drops, 0, 1, E_ITEM_GHAST_TEAR); - - cMonster::KilledBy( a_Killer ); + AddRandomDropItem(a_Drops, 0, 2, E_ITEM_GUNPOWDER); + AddRandomDropItem(a_Drops, 0, 1, E_ITEM_GHAST_TEAR); } -- cgit v1.2.3