Merge branch 'master' into Mario/turrets

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / player_skeleton.qh

diff --git a/qcsrc/client/player_skeleton.qh b/qcsrc/client/player_skeleton.qh
index ad63a7332241b055be120fc9ec2d5cecf2201907..6c95ce231051fad1b7315e50476e82c7b280aa94 100644 (file)
--- a/qcsrc/client/player_skeleton.qh
+++ b/qcsrc/client/player_skeleton.qh
@@ -1,8 +1,13 @@
+#ifndef PLAYER_SKELETON
+#define PLAYER_SKELETON
+
 void free_skeleton_from_frames(entity e);
-void skeleton_from_frames(entity e);
+void skeleton_from_frames(entity e, float is_dead);
 void skeleton_loadinfo(entity e);
 
 .float bone_upperbody;
-.float bone_weapon;
-.float bone_aim;
+.int bone_weapon;
+.float bone_aim[MAX_AIM_BONES];
+.float bone_aimweight[MAX_AIM_BONES];
 .float fixbone;
+#endif