From 07619d932d703611c2e3e1296871bee5e27876b7 Mon Sep 17 00:00:00 2001 From: Alexander Harkness Date: Tue, 16 Jan 2018 19:13:17 +0000 Subject: Exp Orbs and Pickups are destroyed instantly by cacti. (#4136) * Cactus detection code follows pattern set in #3996 * Pickups are now destroyed on cactus contact * Add cactus detection and destruction to Exp Orbs Remove checks for IsExpOrb() in cEntity::Tick() Exp Orbs do not call super::Tick() and so this condition was pointless. --- src/Entities/ExpOrb.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/Entities/ExpOrb.h') diff --git a/src/Entities/ExpOrb.h b/src/Entities/ExpOrb.h index 83672ea02..20ac6e304 100644 --- a/src/Entities/ExpOrb.h +++ b/src/Entities/ExpOrb.h @@ -23,6 +23,9 @@ public: // Override functions virtual void Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override; + + virtual bool DoTakeDamage(TakeDamageInfo & a_TDI) override; + virtual void SpawnOn(cClientHandle & a_Client) override; // tolua_begin -- cgit v1.2.3