Merge remote-tracking branch 'origin/Mario/train_fix'

[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 96879c561cd61528cff66843fdf956749b13053c..ad5e23aa88335e382a221201828870ad848af471 100644 (file)
--- a/qcsrc/client/player_skeleton.qc
+++ b/qcsrc/client/player_skeleton.qc
@@ -8,6 +8,7 @@
 
 void skeleton_loadinfo(entity e)
 {
+       float i;
        if(e.skeleton_info_modelindex == e.modelindex && e.skeleton_info_skin == e.skin)
                return;
        e.bone_upperbody = 0;
@@ -16,10 +17,11 @@ void skeleton_loadinfo(entity e)
                e.bone_weapon = gettagindex(e, "tag_weapon");
        if(!e.bone_weapon)
                e.bone_weapon = gettagindex(e, "bip01 r hand");
-       e.bone_aim1 = 0;
-       e.bone_aim2 = 0;
-       e.bone_aim1weight = 0;
-       e.bone_aim2weight = 0;
+       for(i = 0; i < MAX_AIM_BONES; ++i)
+       {
+               e.(bone_aim[i]) = 0;
+               e.(bone_aimweight[i]) = 0;
+       }
        e.fixbone = 0;
        if(get_model_parameters(e.model, e.skin))
        {
@@ -29,14 +31,13 @@ void skeleton_loadinfo(entity e)
                        e.fixbone = get_model_parameters_fixbone;
                if(get_model_parameters_bone_weapon)
                        e.bone_weapon = gettagindex(e, get_model_parameters_bone_weapon);
-               if(get_model_parameters_bone_aim1)
-                       e.bone_aim1 = gettagindex(e, get_model_parameters_bone_aim1);
-               if(e.bone_aim1)
-                       e.bone_aim1weight = get_model_parameters_bone_aim1weight;
-               if(get_model_parameters_bone_aim2)
-                       e.bone_aim2 = gettagindex(e, get_model_parameters_bone_aim2);
-               if(e.bone_aim2)
-                       e.bone_aim2weight = get_model_parameters_bone_aim2weight;
+               for(i = 0; i < MAX_AIM_BONES; ++i)
+               {
+                       if(get_model_parameters_bone_aim[i])
+                               e.(bone_aim[i]) = gettagindex(e, get_model_parameters_bone_aim[i]);
+                       if(e.bone_aim[i])
+                               e.(bone_aimweight[i]) = get_model_parameters_bone_aimweight[i];
+               }
        }
        else
                dprint("No model parameters for ", e.model, "\n");
@@ -83,8 +84,8 @@ void skel_set_boneabs(float s, float bone, vector absorg)
 
        /*
        vector neworg = skel_get_boneabs(s, bone);
-       print(sprintf("ANG: want: %v, got: %v\n", absang, fixedvectoangles2(v_forward, v_up)));
-       print(sprintf("ORG: want: %v, got: %v\n", absorg, neworg));
+       printf("ANG: want: %v, got: %v\n", absang, fixedvectoangles2(v_forward, v_up));
+       printf("ORG: want: %v, got: %v\n", absorg, neworg);
        */
 }
 
@@ -97,8 +98,9 @@ void free_skeleton_from_frames(entity e)
        }
 }
 
-void skeleton_from_frames(entity e)
+void skeleton_from_frames(entity e, float is_dead)
 {
+       float i;
        float m = e.modelindex;
        if(!e.skeletonindex)
        {
@@ -148,8 +150,8 @@ void skeleton_from_frames(entity e)
                        e.lerpfrac3 = 0;
                        e.lerpfrac4 = savelerpfrac4 * 2;
                }
-               //print(sprintf("Run: bone %d to %d, type %d\n", firstbone + 1, bone, bonetype));
-               //print(sprintf("frame %d %d %d %d lerpfrac * %d %d %d\n", e.frame, e.frame2, e.frame3, e.frame4, e.lerpfrac, e.lerpfrac3, e.lerpfrac4));
+               //printf("Run: bone %d to %d, type %d\n", firstbone + 1, bone, bonetype);
+               //printf("frame %d %d %d %d lerpfrac * %d %d %d\n", e.frame, e.frame2, e.frame3, e.frame4, e.lerpfrac, e.lerpfrac3, e.lerpfrac4);
                skel_build(s, e, m, 0, firstbone + 1, bone);
        }
        e.lerpfrac = savelerpfrac;
@@ -164,23 +166,19 @@ void skeleton_from_frames(entity e)
                skel_set_boneabs(s, e.bone_upperbody, org);
        }
 
-       if(e.bone_aim1)
+       if(!is_dead)
        {
-               vector aim = '1 0 0' * bound(-90, self.v_angle_x, 90) * e.bone_aim1weight;
-               vector org = skel_get_boneabs(s, e.bone_aim1);
-               vector ang_cur = fixedvectoangles2(v_forward, v_up);
-               vector ang = AnglesTransform_Multiply(aim, ang_cur);
-               fixedmakevectors(ang);
-               skel_set_boneabs(s, e.bone_aim1, org);
-       }
-
-       if(e.bone_aim2)
-       {
-               vector aim = '1 0 0' * bound(-90, self.v_angle_x, 90) * e.bone_aim2weight;
-               vector org = skel_get_boneabs(s, e.bone_aim2);
-               vector ang_cur = fixedvectoangles2(v_forward, v_up);
-               vector ang = AnglesTransform_Multiply(aim, ang_cur);
-               fixedmakevectors(ang);
-               skel_set_boneabs(s, e.bone_aim2, org);
+               for(i = 0; i < MAX_AIM_BONES; ++i)
+               {
+                       if(e.(bone_aim[i]))
+                       {
+                               vector aim = '1 0 0' * bound(-90, self.v_angle_x, 90) * e.(bone_aimweight[i]);
+                               vector org = skel_get_boneabs(s, e.(bone_aim[i]));
+                               vector ang_cur = fixedvectoangles2(v_forward, v_up);
+                               vector ang = AnglesTransform_Multiply(aim, ang_cur);
+                               fixedmakevectors(ang);
+                               skel_set_boneabs(s, e.(bone_aim[i]), org);
+                       }
+               }
        }
 }