r5292 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-12-23 17:45:23 -0500 (Tue, 23 Dec 2008)
New Revision: 5292

Modified:
   trunk/data/qcsrc/server/w_campingrifle.qc
   trunk/data/qcsrc/server/w_common.qc
Log:
fix extra casings :P


Modified: trunk/data/qcsrc/server/w_campingrifle.qc
===================================================================
--- trunk/data/qcsrc/server/w_campingrifle.qc	2008-12-23 22:38:21 UTC (rev 5291)
+++ trunk/data/qcsrc/server/w_campingrifle.qc	2008-12-23 22:45:23 UTC (rev 5292)
@@ -29,6 +29,9 @@
 	pointparticles(particleeffectnum("shotgun_muzzleflash"), w_shotorg, w_shotdir * 2000, 1);
 
 	fireBallisticBullet(w_shotorg, v_forward /* no TrueAim for this weapon */, pSpread, pSpeed, pLifetime, pDamage, pHeadshotAddedDamage / pDamage, pForce, deathtype, EF_RED, 1);
+
+	if (cvar("g_casings") >= 2)
+		SpawnCasing (w_shotorg + v_forward * 10, ((random () * 50 + 50) * v_right) - (v_forward * (random () * 25 + 25)) - ((random () * 5 - 70) * v_up), 2, vectoangles(v_forward),'0 250 0', 100, 3);
 	
 	self.campingrifle_bulletcounter = self.campingrifle_bulletcounter + 1;
 	W_Campingrifle_CheckReload();

Modified: trunk/data/qcsrc/server/w_common.qc
===================================================================
--- trunk/data/qcsrc/server/w_common.qc	2008-12-23 22:38:21 UTC (rev 5291)
+++ trunk/data/qcsrc/server/w_common.qc	2008-12-23 22:45:23 UTC (rev 5292)
@@ -321,7 +321,7 @@
 	proj.dmg_radius = cvar("g_ballistics_solidspeedhalflife");
 	setmodel(proj, "models/tracer.mdl");
 	setsize(proj, '0 0 0', '0 0 0');
-	setorigin(proj, w_shotorg);
+	setorigin(proj, start);
 	proj.effects = EF_LOWPRECISION | tracereffects;
 	proj.flags = FL_PROJECTILE;
 
@@ -332,9 +332,6 @@
 	proj.projectiledeathtype = dtype;
 
 	proj.oldvelocity = proj.velocity;
-
-	if (cvar("g_casings") >= 2)
-		SpawnCasing (w_shotorg + v_forward * 10, ((random () * 50 + 50) * v_right) - (v_forward * (random () * 25 + 25)) - ((random () * 5 - 70) * v_up), 2, vectoangles(v_forward),'0 250 0', 100, 3);
 }
 
 void fireBullet (vector start, vector dir, float spread, float damage, float force, float dtype, float tracer)