From: Rudolf Polzer <divverent@xonotic.org>
Date: Tue, 4 Dec 2012 16:37:16 +0000 (+0100)
Subject: more stuff
X-Git-Tag: xonotic-v0.7.0~99^2~27
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7caeb633574128f303cdcab2ff00144923a94926;p=xonotic%2Fxonotic-data.pk3dir.git

more stuff
---

diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index d850ef3d3..bbe5618d9 100644
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -608,6 +608,7 @@ void CSQCModel_Hook_PreDraw(float isplayer)
 			}
 			animdecide_init(self); // FIXME only do this on model change
 			animdecide_setframes(self, flg, doblend, anim_frame, anim_frame1time, anim_frame2, anim_frame2time);
+			print(sprintf("frames: %d %d\n", self.anim_frame, self.anim_frame2));
 			float sf = 0;
 			if(self.anim_saveframe != self.anim_frame || self.anim_saveframe1time != self.anim_frame1time)
 				sf |= CSQCMODEL_PROPERTY_FRAME;
diff --git a/qcsrc/client/player_skeleton.qc b/qcsrc/client/player_skeleton.qc
index 25ab266ea..42efe9bee 100644
--- a/qcsrc/client/player_skeleton.qc
+++ b/qcsrc/client/player_skeleton.qc
@@ -67,8 +67,7 @@ void skeleton_from_frames(entity e)
 		float bonetype = e.skeleton_bonetype[bone];
 		for(++bone; (bone < n) && (e.skeleton_bonetype[bone] == bonetype); ++bone)
 			;
-		float lastbone = bone - 1;
-		if(bonetype == BONETYPE_LOWER)
+		if(bonetype == BONETYPE_LOWER && 1)
 		{
 			// only show frames 1+3
 			e.lerpfrac = 0;
@@ -82,6 +81,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));
 		skel_build(s, e, m, 0, firstbone + 1, bone);
 	}
 	e.lerpfrac = savelerpfrac;