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/cPassiveMonster.cpp | 90 +++++++++++++++++++++++----------------------- 1 file changed, 45 insertions(+), 45 deletions(-) (limited to 'source/cPassiveMonster.cpp') diff --git a/source/cPassiveMonster.cpp b/source/cPassiveMonster.cpp index ad6da16f7..7a4bc6979 100644 --- a/source/cPassiveMonster.cpp +++ b/source/cPassiveMonster.cpp @@ -1,46 +1,46 @@ - -#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules - -#include "cPassiveMonster.h" -#include "MersenneTwister.h" - - - - - -cPassiveMonster::cPassiveMonster() -{ - m_EMPersonality = PASSIVE; -} - -cPassiveMonster::~cPassiveMonster() -{ -} - -void cPassiveMonster::TakeDamage(int a_Damage, cEntity* a_Instigator) -{ - cMonster::TakeDamage(a_Damage, a_Instigator); - if(a_Instigator != this) - m_EMState = ESCAPING; -} - -void cPassiveMonster::Tick(float a_Dt) -{ - cMonster::Tick(a_Dt); - - m_SeePlayerInterval += a_Dt; - - if(m_SeePlayerInterval > 1) - { - MTRand r1; - int rem = r1.randInt() % 3 + 1; //check most of the time but miss occasionally - - m_SeePlayerInterval = 0.0; - if(rem >= 2) { - if(m_EMState == ESCAPING) - { - CheckEventLostPlayer(); - } - } - } + +#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules + +#include "cPassiveMonster.h" +#include "MersenneTwister.h" + + + + + +cPassiveMonster::cPassiveMonster() +{ + m_EMPersonality = PASSIVE; +} + +cPassiveMonster::~cPassiveMonster() +{ +} + +void cPassiveMonster::TakeDamage(int a_Damage, cEntity* a_Instigator) +{ + cMonster::TakeDamage(a_Damage, a_Instigator); + if(a_Instigator != this) + m_EMState = ESCAPING; +} + +void cPassiveMonster::Tick(float a_Dt) +{ + cMonster::Tick(a_Dt); + + m_SeePlayerInterval += a_Dt; + + if(m_SeePlayerInterval > 1) + { + MTRand r1; + int rem = r1.randInt() % 3 + 1; //check most of the time but miss occasionally + + m_SeePlayerInterval = 0.0; + if(rem >= 2) { + if(m_EMState == ESCAPING) + { + CheckEventLostPlayer(); + } + } + } } \ No newline at end of file -- cgit v1.2.3