From afaf104b4086dbc5245f92a209cb68a088780ebb Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Fri, 21 Dec 2012 12:52:14 +0000 Subject: Added more constants into eEntityType; made them a compulsory parameter to the constructor, so that all entities have proper type. Also added a few utility functions to cEntity for distinguishing the types (IsPlayer(), IsPickup() etc.) git-svn-id: http://mc-server.googlecode.com/svn/trunk@1092 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Mobs/PassiveAggressiveMonster.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source/Mobs/PassiveAggressiveMonster.cpp') diff --git a/source/Mobs/PassiveAggressiveMonster.cpp b/source/Mobs/PassiveAggressiveMonster.cpp index 465c302a1..b5ef7aa97 100644 --- a/source/Mobs/PassiveAggressiveMonster.cpp +++ b/source/Mobs/PassiveAggressiveMonster.cpp @@ -20,7 +20,9 @@ cPassiveAggressiveMonster::cPassiveAggressiveMonster(void) void cPassiveAggressiveMonster::DoTakeDamage(TakeDamageInfo & a_TDI) { - if ((m_Target != NULL) && (m_Target->GetEntityType() == cEntity::eEntityType_Player)) + super::DoTakeDamage(a_TDI); + + if ((m_Target != NULL) && (m_Target->IsPlayer())) { cPlayer * Player = (cPlayer *) m_Target; if (Player->GetGameMode() != 1) -- cgit v1.2.3