From 386f6ea9a5f3165e067bf3d7b2a710cf60a3bdad Mon Sep 17 00:00:00 2001 From: div0 Date: Fri, 12 Jun 2009 19:17:24 +0000 Subject: [PATCH] crifle: make a cvar whether to reload on switch, but don't use it yet git-svn-id: svn://svn.icculus.org/nexuiz/trunk@7014 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/w_campingrifle.qc | 1 + data/weapons.cfg | 1 + data/weaponsHavoc.cfg | 1 + 3 files changed, 3 insertions(+) diff --git a/data/qcsrc/server/w_campingrifle.qc b/data/qcsrc/server/w_campingrifle.qc index 5576b7cc4..7bbe1750e 100644 --- a/data/qcsrc/server/w_campingrifle.qc +++ b/data/qcsrc/server/w_campingrifle.qc @@ -149,6 +149,7 @@ float w_campingrifle(float req) else if (req == WR_SETUP) { weapon_setup(WEP_CAMPINGRIFLE); + if(cvar("g_balance_campingrifle_auto_reload_after_changing_weapons")) if(self.campingrifle_bulletcounter != 0) self.campingrifle_bulletcounter = -1; } diff --git a/data/weapons.cfg b/data/weapons.cfg index 0a7469aa5..2ca8c7268 100644 --- a/data/weapons.cfg +++ b/data/weapons.cfg @@ -398,6 +398,7 @@ set g_balance_seeker_flac_ammo 0.5 set g_balance_campingrifle_magazinecapacity 8 set g_balance_campingrifle_reloadtime 2 // matches reload anim +set g_balance_campingrifle_auto_reload_after_changing_weapons 1 set g_balance_campingrifle_primary_damage 60 set g_balance_campingrifle_primary_headshotaddeddamage 100 set g_balance_campingrifle_primary_spread 0 diff --git a/data/weaponsHavoc.cfg b/data/weaponsHavoc.cfg index 85ea8a1c3..578acd523 100644 --- a/data/weaponsHavoc.cfg +++ b/data/weaponsHavoc.cfg @@ -393,6 +393,7 @@ set g_balance_seeker_flac_ammo 0.5 set g_balance_campingrifle_magazinecapacity 5 set g_balance_campingrifle_reloadtime 1.5 +set g_balance_campingrifle_auto_reload_after_changing_weapons 1 set g_balance_campingrifle_primary_damage 50 set g_balance_campingrifle_primary_headshotaddeddamage 100 set g_balance_campingrifle_primary_spread 0 -- 2.39.2