X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_weaponsystem.qc;h=f5fc4a33aab3f42c8ba22d5c9702d1bf95da2813;hb=0f5203ceed075bb2a648254f461902387588b172;hp=08b1ec3ba38aeeb4229e23ab0e7b94f1e201322d;hpb=bc3c96311eab9ac5d775a69dc0496a0d7b789284;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc
index 08b1ec3ba3..f5fc4a33aa 100644
--- a/qcsrc/server/cl_weaponsystem.qc
+++ b/qcsrc/server/cl_weaponsystem.qc
@@ -142,7 +142,7 @@ void W_SetupShot_Dir_ProjectileSize_Range(entity ent, vector s_forward, vector m
 	local float oldsolid;
 	vector vecs, dv;
 	oldsolid = ent.dphitcontentsmask;
-	if(ent.weapon == WEP_SNIPERRIFLE)
+	if(ent.weapon == WEP_RIFLE)
 		ent.dphitcontentsmask = DPCONTENTS_BODY | DPCONTENTS_CORPSE;
 	else
 		ent.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_CORPSE;
@@ -828,33 +828,36 @@ void CL_ExteriorWeaponentity_Think()
 	else
 		self.alpha = 1;
 
-	ang_x = bound(sv_pitch_min, self.owner.v_angle_x, sv_pitch_max);
-	ang_y = 0;
-	ang_z = 0;
-
-	if(sv_pitch_fixyaw) // workaround for stupid player models that don't aim forward
-	{
-		ang_y = self.owner.v_angle_y;
-		makevectors(ang);
-		var vector v = v_forward;
-		var float t = self.tag_entity.frame1time;
-		var float f = self.tag_entity.frame;
-		self.tag_entity.frame1time = time;
-		self.tag_entity.frame = self.tag_entity.anim_idle_x;
-		gettaginfo(self.tag_entity, self.tag_index);
-		self.tag_entity.frame1time = t;
-		self.tag_entity.frame = f;
-		// untransform v according to this coordinate space
-		vector w;
-		w_x = v_forward * v;
-		w_y = -v_right * v;
-		w_z = v_up * v;
-		self.angles = vectoangles(w);
-	}
-	else
+	if (!intermission_running)
 	{
-		ang_x = -/* don't ask */ang_x;
-		self.angles = ang;
+		ang_x = bound(sv_pitch_min, self.owner.v_angle_x, sv_pitch_max);
+		ang_y = 0;
+		ang_z = 0;
+
+		if(sv_pitch_fixyaw) // workaround for stupid player models that don't aim forward
+		{
+			ang_y = self.owner.v_angle_y;
+			makevectors(ang);
+			var vector v = v_forward;
+			var float t = self.tag_entity.frame1time;
+			var float f = self.tag_entity.frame;
+			self.tag_entity.frame1time = time;
+			self.tag_entity.frame = self.tag_entity.anim_idle_x;
+			gettaginfo(self.tag_entity, self.tag_index);
+			self.tag_entity.frame1time = t;
+			self.tag_entity.frame = f;
+			// untransform v according to this coordinate space
+			vector w;
+			w_x = v_forward * v;
+			w_y = -v_right * v;
+			w_z = v_up * v;
+			self.angles = vectoangles(w);
+		}
+		else
+		{
+			ang_x = -/* don't ask */ang_x;
+			self.angles = ang;
+		}
 	}
 
 	self.glowmod = self.owner.weaponentity_glowmod;
@@ -1257,6 +1260,7 @@ 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
@@ -1264,8 +1268,8 @@ void weapon_thinkf(float fr, float t, void() func)
 		local vector anim;
 		if(self.weapon == WEP_SHOTGUN && self.BUTTON_ATCK2)
 			anim = self.anim_melee;
-		else
-			anim = self.anim_shoot;
+		/*else
+			anim = self.anim_shoot;*/
 		anim_z = anim_y / (t + sys_frametime);
 		setanim(self, anim, FALSE, TRUE, TRUE);
 	}