Don't do exact trigger checks if the activator is not a trigger, fixes button-activat...

diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc
index 656d829a93ee26b86bc1acb345db9257bee196a3..f8002c8cf01205b7cd3716607b5e752bcf0506b1 100644 (file)
--- 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;
                return;
        if(IS_DEAD(actor))
                return;

-       EXACTTRIGGER_TOUCH;
+       if(trigger.solid == SOLID_TRIGGER)
+       {
+               EXACTTRIGGER_TOUCH;
+       }

 
        FOREACH_ENTITY_ENT(enemy, actor,
        {
 
        FOREACH_ENTITY_ENT(enemy, actor,
        {