Merge branch 'master' into DefaultUser/armormega
[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mutators / mutator / overkill / sv_overkill.qc
index 21a191a..dc1a2e5 100644 (file)
@@ -11,7 +11,7 @@ float autocvar_g_overkill_ammo_charge_limit;
 bool autocvar_g_overkill_filter_healthmega;
 bool autocvar_g_overkill_filter_armormedium;
 bool autocvar_g_overkill_filter_armorbig;
-bool autocvar_g_overkill_filter_armorlarge;
+bool autocvar_g_overkill_filter_armormega;
 
 .float ok_lastwep;
 .float ok_item;
@@ -312,10 +312,8 @@ MUTATOR_HOOKFUNCTION(ok, FilterItem)
        {
                case ITEM_HealthMega: return autocvar_g_overkill_filter_healthmega;
                case ITEM_ArmorMedium: return autocvar_g_overkill_filter_armormedium;
-               // WARNING: next two statements look wrong because of inconsistency between cvar names and code
-               // armor cvars need renaming to be consistent with their health counterparts
-               case ITEM_ArmorLarge: return autocvar_g_overkill_filter_armorbig;
-               case ITEM_ArmorMega: return autocvar_g_overkill_filter_armorlarge;
+               case ITEM_ArmorBig: return autocvar_g_overkill_filter_armorbig;
+               case ITEM_ArmorMega: return autocvar_g_overkill_filter_armormega;
        }
 
        return true;