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/Chicken.cpp | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) (limited to 'source/Mobs/Chicken.cpp') diff --git a/source/Mobs/Chicken.cpp b/source/Mobs/Chicken.cpp index 940491ad4..cd282f5ed 100644 --- a/source/Mobs/Chicken.cpp +++ b/source/Mobs/Chicken.cpp @@ -7,13 +7,13 @@ -// TODO Drop egg every 5-10 minutes +// TODO: Drop egg every 5-10 minutes -cChicken::cChicken() +cChicken::cChicken(void) { m_MobType = 93; GetMonsterConfig("Chicken"); @@ -23,32 +23,19 @@ cChicken::cChicken() -cChicken::~cChicken() +bool cChicken::IsA(const char * a_EntityType) { + return ((strcmp(a_EntityType, "cChicken") == 0) || super::IsA(a_EntityType)); } -bool cChicken::IsA( const char* a_EntityType ) +void cChicken::GetDrops(cItems & a_Drops, cPawn * a_Killer) { - if( strcmp( a_EntityType, "cChicken" ) == 0 ) return true; - return cMonster::IsA( a_EntityType ); -} - - - - - -void cChicken::KilledBy( cEntity* a_Killer ) -{ - cItems Drops; - AddRandomDropItem(Drops, 0, 2, E_ITEM_FEATHER); - Drops.push_back(cItem((GetMetaData() == BURNING) ? E_ITEM_COOKED_CHICKEN : E_ITEM_RAW_CHICKEN, 1)); - m_World->SpawnItemPickups(Drops, m_Pos.x, m_Pos.y, m_Pos.z); - - cMonster::KilledBy( a_Killer ); + AddRandomDropItem(a_Drops, 0, 2, E_ITEM_FEATHER); + a_Drops.push_back(cItem((GetMetaData() == BURNING) ? E_ITEM_COOKED_CHICKEN : E_ITEM_RAW_CHICKEN, 1)); } -- cgit v1.2.3