From: Samual Lenks <samual@xonotic.org>
Date: Tue, 20 Aug 2013 21:03:21 +0000 (-0400)
Subject: Remove more stupidity
X-Git-Tag: xonotic-v0.8.0~152^2~328
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=79355d207a08f4f1b9c87c3235427316a71e948f;p=xonotic%2Fxonotic-data.pk3dir.git

Remove more stupidity
---

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index e0f720624..cd6d469fb 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -564,7 +564,7 @@ void PutClientInServer (void)
 			entity e;
 			e = get_weaponinfo(j);
 			if(e.spawnflags & WEP_FLAG_RELOADABLE) // prevent accessing undefined cvars
-				self.(weapon_load[j]) = cvar(strcat("g_balance_", e.netname, "_reload_ammo"));
+				self.(weapon_load[j]) = e.reloading_ammo;
 		}
 
 		oldself = self;
diff --git a/qcsrc/server/mutators/mutator_nix.qc b/qcsrc/server/mutators/mutator_nix.qc
index 44ff71749..166063df5 100644
--- a/qcsrc/server/mutators/mutator_nix.qc
+++ b/qcsrc/server/mutators/mutator_nix.qc
@@ -104,7 +104,7 @@ void NIX_GiveCurrentWeapon()
 		entity e;
 		e = get_weaponinfo(nix_weapon);
 		if(e.spawnflags & WEP_FLAG_RELOADABLE) // prevent accessing undefined cvars
-			self.(weapon_load[nix_weapon]) = cvar(strcat("g_balance_", e.netname, "_reload_ammo"));
+			self.(weapon_load[nix_weapon]) = e.reloading_ammo;
 
 		// nex too
 		if(WEP_CVAR(nex, charge))