X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_nex.qc;h=cdcabc86688996cde0ce04f43dd94816ab9eb88e;hb=71ee5248f3bc5e5fbddb4d42fb74c2e247658039;hp=3f47b48fd073b149cfdb6b386f226442badd668a;hpb=37ff2a84b803701be464173fb557c80b2cf60f46;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc index 3f47b48fd..cdcabc866 100644 --- a/qcsrc/server/w_nex.qc +++ b/qcsrc/server/w_nex.qc @@ -221,10 +221,17 @@ float w_nex(float req) } else if (req == WR_CHECKAMMO2) { - // don't allow charging if we don't have enough ammo - ammo_amount = self.ammo_cells >= autocvar_g_balance_nex_secondary_ammo; - ammo_amount += self.(weapon_load[WEP_NEX]) >= autocvar_g_balance_nex_secondary_ammo; - return ammo_amount; + if(autocvar_g_balance_nex_secondary) + { + // don't allow charging if we don't have enough ammo + ammo_amount = self.ammo_cells >= autocvar_g_balance_nex_secondary_ammo; + ammo_amount += self.(weapon_load[WEP_NEX]) >= autocvar_g_balance_nex_secondary_ammo; + return ammo_amount; + } + else + { + return FALSE; // zoom is not a fire mode + } } else if (req == WR_RELOAD) {