From 6e5ad7185598a22ed0a44b4635850a895f11908a Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Tue, 24 Jan 2023 00:39:41 +0100 Subject: [PATCH] Remove hitbox drawing test code Was only hooked up to lag compensation code for testing. --- r5dev/game/server/baseanimating.cpp | 7 ------- r5dev/game/server/baseanimating.h | 7 ------- 2 files changed, 14 deletions(-) diff --git a/r5dev/game/server/baseanimating.cpp b/r5dev/game/server/baseanimating.cpp index 5508a821..e93dd201 100644 --- a/r5dev/game/server/baseanimating.cpp +++ b/r5dev/game/server/baseanimating.cpp @@ -80,16 +80,9 @@ CStudioHdr* CBaseAnimating::GetModelPtr(void) return (m_pStudioHdr && m_pStudioHdr->IsValid()) ? m_pStudioHdr : nullptr; } -void DrawServerHitboxes(CBaseAnimating* thisp, float duration) -{ - thisp->DrawServerHitboxes(duration); -} - void BaseAnimating_Attach() { - DetourAttach(&v_CBaseAnimating__DrawServerHitboxes, &DrawServerHitboxes); } void BaseAnimating_Detach() { - DetourDetach(&v_CBaseAnimating__DrawServerHitboxes, &DrawServerHitboxes); } \ No newline at end of file diff --git a/r5dev/game/server/baseanimating.h b/r5dev/game/server/baseanimating.h index 434585ff..ff0111eb 100644 --- a/r5dev/game/server/baseanimating.h +++ b/r5dev/game/server/baseanimating.h @@ -139,9 +139,6 @@ protected: inline CMemory p_CBaseAnimating__LockStudioHdr; inline auto v_CBaseAnimating__LockStudioHdr = p_CBaseAnimating__LockStudioHdr.RCast(); -inline CMemory p_CBaseAnimating__DrawServerHitboxes; -inline auto v_CBaseAnimating__DrawServerHitboxes = p_CBaseAnimating__DrawServerHitboxes.RCast(); - void BaseAnimating_Attach(); void BaseAnimating_Detach(); @@ -151,16 +148,12 @@ class VBaseAnimating : public IDetour virtual void GetAdr(void) const { spdlog::debug("| FUN: CBaseAnimating::LockStudioHdr : {:#18x} |\n", p_CBaseAnimating__LockStudioHdr.GetPtr()); - spdlog::debug("| FUN: CBaseAnimating::DrawServerHitboxes : {:#18x} |\n", p_CBaseAnimating__DrawServerHitboxes.GetPtr()); spdlog::debug("+----------------------------------------------------------------+\n"); } virtual void GetFun(void) const { p_CBaseAnimating__LockStudioHdr = g_GameDll.FindPatternSIMD("48 89 5C 24 ?? 48 89 74 24 ?? 41 56 48 83 EC 20 0F BF 41 58"); v_CBaseAnimating__LockStudioHdr = p_CBaseAnimating__LockStudioHdr.RCast(); - - p_CBaseAnimating__DrawServerHitboxes = g_GameDll.FindPatternSIMD("41 57 48 81 EC ?? ?? ?? ?? 48 83 B9 ?? ?? ?? ?? ?? 4C 8B F9"); // !FIXME NOT COMPAT WITH S0~S2! - v_CBaseAnimating__DrawServerHitboxes = p_CBaseAnimating__DrawServerHitboxes.RCast(); } virtual void GetVar(void) const { } virtual void GetCon(void) const { }