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/Mooshroom.cpp | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) (limited to 'source/Mobs/Mooshroom.cpp') diff --git a/source/Mobs/Mooshroom.cpp b/source/Mobs/Mooshroom.cpp index f70349e97..0732b3fea 100644 --- a/source/Mobs/Mooshroom.cpp +++ b/source/Mobs/Mooshroom.cpp @@ -13,7 +13,7 @@ -cMooshroom::cMooshroom() +cMooshroom::cMooshroom(void) { m_MobType = 96; GetMonsterConfig("Mooshroom"); @@ -23,32 +23,19 @@ cMooshroom::cMooshroom() -cMooshroom::~cMooshroom() +bool cMooshroom::IsA(const char * a_EntityType) { + return ((strcmp(a_EntityType, "cMooshroom") == 0) || super::IsA(a_EntityType)); } -bool cMooshroom::IsA( const char* a_EntityType ) +void cMooshroom::GetDrops(cItems & a_Drops, cPawn * a_Killer) { - if( strcmp( a_EntityType, "cMooshroom" ) == 0 ) return true; - return cMonster::IsA( a_EntityType ); -} - - - - - -void cMooshroom::KilledBy( cEntity* a_Killer ) -{ - cItems Drops; - AddRandomDropItem(Drops, 0, 2, E_ITEM_LEATHER); - AddRandomDropItem(Drops, 1, 3, (GetMetaData() == BURNING) ? E_ITEM_STEAK : E_ITEM_RAW_BEEF); - m_World->SpawnItemPickups(Drops, m_Pos.x, m_Pos.y, m_Pos.z); - - cMonster::KilledBy( a_Killer ); + AddRandomDropItem(a_Drops, 0, 2, E_ITEM_LEATHER); + AddRandomDropItem(a_Drops, 1, 3, (GetMetaData() == BURNING) ? E_ITEM_STEAK : E_ITEM_RAW_BEEF); } -- cgit v1.2.3