Revert "Merge branch 'bones_was_here/func_door' into 'master'"

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

diff --git a/qcsrc/common/mapobjects/platforms.qc b/qcsrc/common/mapobjects/platforms.qc
index 9e1f635b32c9982ab594d10c3036bad243f6e00e..28b420b20ab4f2ed6c49bde68e5383d365de1b6b 100644 (file)
--- a/qcsrc/common/mapobjects/platforms.qc
+++ b/qcsrc/common/mapobjects/platforms.qc
@@ -173,21 +173,13 @@ void plat_use(entity this, entity actor, entity trigger)
        plat_go_down(this);
 }
 
-void plat_target_use(entity this, entity actor, entity trigger)
-{
-       if (this.state == STATE_TOP)
-               this.nextthink = this.ltime + 1;
-       else if (this.state != STATE_UP)
-               plat_go_up(this);
-}
-
 // WARNING: backwards compatibility because people don't use already existing fields :(
 // TODO: Check if any maps use these fields and remove these fields if it doesn't break maps
 .string sound1, sound2;
 
 void plat_reset(entity this)
 {
-       if(this.targetname && this.targetname != "" && !Q3COMPAT_COMMON)
+       if(this.targetname && this.targetname != "")
        {
                setorigin(this, this.pos1);
                this.state = STATE_UP;
@@ -197,7 +189,7 @@ void plat_reset(entity this)
        {
                setorigin(this, this.pos2);
                this.state = STATE_BOTTOM;
-               this.use = (this.targetname != "" && Q3COMPAT_COMMON) ? plat_target_use : plat_trigger_use;
+               this.use = plat_trigger_use;
        }
 
 #ifdef SVQC