From 29dcdd5a9792b133994ed58ba2950b32962fb14f Mon Sep 17 00:00:00 2001 From: div0 Date: Sun, 4 Oct 2009 11:27:19 +0000 Subject: [PATCH] bring back rifle bullet glow if antilag bulets are off git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8051 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/client/projectile.qc | 6 ++++-- data/qcsrc/common/constants.qh | 1 + data/qcsrc/server/w_campingrifle.qc | 2 +- data/qcsrc/server/w_common.qc | 2 ++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/data/qcsrc/client/projectile.qc b/data/qcsrc/client/projectile.qc index 9187846a6..93e438186 100644 --- a/data/qcsrc/client/projectile.qc +++ b/data/qcsrc/client/projectile.qc @@ -84,6 +84,9 @@ void Projectile_DrawTrail(vector to) 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 @@ void Projectile_Draw() switch(self.cnt) { - /* case PROJECTILE_BULLET_GLOWING: + case PROJECTILE_BULLET_GLOWING_TRACER: R_AddDynamicLight(self.origin, 50, '1 1 0'); break; - */ default: break; } diff --git a/data/qcsrc/common/constants.qh b/data/qcsrc/common/constants.qh index 022edabec..a6f122bcf 100644 --- a/data/qcsrc/common/constants.qh +++ b/data/qcsrc/common/constants.qh @@ -407,6 +407,7 @@ float PROJECTILE_BULLET_GLOWING = 18; 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; diff --git a/data/qcsrc/server/w_campingrifle.qc b/data/qcsrc/server/w_campingrifle.qc index 218681593..82587d3ee 100644 --- a/data/qcsrc/server/w_campingrifle.qc +++ b/data/qcsrc/server/w_campingrifle.qc @@ -88,7 +88,7 @@ void W_CampingRifle_FireBullet(float pSpread, float pDamage, float pHeadshotAdde 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) diff --git a/data/qcsrc/server/w_common.qc b/data/qcsrc/server/w_common.qc index 93ed57bef..8a7b67761 100644 --- a/data/qcsrc/server/w_common.qc +++ b/data/qcsrc/server/w_common.qc @@ -488,6 +488,8 @@ void fireBallisticBullet(vector start, vector dir, float spread, float pSpeed, f } 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); -- 2.39.2