From 2185c72c2ca2d66b238d7d3234c173bd820d32ac Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Sat, 7 Jun 2014 16:32:37 -0700
Subject: Implemented drinkable potions, noeffect entity effect,

Clears entity effects on death
---
 src/Entities/EntityEffects.h |  1 +
 src/Entities/Pawn.cpp        | 14 ++++++++++++++
 src/Entities/Pawn.h          |  1 +
 3 files changed, 16 insertions(+)

(limited to 'src/Entities')

diff --git a/src/Entities/EntityEffects.h b/src/Entities/EntityEffects.h
index 2bda2e104..137eb6480 100644
--- a/src/Entities/EntityEffects.h
+++ b/src/Entities/EntityEffects.h
@@ -9,6 +9,7 @@ public:
 	/** All types of entity effects (numbers correspond to IDs) */
 	enum eType
 	{
+		efNoEffect       = 0,
 		efSpeed          = 1,
 		efSlowness       = 2,
 		efHaste          = 3,
diff --git a/src/Entities/Pawn.cpp b/src/Entities/Pawn.cpp
index 4c840e6e1..5cf270006 100644
--- a/src/Entities/Pawn.cpp
+++ b/src/Entities/Pawn.cpp
@@ -52,8 +52,22 @@ void cPawn::Tick(float a_Dt, cChunk & a_Chunk)
 
 
 
+void cPawn::KilledBy(cEntity *a_Killer)
+{
+	ClearEntityEffects();
+}
+
+
+
+
+
 void cPawn::AddEntityEffect(cEntityEffect::eType a_EffectType, cEntityEffect a_Effect)
 {
+	if (a_EffectType == cEntityEffect::efNoEffect)
+	{
+		return;
+	}
+	
 	m_EntityEffects[a_EffectType] = a_Effect;
 	m_World->BroadcastEntityEffect(*this, a_EffectType, a_Effect.GetIntensity(), a_Effect.m_Ticks);
 }
diff --git a/src/Entities/Pawn.h b/src/Entities/Pawn.h
index 857488901..47fb691f4 100644
--- a/src/Entities/Pawn.h
+++ b/src/Entities/Pawn.h
@@ -21,6 +21,7 @@ public:
 	cPawn(eEntityType a_EntityType, double a_Width, double a_Height);
 	
 	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
+	virtual void KilledBy(cEntity * a_Killer) override;
 	
 	/** Applies an entity effect
 	 *  @param a_EffectType The entity effect to apply
-- 
cgit v1.2.3