Skip to content

Commit 9481893

Browse files
committed
fix TakeDamage crash
1 parent c1b3be7 commit 9481893

3 files changed

Lines changed: 4 additions & 1 deletion

File tree

src/addresses.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ bool addresses::Initialize(CGameConfig* g_GameConfig)
7171
RESOLVE_SIG(g_GameConfig, "CTakeDamageInfo", addresses::CTakeDamageInfo_Constructor);
7272
RESOLVE_SIG(g_GameConfig, "CCSPlayer_WeaponServices_EquipWeapon", addresses::CCSPlayer_WeaponServices_EquipWeapon);
7373
RESOLVE_SIG(g_GameConfig, "GetSpawnGroups", addresses::GetSpawnGroups);
74+
RESOLVE_SIG(g_GameConfig, "CBaseEntity_TakeDamageOld", addresses::CBaseEntity_TakeDamageOld);
7475

7576
return InitializeBanMap(g_GameConfig);
7677
}

src/addresses.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ class CBasePlayerWeapon;
5959
class CSpawnGroupMgrGameSystem;
6060
struct EmitSound_t;
6161
struct StartSoundEventInfo;
62+
struct CTakeDamageResult;
6263

6364
// Can't be forward-declared, can't include cgamerules.h.. just define it here
6465
struct CGcBanInformation_t
@@ -106,4 +107,5 @@ namespace addresses
106107
const Vector* vecDamageForce, const Vector* vecDamagePosition, float flDamage, int bitsDamageType, int iCustomDamage, void* a10);
107108
inline void(FASTCALL* CCSPlayer_WeaponServices_EquipWeapon)(CCSPlayer_WeaponServices* pWeaponServices, CBasePlayerWeapon* pPlayerWeapon);
108109
inline void(FASTCALL* GetSpawnGroups)(CSpawnGroupMgrGameSystem* pSpawnGroupMgr, CUtlVector<SpawnGroupHandle_t>* pList);
110+
inline int64(FASTCALL* CBaseEntity_TakeDamageOld)(CBaseEntity* pThis, CTakeDamageInfo* pInfo, CTakeDamageResult* pResult);
109111
} // namespace addresses

src/cs2_sdk/entity/cbaseentity.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ class CBaseEntity : public CEntityInstance
171171

172172
void TakeDamage(CTakeDamageInfo& info)
173173
{
174-
Detour_CBaseEntity_TakeDamageOld(this, &info, 0);
174+
addresses::CBaseEntity_TakeDamageOld(this, &info, 0);
175175
}
176176

177177
void Teleport(const Vector* pPosition, const QAngle* pAngles, const Vector* pVelocity)

0 commit comments

Comments
 (0)