Paintings: add sound effects, remove critical hitting (#5276)
This commit is contained in:
parent
6a4460383e
commit
4221e08f3a
|
@ -61,6 +61,7 @@ p-mcgowan
|
||||||
pokechu22
|
pokechu22
|
||||||
ProjectBM
|
ProjectBM
|
||||||
pwnOrbitals
|
pwnOrbitals
|
||||||
|
Rorkh
|
||||||
rs2k
|
rs2k
|
||||||
SamJBarney
|
SamJBarney
|
||||||
Schwertspize
|
Schwertspize
|
||||||
|
|
|
@ -390,6 +390,18 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (IsPainting())
|
||||||
|
{
|
||||||
|
KilledBy(a_TDI);
|
||||||
|
|
||||||
|
if (a_TDI.Attacker != nullptr)
|
||||||
|
{
|
||||||
|
a_TDI.Attacker->Killed(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
if ((a_TDI.Attacker != nullptr) && (a_TDI.Attacker->IsPlayer()))
|
if ((a_TDI.Attacker != nullptr) && (a_TDI.Attacker->IsPlayer()))
|
||||||
{
|
{
|
||||||
cPlayer * Player = static_cast<cPlayer *>(a_TDI.Attacker);
|
cPlayer * Player = static_cast<cPlayer *>(a_TDI.Attacker);
|
||||||
|
|
|
@ -24,6 +24,8 @@ void cPainting::SpawnOn(cClientHandle & a_Client)
|
||||||
{
|
{
|
||||||
Super::SpawnOn(a_Client);
|
Super::SpawnOn(a_Client);
|
||||||
a_Client.SendPaintingSpawn(*this);
|
a_Client.SendPaintingSpawn(*this);
|
||||||
|
|
||||||
|
m_World->BroadcastSoundEffect("entity.painting.place", GetPosition(), 1, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -41,3 +43,10 @@ void cPainting::GetDrops(cItems & a_Items, cEntity * a_Killer)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
void cPainting::KilledBy(TakeDamageInfo & a_TDI)
|
||||||
|
{
|
||||||
|
Super::KilledBy(a_TDI);
|
||||||
|
m_World->BroadcastSoundEffect("entity.painting.break", GetPosition(), 1, 1);
|
||||||
|
Destroy();
|
||||||
|
}
|
||||||
|
|
|
@ -28,11 +28,7 @@ private:
|
||||||
|
|
||||||
virtual void SpawnOn(cClientHandle & a_Client) override;
|
virtual void SpawnOn(cClientHandle & a_Client) override;
|
||||||
virtual void GetDrops(cItems & a_Items, cEntity * a_Killer) override;
|
virtual void GetDrops(cItems & a_Items, cEntity * a_Killer) override;
|
||||||
virtual void KilledBy(TakeDamageInfo & a_TDI) override
|
virtual void KilledBy(TakeDamageInfo & a_TDI) override;
|
||||||
{
|
|
||||||
Super::KilledBy(a_TDI);
|
|
||||||
Destroy();
|
|
||||||
}
|
|
||||||
|
|
||||||
AString m_Name;
|
AString m_Name;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user