[nexuiz-commits] r8051 - in trunk/data/qcsrc: client common server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-10-04 07:27:19 -0400 (Sun, 04 Oct 2009)
New Revision: 8051

Modified:
   trunk/data/qcsrc/client/projectile.qc
   trunk/data/qcsrc/common/constants.qh
   trunk/data/qcsrc/server/w_campingrifle.qc
   trunk/data/qcsrc/server/w_common.qc
Log:
bring back rifle bullet glow if antilag bulets are off


Modified: trunk/data/qcsrc/client/projectile.qc
===================================================================
--- trunk/data/qcsrc/client/projectile.qc	2009-10-04 11:24:11 UTC (rev 8050)
+++ trunk/data/qcsrc/client/projectile.qc	2009-10-04 11:27:19 UTC (rev 8051)
@@ -84,6 +84,9 @@
 			trailparticles(self, particleeffectnum("tr_bullet"), from, to);
 			break;
 		case PROJECTILE_BULLET_GLOWING:
+			trailparticles(self, particleeffectnum("tr_bullet"), from, to);
+			break;
+		case PROJECTILE_BULLET_GLOWING_TRACER:
 			trailparticles(self, particleeffectnum("tr_rifle"), from, to);
 			break;
 		case PROJECTILE_FIREMINE:
@@ -177,11 +180,10 @@
 
 	switch(self.cnt)
 	{
-		/*
 		case PROJECTILE_BULLET_GLOWING:
+		case PROJECTILE_BULLET_GLOWING_TRACER:
 			R_AddDynamicLight(self.origin, 50, '1 1 0');
 			break;
-		*/
 		default:
 			break;
 	}

Modified: trunk/data/qcsrc/common/constants.qh
===================================================================
--- trunk/data/qcsrc/common/constants.qh	2009-10-04 11:24:11 UTC (rev 8050)
+++ trunk/data/qcsrc/common/constants.qh	2009-10-04 11:27:19 UTC (rev 8051)
@@ -407,6 +407,7 @@
 float PROJECTILE_CRYLINK_BOUNCING = 19;
 float PROJECTILE_FIREBALL = 20;
 float PROJECTILE_FIREMINE = 21;
+float PROJECTILE_BULLET_GLOWING_TRACER = 22;
 
 float SPECIES_HUMAN        =  0;
 float SPECIES_ROBOT_SOLID  =  1;

Modified: trunk/data/qcsrc/server/w_campingrifle.qc
===================================================================
--- trunk/data/qcsrc/server/w_campingrifle.qc	2009-10-04 11:24:11 UTC (rev 8050)
+++ trunk/data/qcsrc/server/w_campingrifle.qc	2009-10-04 11:27:19 UTC (rev 8051)
@@ -88,7 +88,7 @@
 		w_shotorg = self.origin + self.view_ofs + ((w_shotorg - self.origin - self.view_ofs) * v_forward) * v_forward;
 	}
 
-	fireBallisticBullet(w_shotorg, w_shotdir, pSpread, pSpeed, pLifetime, pDamage, pHeadshotAddedDamage / pDamage, pForce, deathtype, (cvar("g_balance_campingrifle_tracer") ? EF_RED : 0), 1, pBulletConstant);
+	fireBallisticBullet(w_shotorg, w_shotdir, pSpread, pSpeed, pLifetime, pDamage, pHeadshotAddedDamage / pDamage, pForce, deathtype, (cvar("g_balance_campingrifle_tracer") ? EF_RED : EF_BLUE), 1, pBulletConstant);
 	endFireBallisticBullet();
 
 	if (cvar("g_casings") >= 2)

Modified: trunk/data/qcsrc/server/w_common.qc
===================================================================
--- trunk/data/qcsrc/server/w_common.qc	2009-10-04 11:24:11 UTC (rev 8050)
+++ trunk/data/qcsrc/server/w_common.qc	2009-10-04 11:27:19 UTC (rev 8051)
@@ -488,6 +488,8 @@
 	}
 
 	if(tracereffects & EF_RED)
+		CSQCProjectile(proj, TRUE, PROJECTILE_BULLET_GLOWING_TRACER, TRUE);
+	else if(tracereffects & EF_BLUE)
 		CSQCProjectile(proj, TRUE, PROJECTILE_BULLET_GLOWING, TRUE);
 	else
 		CSQCProjectile(proj, TRUE, PROJECTILE_BULLET, TRUE);