From: Mario Date: Wed, 8 Jun 2016 09:25:43 +0000 (+1000) Subject: Don't do exact trigger checks if the activator is not a trigger, fixes button-activat... X-Git-Tag: xonotic-v0.8.2~883 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8c88c9061305974a4254b295a2781a6e8139571a;p=xonotic%2Fxonotic-data.pk3dir.git Don't do exact trigger checks if the activator is not a trigger, fixes button-activated target_items --- diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc index 656d829a9..f8002c8cf 100644 --- a/qcsrc/common/t_items.qc +++ b/qcsrc/common/t_items.qc @@ -1432,7 +1432,10 @@ void target_items_use(entity this, entity actor, entity trigger) return; if(IS_DEAD(actor)) return; - EXACTTRIGGER_TOUCH; + if(trigger.solid == SOLID_TRIGGER) + { + EXACTTRIGGER_TOUCH; + } FOREACH_ENTITY_ENT(enemy, actor, {