Backups/hl2sdk
1
0
Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-01-07 09:43:40 +08:00
Code

Update CTakeDamageInfo from Source SDK 2013.

Browse Source
This commit is contained in:
Nicholas Hastings 2015-11-11 12:53:54 -05:00
parent 02a7e3c497
commit dbe9d8ab8e
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
game/shared/takedamageinfo.cpp
View File

@ -61,6 +61,7 @@ void CTakeDamageInfo::Init( CBaseEntity *pInflictor, CBaseEntity *pAttacker, CBa
m_iPlayerPenetrationCount = 0; m_iPlayerPenetrationCount = 0;
m_flDamageBonus = 0.f; m_flDamageBonus = 0.f;
m_bForceFriendlyFire = false; m_bForceFriendlyFire = false;
m_flDamageForForce = 0.f;
} }
CTakeDamageInfo::CTakeDamageInfo() CTakeDamageInfo::CTakeDamageInfo()

26
game/shared/takedamageinfo.h
View File

@ -55,7 +55,8 @@ public:
void AddDamage( float flAddAmount ); void AddDamage( float flAddAmount );
void SubtractDamage( float flSubtractAmount ); void SubtractDamage( float flSubtractAmount );
float GetDamageBonus() const; float GetDamageBonus() const;
void SetDamageBonus( float flBonus ); CBaseEntity *GetDamageBonusProvider() const;
void SetDamageBonus( float flBonus, CBaseEntity *pProvider = NULL );
float GetBaseDamage() const; float GetBaseDamage() const;
bool BaseDamageIsValid() const; bool BaseDamageIsValid() const;
@ -63,6 +64,8 @@ public:
Vector GetDamageForce() const; Vector GetDamageForce() const;
void SetDamageForce( const Vector &damageForce ); void SetDamageForce( const Vector &damageForce );
void ScaleDamageForce( float flScaleAmount ); void ScaleDamageForce( float flScaleAmount );
float GetDamageForForceCalc() const;
void SetDamageForForceCalc( const float flScaleAmount );
Vector GetDamagePosition() const; Vector GetDamagePosition() const;
void SetDamagePosition( const Vector &damagePosition ); void SetDamagePosition( const Vector &damagePosition );
@ -125,8 +128,11 @@ protected:
int m_iDamagedOtherPlayers; int m_iDamagedOtherPlayers;
int m_iPlayerPenetrationCount; int m_iPlayerPenetrationCount;
float m_flDamageBonus; // Anything that increases damage (crit) - store the delta float m_flDamageBonus; // Anything that increases damage (crit) - store the delta
EHANDLE m_hDamageBonusProvider; // Who gave us the ability to do extra damage?
bool m_bForceFriendlyFire; // Ideally this would be a dmg type, but we can't add more bool m_bForceFriendlyFire; // Ideally this would be a dmg type, but we can't add more
float m_flDamageForForce;
DECLARE_SIMPLE_DATADESC(); DECLARE_SIMPLE_DATADESC();
}; };
@ -247,9 +253,15 @@ inline float CTakeDamageInfo::GetDamageBonus() const
return m_flDamageBonus; return m_flDamageBonus;
} }
inline void CTakeDamageInfo::SetDamageBonus( float flBonus ) inline CBaseEntity *CTakeDamageInfo::GetDamageBonusProvider() const
{
return m_hDamageBonusProvider;
}
inline void CTakeDamageInfo::SetDamageBonus( float flBonus, CBaseEntity *pProvider /*= NULL*/ )
{ {
m_flDamageBonus = flBonus; m_flDamageBonus = flBonus;
m_hDamageBonusProvider = pProvider;
} }
inline float CTakeDamageInfo::GetBaseDamage() const inline float CTakeDamageInfo::GetBaseDamage() const
@ -281,6 +293,16 @@ inline void CTakeDamageInfo::ScaleDamageForce( float flScaleAmount )
m_vecDamageForce *= flScaleAmount; m_vecDamageForce *= flScaleAmount;
} }
inline float CTakeDamageInfo::GetDamageForForceCalc() const
{
return m_flDamageForForce;
}
inline void CTakeDamageInfo::SetDamageForForceCalc( float flDamage )
{
m_flDamageForForce = flDamage;
}
inline Vector CTakeDamageInfo::GetDamagePosition() const inline Vector CTakeDamageInfo::GetDamagePosition() const
{ {
return m_vecDamagePosition; return m_vecDamagePosition;