1 files changed, 22 insertions, 20 deletions

diff --git a/src/hl2h.cpp b/src/hl2h.cpp
index 4ba30bc..ee2e990 100644
--- a/src/hl2h.cpp
+++ b/src/hl2h.cpp
@@ -500,34 +500,36 @@ static void do_move(int seq, float frametime) {
   if (jumpbug_apply(cmd, localIdx, ent, flags, vel, frametime))
     note_modified(cmd, flags, vel);
 
-  if (!feature_active(FEAT_AIMBOT) || !feature_has_bind(FEAT_AIMBOT))
+  bool melee = feature_active(FEAT_MELEE) && melee_weapon_active(ent);
+
+  if (!feature_active(FEAT_AIMBOT) || !feature_has_bind(FEAT_AIMBOT) || melee)
     aimbot_reset_lock();
-  if (!feature_active(FEAT_SILENTAIM) || !feature_has_bind(FEAT_SILENTAIM))
+  if (!feature_active(FEAT_SILENTAIM) || !feature_has_bind(FEAT_SILENTAIM) ||
+      melee)
     silentaim_reset_lock();
 
-  if (feature_active(FEAT_AIMBOT)) {
-    static bool aim_feature_logged = false;
-    if (!aim_feature_logged) {
-      aim_feature_logged = true;
-      logf("aimbot: feature active (bind held)");
-    }
-    if (aimbot_apply(cmd)) {
-      const float *vel = (const float *)(e + g_net.velocity);
+  if (melee) {
+    if (melee_aimbot_apply(cmd))
       note_modified(cmd, flags, vel);
+  } else {
+    if (feature_active(FEAT_AIMBOT)) {
+      static bool aim_feature_logged = false;
+      if (!aim_feature_logged) {
+        aim_feature_logged = true;
+        logf("aimbot: feature active (bind held)");
+      }
+      if (aimbot_apply(cmd))
+        note_modified(cmd, flags, vel);
     }
-  }
 
-  if (feature_active(FEAT_TRIGGERBOT)) {
-    if (triggerbot_apply(cmd)) {
-      const float *vel = (const float *)(e + g_net.velocity);
-      note_modified(cmd, flags, vel);
+    if (feature_active(FEAT_TRIGGERBOT)) {
+      if (triggerbot_apply(cmd))
+        note_modified(cmd, flags, vel);
     }
-  }
 
-  if (feature_active(FEAT_SILENTAIM)) {
-    if (silent_aim_apply(cmd)) {
-      const float *vel = (const float *)(e + g_net.velocity);
-      note_modified(cmd, flags, vel);
+    if (feature_active(FEAT_SILENTAIM)) {
+      if (silent_aim_apply(cmd))
+        note_modified(cmd, flags, vel);
     }
   }
 }