]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
when nex secondary is off, nex secondary charge is on, make nex charge and zoom at...
authorRudolf Polzer <divverent@alientrap.org>
Sat, 1 Jan 2011 19:48:58 +0000 (20:48 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 1 Jan 2011 19:48:58 +0000 (20:48 +0100)
qcsrc/server/w_nex.qc

index 14d19565d32679ed14903f5b5b2f7437f6ac1c1e..77183073da312438534ad96cc16b069cc31114d4 100644 (file)
@@ -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)
                        {