Backups/hl2sdk
1
0
Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-09-19 20:16:10 +08:00
Code Activity

Fixed takedamageinfo (removed m_hWeapon) (bug 5196, r=ds).

Browse Source
This commit is contained in:
Nicholas Hastings
2011-12-20 11:14:19 -05:00
parent fee590cc59
commit f623cd05fe
1 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
game/shared/takedamageinfo.h
View File

@ -37,12 +37,6 @@ public:
CBaseEntity* GetInflictor() const; CBaseEntity* GetInflictor() const;
void SetInflictor( CBaseEntity *pInflictor ); void SetInflictor( CBaseEntity *pInflictor );
// Weapon is the weapon that did the attack.
// For hitscan weapons, it'll be the same as the inflictor. For projectile weapons, the projectile
// is the inflictor, and this contains the weapon that created the projectile.
CBaseEntity* GetWeapon() const;
void SetWeapon( CBaseEntity *pWeapon );
// Attacker is the character who originated the attack (like a player or an AI). // Attacker is the character who originated the attack (like a player or an AI).
CBaseEntity* GetAttacker() const; CBaseEntity* GetAttacker() const;
void SetAttacker( CBaseEntity *pAttacker ); void SetAttacker( CBaseEntity *pAttacker );
@ -104,7 +98,6 @@ protected:
Vector m_vecReportedPosition; // Position players are told damage is coming from Vector m_vecReportedPosition; // Position players are told damage is coming from
EHANDLE m_hInflictor; EHANDLE m_hInflictor;
EHANDLE m_hAttacker; EHANDLE m_hAttacker;
EHANDLE m_hWeapon;
float m_flDamage; float m_flDamage;
float m_flMaxDamage; float m_flMaxDamage;
float m_flBaseDamage; // The damage amount before skill leve adjustments are made. Used to get uniform damage forces. float m_flBaseDamage; // The damage amount before skill leve adjustments are made. Used to get uniform damage forces.
@ -181,17 +174,6 @@ inline void CTakeDamageInfo::SetAttacker( CBaseEntity *pAttacker )
m_hAttacker = pAttacker; m_hAttacker = pAttacker;
} }
inline CBaseEntity* CTakeDamageInfo::GetWeapon() const
{
return m_hWeapon;
}
inline void CTakeDamageInfo::SetWeapon( CBaseEntity *pWeapon )
{
m_hWeapon = pWeapon;
}
inline float CTakeDamageInfo::GetDamage() const inline float CTakeDamageInfo::GetDamage() const
{ {