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/Villager.cpp | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) (limited to 'source/Mobs/Villager.cpp') diff --git a/source/Mobs/Villager.cpp b/source/Mobs/Villager.cpp index 65b2ac5b5..0e6d364d7 100644 --- a/source/Mobs/Villager.cpp +++ b/source/Mobs/Villager.cpp @@ -17,27 +17,9 @@ cVillager::cVillager() -cVillager::~cVillager() +bool cVillager::IsA(const char * a_EntityType) { -} - - - - - -bool cVillager::IsA( const char* a_EntityType ) -{ - if( strcmp( a_EntityType, "cVillager" ) == 0 ) return true; - return cMonster::IsA( a_EntityType ); -} - - - - - -void cVillager::KilledBy( cEntity* a_Killer ) -{ - cMonster::KilledBy( a_Killer ); + return ((strcmp(a_EntityType, "cVillager") == 0) || super::IsA(a_EntityType)); } -- cgit v1.2.3