]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Use self.switchweapon instead of self.weapon where needed
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 21 Jan 2011 20:50:44 +0000 (22:50 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 21 Jan 2011 20:50:44 +0000 (22:50 +0200)
qcsrc/server/cl_weaponsystem.qc

index abeb9f6da4c6f379c8bb5a0263d910bb7a6dba57..0b23049fb113e717675c574b0aa879eaf36372b5 100644 (file)
@@ -931,7 +931,7 @@ float client_hasweapon(entity cl, float wpn, float andammo, float complain)
                                // allow switching to reloadable weapons, even if we're out of ammo, since the weapon itself
                                // might still be loaded. The reload code takes care of complaining and forced switching
                                entity e;
-                               e = get_weaponinfo(self.weapon);
+                               e = get_weaponinfo(self.switchweapon);
                                if(cvar(strcat("g_balance_", e.netname, "_reload_ammo")))
                                        f = 1;