Merge branch 'master' into terencehill/replicatevars_enhancements

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

diff --git a/qcsrc/server/items/items.qc b/qcsrc/server/items/items.qc
index 0ea10da5e389ef37a23402584390aa671470fa16..57b245a252a167b2beb7b069f1b2f12bac1ccbfd 100644 (file)
--- a/qcsrc/server/items/items.qc
+++ b/qcsrc/server/items/items.qc
@@ -484,7 +484,7 @@ bool Item_GiveTo(entity item, entity player)
        // if the player is using their best weapon before items are given, they
        // probably want to switch to an even better weapon after items are given
 
-       if(CS_CVAR(player).autoswitch)
+       if(CS_CVAR(player).cvar_cl_autoswitch)
        {
                for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
                {
@@ -1513,7 +1513,7 @@ float GiveItems(entity e, float beginarg, float endarg)
 
        int _switchweapon = 0;
 
-       if(CS_CVAR(e).autoswitch)
+       if(CS_CVAR(e).cvar_cl_autoswitch)
        {
                for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
                {