Invalid camera mode checks

improve it once again, make a wider list
openmultiplayer · Oct 12, 2024 · 18f9f37 · 18f9f37
1 parent 0ac24ef
commit 18f9f37
Showing 1 changed file with 8 additions and 5 deletions.
diff --git 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;