From: FruitieX <rasse@rasse-laptop.(none)>
Date: Wed, 13 Oct 2010 08:52:51 +0000 (+0300)
Subject: oops, primary and secondary tracer checks flipped
X-Git-Tag: xonotic-v0.1.0preview~307^2~14
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ec02f49689f9347b6c2886031d965a7ac978314f;p=xonotic%2Fxonotic-data.pk3dir.git

oops, primary and secondary tracer checks flipped
---

diff --git a/qcsrc/server/w_campingrifle.qc b/qcsrc/server/w_campingrifle.qc
index 4e2e51816..d0b6f4ed8 100644
--- a/qcsrc/server/w_campingrifle.qc
+++ b/qcsrc/server/w_campingrifle.qc
@@ -97,9 +97,9 @@ void W_CampingRifle_FireBullet(float pSpread, float pDamage, float pHeadshotAdde
 	}
 
 	if(deathtype & HITTYPE_SECONDARY)
-		fireBallisticBullet(w_shotorg, w_shotdir, pSpread, pSpeed, pLifetime, pDamage, pHeadshotAddedDamage / pDamage, pForce, deathtype, (cvar("g_balance_campingrifle_primary_tracer") ? EF_RED : EF_BLUE), 1, pBulletConstant);
-	else
 		fireBallisticBullet(w_shotorg, w_shotdir, pSpread, pSpeed, pLifetime, pDamage, pHeadshotAddedDamage / pDamage, pForce, deathtype, (cvar("g_balance_campingrifle_secondary_tracer") ? EF_RED : EF_BLUE), 1, pBulletConstant);
+	else
+		fireBallisticBullet(w_shotorg, w_shotdir, pSpread, pSpeed, pLifetime, pDamage, pHeadshotAddedDamage / pDamage, pForce, deathtype, (cvar("g_balance_campingrifle_primary_tracer") ? EF_RED : EF_BLUE), 1, pBulletConstant);
 	endFireBallisticBullet();
 
 	if (cvar("g_casings") >= 2)