valve/source-sdk-2013
0
0
Fork 0
mirror of https://github.com/ValveSoftware/source-sdk-2013.git synced 2025-04-06 18:12:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

allow deployed SLAM to be shot

Browse source 
shooting a deployed SLAM now causes it to detonate again
This commit is contained in:
tonysergi 2013-12-06 12:21:13 +09:00
parent c6576b431a
commit 11b50445a8
2 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
mp/src/game/server/hl2mp/grenade_tripmine.cpp
View file

@ -132,6 +132,7 @@ void CTripmineGrenade::PowerupThink( void )
{
if (gpGlobals->curtime > m_flPowerUp)
{
m_flPowerUp = 0;
MakeBeam( );
RemoveSolidFlags( FSOLID_NOT_SOLID );
m_bIsLive = true;
@ -166,8 +167,6 @@ void CTripmineGrenade::MakeBeam( void )
m_flBeamLength = tr.fraction;
// If I hit a living thing, send the beam through me so it turns on briefly
// and then blows the living thing up
CBaseEntity *pEntity = tr.m_pEnt;
@ -259,22 +258,22 @@ void CTripmineGrenade::BeamBreakThink( void )
SetNextThink( gpGlobals->curtime + 0.05f );
}
#if 0 // FIXME: OnTakeDamage_Alive() is no longer called now that base grenade derives from CBaseAnimating
int CTripmineGrenade::OnTakeDamage_Alive( const CTakeDamageInfo &info )
int CTripmineGrenade::OnTakeDamage( const CTakeDamageInfo &info )
{
if (gpGlobals->curtime < m_flPowerUp && info.GetDamage() < m_iHealth)
if ( m_iHealth < 0 )
return 0; //already dead.
if ( gpGlobals->curtime > m_flPowerUp )
{
// disable
// Create( "weapon_tripmine", GetLocalOrigin() + m_vecDir * 24, GetAngles() );
SetThink( &CTripmineGrenade::SUB_Remove );
SetNextThink( gpGlobals->curtime + 0.1f );
KillBeam();
return FALSE;
m_iHealth -= info.GetDamage();
if ( m_iHealth <= 0 )
Event_Killed( info );
return info.GetDamage();
}
return BaseClass::OnTakeDamage_Alive( info );
return 0;
}
#endif
//-----------------------------------------------------------------------------
// Purpose:

4
mp/src/game/server/hl2mp/grenade_tripmine.h
View file

@ -29,9 +29,7 @@ public:
void Spawn( void );
void Precache( void );
#if 0 // FIXME: OnTakeDamage_Alive() is no longer called now that base grenade derives from CBaseAnimating
int OnTakeDamage_Alive( const CTakeDamageInfo &info );
#endif
virtual int OnTakeDamage( const CTakeDamageInfo &info );
void WarningThink( void );
void PowerupThink( void );
void BeamBreakThink( void );