flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Refactored the TakeDamage API to take equipped weapon and armor into consideration (PvP untested)

Browse Source 
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
This commit is contained in:
madmaxoft@gmail.com
2012-12-21 11:04:08 +00:00
parent 231d6aed35
commit 912a1e7adc
62 changed files with 2532 additions and 1140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
source/Mobs/PassiveMonster.cpp
View File

@@ -8,21 +8,27 @@
cPassiveMonster::cPassiveMonster()
cPassiveMonster::cPassiveMonster(void)
{
m_EMPersonality = PASSIVE;
}
cPassiveMonster::~cPassiveMonster()
void cPassiveMonster::DoTakeDamage(TakeDamageInfo & a_TDI)
{
super::DoTakeDamage(a_TDI);
if ((a_TDI.Attacker != this) && (a_TDI.Attacker != NULL))
{
m_EMState = ESCAPING;
}
}
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)
{
@@ -30,17 +36,22 @@ void cPassiveMonster::Tick(float a_Dt)
m_SeePlayerInterval += a_Dt;
if(m_SeePlayerInterval > 1)
if (m_SeePlayerInterval > 1) // Check every second
{
MTRand r1;
int rem = r1.randInt() % 3 + 1; //check most of the time but miss occasionally
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)
if (rem >= 2)
{
if (m_EMState == ESCAPING)
{
CheckEventLostPlayer();
}
}
}
}
}