From 90a43258579a854a9bb81b78cebcd3cad71aabc1 Mon Sep 17 00:00:00 2001 From: ineedbots Date: Wed, 30 Jun 2021 02:11:07 -0600 Subject: [PATCH] Fix clipping through dobjs --- src/Components/Modules/Player.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Components/Modules/Player.cpp b/src/Components/Modules/Player.cpp index 790f715..e636d4b 100644 --- a/src/Components/Modules/Player.cpp +++ b/src/Components/Modules/Player.cpp @@ -26,10 +26,12 @@ namespace Components } } - void Player::CM_Trace_Func(float* a1, float* a2, float* a3, int a4, float* a5, int a6, int a7) + void Player::CM_Trace_Func(float* a1, float* a2, float* a3, int a4, float* a5, int a6, int contentmask) { - if (g_playerCollision->current.boolean) - Game::CM_Trace(a1, a2, a3, a4, a5, a6, a7); + if (!g_playerCollision->current.boolean) + contentmask &= ~0x2000000; // remove the CONTENT_BODY bit + + Game::CM_Trace(a1, a2, a3, a4, a5, a6, contentmask); } __declspec(naked) void Player::CM_Trace_Stub()