From: Freddy Date: Wed, 12 Oct 2016 21:49:43 +0000 (+0200) Subject: Fix the g_overkill_filter_* cvars X-Git-Tag: xonotic-v0.8.2~519^2 X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=d299cf86163486e2206b4b404ade60fb32005d3f;p=xonotic%2Fxonotic-data.pk3dir.git Fix the g_overkill_filter_* cvars --- diff --git a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc index 86bd70deb..d47da6c3c 100644 --- a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc +++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc @@ -308,14 +308,14 @@ MUTATOR_HOOKFUNCTION(ok, FilterItem) if(item.ok_item) return false; - switch(item.items) + switch(item.itemdef) { - case ITEM_HealthMega.m_itemid: return autocvar_g_overkill_filter_healthmega; - case ITEM_ArmorMedium.m_itemid: return autocvar_g_overkill_filter_armormedium; + 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.m_itemid: return autocvar_g_overkill_filter_armorbig; - case ITEM_ArmorMega.m_itemid: return autocvar_g_overkill_filter_armorlarge; + case ITEM_ArmorLarge: return autocvar_g_overkill_filter_armorbig; + case ITEM_ArmorMega: return autocvar_g_overkill_filter_armorlarge; } return true;