X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_weaponsystem.qc;h=4233e7d92d755b7651a60362f27080c192e888c7;hp=ee4b703523a2239593a46772f0976bd0c8b6dcc2;hb=776d57d3d746545313180c02b0c5e0e79af757bb;hpb=f884797b17fa38d33fb8efc0615aff6481e455c1

diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc
index ee4b703523..4233e7d92d 100644
--- a/qcsrc/server/cl_weaponsystem.qc
+++ b/qcsrc/server/cl_weaponsystem.qc
@@ -1257,15 +1257,21 @@ void weapon_thinkf(float fr, float t, void() func)
 	self.weapon_think = func;
 	//dprint("next ", ftos(self.weapon_nextthink), "\n");
 
+    // The shoot animation looks TERRIBLE without animation blending! Yay for moonwalking while shooting!
+    /*
 	if (restartanim)
 	if (t)
 	if (!self.crouch) // shoot anim stands up, this looks bad
 	{
 		local vector anim;
-		anim = self.anim_shoot;
+		if(self.weapon == WEP_SHOTGUN && self.BUTTON_ATCK2)
+			anim = self.anim_melee;
+		else
+			anim = self.anim_shoot;
 		anim_z = anim_y / (t + sys_frametime);
 		setanim(self, anim, FALSE, TRUE, TRUE);
 	}
+    */
 };
 
 void weapon_boblayer1(float spd, vector org)
@@ -1738,4 +1744,4 @@ void W_Reload(float sent_ammo_min, float sent_ammo_amount, float sent_time, stri
 		self.clip_load = 0;
 	self.old_clip_load = self.clip_load;
 	self.clip_load = self.weapon_load[self.weapon] = -1;
-}
\ No newline at end of file
+}