Skip to content

Commit 18f9f37

Browse files
authored
Invalid camera mode checks
improve it once again, make a wider list
1 parent 0ac24ef commit 18f9f37

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

Server/Source/player_pool.hpp

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -870,12 +870,15 @@ struct PlayerPool final : public IPlayerPool, public NetworkEventHandler, public
870870
player.aimingData_.aspectRatio = (aimSync.AspectRatio * 1.f / 255) + 1.f;
871871

872872
// Check for invalid camera modes
873-
if (aimSync.CamMode < 0u || aimSync.CamMode > 65u)
874-
aimSync.CamMode = 4u;
875-
876-
// Fix for camera shaking hack
877873
// https://gtag.sannybuilder.com/sanandreas/camera-modes/
878-
if (aimSync.CamMode == 5u || aimSync.CamMode == 34u || (aimSync.CamMode >= 39u && aimSync.CamMode <= 43u) || aimSync.CamMode == 45u || aimSync.CamMode == 49u || aimSync.CamMode == 52u)
874+
if (aimSync.CamMode < 3u || aimSync.CamMode == 5u || aimSync.CamMode == 6u ||
875+
(aimSync.CamMode >= 9u && aimSync.CamMode <= 13u) || aimSync.CamMode == 17u ||
876+
(aimSync.CamMode >= 19u && aimSync.CamMode <= 21u) ||
877+
(aimSync.CamMode >= 23u && aimSync.CamMode <= 28u) ||
878+
(aimSync.CamMode >= 30u && aimSync.CamMode <= 45u) ||
879+
(aimSync.CamMode >= 48u && aimSync.CamMode <= 50u) ||
880+
aimSync.CamMode == 52u || aimSync.CamMode == 54u ||
881+
aimSync.CamMode == 60u || aimSync.CamMode == 61u || aimSync.CamMode > 64u)
879882
aimSync.CamMode = 4u;
880883

881884
aimSync.PlayerID = player.poolID;

0 commit comments

Comments
 (0)