From f5529e544cf8350daf8a20bb8d997f85ee2824f7 Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Mon, 16 Jun 2014 20:22:17 -0700
Subject: EntityEffects.x -> EntityEffect.x, Object-Oriented effects

Changed effect map to take a pointer of the effect as a result.
---
 src/Mobs/Monster.cpp | 45 ---------------------------------------------
 1 file changed, 45 deletions(-)

(limited to 'src/Mobs/Monster.cpp')

diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp
index 4c59960f6..a51315ecf 100644
--- a/src/Mobs/Monster.cpp
+++ b/src/Mobs/Monster.cpp
@@ -436,51 +436,6 @@ void cMonster::HandleFalling()
 
 
 
-void cMonster::HandleEntityEffect(cEntityEffect::eType a_EffectType, cEntityEffect a_Effect)
-{
-	switch (a_EffectType)
-	{
-		case cEntityEffect::effPoison:
-		{
-			// Default effect for non-undead mobs and non-spiders
-			if (!IsUndead() && GetMobType() != mtSpider) break;
-			return; // No effect
-		}
-		case cEntityEffect::effRegeneration:
-		{
-			// Default effect for non-undead mobs
-			if (!IsUndead() && GetMobType()) break;
-			return; // No effect
-		}
-		case cEntityEffect::effInstantDamage:
-		{
-			// Default effect for non-undead mobs
-			if (!IsUndead() && GetMobType()) break;
-			
-			// Undead mobs are healed by instant damage
-			// Base heal = 6, doubles for every increase in intensity
-			Heal((int)(6 * std::pow(2.0, a_Effect.GetIntensity()) * a_Effect.GetDistanceModifier()));
-			return;
-		}
-		case cEntityEffect::effInstantHealth:
-		{
-			// Default effect for non-undead mobs
-			if (!IsUndead() && GetMobType()) break;
-			
-			// Undead mobs are damaged by instant health
-			// Base damage = 6, doubles for every increase in intensity
-			int damage = (int)(6 * std::pow(2.0, a_Effect.GetIntensity()) * a_Effect.GetDistanceModifier());
-			TakeDamage(dtPotionOfHarming, a_Effect.GetCreator(), damage, 0);
-			return;
-		}
-	}
-	
-	super::HandleEntityEffect(a_EffectType, a_Effect);
-}
-
-
-
-
 int cMonster::FindFirstNonAirBlockPosition(double a_PosX, double a_PosZ)
 {
 	int PosY = POSY_TOINT;
-- 
cgit v1.2.3