From 18f9f37b1262c07db8b912ac31346281dc17e8cc Mon Sep 17 00:00:00 2001 From: Nexius Date: Sat, 12 Oct 2024 03:14:33 +0300 Subject: [PATCH] Invalid camera mode checks improve it once again, make a wider list --- Server/Source/player_pool.hpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Server/Source/player_pool.hpp b/Server/Source/player_pool.hpp index 31d4af8c1..81db9de55 100644 --- a/Server/Source/player_pool.hpp +++ b/Server/Source/player_pool.hpp @@ -870,12 +870,15 @@ struct PlayerPool final : public IPlayerPool, public NetworkEventHandler, public player.aimingData_.aspectRatio = (aimSync.AspectRatio * 1.f / 255) + 1.f; // Check for invalid camera modes - if (aimSync.CamMode < 0u || aimSync.CamMode > 65u) - aimSync.CamMode = 4u; - - // Fix for camera shaking hack // https://gtag.sannybuilder.com/sanandreas/camera-modes/ - if (aimSync.CamMode == 5u || aimSync.CamMode == 34u || (aimSync.CamMode >= 39u && aimSync.CamMode <= 43u) || aimSync.CamMode == 45u || aimSync.CamMode == 49u || aimSync.CamMode == 52u) + if (aimSync.CamMode < 3u || aimSync.CamMode == 5u || aimSync.CamMode == 6u || + (aimSync.CamMode >= 9u && aimSync.CamMode <= 13u) || aimSync.CamMode == 17u || + (aimSync.CamMode >= 19u && aimSync.CamMode <= 21u) || + (aimSync.CamMode >= 23u && aimSync.CamMode <= 28u) || + (aimSync.CamMode >= 30u && aimSync.CamMode <= 45u) || + (aimSync.CamMode >= 48u && aimSync.CamMode <= 50u) || + aimSync.CamMode == 52u || aimSync.CamMode == 54u || + aimSync.CamMode == 60u || aimSync.CamMode == 61u || aimSync.CamMode > 64u) aimSync.CamMode = 4u; aimSync.PlayerID = player.poolID;