From 9f77572fb0d045229556314ba9d7aa0f52ad5635 Mon Sep 17 00:00:00 2001 From: "lapayo94@gmail.com" Date: Mon, 26 Dec 2011 20:57:12 +0000 Subject: - improved Simulator system -> Manager handles all ticks -> advantage: Much easier to add new simulators, because you only have to register them in the manager MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - moved sand and gravel simulation to a Simulator-class (cSandSimulator) - Made Squid a little bit more funny and realistic, because it dies now when it´s not in water -Escaping mobs run now faster than normal (They just walked away before :D) git-svn-id: http://mc-server.googlecode.com/svn/trunk@125 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/cPassiveMonster.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/cPassiveMonster.cpp') diff --git a/source/cPassiveMonster.cpp b/source/cPassiveMonster.cpp index 1f11484ef..0879ebbee 100644 --- a/source/cPassiveMonster.cpp +++ b/source/cPassiveMonster.cpp @@ -14,7 +14,8 @@ cPassiveMonster::~cPassiveMonster() void cPassiveMonster::TakeDamage(int a_Damage, cEntity* a_Instigator) { cMonster::TakeDamage(a_Damage, a_Instigator); - m_EMState = ESCAPING; + if(a_Instigator != this) + m_EMState = ESCAPING; } void cPassiveMonster::Tick(float a_Dt) -- cgit v1.2.3