1 files changed, 39 insertions, 5 deletions

diff --git a/src/hl2h.cpp b/src/hl2h.cpp
index 90e0990..c4f8aad 100644
--- a/src/hl2h.cpp
+++ b/src/hl2h.cpp
@@ -4,6 +4,7 @@
 #include <cstdarg>
 #include <cstdlib>
 #include <sys/mman.h>
+#include <time.h>
 
 // ---------------------------------------------------------------------------
 // logging
@@ -417,24 +418,50 @@ static bool jumpbug_apply(CUserCmd *cmd, int local, void *ent, int flags,
 
 static void (*g_real_random_seed)(int) = nullptr;
 static uintptr_t g_srv_base = 0;
+static uintptr_t g_local_server_player = 0;
 static bool g_seed_hook_installed = false;
 
 static void hkdSrvRandomSeed(int seed) {
   uintptr_t ret = (uintptr_t)__builtin_return_address(0);
   long off = (long)(ret - g_srv_base);
   static bool trace = getenv("HL2H_SEED_TRACE") != nullptr;
-  static bool force = getenv("HL2H_SEED_FORCE") != nullptr;
   static int logs = 0;
   bool bullet_site = (off >= 0x216900 && off <= 0x216930);
+
+  void *frame = nullptr;
+  __asm__ volatile("movl %%ebp, %0" : "=r"(frame));
+  if (frame)
+    frame = *(void **)frame; // caller's ebp (CBaseEntity::FireBullets)
+  void *self = frame ? *(void **)((char *)frame + 8) : nullptr;
+  bool local = self && g_local_server_player &&
+               (uintptr_t)self == g_local_server_player;
+
+  if (bullet_site && local && feature_active(FEAT_SPREAD) &&
+      spread_no_spread_enabled()) {
+    int pellets = g_spread_pellets;
+    if (pellets < 1)
+      pellets = 1;
+    if (pellets > 12)
+      pellets = 12;
+    static int idx = 0;
+    static double last = 0.0;
+    struct timespec ts;
+    clock_gettime(CLOCK_MONOTONIC, &ts);
+    double now = (double)ts.tv_sec + (double)ts.tv_nsec * 1e-9;
+    if (now - last > 0.05 || idx >= pellets)
+      idx = 0;
+    last = now;
+    seed = spread_best_seed(pellets) + idx;
+    idx++;
+  }
+
   if (trace && (bullet_site || logs < 12)) {
     if (logs < 200) {
       logs++;
-      logf("srvseed: seed=%d off=0x%lx bullet=%d", seed, off,
-           (int)bullet_site);
+      logf("srvseed: seed=%d off=0x%lx bullet=%d self=%p local=%d", seed, off,
+           (int)bullet_site, self, (int)local);
     }
   }
-  if (force && bullet_site)
-    seed = 33;
   if (g_real_random_seed)
     g_real_random_seed(seed);
 }
@@ -491,6 +518,13 @@ static void do_move(int seq, float frametime) {
   if (!ent)
     return;
 
+  if (feature_active(FEAT_SPREAD)) {
+    resolve_server_netvars();
+    void *srv = nullptr;
+    if (server_entity_health(localIdx, nullptr, nullptr, &srv) >= 0 && srv)
+      g_local_server_player = (uintptr_t)srv;
+  }
+
   CUserCmd *cmd = get_usercmd(seq);
   if (!cmd)
     return;