]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Remove more stupidity
authorSamual Lenks <samual@xonotic.org>
Tue, 20 Aug 2013 21:03:21 +0000 (17:03 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 20 Aug 2013 21:03:21 +0000 (17:03 -0400)
qcsrc/server/cl_client.qc
qcsrc/server/mutators/mutator_nix.qc

index e0f7206249163044c9f53d12ab00a1fb730ceef5..cd6d469fbfbc96ff7175e0a83a5de21584ea4ede 100644 (file)
@@ -564,7 +564,7 @@ void PutClientInServer (void)
                        entity e;
                        e = get_weaponinfo(j);
                        if(e.spawnflags & WEP_FLAG_RELOADABLE) // prevent accessing undefined cvars
                        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;
                }
 
                oldself = self;
index 44ff71749cca4355a2ef8f44a30baa5f1cf41aeb..166063df5699b5a05ea888a0faea34526e455ee0 100644 (file)
@@ -104,7 +104,7 @@ void NIX_GiveCurrentWeapon()
                entity e;
                e = get_weaponinfo(nix_weapon);
                if(e.spawnflags & WEP_FLAG_RELOADABLE) // prevent accessing undefined cvars
                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))
 
                // nex too
                if(WEP_CVAR(nex, charge))