source/hl2sdk
1
0
Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-12-07 18:48:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Touched up CTakeDamageInfo (bug 5084, r=DS).

Browse Source
This commit is contained in:
Nicholas Hastings 2011-09-09 15:17:50 -04:00
parent 998fd9a9e8
commit cb4f63f743
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
game/shared/takedamageinfo.cpp
View File

@ -28,6 +28,7 @@ BEGIN_SIMPLE_DATADESC( CTakeDamageInfo )
DEFINE_FIELD( m_iDamageCustom, FIELD_INTEGER), DEFINE_FIELD( m_iDamageCustom, FIELD_INTEGER),
DEFINE_FIELD( m_iDamageStats, FIELD_INTEGER), DEFINE_FIELD( m_iDamageStats, FIELD_INTEGER),
DEFINE_FIELD( m_iAmmoType, FIELD_INTEGER), DEFINE_FIELD( m_iAmmoType, FIELD_INTEGER),
DEFINE_FIELD( m_iDamagedOtherPlayers, FIELD_INTEGER),
END_DATADESC() 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 ) void CTakeDamageInfo::Init( CBaseEntity *pInflictor, CBaseEntity *pAttacker, CBaseEntity *pWeapon, const Vector &damageForce, const Vector &damagePosition, const Vector &reportedPosition, float flDamage, int bitsDamageType, int iCustomDamage )
@ -56,6 +57,9 @@ void CTakeDamageInfo::Init( CBaseEntity *pInflictor, CBaseEntity *pAttacker, CBa
m_vecDamagePosition = damagePosition; m_vecDamagePosition = damagePosition;
m_vecReportedPosition = reportedPosition; m_vecReportedPosition = reportedPosition;
m_iAmmoType = -1; m_iAmmoType = -1;
m_iDamagedOtherPlayers = 0;
m_iPlayerPenetrateCount = 0;
} }
CTakeDamageInfo::CTakeDamageInfo() CTakeDamageInfo::CTakeDamageInfo()

2
game/shared/takedamageinfo.h
View File

@ -112,7 +112,7 @@ protected:
int m_iDamageCustom; int m_iDamageCustom;
int m_iDamageStats; int m_iDamageStats;
int m_iAmmoType; // AmmoType of the weapon used to cause this damage, if any int m_iAmmoType; // AmmoType of the weapon used to cause this damage, if any
int m_iUnknown1; int m_iDamagedOtherPlayers;
int m_iPlayerPenetrateCount; int m_iPlayerPenetrateCount;
DECLARE_SIMPLE_DATADESC(); DECLARE_SIMPLE_DATADESC();