X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fplayer_skeleton.qc;h=d9c9ab14210353a5490d4e9dc5deadde59763577;hp=d6b2b0d44a72ce7ff878f0bb20aa0340a863a8ec;hb=991de5e6922cd3c283de56c3249624f0f1bfe767;hpb=289dc834837712c152d42d7755992e8e5ed09deb

diff --git a/qcsrc/client/player_skeleton.qc b/qcsrc/client/player_skeleton.qc
index d6b2b0d44a..d9c9ab1421 100644
--- a/qcsrc/client/player_skeleton.qc
+++ b/qcsrc/client/player_skeleton.qc
@@ -1,18 +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"
 
-.vector v_angle;
+.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)
 {
@@ -50,7 +52,7 @@ void skeleton_loadinfo(entity e)
 		}
 	}
 	else
-		LOG_TRACE("No model parameters for ", e.model, "\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;
@@ -79,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));
@@ -108,8 +111,9 @@ void free_skeleton_from_frames(entity e)
 	}
 }
 
-void skeleton_from_frames(entity e, float is_dead)
-{SELFPARAM();
+void skeleton_from_frames(entity e, bool is_dead)
+{
+	TC(bool, is_dead);
 	float m = e.modelindex;
 	if(!e.skeletonindex)
 	{
@@ -176,14 +180,23 @@ void skeleton_from_frames(entity e, float is_dead)
 
 	if(!is_dead)
 	{
-		if(self == csqcplayer)
-			self.v_angle_x = input_angles_x;
+		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);