1 files changed, 39 insertions, 7 deletions

diff --git a/src/esp.cpp b/src/esp.cpp
index bda6232..ca7bae0 100644
--- a/src/esp.cpp
+++ b/src/esp.cpp
@@ -2,6 +2,7 @@
 #include "hl2h.h"
 #include <cmath>
 #include <cstring>
+#include <strings.h>
 #include <cstddef>
 #include <cstdlib>
 #include <ctime>
@@ -1131,18 +1132,49 @@ static void spread_compute() {
   g_spread_ready = true;
 }
 
+static bool icontains(const char *hay, const char *needle) {
+  if (!hay || !needle || !*needle)
+    return false;
+  size_t n = strlen(needle);
+  for (const char *p = hay; *p; p++)
+    if (strncasecmp(p, needle, n) == 0)
+      return true;
+  return false;
+}
+
 bool entity_is_physics_prop(int idx) {
   if (idx <= 0 || idx > 4096)
     return false;
+  void *ent = entitylist_get(idx);
+  if (!ent)
+    return false;
+  int mt = -1;
+  // The reliable signal: physics objects use MOVETYPE_VPHYSICS. The client
+  // class is CPhysicsProp / CPhysBox, not the server's prop_physics name.
+  if (g_net.movetype >= 0) {
+    mt = *(int *)((uintptr_t)ent + g_net.movetype);
+    if (mt == MOVETYPE_VPHYSICS)
+      return true;
+  }
   void *net = entity_networkable(idx);
   const char *cls = net ? entity_class_name(net, nullptr) : nullptr;
-  void *ent = entitylist_get(idx);
-  const char *model = ent ? entity_model_name(ent) : nullptr;
-  if (cls && (strstr(cls, "prop_physics") || strstr(cls, "physbox")))
-    return true;
-  if (model && (strstr(model, "props_junk") || strstr(model, "props_physics")))
-    return true;
-  return false;
+  const char *model = entity_model_name(ent);
+  bool is_prop = icontains(cls, "physicsprop") || icontains(cls, "physbox") ||
+                 icontains(cls, "prop_physics") ||
+                 icontains(model, "props_junk") ||
+                 icontains(model, "props_physics") ||
+                 icontains(model, "props_c17") ||
+                 icontains(model, "props_interiors") ||
+                 icontains(model, "props_lab");
+  if (!is_prop) {
+    static int miss_logs = 0;
+    if (miss_logs < 6) {
+      miss_logs++;
+      logf("stucklaunch prop? idx=%d movetype=%d cls=%s model=%s", idx, mt,
+           cls ? cls : "?", model ? model : "?");
+    }
+  }
+  return is_prop;
 }
 
 bool active_weapon_is_gravity_gun(void *local_ent) {