16aeb84cd3
* Fix potential destruction crashes * Fix destructors accessing destroyted objects * Fix cPlayer not destroying windows (Destroyed never called) * Tentatively fixes #4608, fixes #3236, fixes #3262 - Remove cEntity::Destroyed() and replace with cEntity::OnRemoveFromWorld() * Add missing call to OnRemoveFromWorld
69 lines
1.2 KiB
C++
69 lines
1.2 KiB
C++
|
|
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
|
|
|
|
#include "PassiveMonster.h"
|
|
#include "../World.h"
|
|
#include "../Entities/Player.h"
|
|
#include "../BoundingBox.h"
|
|
#include "../Items/ItemSpawnEgg.h"
|
|
|
|
|
|
|
|
|
|
cPassiveMonster::cPassiveMonster(const AString & a_ConfigName, eMonsterType a_MobType, const AString & a_SoundHurt, const AString & a_SoundDeath, const AString & a_SoundAmbient, double a_Width, double a_Height) :
|
|
Super(a_ConfigName, a_MobType, a_SoundHurt, a_SoundDeath, a_SoundAmbient, a_Width, a_Height)
|
|
{
|
|
m_EMPersonality = PASSIVE;
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool cPassiveMonster::DoTakeDamage(TakeDamageInfo & a_TDI)
|
|
{
|
|
if (!Super::DoTakeDamage(a_TDI))
|
|
{
|
|
return false;
|
|
}
|
|
if ((a_TDI.Attacker != this) && (a_TDI.Attacker != nullptr))
|
|
{
|
|
m_EMState = ESCAPING;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void cPassiveMonster::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
|
|
{
|
|
Super::Tick(a_Dt, a_Chunk);
|
|
if (!IsTicking())
|
|
{
|
|
// The base class tick destroyed us
|
|
return;
|
|
}
|
|
|
|
if (m_EMState == ESCAPING)
|
|
{
|
|
CheckEventLostPlayer(a_Dt);
|
|
}
|
|
|
|
cMonster::LoveTick();
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void cPassiveMonster::OnRightClicked(cPlayer & a_Player)
|
|
{
|
|
Super::OnRightClicked(a_Player);
|
|
Super::RightClickFeed(a_Player);
|
|
}
|
|
|
|
|
|
|