4 files changed, 26 insertions, 8 deletions

diff --git a/src/esp.cpp b/src/esp.cpp
index 5683704..7c3f1bc 100644
--- a/src/esp.cpp
+++ b/src/esp.cpp
@@ -872,6 +872,11 @@ static float vec_dist(const Vector &a, const Vector &b) {
 bool melee_weapon_active(void *local_ent) {
   if (!local_ent)
     return false;
+  static bool enter_logged = false;
+  if (!enter_logged) {
+    enter_logged = true;
+    logf("melee: enter");
+  }
   int local = engine_get_local_player();
   if (g_iface.engineserver)
     resolve_server_netvars();
diff --git a/src/hl2h.cpp b/src/hl2h.cpp
index 375cd5a..84f9d0d 100644
--- a/src/hl2h.cpp
+++ b/src/hl2h.cpp
@@ -584,6 +584,7 @@ static void do_move(int seq, float frametime) {
     aimbot_reset_lock();
     silentaim_reset_lock();
     fullbright_invalidate();
+    logf("do_move: post-local");
   }
 
   if (feature_active(FEAT_SPREAD)) {
@@ -696,7 +697,12 @@ static void do_move(int seq, float frametime) {
   if (jumpbug_apply(cmd, localIdx, ent, flags, vel, frametime))
     note_modified(cmd, flags, vel);
 
+  static bool melee_logged = false;
   bool melee = feature_active(FEAT_MELEE) && melee_weapon_active(ent);
+  if (!melee_logged) {
+    melee_logged = true;
+    logf("do_move: after melee check (crowbar=%d)", (int)melee);
+  }
 
   if (!feature_active(FEAT_AIMBOT) || !feature_has_bind(FEAT_AIMBOT) || melee)
     aimbot_reset_lock();
diff --git a/src/menu.cpp b/src/menu.cpp
index 0c022e4..af1d2b8 100644
--- a/src/menu.cpp
+++ b/src/menu.cpp
@@ -664,9 +664,24 @@ void draw_text_col(int x, int y, const char *text, int r, int g, int b) {
 // (see hkdDrawPrintText hook in hl2h.cpp): we wrap our draws in
 // PushMakeCurrent/PopMakeCurrent so they are submitted with a clean clip.
 void outer_draw() {
+  static bool outer_enter = false;
+  if (!outer_enter) {
+    outer_enter = true;
+    logf("outer_draw: enter");
+  }
   poll_keyboard();
   fullbright_update();
+  static bool fb_done = false;
+  if (!fb_done) {
+    fb_done = true;
+    logf("outer_draw: after fullbright");
+  }
   gui_handle_input();
+  static bool gui_done = false;
+  if (!gui_done) {
+    gui_done = true;
+    logf("outer_draw: after gui input");
+  }
   // HL2H_DRAW_TEST=1 draws a probe rect without needing the GUI open
   static bool draw_test = getenv("HL2H_DRAW_TEST") != nullptr;
   bool esp_on = feature_active(FEAT_ESP);
diff --git a/src/netvars.cpp b/src/netvars.cpp
index 834aa2f..238af70 100644
--- a/src/netvars.cpp
+++ b/src/netvars.cpp
@@ -92,14 +92,6 @@ static void collect_netvars(uintptr_t table, uintptr_t base_off, int depth) {
     } else if (strcmp(pname2, "m_hActiveWeapon") == 0 &&
                g_net.activeweapon < 0) {
       g_net.activeweapon = (int)(base_off + (uint32_t)poff);
-    } else if (strcmp(pname2, "m_hOwnerEntity") == 0 && g_net.owner < 0) {
-      int off = (int)(base_off + (uint32_t)poff);
-      if (off > 0 && off < 0x2000)
-        g_net.owner = off;
-    } else if (strcmp(pname2, "m_hOwner") == 0 && g_net.weapon_owner < 0) {
-      int off = (int)(base_off + (uint32_t)poff);
-      if (off > 0 && off < 0x2000)
-        g_net.weapon_owner = off;
     } else if (strcmp(pname2, "m_iTeamNum") == 0 && g_net.teamnum < 0) {
       g_net.teamnum = (int)(base_off + (uint32_t)poff);
     } else if (strcmp(pname2, "m_vecOrigin") == 0 && g_net.origin < 0) {