Cleanse more of the mutator hooks

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / t_items.qc

diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc
index 656d829a93ee26b86bc1acb345db9257bee196a3..8848aa917bd5126e0a8fd0599d9c737b8595b816 100644 (file)
--- a/qcsrc/common/t_items.qc
+++ b/qcsrc/common/t_items.qc
@@ -1131,7 +1131,7 @@ void _StartItem(entity this, entity def, float defaultrespawntime, float default
                        this.SendFlags |= ISF_SIZE;
                        // note droptofloor returns false if stuck/or would fall too far
                        if (!this.noalign)
-                               WITHSELF(this, droptofloor());
+                               droptofloor(this);
                        waypoint_spawnforitem(this);
                }
 
@@ -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,
        {