Purge direct includes of mutators/events.qh in favour of the _mod files

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

diff --git a/qcsrc/client/player_skeleton.qc b/qcsrc/client/player_skeleton.qc
index 9a2f32931f8c3c587c37381613a7d0c5446fea70..bb1b6f919b840c78a2bca6d339245e5b057acbc1 100644 (file)
--- a/qcsrc/client/player_skeleton.qc
+++ b/qcsrc/client/player_skeleton.qc
@@ -1,19 +1,20 @@
 #include "player_skeleton.qh"
 
-#include "mutators/events.qh"
+#include <common/physics/movetypes/movetypes.qh>
+#include <common/physics/player.qh>
+#include <client/mutators/_mod.qh>
 #include "../lib/csqcmodel/cl_player.qh"
 #include "../lib/warpzone/anglestransform.qh"
 
-.float v_angle_x;
 .float v_angle_save_x;
 
-class(Skeleton) .float skeleton_info_modelindex;
-class(Skeleton) .float skeleton_info_skin;
+classfield(Skeleton) .float skeleton_info_modelindex;
+classfield(Skeleton) .float skeleton_info_skin;
 const int BONETYPE_LOWER = 0;
 const int BONETYPE_UPPER = 1;
 const int MAX_BONES = 128;
-class(Skeleton) .float skeleton_bonetype[MAX_BONES];
-class(Skeleton) .float skeleton_numbones;
+classfield(Skeleton) .float skeleton_bonetype[MAX_BONES];
+classfield(Skeleton) .float skeleton_numbones;
 
 void skeleton_loadinfo(entity e)
 {
@@ -181,7 +182,7 @@ void skeleton_from_frames(entity e, bool is_dead)
        {
                if(e == csqcplayer)
                {
-                       if(intermission)
+                       if(e.move_movetype == MOVETYPE_NONE)
                        {
                                if(!e.v_angle_save_x)
                                        e.v_angle_save_x = input_angles.x;