- Attack() is now called from cAggressive instead of cMonster
* Monsters can no longer attack through walls
* Should fix last remnants of player damage after teleporting (that both
STR and bearbin contributed fixes to :P)
This commit is contained in:
Tiger Wang
2014-02-11 22:09:56 +00:00
parent c53406f0d4
commit 06239c8336
5 changed files with 12 additions and 21 deletions
-14
View File
@@ -311,9 +311,6 @@ void cMonster::Tick(float a_Dt, cChunk & a_Chunk)
}
}
if (ReachedFinalDestination() && (m_Target != NULL))
Attack(a_Dt);
SetPitchAndYawFromDestination();
HandleFalling();
@@ -657,17 +654,6 @@ void cMonster::InStateEscaping(float a_Dt)
// Do attack here
// a_Dt is passed so we can set attack rate
void cMonster::Attack(float a_Dt)
{
m_AttackInterval += a_Dt * m_AttackRate;
}
void cMonster::GetMonsterConfig(const AString & a_Name)
{
cRoot::Get()->GetMonsterConfig()->AssignAttributes(this, a_Name);