From: Mario <mario@smbclan.net>
Date: Mon, 12 Feb 2018 23:43:21 +0000 (+1000)
Subject: Fix vortex chargepol
X-Git-Tag: xonotic-v0.8.5~2321
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7198f69860902c5f8bd6b200db25101353b91316;p=xonotic%2Fxonotic-data.pk3dir.git

Fix vortex chargepol
---

diff --git a/qcsrc/common/mutators/mutator/nix/sv_nix.qc b/qcsrc/common/mutators/mutator/nix/sv_nix.qc
index eb14a3159..c174b530f 100644
--- a/qcsrc/common/mutators/mutator/nix/sv_nix.qc
+++ b/qcsrc/common/mutators/mutator/nix/sv_nix.qc
@@ -183,18 +183,6 @@ void NIX_GiveCurrentWeapon(entity this)
 			}
 		}
 
-		// vortex too
-		if(WEP_CVAR(vortex, charge))
-		{
-			if(WEP_CVAR_SEC(vortex, chargepool))
-				this.vortex_chargepool_ammo = 1;
-			for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
-			{
-				.entity weaponentity = weaponentities[slot];
-				this.(weaponentity).vortex_charge = WEP_CVAR(vortex, charge_start);
-			}
-		}
-
 		// set last change info
 		this.nix_lastchange_id = nix_nextchange;
 	}
diff --git a/qcsrc/common/weapons/weapon/vortex.qc b/qcsrc/common/weapons/weapon/vortex.qc
index 39433dd6f..257faed6b 100644
--- a/qcsrc/common/weapons/weapon/vortex.qc
+++ b/qcsrc/common/weapons/weapon/vortex.qc
@@ -208,11 +208,11 @@ METHOD(Vortex, wr_think, void(entity thiswep, entity actor, .entity weaponentity
                         if(WEP_CVAR_SEC(vortex, ammo))
                         {
                             // always deplete if secondary is held
-                            actor.vortex_chargepool_ammo = max(0, actor.vortex_chargepool_ammo - WEP_CVAR_SEC(vortex, ammo) * dt);
+                            actor.(weaponentity).vortex_chargepool_ammo = max(0, actor.(weaponentity).vortex_chargepool_ammo - WEP_CVAR_SEC(vortex, ammo) * dt);
 
                             dt = min(dt, (1 - actor.(weaponentity).vortex_charge) / WEP_CVAR(vortex, charge_rate));
                             actor.vortex_chargepool_pauseregen_finished = time + WEP_CVAR_SEC(vortex, chargepool_pause_regen);
-                            dt = min(dt, actor.vortex_chargepool_ammo);
+                            dt = min(dt, actor.(weaponentity).vortex_chargepool_ammo);
                             dt = max(0, dt);
 
                             actor.(weaponentity).vortex_charge += dt * WEP_CVAR(vortex, charge_rate);