1 files changed, 20 insertions, 7 deletions

diff --git a/src/server.cpp b/src/server.cpp
index b1661ac..0d14c59 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -68,7 +68,7 @@ static bool g_srv_checked = false;
 
 static uintptr_t find_string(const char *s) {
   size_t n = strlen(s) + 1;
-  for (auto &r : g_server.ranges) {
+  for (auto &r : mod_server().ranges) {
     const uint8_t *base = (const uint8_t *)r.lo;
     size_t span = r.hi - r.lo;
     for (size_t i = 0; i + n <= span; i++)
@@ -92,7 +92,7 @@ static int datamap_offsets(const char *name, int want_type, int min_off,
   if (!str)
     return 0;
   int n = 0;
-  for (auto &r : g_server.ranges) {
+  for (auto &r : mod_server().ranges) {
     const uint8_t *base = (const uint8_t *)r.lo;
     size_t span = r.hi - r.lo;
     for (size_t off = 4; off + 0x18 <= span; off += 4) {
@@ -111,7 +111,7 @@ static int datamap_offsets(const char *name, int want_type, int min_off,
         continue;
       // DEFINE_KEYFIELD entries have an external name ("health"); plain
       // DEFINE_FIELD entries have none. Either way it must be in server.so.
-      if (ext && !g_server.contains(ext))
+      if (ext && !mod_server().contains(ext))
         continue;
       bool dup = false;
       for (int i = 0; i < n; i++)
@@ -144,9 +144,9 @@ bool resolve_server_netvars() {
   if ((retry++ % 100) != 0)
     return false;
   // server.so is only mapped once a map is running; refresh the module list.
-  if (!g_server.valid())
+  if (!mod_server().valid())
     find_modules();
-  if (!g_server.valid()) {
+  if (!mod_server().valid()) {
     if (!fail_logged) {
       fail_logged = true;
       logd("server datamap: server.so not mapped yet");
@@ -209,7 +209,7 @@ bool resolve_server_netvars() {
          "followtarget=%d spawnflags=%d hacked=%d npcstate=%d "
          "takedamage=%d mapname=%d armor=%d detonate=%d dmgradius=%d "
          "ammo=%d myweapons=%d juice_suit=%d juice_health=%d",
-         g_server.path.c_str(), g_srv_health, g_srv_maxhealth, g_srv_lifestate,
+         mod_server().path.c_str(), g_srv_health, g_srv_maxhealth, g_srv_lifestate,
          g_srv_modelindex, g_srv_absvelocity, g_srv_velocity,
          g_srv_activeweapon, g_srv_relationship, g_srv_followtarget,
          g_srv_spawnflags, g_srv_hacked, g_srv_npcstate, g_srv_takedamage,
@@ -219,7 +219,7 @@ bool resolve_server_netvars() {
   } else if (!fail_logged) {
     fail_logged = true;
     logf("server datamap: scan failed (server.so at %s)",
-         g_server.path.c_str());
+         mod_server().path.c_str());
     toastf(TOAST_WARN, "Server datamap scan failed; jumpbug assist limited");
   }
   return g_srv_ready;
@@ -275,6 +275,19 @@ int server_entity_health(int idx, int *maxhealth, int *lifestate,
   return hp;
 }
 
+bool server_entity_velocity(int idx, Vector *out) {
+  if (!out || g_srv_velocity <= 0)
+    return false;
+  void *base = nullptr;
+  if (server_entity_health(idx, nullptr, nullptr, &base) < 0 || !base)
+    return false;
+  uintptr_t b = (uintptr_t)base;
+  out->x = *(float *)(b + g_srv_velocity);
+  out->y = *(float *)(b + g_srv_velocity + 4);
+  out->z = *(float *)(b + g_srv_velocity + 8);
+  return true;
+}
+
 int server_model_index(void *base) {
   if (!base || g_srv_modelindex <= 0)
     return -1;