Merge branch 'master' into z411/bai-server

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

diff --git a/qcsrc/common/mapobjects/triggers.qc b/qcsrc/common/mapobjects/triggers.qc
index 0f0f7f788e99d7445dbd7b41fe7ffb2c6d89fb29..cfc1d6fac67f6222162c444e665f2dd31133b443 100644 (file)
--- a/qcsrc/common/mapobjects/triggers.qc
+++ b/qcsrc/common/mapobjects/triggers.qc
@@ -9,7 +9,7 @@ bool isPushable(entity e)
                return false;
        if(e.iscreature)
                return true;
-       if (Item_IsLoot(e))
+       if (ITEM_IS_LOOT(e))
        {
                return true;
        }
@@ -205,6 +205,8 @@ void trigger_common_read(entity this, bool withtarget)
                this.angles = '0 0 0';
 
        this.modelindex = ReadShort();
+       if (this.modelindex)
+               setmodelindex(this, this.modelindex);
        this.mins = ReadVector();
        this.maxs = ReadVector();
        this.scale = ReadByte() / 16;