Update CTakeDamageInfo & CTakeDamageResult

Author: Vauff

src/cs2_sdk/entity/ctakedamageinfo.h

@@ -136,52 +136,60 @@ class CTakeDamageInfo
 public:
 	void* m_hScriptInstance;								// 0xe0 | 224
 	AttackerInfo_t m_AttackerInfo;							// 0xe8 | 232
-	CUtlVector<int> m_nDestructibleHitGroupsToForceDestroy; // 0x100 | 256
-	bool m_bInTakeDamageFlow;								// 0x118 | 280
+	CUtlLeanVector<int> m_DestructibleHitGroupRequests;		// 0x100 | 256   CUtlLeanVector<DestructiblePartDamageRequest_t>
+	bool m_bInTakeDamageFlow;								// 0x110 | 272
 
 private:
 	[[maybe_unused]] int32_t m_nUnknown4; // 0x11c | 284
 };
-static_assert(sizeof(CTakeDamageInfo) == 288);
+static_assert(sizeof(CTakeDamageInfo) == 280);
 
 struct CTakeDamageResult
 {
+public:
 	CTakeDamageInfo* m_pOriginatingInfo;
+	CUtlLeanVector<int> m_DestructibleHitGroupRequests; // CUtlLeanVector<DestructiblePartDamageRequest_t>
 	int32_t m_nHealthLost;
 	int32_t m_nHealthBefore;
-	int32_t m_nDamageDealt;
+	float m_flDamageDealt;
 	float m_flPreModifiedDamage;
 	int32_t m_nTotalledHealthLost;
-	int32_t m_nTotalledDamageDealt;
+	float m_flTotalledDamageDealt;
 	float m_flTotalledPreModifiedDamage;
+	float m_flNewDamageAccumulatorValue;
+	TakeDamageFlags_t m_nDamageFlags;
 	bool m_bWasDamageSuppressed;
 	bool m_bSuppressFlinch;
 	HitGroup_t m_nOverrideFlinchHitGroup;
 
+private:
+	[[maybe_unused]] uint8_t m_nUnknown0[0x8];
+
+public:
 	void CopyFrom(CTakeDamageInfo* pInfo)
 	{
 		m_pOriginatingInfo = pInfo;
 		m_nHealthLost = static_cast<int32_t>(pInfo->m_flDamage);
 		m_nHealthBefore = 0;
-		m_nDamageDealt = static_cast<int32_t>(pInfo->m_flDamage);
+		m_flDamageDealt = pInfo->m_flDamage;
 		m_flPreModifiedDamage = pInfo->m_flDamage;
 		m_nTotalledHealthLost = static_cast<int32_t>(pInfo->m_flDamage);
-		m_nTotalledDamageDealt = static_cast<int32_t>(pInfo->m_flDamage);
+		m_flTotalledDamageDealt = pInfo->m_flDamage;
 		m_bWasDamageSuppressed = false;
 	}
 
 	CTakeDamageResult() = delete;
 
-	constexpr CTakeDamageResult(float damage) :
+	CTakeDamageResult(float damage) :
 		m_pOriginatingInfo(nullptr),
 		m_nHealthLost(static_cast<int32_t>(damage)),
 		m_nHealthBefore(0),
-		m_nDamageDealt(static_cast<int32_t>(damage)),
+		m_flDamageDealt(damage),
 		m_flPreModifiedDamage(damage),
 		m_nTotalledHealthLost(static_cast<int32_t>(damage)),
-		m_nTotalledDamageDealt(static_cast<int32_t>(damage)),
+		m_flTotalledDamageDealt(damage),
 		m_bWasDamageSuppressed(false)
 	{
 	}
 };
-static_assert(sizeof(CTakeDamageResult) == 48);
+static_assert(sizeof(CTakeDamageResult) == 80);

src/cs2fixes.cpp

@@ -1047,7 +1047,7 @@ bool CS2Fixes::Hook_OnTakeDamage_Alive(CTakeDamageResult* pDamageResult)
 	if (g_cvarEnableZR.Get() && ZR_Hook_OnTakeDamage_Alive(pDamageResult->m_pOriginatingInfo, pPawn))
 	{
 		pDamageResult->m_bWasDamageSuppressed = true;
-		pDamageResult->m_nDamageDealt = 0;
+		pDamageResult->m_flDamageDealt = 0.0f;
 		RETURN_META_VALUE(MRES_SUPERCEDE, false);
 	}
 

