Merge remote branch 'origin/fruitiex/fruit_vs_tzork-balance'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / cl_client.qc

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 991017f0fe5cbdb8054e76085f5befae3842c2fd..3d06f58718b22da56d8bb07432bc266df9b81a43 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -889,7 +889,11 @@ void PutClientInServer (void)
                self.air_finished = time + 12;
                self.dmg = 2;
                if(cvar("g_balance_nex_charge"))
                self.air_finished = time + 12;
                self.dmg = 2;
                if(cvar("g_balance_nex_charge"))

+               {
+                       if(cvar("g_balance_nex_secondary_charge_pool"))
+                               self.nex_charge_pool_ammo = 1;

                        self.nex_charge = cvar("g_balance_nex_charge_start");
                        self.nex_charge = cvar("g_balance_nex_charge_start");

+               }

 
                if(inWarmupStage)
                {
 
                if(inWarmupStage)
                {