Skip to content

[L4D2] Added missing fields to the CTakeDamageInfo class #345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 19, 2025
Merged

[L4D2] Added missing fields to the CTakeDamageInfo class #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 17 additions & 11 deletions game/shared/takedamageinfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,20 @@ ConVar phys_pushscale( "phys_pushscale", "1", FCVAR_REPLICATED );

BEGIN_SIMPLE_DATADESC( CTakeDamageInfo )
DEFINE_FIELD( m_vecDamageForce, FIELD_VECTOR ),
DEFINE_FIELD( m_vecDamagePosition, FIELD_POSITION_VECTOR),
DEFINE_FIELD( m_vecReportedPosition, FIELD_POSITION_VECTOR),
DEFINE_FIELD( m_hInflictor, FIELD_EHANDLE),
DEFINE_FIELD( m_hAttacker, FIELD_EHANDLE),
DEFINE_FIELD( m_hWeapon, FIELD_EHANDLE),
DEFINE_FIELD( m_flDamage, FIELD_FLOAT),
DEFINE_FIELD( m_flMaxDamage, FIELD_FLOAT),
DEFINE_FIELD( m_vecDamagePosition, FIELD_POSITION_VECTOR ),
DEFINE_FIELD( m_vecReportedPosition, FIELD_POSITION_VECTOR ),
DEFINE_FIELD( m_hInflictor, FIELD_EHANDLE ),
DEFINE_FIELD( m_hAttacker, FIELD_EHANDLE ),
DEFINE_FIELD( m_hWeapon, FIELD_EHANDLE ),
DEFINE_FIELD( m_flDamage, FIELD_FLOAT ),
DEFINE_FIELD( m_flMaxDamage, FIELD_FLOAT ),
DEFINE_FIELD( m_flBaseDamage, FIELD_FLOAT ),
DEFINE_FIELD( m_bitsDamageType, FIELD_INTEGER),
DEFINE_FIELD( m_iDamageCustom, FIELD_INTEGER),
DEFINE_FIELD( m_iDamageStats, FIELD_INTEGER),
DEFINE_FIELD( m_iAmmoType, FIELD_INTEGER),
DEFINE_FIELD( m_bitsDamageType, FIELD_INTEGER ),
DEFINE_FIELD( m_iDamageCustom, FIELD_INTEGER ),
DEFINE_FIELD( m_iDamageStats, FIELD_INTEGER ),
DEFINE_FIELD( m_iAmmoType, FIELD_INTEGER ),
DEFINE_FIELD( m_flRadius, FIELD_FLOAT ),
DEFINE_FIELD( m_iDamageVictimIndex, FIELD_INTEGER ),
END_DATADESC()

void CTakeDamageInfo::Init( CBaseEntity *pInflictor, CBaseEntity *pAttacker, CBaseEntity *pWeapon, const Vector &damageForce, const Vector &damagePosition, const Vector &reportedPosition, float flDamage, int bitsDamageType, int iCustomDamage )
Expand Down Expand Up @@ -56,6 +58,10 @@ void CTakeDamageInfo::Init( CBaseEntity *pInflictor, CBaseEntity *pAttacker, CBa
m_vecDamagePosition = damagePosition;
m_vecReportedPosition = reportedPosition;
m_iAmmoType = -1;

m_vecDamageDirection = vec3_origin;
m_flRadius = 0.0;
m_iDamageVictimIndex = 0;
}

CTakeDamageInfo::CTakeDamageInfo()
Expand Down
42 changes: 41 additions & 1 deletion game/shared/takedamageinfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,15 @@ class CTakeDamageInfo
void SetAmmoType( int iAmmoType );
const char * GetAmmoName() const;

Vector GetDamageDirection() const;
void SetDamageDirection( const Vector &damageDirection );

float GetRadius() const;
void SetRadius( float flRadius );

float GetVictimIndex() const;
void SetVictimIndex( int iVictimIndex );

void Set( CBaseEntity *pInflictor, CBaseEntity *pAttacker, float flDamage, int bitsDamageType, int iKillType = 0 );
void Set( CBaseEntity *pInflictor, CBaseEntity *pAttacker, CBaseEntity *pWeapon, float flDamage, int bitsDamageType, int iKillType = 0 );
void Set( CBaseEntity *pInflictor, CBaseEntity *pAttacker, const Vector &damageForce, const Vector &damagePosition, float flDamage, int bitsDamageType, int iKillType = 0, Vector *reportedPosition = NULL );
Expand All @@ -102,7 +111,7 @@ class CTakeDamageInfo
Vector m_vecDamageForce;
Vector m_vecDamagePosition;
Vector m_vecReportedPosition; // Position players are told damage is coming from
Vector m_vecUnknown;
Vector m_vecDamageDirection; // The type matches, but I'm not sure about the name; the name is taken from new games.
EHANDLE m_hInflictor;
EHANDLE m_hAttacker;
EHANDLE m_hWeapon;
Expand All @@ -113,6 +122,8 @@ class CTakeDamageInfo
int m_iDamageCustom;
int m_iDamageStats;
int m_iAmmoType; // AmmoType of the weapon used to cause this damage, if any
int m_flRadius;
int m_iDamageVictimIndex;

DECLARE_SIMPLE_DATADESC();
};
Expand Down Expand Up @@ -331,6 +342,35 @@ inline void CTakeDamageInfo::CopyDamageToBaseDamage()
m_flBaseDamage = m_flDamage;
}

inline Vector CTakeDamageInfo::GetDamageDirection() const
{
return m_vecDamageDirection;
}

inline void CTakeDamageInfo::SetDamageDirection( const Vector &damageDirection )
{
m_vecDamageDirection = damageDirection;
}

inline float CTakeDamageInfo::GetRadius() const
{
return m_flRadius;
}

inline void CTakeDamageInfo::SetRadius( float flRadius )
{
m_flRadius = flRadius;
}

inline float CTakeDamageInfo::GetVictimIndex() const
{
return m_iDamageVictimIndex;
}

inline void CTakeDamageInfo::SetVictimIndex( int iVictimIndex )
{
m_iDamageVictimIndex = iVictimIndex;
}

// -------------------------------------------------------------------------------------------------- //
// Inlines.
Expand Down