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.cpp | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) (limited to 'source/Mobs/Witch.cpp') diff --git a/source/Mobs/Witch.cpp b/source/Mobs/Witch.cpp index 02d1de4fe..5077f0cdd 100644 --- a/source/Mobs/Witch.cpp +++ b/source/Mobs/Witch.cpp @@ -17,37 +17,24 @@ cWitch::cWitch() -cWitch::~cWitch() +bool cWitch::IsA(const char * a_EntityType) { + return ((strcmp(a_EntityType, "cWitch") == 0) || super::IsA(a_EntityType)); } -bool cWitch::IsA( const char* a_EntityType ) +void cWitch::GetDrops(cItems & a_Drops, cPawn * a_Killer) { - if( strcmp( a_EntityType, "cWitch" ) == 0 ) return true; - return cMonster::IsA( a_EntityType ); -} - - - - - -void cWitch::KilledBy( cEntity* a_Killer ) -{ - cItems Drops; - AddRandomDropItem(Drops, 0, 6, E_ITEM_GLASS_BOTTLE); - AddRandomDropItem(Drops, 0, 6, E_ITEM_GLOWSTONE_DUST); - AddRandomDropItem(Drops, 0, 6, E_ITEM_GUNPOWDER); - AddRandomDropItem(Drops, 0, 6, E_ITEM_REDSTONE_DUST); - AddRandomDropItem(Drops, 0, 6, E_ITEM_SPIDER_EYE); - AddRandomDropItem(Drops, 0, 6, E_ITEM_STICK); - AddRandomDropItem(Drops, 0, 6, E_ITEM_SUGAR); - m_World->SpawnItemPickups(Drops, m_Pos.x, m_Pos.y, m_Pos.z); - - cMonster::KilledBy( a_Killer ); + AddRandomDropItem(a_Drops, 0, 6, E_ITEM_GLASS_BOTTLE); + AddRandomDropItem(a_Drops, 0, 6, E_ITEM_GLOWSTONE_DUST); + AddRandomDropItem(a_Drops, 0, 6, E_ITEM_GUNPOWDER); + AddRandomDropItem(a_Drops, 0, 6, E_ITEM_REDSTONE_DUST); + AddRandomDropItem(a_Drops, 0, 6, E_ITEM_SPIDER_EYE); + AddRandomDropItem(a_Drops, 0, 6, E_ITEM_STICK); + AddRandomDropItem(a_Drops, 0, 6, E_ITEM_SUGAR); } -- cgit v1.2.3