3 files changed, 14 insertions, 3 deletions

diff --git a/src/bones.cpp b/src/bones.cpp
index d1e25cb..f33a4b2 100644
--- a/src/bones.cpp
+++ b/src/bones.cpp
@@ -371,16 +371,20 @@ int bone_parent(int idx, int bone) {
 
 bool bone_is_skeleton_core(int idx, int bone) {
   BoneEntry *e = find_entry(idx);
-  if (!e || !e->valid || !e->humanoid || bone < 0 || bone >= e->count)
+  if (!e || !e->valid || bone < 0 || bone >= e->count)
     return false;
+  if (!e->humanoid)
+    return true; // non-humanoid: draw its full bone tree
   return e->core[bone];
 }
 
 int bone_nearest_core_parent(int idx, int bone) {
   BoneEntry *e = find_entry(idx);
-  if (!e || !e->valid || !e->humanoid || bone < 0 || bone >= e->count)
+  if (!e || !e->valid || bone < 0 || bone >= e->count)
     return -1;
   int p = bone_at(e->hdr, bone)->parent;
+  if (!e->humanoid)
+    return (p >= 0 && p < e->count) ? p : -1;
   for (int guard = 0; p >= 0 && p < e->count && guard < 64; guard++) {
     if (e->core[p])
       return p;
@@ -389,6 +393,11 @@ int bone_nearest_core_parent(int idx, int bone) {
   return -1;
 }
 
+bool bones_is_humanoid(int idx) {
+  BoneEntry *e = find_entry(idx);
+  return e && e->valid && e->humanoid;
+}
+
 bool bone_pos(int idx, int bone, Vector &out) {
   BoneEntry *e = find_entry(idx);
   if (!e || !e->valid || bone < 0 || bone >= e->count)
diff --git a/src/esp.cpp b/src/esp.cpp
index b5cb9b0..34a702a 100644
--- a/src/esp.cpp
+++ b/src/esp.cpp
@@ -298,7 +298,8 @@ static void draw_skeleton(const EspTarget &t) {
   static int logged = 0;
   if (core_count > 0 && logged < 4) {
     logged++;
-    logf("skeleton: idx=%d bones=%d core=%d", t.idx, n, core_count);
+    logf("skeleton: idx=%d bones=%d core=%d humanoid=%d", t.idx, n, core_count,
+         (int)bones_is_humanoid(t.idx));
   }
   if (t.friendly)
     surf_color(60, 255, 60, 255);
diff --git a/src/hl2h.h b/src/hl2h.h
index c0d4cdd..289e4e6 100644
--- a/src/hl2h.h
+++ b/src/hl2h.h
@@ -177,6 +177,7 @@ int bone_parent(int idx, int bone);
 bool bone_pos(int idx, int bone, Vector &out);
 bool bone_is_skeleton_core(int idx, int bone);
 int bone_nearest_core_parent(int idx, int bone);
+bool bones_is_humanoid(int idx);
 bool hitbox_center(int idx, const char *hitbox_name, Vector &out);
 bool head_position(int idx, Vector &out);