Merge branch 'z411/fix_resetmatch_scores' 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 832b25b6b4e8f6513bd30655347ef0472f8c3468..28b420b20ab4f2ed6c49bde68e5383d365de1b6b 100644 (file)
--- a/qcsrc/common/mapobjects/platforms.qc
+++ b/qcsrc/common/mapobjects/platforms.qc
@@ -1,4 +1,5 @@
 #include "platforms.qh"
+
 void generic_plat_blocked(entity this, entity blocker)
 {
 #ifdef SVQC
@@ -19,10 +20,9 @@ void generic_plat_blocked(entity this, entity blocker)
 
 void plat_spawn_inside_trigger(entity this)
 {
-       entity trigger;
        vector tmin, tmax;
 
-       trigger = spawn();
+       entity trigger = spawn();
        settouch(trigger, plat_center_touch);
        set_movetype(trigger, MOVETYPE_NONE);
        trigger.solid = SOLID_TRIGGER;
@@ -179,7 +179,7 @@ void plat_use(entity this, entity actor, entity trigger)
 
 void plat_reset(entity this)
 {
-       IFTARGETED
+       if(this.targetname && this.targetname != "")
        {
                setorigin(this, this.pos1);
                this.state = STATE_UP;