From e35218b25daab5030ab771d0acada6e8e9fe275d Mon Sep 17 00:00:00 2001 From: div0 Date: Sun, 7 Jun 2009 17:20:24 +0000 Subject: [PATCH] fix antilag AGAIN ;) (this time, if antilagged bullets are off) git-svn-id: svn://svn.icculus.org/nexuiz/trunk@6902 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/w_campingrifle.qc | 4 ++-- data/qcsrc/server/w_shotgun.qc | 4 ++-- data/qcsrc/server/w_uzi.qc | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/data/qcsrc/server/w_campingrifle.qc b/data/qcsrc/server/w_campingrifle.qc index f0ee5a23e..f001a9878 100644 --- a/data/qcsrc/server/w_campingrifle.qc +++ b/data/qcsrc/server/w_campingrifle.qc @@ -52,9 +52,9 @@ void W_CampingRifle_FireBullet(float pSpread, float pDamage, float pHeadshotAdde self.ammo_nails -= pAmmo; if(deathtype & HITTYPE_SECONDARY) - W_SetupShot (self, TRUE, 2, "weapons/campingrifle_fire2.wav"); + W_SetupShot (self, cvar("g_antilag_bullets") && pSpeed >= cvar("g_antilag_bullets"), 2, "weapons/campingrifle_fire2.wav"); else - W_SetupShot (self, TRUE, 2, "weapons/campingrifle_fire.wav"); + W_SetupShot (self, cvar("g_antilag_bullets") && pSpeed >= cvar("g_antilag_bullets"), 2, "weapons/campingrifle_fire.wav"); pointparticles(particleeffectnum("shotgun_muzzleflash"), w_shotorg, w_shotdir * 2000, 1); diff --git a/data/qcsrc/server/w_shotgun.qc b/data/qcsrc/server/w_shotgun.qc index fa11d59aa..5720eb49d 100644 --- a/data/qcsrc/server/w_shotgun.qc +++ b/data/qcsrc/server/w_shotgun.qc @@ -19,7 +19,7 @@ void W_Shotgun_Attack (void) bulletspeed = cvar("g_balance_shotgun_primary_speed"); bulletconstant = cvar("g_balance_shotgun_primary_bulletconstant"); - W_SetupShot (self, TRUE, 5, "weapons/shotgun_fire.wav"); + W_SetupShot (self, cvar("g_antilag_bullets") && bulletspeed >= cvar("g_antilag_bullets"), 5, "weapons/shotgun_fire.wav"); for (sc = 0;sc < bullets;sc = sc + 1) fireBallisticBullet(w_shotorg, w_shotdir, spread, bulletspeed, 5, d, 0, f, WEP_SHOTGUN, 0, 1, bulletconstant); if not(self.items & IT_UNLIMITED_WEAPON_AMMO) @@ -62,7 +62,7 @@ void W_Shotgun_Attack2 (void) bulletspeed = cvar("g_balance_shotgun_secondary_speed"); bulletconstant = cvar("g_balance_shotgun_secondary_bulletconstant"); - W_SetupShot (self, TRUE, 5, "weapons/shotgun_fire.wav"); + W_SetupShot (self, cvar("g_antilag_bullets") && bulletspeed >= cvar("g_antilag_bullets"), 5, "weapons/shotgun_fire.wav"); for (sc = 0;sc < bullets;sc = sc + 1) fireBallisticBullet(w_shotorg, w_shotdir, spread, bulletspeed, 5, d, 0, f, WEP_SHOTGUN | HITTYPE_SECONDARY, 0, 1, bulletconstant); if not(self.items & IT_UNLIMITED_WEAPON_AMMO) diff --git a/data/qcsrc/server/w_uzi.qc b/data/qcsrc/server/w_uzi.qc index 89ca61b12..08c8fe379 100644 --- a/data/qcsrc/server/w_uzi.qc +++ b/data/qcsrc/server/w_uzi.qc @@ -22,7 +22,7 @@ void W_Uzi_Attack (float deathtype) else self.ammo_nails = self.ammo_nails - cvar("g_balance_uzi_sustained_ammo"); } - W_SetupShot (self, TRUE, 0, "weapons/uzi_fire.wav"); + W_SetupShot (self, cvar("g_antilag_bullets") && cvar("g_balance_uzi_speed") >= cvar("g_antilag_bullets"), 0, "weapons/uzi_fire.wav"); if (!g_norecoil) { self.punchangle_x = random () - 0.5; -- 2.39.2