Whitelist overkill's health/armor items again

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mutators / mutator / overkill / sv_overkill.qc

diff --git a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
index d50094fb5c3e480866e8c58681d325424b5fd065..fab0b6ff969008269df0d6b595cf882ce5677ef9 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
+++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
@@ -167,7 +167,7 @@ MUTATOR_HOOKFUNCTION(ok, PlayerPreThink)
        PHYS_INPUT_BUTTON_ATCK2(player) = false;
 }
 
-MUTATOR_HOOKFUNCTION(ok, ShouldGiveRandomStartWeapons)
+MUTATOR_HOOKFUNCTION(ok, ForbidRandomStartWeapons)
 {
        return true;
 }
@@ -230,6 +230,13 @@ MUTATOR_HOOKFUNCTION(ok, FilterItem)
        {
                return false;
        }
+       switch(item.itemdef)
+       {
+               case ITEM_HealthMega: return autocvar_g_overkill_filter_healthmega;
+               case ITEM_ArmorMedium: return autocvar_g_overkill_filter_armormedium;
+               case ITEM_ArmorBig: return autocvar_g_overkill_filter_armorbig;
+               case ITEM_ArmorMega: return autocvar_g_overkill_filter_armormega;
+       }
        if (!autocvar_g_powerups || !autocvar_g_overkill_powerups_replace)
        {
                return true;