From: Amadeusz Sławiński Date: Wed, 22 Feb 2017 13:40:18 +0000 (+0100) Subject: more if simplification X-Git-Tag: xonotic-v0.8.5~2843^2~6 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d07761ed9fd9190720ec7f16433ac29bcf188905;p=xonotic%2Fxonotic-data.pk3dir.git more if simplification --- diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc index 7576d761ed..e5c6218b12 100644 --- a/qcsrc/common/t_items.qc +++ b/qcsrc/common/t_items.qc @@ -1461,10 +1461,9 @@ void target_items_use(entity this, entity actor, entity trigger) return; } - if (!IS_PLAYER(actor)) - return; - if(IS_DEAD(actor)) + if (!IS_PLAYER(actor) || IS_DEAD(actor)) return; + if(trigger.solid == SOLID_TRIGGER) { EXACTTRIGGER_TOUCH(this, trigger);