Merge branch 'master' into 'terencehill/bot_waypoints'

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

diff --git a/qcsrc/common/triggers/trigger/relay_activators.qc b/qcsrc/common/triggers/trigger/relay_activators.qc
index d713a05837728245f18a604f96647b5a300d40ca..18c2a40d01d569bb48cb1ba054484d1e624c4cfc 100644 (file)
--- a/qcsrc/common/triggers/trigger/relay_activators.qc
+++ b/qcsrc/common/triggers/trigger/relay_activators.qc
@@ -9,13 +9,7 @@ void relay_activators_use(entity this, entity actor, entity trigger)
                else
                {
                        //bprint("Not using setactive\n");
-                       if(this.cnt == ACTIVE_TOGGLE)
-                               if(trg.active == ACTIVE_ACTIVE)
-                                       trg.active = ACTIVE_NOT;
-                               else
-                                       trg.active = ACTIVE_ACTIVE;
-                       else
-                               trg.active = this.cnt;
+                       generic_setactive(trg, this.cnt);
                }
        }
 }