From 92c59963f82f81aa3202657e7fdbb2592924ede3 Mon Sep 17 00:00:00 2001 From: "cedeel@gmail.com" Date: Thu, 14 Jun 2012 13:06:06 +0000 Subject: Attempt to bring sanity to newlines across systems. git-svn-id: http://mc-server.googlecode.com/svn/trunk@606 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/cPassiveAggressiveMonster.cpp | 74 ++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 37 deletions(-) (limited to 'source/cPassiveAggressiveMonster.cpp') diff --git a/source/cPassiveAggressiveMonster.cpp b/source/cPassiveAggressiveMonster.cpp index 09e7b6a25..946ef86e0 100644 --- a/source/cPassiveAggressiveMonster.cpp +++ b/source/cPassiveAggressiveMonster.cpp @@ -1,38 +1,38 @@ - -#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules - -#include "cPassiveAggressiveMonster.h" - -#include "cPlayer.h" - - - - - -cPassiveAggressiveMonster::cPassiveAggressiveMonster() -{ - m_EMPersonality = PASSIVE; -} - -cPassiveAggressiveMonster::~cPassiveAggressiveMonster() -{ -} - -void cPassiveAggressiveMonster::TakeDamage(int a_Damage, cEntity* a_Instigator) -{ - cMonster::TakeDamage(a_Damage, a_Instigator); - if(m_Target->GetEntityType() == cEntity::eEntityType_Player) - { - cPlayer * Player = (cPlayer *) m_Target; - if(Player->GetGameMode() != 1) - { - m_EMState = CHASING; - } - } - -} - -void cPassiveAggressiveMonster::EventSeePlayer(cEntity *a_Entity) -{ - return cMonster::EventSeePlayer(a_Entity); + +#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules + +#include "cPassiveAggressiveMonster.h" + +#include "cPlayer.h" + + + + + +cPassiveAggressiveMonster::cPassiveAggressiveMonster() +{ + m_EMPersonality = PASSIVE; +} + +cPassiveAggressiveMonster::~cPassiveAggressiveMonster() +{ +} + +void cPassiveAggressiveMonster::TakeDamage(int a_Damage, cEntity* a_Instigator) +{ + cMonster::TakeDamage(a_Damage, a_Instigator); + if(m_Target->GetEntityType() == cEntity::eEntityType_Player) + { + cPlayer * Player = (cPlayer *) m_Target; + if(Player->GetGameMode() != 1) + { + m_EMState = CHASING; + } + } + +} + +void cPassiveAggressiveMonster::EventSeePlayer(cEntity *a_Entity) +{ + return cMonster::EventSeePlayer(a_Entity); } \ No newline at end of file -- cgit v1.2.3