X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_weaponsystem.qc;h=21a9bc9428a71d6ec6d9bab9acc51a3db464a105;hp=af76117fec8f2ae7cdb50f539e9b7c31784decfa;hb=1b2f61baeeff5a7d004fafd3cfdd8269a0338a1e;hpb=a9f034bd247570b2b06c435599db8e283c1a42de

diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc
index af76117fec..21a9bc9428 100644
--- a/qcsrc/server/cl_weaponsystem.qc
+++ b/qcsrc/server/cl_weaponsystem.qc
@@ -1273,6 +1273,12 @@ void weapon_thinkf(float fr, float t, void() func)
 			anim_z = anim_y / (t + sys_frametime);
 			setanim(self, anim, FALSE, TRUE, TRUE);
 		}
+		else if (self.animstate_startframe == self.anim_idle_x) // only allow shoot anim to override idle animation until we have animation blending
+		{
+			anim = self.anim_shoot;
+			anim_z = anim_y / (t + sys_frametime);
+			setanim(self, anim, FALSE, TRUE, TRUE);
+		}
 	}
 };