From 1645ce4061a4fda9bc8536ff1e5cd370721adb52 Mon Sep 17 00:00:00 2001
From: Unnamed <user@localhost.localdomain>
Date: Wed, 21 Aug 2019 11:29:16 +0000
Subject: [PATCH] AntiAim.cpp: implement fake sideways Randomly switch between
 fake right and fake left (configurable)

---
 data/menu/nullifiedcat/antiaim.xml |  1 +
 src/hacks/AntiAim.cpp              | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/data/menu/nullifiedcat/antiaim.xml b/data/menu/nullifiedcat/antiaim.xml
index fef98953..dfd1d3a7 100755
--- a/data/menu/nullifiedcat/antiaim.xml
+++ b/data/menu/nullifiedcat/antiaim.xml
@@ -46,6 +46,7 @@
                     <Option name="FakeOffset" value="15"/>
                     <Option name="FakeEdge" value="16"/>
                     <Option name="FakeHeck" value="17"/>
+                    <Option name="FakeSideways" value="18"/>
                     <Option name="FakeLeft" value="19"/>
                     <Option name="FakeRight" value="20"/>
                     <Option name="FakeREdge" value="21"/>
diff --git a/src/hacks/AntiAim.cpp b/src/hacks/AntiAim.cpp
index a26b2e12..0eee9758 100644
--- a/src/hacks/AntiAim.cpp
+++ b/src/hacks/AntiAim.cpp
@@ -18,6 +18,8 @@ float used_yaw     = 0.0f;
 static settings::Boolean enable{ "antiaim.enable", "0" };
 static settings::Float yaw{ "antiaim.yaw.static", "0" };
 static settings::Int yaw_mode{ "antiaim.yaw.mode", "0" };
+static settings::Int yaw_sideways_min{ "antiaim.yaw.sideways.min", "0" };
+static settings::Int yaw_sideways_max{ "antiaim.yaw.sideways.max", "4" };
 
 static settings::Float pitch{ "antiaim.pitch.static", "0" };
 static settings::Int pitch_mode{ "antiaim.pitch.mode", "0" };
@@ -369,6 +371,14 @@ void ProcessUserCmd(CUserCmd *cmd)
     static bool bsendflip = true;
     static float rngyaw   = 0.0f;
     bool clamp            = !no_clamping;
+
+    static int ticksUntilSwap = 0;
+    static bool swap = true;
+
+    if (ticksUntilSwap > 0 && *yaw_mode != 18) {
+        swap = true;
+        ticksUntilSwap = 0;
+    }
     switch ((int) yaw_mode)
     {
     case 1: // FIXED
@@ -481,8 +491,14 @@ void ProcessUserCmd(CUserCmd *cmd)
             clamp = false;
         }
         break;
-    case 20:
     case 18: // Fake sideways
+        if (*bSendPackets && ticksUntilSwap--) {
+            ticksUntilSwap = UniformRandomInt(*yaw_sideways_min, *yaw_sideways_max);
+            swap = !swap;
+        }
+        y += *bSendPackets ^ swap ? 90.0f : -90.0f;
+        break;
+    case 20: // Fake right
         y += *bSendPackets ? 90.0f : -90.0f;
         break;
     case 19: // Fake left