From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Wed, 21 Jul 2010 00:37:04 +0000 (+0300)
Subject: dont remove(self) if we hit a wall duh!
X-Git-Tag: xonotic-v0.1.0preview~423^2~26^2~5
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=96c3280cdcffff9511c8c99c62ed522ae0481f4d

dont remove(self) if we hit a wall duh!
---

diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc
index 319f743e35..9d1d8fba59 100644
--- a/qcsrc/server/w_shotgun.qc
+++ b/qcsrc/server/w_shotgun.qc
@@ -99,8 +99,7 @@ void shotgun_meleethink (void)
 	vector angle;
 	angle = v_forward;
 
-	// broken? fix, needs to be easier to hit EDIT: maybe not :)
-	//WarpZone_tracebox_antilag(self.owner, self.owner.origin + self.owner.view_ofs, self.owner.origin + self.owner.view_ofs + angle * cvar("g_balance_shotgun_secondary_melee_range") - (v_right + v_up) * cvar("g_balance_shotgun_secondary_melee_size"), self.owner.origin + self.owner.view_ofs + (v_right + v_up) * cvar("g_balance_shotgun_secondary_melee_size"), self.owner.origin + self.owner.view_ofs + angle * cvar("g_balance_shotgun_secondary_melee_range"), FALSE, self.owner, ANTILAG_LATENCY(self.owner));
+	// perform trace
 	float f;
 	f = (self.cnt + cvar("g_balance_shotgun_secondary_melee_time") - time) / cvar("g_balance_shotgun_secondary_melee_time") * 2 - 1;
 	vector targpos;
@@ -108,7 +107,7 @@ void shotgun_meleethink (void)
 	WarpZone_traceline_antilag(self.owner, self.owner.origin + self.owner.view_ofs, targpos, FALSE, self.owner, ANTILAG_LATENCY(self.owner));
 
 	// apply the damage, also remove self
-	if(trace_fraction < 1)
+	if(trace_fraction < 1 && trace_ent.takedamage == DAMAGE_AIM && trace_ent.classname == "player")
 	{
 		vector force;
 		force = angle * cvar("g_balance_shotgun_secondary_force");