1 files changed, 61 insertions, 0 deletions

diff --git a/src/esp.cpp b/src/esp.cpp
index 4d2345d..06bafaf 100644
--- a/src/esp.cpp
+++ b/src/esp.cpp
@@ -669,6 +669,61 @@ static bool select_aim_target(const QAngle &view, unsigned bone_mask,
   return false;
 }
 
+static bool active_weapon_contains(void *local_ent, const char *needle) {
+  if (!local_ent || g_net.activeweapon < 0 || !needle)
+    return false;
+  uint32_t h = *(uint32_t *)((uintptr_t)local_ent + g_net.activeweapon);
+  if (h == 0xFFFFFFFFu)
+    return false;
+  int idx = (int)(h & 0xFFFF);
+  if (idx <= 0 || idx > 4096)
+    return false;
+  void *wep = entitylist_get(idx);
+  void *net = entity_networkable(idx);
+  const char *cls = net ? entity_class_name(net, nullptr) : nullptr;
+  const char *model = wep ? entity_model_name(wep) : nullptr;
+  return (cls && strstr(cls, needle)) || (model && strstr(model, needle));
+}
+
+// Crossbow bolts and RPG rockets are not hitscan. Lead moving targets by the
+// projectile travel time; the crossbow bolt also has gravity 0.05 (30 u/s^2).
+static bool projectile_lead_point(int target_idx, const Vector &point,
+                                  Vector &out) {
+  int local = engine_get_local_player();
+  if (local <= 0)
+    return false;
+  void *local_ent = entitylist_get(local);
+  if (!local_ent)
+    return false;
+  float speed = 0.0f, gravity = 0.0f;
+  if (active_weapon_contains(local_ent, "crossbow") ||
+      active_weapon_contains(local_ent, "Crossbow")) {
+    speed = 2500.0f;
+    gravity = 30.0f;
+  } else if (active_weapon_contains(local_ent, "rocket_launcher") ||
+             active_weapon_contains(local_ent, "w_rpg") ||
+             active_weapon_contains(local_ent, "RPG")) {
+    speed = 1500.0f;
+    gravity = 0.0f;
+  } else {
+    return false;
+  }
+  void *target = entitylist_get(target_idx);
+  if (!target || g_net.velocity < 0)
+    return false;
+  const float *v = (const float *)((uintptr_t)target + g_net.velocity);
+  float dx = point.x - g_cam_eye.x;
+  float dy = point.y - g_cam_eye.y;
+  float dz = point.z - g_cam_eye.z;
+  float dist = sqrtf(dx * dx + dy * dy + dz * dz);
+  float t = dist / speed;
+  out = point;
+  out.x += v[0] * t;
+  out.y += v[1] * t;
+  out.z += v[2] * t + 0.5f * gravity * t * t;
+  return true;
+}
+
 bool aimbot_apply(CUserCmd *cmd) {
   unsigned bone_mask = aimbot_bone_mask();
   if (!bone_mask)
@@ -684,6 +739,9 @@ bool aimbot_apply(CUserCmd *cmd) {
   if (!select_aim_target(view, bone_mask, aimbot_vischeck_enabled(), max_fov,
                          "aimbot", lock, target, point, fov))
     return false;
+  Vector lead;
+  if (projectile_lead_point(target, point, lead))
+    point = lead;
   QAngle desired = angle_to(g_cam_eye, point);
   static int want_logs = 0;
   if (want_logs < 10) {
@@ -759,6 +817,9 @@ bool silent_aim_apply(CUserCmd *cmd) {
   if (!select_aim_target(view, bone_mask, true, max_fov, "silentaim", lock,
                          target, point, fov))
     return false;
+  Vector lead;
+  if (projectile_lead_point(target, point, lead))
+    point = lead;
   QAngle desired = angle_to(g_cam_eye, point);
   float np = desired.x;
   if (np > 89.0f) np = 89.0f;