From 6379954153e2c0c0001139b7f7dce9835b17da15 Mon Sep 17 00:00:00 2001
From: Night Owl <sepulkarium45@yahoo.com>
Date: Wed, 5 Jul 2017 03:32:53 +0500
Subject: [PATCH] Merge
 https://github.com/SamVanheer/HLEnhanced/commit/e41b164fdffef1b89aa5286ae15c9617dfcf2188
 https://github.com/SamVanheer/HLEnhanced/commit/2da0a12d353f2078f1e2f6d931deb9c0f04e5b43

---
 dlls/gargantua.cpp | 14 ++++++++++++++
 dlls/islave.cpp    |  8 ++++++++
 2 files changed, 22 insertions(+)

diff --git a/dlls/gargantua.cpp b/dlls/gargantua.cpp
index 7f60b401..6aa6a738 100644
--- a/dlls/gargantua.cpp
+++ b/dlls/gargantua.cpp
@@ -200,6 +200,7 @@ class CGargantua : public CBaseMonster
 public:
 	void Spawn( void );
 	void Precache( void );
+	void UpdateOnRemove();
 	void SetYawSpeed( void );
 	int Classify( void );
 	int TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType );
@@ -802,6 +803,19 @@ void CGargantua::Precache()
 		PRECACHE_SOUND( (char *)pBreatheSounds[i] );
 }	
 
+void CGargantua::UpdateOnRemove()
+{
+	CBaseEntity::UpdateOnRemove();
+
+	if( m_pEyeGlow )
+	{
+		UTIL_Remove( m_pEyeGlow );
+		m_pEyeGlow = 0;
+	}
+
+	FlameDestroy();
+}
+
 void CGargantua::TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType )
 {
 	ALERT( at_aiconsole, "CGargantua::TraceAttack\n" );
diff --git a/dlls/islave.cpp b/dlls/islave.cpp
index 3b4343d3..51def5d3 100644
--- a/dlls/islave.cpp
+++ b/dlls/islave.cpp
@@ -44,6 +44,7 @@ class CISlave : public CSquadMonster
 public:
 	void Spawn( void );
 	void Precache( void );
+	void UpdateOnRemove();
 	void SetYawSpeed( void );
 	int ISoundMask( void );
 	int Classify( void );
@@ -557,6 +558,13 @@ void CISlave::Precache()
 	UTIL_PrecacheOther( "test_effect" );
 }
 
+void CISlave::UpdateOnRemove()
+{
+	CBaseEntity::UpdateOnRemove();
+
+	ClearBeams();
+}
+
 //=========================================================
 // TakeDamage - get provoked when injured
 //=========================================================