src/detours.cpp

@@ -155,8 +155,8 @@ int64 FASTCALL Detour_CBaseEntity_TakeDamageOld(CBaseEntity* pThis, CTakeDamageI
 
 	CBaseEntity_TakeDamageOld(pThis, pInfo, pResult);
 
-	if (pResult->m_nDamageDealt > 0 && !pResult->m_bWasDamageSuppressed && g_cvarEnableZR.Get() && pThis->IsPawn())
-		ZR_OnPlayerTakeDamage(reinterpret_cast<CCSPlayerPawn*>(pThis), pInfo, pResult->m_nDamageDealt);
+	if (pResult->m_flDamageDealt > 0.0f && !pResult->m_bWasDamageSuppressed && g_cvarEnableZR.Get() && pThis->IsPawn())
+		ZR_OnPlayerTakeDamage(reinterpret_cast<CCSPlayerPawn*>(pThis), pInfo, pResult->m_flDamageDealt);
 
 	return 1;
 }

src/zombiereborn.cpp

@@ -988,7 +988,7 @@ void ZR_OnPlayerSpawn(CCSPlayerController* pController)
 	});
 }
 
-void ZR_ApplyKnockback(CCSPlayerPawn* pHuman, CCSPlayerPawn* pVictim, int iDamage, const char* szWeapon, int hitgroup, float classknockback)
+void ZR_ApplyKnockback(CCSPlayerPawn* pHuman, CCSPlayerPawn* pVictim, float flDamage, const char* szWeapon, int hitgroup, float classknockback)
 {
 	std::shared_ptr<ZRWeapon> pWeapon = g_pZRWeaponConfig->FindWeapon(szWeapon);
 	std::shared_ptr<ZRHitgroup> pHitgroup = g_pZRHitgroupConfig->FindHitgroupIndex(hitgroup);
@@ -1003,7 +1003,7 @@ void ZR_ApplyKnockback(CCSPlayerPawn* pHuman, CCSPlayerPawn* pVictim, int iDamag
 
 	Vector vecKnockback;
 	AngleVectors(pHuman->m_angEyeAngles(), &vecKnockback);
-	vecKnockback *= (iDamage * g_cvarKnockbackScale.Get() * flWeaponKnockbackScale * flHitgroupKnockbackScale * classknockback);
+	vecKnockback *= (flDamage * g_cvarKnockbackScale.Get() * flWeaponKnockbackScale * flHitgroupKnockbackScale * classknockback);
 	pVictim->m_vecAbsVelocity = pVictim->m_vecAbsVelocity() + vecKnockback;
 }
 
@@ -1594,7 +1594,7 @@ void ZR_Hook_ClientCommand_JoinTeam(CPlayerSlot slot, const CCommand& args)
 		SpawnPlayer(pController);
 }
 
-void ZR_OnPlayerTakeDamage(CCSPlayerPawn* pVictimPawn, const CTakeDamageInfo* pInfo, const int32_t damage)
+void ZR_OnPlayerTakeDamage(CCSPlayerPawn* pVictimPawn, const CTakeDamageInfo* pInfo, const float damage)
 {
 	// bullet & knife only
 	if ((!(pInfo->m_bitsDamageType & DMG_BULLET) && !(pInfo->m_bitsDamageType & DMG_SLASH)) || !pInfo->m_pTrace || !pInfo->m_pTrace->m_pHitbox)

src/zombiereborn.h

@@ -267,7 +267,7 @@ void ZR_OnLevelInit();
 void ZR_OnRoundPrestart(IGameEvent* pEvent);
 void ZR_OnRoundStart(IGameEvent* pEvent);
 void ZR_OnPlayerSpawn(CCSPlayerController* pController);
-void ZR_OnPlayerTakeDamage(CCSPlayerPawn* pVictimPawn, const CTakeDamageInfo* pInfo, const int32 damage);
+void ZR_OnPlayerTakeDamage(CCSPlayerPawn* pVictimPawn, const CTakeDamageInfo* pInfo, const float damage);
 void ZR_OnPlayerDeath(IGameEvent* pEvent);
 void ZR_OnRoundFreezeEnd(IGameEvent* pEvent);
 void ZR_OnRoundTimeWarning(IGameEvent* pEvent);