Merge branch 'master' into Lyberta/WaypointIcons

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

diff --git a/qcsrc/common/mapobjects/func/conveyor.qc b/qcsrc/common/mapobjects/func/conveyor.qc
index 9ad326cfa225f7ef9b0c08151e96f4feeacdff39..3666dd337b2c56ffed1b03ca54d1339dfe98d4e8 100644 (file)
--- a/qcsrc/common/mapobjects/func/conveyor.qc
+++ b/qcsrc/common/mapobjects/func/conveyor.qc
@@ -98,7 +98,7 @@ void conveyor_init(entity this)
        setthink(this, conveyor_think);
        this.nextthink = time;
        this.setactive = generic_netlinked_setactive;
-       IFTARGETED
+       if(this.targetname && this.targetname != "")
        {
                // backwards compatibility
                this.use = generic_netlinked_legacy_use;
@@ -106,8 +106,6 @@ void conveyor_init(entity this)
        this.reset = generic_netlinked_reset;
        this.reset(this);
 
-       FixSize(this);
-
        Net_LinkEntity(this, 0, false, conveyor_send);
 
        this.SendFlags |= SF_TRIGGER_INIT;