Allow grabber secondary to be toggled

diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg
index 224465747816cb84cfa49c9bd6fb8399d9765bbc..dbe24064d51faa0437489b838c4bc49adb7313fc 100644 (file)
--- a/data/balanceVT.cfg
+++ b/data/balanceVT.cfg
@@ -173,6 +173,7 @@ set g_balance_grabber_primary_grabbered_time_max 0 // infinite
 set g_balance_grabber_primary_grabbered_time_free 1 // 1s being grabbered are free\r
 set g_balance_grabber_primary_grabbered_fuel 5 // fuel per second grabbered\r
 set g_balance_grabber_primary_recoil 2.5\r
+set g_balance_grabber_secondary 1\r
 set g_balance_grabber_secondary_ammo 15\r
 set g_balance_grabber_secondary_refire 1.1\r
 set g_balance_grabber_secondary_animtime 1 // good melee anim\r

diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc
index cbd202b66a864f8dae6107a3a4050975d4cdd14b..bd5f3431e72603f42ea254fa50e602580fe61b6c 100644 (file)
--- a/data/qcsrc/server/w_grabber.qc
+++ b/data/qcsrc/server/w_grabber.qc
@@ -81,7 +81,7 @@ float w_grabber(float req)
                // determine by distance if this will be primary fire or alternate fire\r
                W_SetupShot (self, TRUE, 0, "", 0); // do this to update w_shotorg\r
                WarpZone_traceline_antilag(self, w_shotorg, w_shotorg + w_shotdir * cvar("g_balance_grabber_secondary_radius"), FALSE, self, ANTILAG_LATENCY(self));\r
-               if(trace_fraction < 1 && !self.grabber) // not if hooked or firing the hook\r
+               if(cvar("g_balance_grabber_secondary") && trace_fraction < 1 && !self.grabber) // not if hooked or firing the hook\r
                        self.stat_crosshair_style = 1;\r
                else\r
                        self.stat_crosshair_style = 0;\r