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/Pig.cpp | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) (limited to 'source/Mobs/Pig.cpp') diff --git a/source/Mobs/Pig.cpp b/source/Mobs/Pig.cpp index 48954dc73..8abd0a10e 100644 --- a/source/Mobs/Pig.cpp +++ b/source/Mobs/Pig.cpp @@ -7,7 +7,7 @@ -cPig::cPig() +cPig::cPig(void) { m_MobType = 90; GetMonsterConfig("Pig"); @@ -17,33 +17,18 @@ cPig::cPig() -cPig::~cPig() +bool cPig::IsA(const char * a_EntityType) { + return ((strcmp(a_EntityType, "cPig") == 0) || super::IsA(a_EntityType)); } -bool cPig::IsA( const char* a_EntityType ) +void cPig::GetDrops(cItems & a_Drops, cPawn * a_Killer) { - if( strcmp( a_EntityType, "cPig" ) == 0 ) return true; - return cMonster::IsA( a_EntityType ); -} - - - - - -void cPig::KilledBy( cEntity* a_Killer ) -{ - cItems Drops; - AddRandomDropItem(Drops, 0, 2, E_ITEM_RAW_MEAT); - m_World->SpawnItemPickups(Drops, m_Pos.x, m_Pos.y, m_Pos.z); - - // TODO: Check for burning state - - cMonster::KilledBy( a_Killer ); + AddRandomDropItem(a_Drops, 1, 3, (GetMetaData() == BURNING) ? E_ITEM_COOKED_PORKCHOP : E_ITEM_RAW_MEAT); } -- cgit v1.2.3