FWGS
/
hlsdk-xash3d
mirror of https://github.com/FWGS/hlsdk-xash3d
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge e41b164fdf 2da0a12d35

This commit is contained in:
Night Owl 2017-07-05 03:32:53 +05:00
parent f22f1331af
commit 6379954153
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/gargantua.cpp
View File

@ -200,6 +200,7 @@ class CGargantua : public CBaseMonster
public: public:
void Spawn( void ); void Spawn( void );
void Precache( void ); void Precache( void );
void UpdateOnRemove();
void SetYawSpeed( void ); void SetYawSpeed( void );
int Classify( void ); int Classify( void );
int TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType ); int TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, int bitsDamageType );
@ -802,6 +803,19 @@ void CGargantua::Precache()
PRECACHE_SOUND( (char *)pBreatheSounds[i] ); 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 ) void CGargantua::TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir, TraceResult *ptr, int bitsDamageType )
{ {
ALERT( at_aiconsole, "CGargantua::TraceAttack\n" ); ALERT( at_aiconsole, "CGargantua::TraceAttack\n" );

8
dlls/islave.cpp
View File

@ -44,6 +44,7 @@ class CISlave : public CSquadMonster
public: public:
void Spawn( void ); void Spawn( void );
void Precache( void ); void Precache( void );
void UpdateOnRemove();
void SetYawSpeed( void ); void SetYawSpeed( void );
int ISoundMask( void ); int ISoundMask( void );
int Classify( void ); int Classify( void );
@ -557,6 +558,13 @@ void CISlave::Precache()
UTIL_PrecacheOther( "test_effect" ); UTIL_PrecacheOther( "test_effect" );
} }
void CISlave::UpdateOnRemove()
{
CBaseEntity::UpdateOnRemove();
ClearBeams();
}
//========================================================= //=========================================================
// TakeDamage - get provoked when injured // TakeDamage - get provoked when injured
//========================================================= //=========================================================