Skip to content

Commit 75ed954

Browse files
committed
Address automatic review findings
1 parent cd02e27 commit 75ed954

2 files changed

Lines changed: 8 additions & 3 deletions

File tree

src/cs2fixes.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1309,7 +1309,7 @@ KHook::Return<bool> CS2Fixes::Hook_ProcessVoiceData(CServerSideClient* pClient,
13091309
return {KHook::Action::Ignore};
13101310

13111311
if (pPlayer->IsMuted())
1312-
return {KHook::Action::Supersede};
1312+
return {KHook::Action::Supersede, true};
13131313

13141314
if (GetGlobals())
13151315
pPlayer->SetLastVoiceTime(GetGlobals()->curtime);

src/detours.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ KHook::Return<int64> Detour_CBaseEntity_TakeDamageOld(CBaseEntity* pThis, CTakeD
242242

243243
KHook::Return<int64> Detour_CBaseEntity_TakeDamageOld_Post(CBaseEntity* pThis, CTakeDamageInfo* pInfo, CTakeDamageResult* pResult)
244244
{
245-
if (pResult->m_flDamageDealt > 0.0f && !pResult->m_bWasDamageSuppressed && g_cvarEnableZR.Get() && pThis->IsPawn())
245+
if (!KHook::WasOriginalFunctionSkipped() && pResult->m_flDamageDealt > 0.0f && !pResult->m_bWasDamageSuppressed && g_cvarEnableZR.Get() && pThis->IsPawn())
246246
ZR_OnPlayerTakeDamage(reinterpret_cast<CCSPlayerPawn*>(pThis), pInfo, pResult->m_flDamageDealt);
247247

248248
return {KHook::Action::Ignore};
@@ -639,7 +639,12 @@ KHook::Return<void> Detour_ProcessMovement(CCSPlayer_MovementServices* pThis, vo
639639

640640
KHook::Return<void> Detour_ProcessMovement_Post(CCSPlayer_MovementServices* pThis, void* pMove)
641641
{
642-
GetGlobals()->frametime = g_flStoreFrametime;
642+
if (g_flStoreFrametime != 0.0f)
643+
{
644+
GetGlobals()->frametime = g_flStoreFrametime;
645+
g_flStoreFrametime = 0.0f;
646+
}
647+
643648
return {KHook::Action::Ignore};
644649
}
645650

0 commit comments

Comments
 (0)