From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 1 Jan 2011 19:48:58 +0000 (+0100)
Subject: when nex secondary is off, nex secondary charge is on, make nex charge and zoom at... 
X-Git-Tag: xonotic-v0.5.0~328^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ba9551efc3bf41d5c4866d4e47f415f3428b22b3;p=xonotic%2Fxonotic-data.pk3dir.git

when nex secondary is off, nex secondary charge is on, make nex charge and zoom at the same time; also make ANY zoom enable charge of the nex
---

diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc
index 14d19565d..77183073d 100644
--- a/qcsrc/server/w_nex.qc
+++ b/qcsrc/server/w_nex.qc
@@ -110,7 +110,7 @@ float w_nex(float req)
 				weapon_thinkf(WFRAME_FIRE1, autocvar_g_balance_nex_primary_animtime, w_ready);
 			}
 		}
-		if (self.BUTTON_ATCK2)
+		if (self.BUTTON_ATCK2 || (self.BUTTON_ZOOM && autocvar_g_balance_nex_secondary_charge && !autocvar_g_balance_nex_secondary))
 		{
 			if(autocvar_g_balance_nex_secondary_charge)
 			{