X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fplayer_skeleton.qc;h=4039c905c1f135f3afea1e2e6d1e76d7c65947c5;hb=4181392df811a93dee6b97c303c3f7655f2f0a23;hp=7784fc1f693fe2bb54674220bb47c4ace5f57162;hpb=bf20397b0c62c9de0335ef9d70d60842fde9d0b2;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/player_skeleton.qc b/qcsrc/client/player_skeleton.qc
index 7784fc1f69..bb1b6f919b 100644
--- a/qcsrc/client/player_skeleton.qc
+++ b/qcsrc/client/player_skeleton.qc
@@ -1,14 +1,24 @@
-.float skeleton_info_modelindex;
-.float skeleton_info_skin;
-#define BONETYPE_LOWER 0
-#define BONETYPE_UPPER 1
-#define MAX_BONES 128
-.float skeleton_bonetype[MAX_BONES];
-.float skeleton_numbones;
+#include "player_skeleton.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_save_x;
+
+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;
+classfield(Skeleton) .float skeleton_bonetype[MAX_BONES];
+classfield(Skeleton) .float skeleton_numbones;
 
 void skeleton_loadinfo(entity e)
 {
-	float i;
+	int i;
 	if(e.skeleton_info_modelindex == e.modelindex && e.skeleton_info_skin == e.skin)
 		return;
 	e.bone_upperbody = 0;
@@ -17,6 +27,7 @@ void skeleton_loadinfo(entity e)
 		e.bone_weapon = gettagindex(e, "tag_weapon");
 	if(!e.bone_weapon)
 		e.bone_weapon = gettagindex(e, "bip01 r hand");
+	MUTATOR_CALLHOOK(Skeleton_CheckBones, e);
 	for(i = 0; i < MAX_AIM_BONES; ++i)
 	{
 		e.(bone_aim[i]) = 0;
@@ -31,6 +42,7 @@ 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);
+		MUTATOR_CALLHOOK(Skeleton_CheckModel, e);
 		for(i = 0; i < MAX_AIM_BONES; ++i)
 		{
 			if(get_model_parameters_bone_aim[i])
@@ -40,8 +52,8 @@ void skeleton_loadinfo(entity e)
 		}
 	}
 	else
-		dprint("No model parameters for ", e.model, "\n");
-	dprint(e.model, " uses ", ftos(e.bone_upperbody), " ", ftos(e.fixbone), "\n");
+		LOG_TRACE("No model parameters for ", e.model);
+	//dprint(e.model, " uses ", ftos(e.bone_upperbody), " ", ftos(e.fixbone), "\n");
 	get_model_parameters(string_null, 0);
 	e.skeleton_info_modelindex = e.modelindex;
 	e.skeleton_info_skin = e.skin;
@@ -56,11 +68,11 @@ void skeleton_markbones(entity e)
 {
 	float s = e.skeletonindex;
 	float n = (e.skeleton_numbones = skel_get_numbones(s));
-	float i;
+	int i;
 	for(i = 1; i <= n; ++i)
 	{
 		float t = BONETYPE_LOWER;
-		float p = skel_get_boneparent(s, i);
+		int p = skel_get_boneparent(s, i);
 		if(p > 0)
 			t = e.(skeleton_bonetype[p-1]);
 		if(i == e.bone_upperbody)
@@ -69,8 +81,9 @@ void skeleton_markbones(entity e)
 	}
 }
 
-void skel_set_boneabs(float s, float bone, vector absorg)
+void skel_set_boneabs(float s, int bone, vector absorg)
 {
+    TC(int, bone);
 	vector absang = fixedvectoangles2(v_forward, v_up);
 
 	vector parentorg = skel_get_boneabs(s, skel_get_boneparent(s, bone));
@@ -84,8 +97,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);
 	*/
 }
 
@@ -98,9 +111,9 @@ void free_skeleton_from_frames(entity e)
 	}
 }
 
-void skeleton_from_frames(entity e, float is_dead)
+void skeleton_from_frames(entity e, bool is_dead)
 {
-	float i;
+    TC(bool, is_dead);
 	float m = e.modelindex;
 	if(!e.skeletonindex)
 	{
@@ -110,7 +123,6 @@ void skeleton_from_frames(entity e, float is_dead)
 	float s = e.skeletonindex;
 	if(!s)
 		return;
-	float bone;
 	float n = e.skeleton_numbones;
 	float savelerpfrac = e.lerpfrac;
 	float savelerpfrac3 = e.lerpfrac3;
@@ -129,7 +141,7 @@ void skeleton_from_frames(entity e, float is_dead)
 		skel_get_boneabs(s, e.bone_upperbody);
 		fixbone_oldangles = fixedvectoangles2(v_forward, v_up);
 	}
-
+	int bone;
 	for(bone = 0; bone < n; )
 	{
 		float firstbone = bone;
@@ -150,8 +162,8 @@ void skeleton_from_frames(entity e, float is_dead)
 			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;
@@ -168,11 +180,23 @@ void skeleton_from_frames(entity e, float is_dead)
 
 	if(!is_dead)
 	{
+		if(e == csqcplayer)
+		{
+			if(e.move_movetype == MOVETYPE_NONE)
+			{
+				if(!e.v_angle_save_x)
+					e.v_angle_save_x = input_angles.x;
+				e.v_angle_x = e.v_angle_save_x;
+			}
+			else
+				e.v_angle_x = input_angles.x;
+		}
+		int i;
 		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 aim = '1 0 0' * bound(-90, e.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);