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/Skeleton.cpp | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) (limited to 'source/Mobs/Skeleton.cpp') diff --git a/source/Mobs/Skeleton.cpp b/source/Mobs/Skeleton.cpp index b35cdb68e..f219713e0 100644 --- a/source/Mobs/Skeleton.cpp +++ b/source/Mobs/Skeleton.cpp @@ -7,7 +7,7 @@ -cSkeleton::cSkeleton() +cSkeleton::cSkeleton(void) { m_MobType = 51; GetMonsterConfig("Skeleton"); @@ -17,18 +17,9 @@ cSkeleton::cSkeleton() -cSkeleton::~cSkeleton() -{ -} - - - - - bool cSkeleton::IsA( const char* a_EntityType ) { - if( strcmp( a_EntityType, "cSkeleton" ) == 0 ) return true; - return cMonster::IsA( a_EntityType ); + return ((strcmp(a_EntityType, "cSkeleton") == 0) || super::IsA(a_EntityType)); } @@ -51,14 +42,10 @@ void cSkeleton::Tick(float a_Dt) -void cSkeleton::KilledBy( cEntity* a_Killer ) +void cSkeleton::GetDrops(cItems & a_Drops, cPawn * a_Killer) { - cItems Drops; - AddRandomDropItem(Drops, 0, 2, E_ITEM_ARROW); - AddRandomDropItem(Drops, 0, 2, E_ITEM_BONE); - m_World->SpawnItemPickups(Drops, m_Pos.x, m_Pos.y, m_Pos.z); - - cMonster::KilledBy( a_Killer ); + AddRandomDropItem(a_Drops, 0, 2, E_ITEM_ARROW); + AddRandomDropItem(a_Drops, 0, 2, E_ITEM_BONE); } -- cgit v1.2.3