Merge branch 'master' into 'terencehill/bot_waypoints'

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

diff --git a/qcsrc/common/triggers/trigger/counter.qc b/qcsrc/common/triggers/trigger/counter.qc
index 87c046b0dba724fc877ad318b9b95e1be69fb8e1..4c89c4c27ed20efc86f73a678c615d68aa82673b 100644 (file)
--- a/qcsrc/common/triggers/trigger/counter.qc
+++ b/qcsrc/common/triggers/trigger/counter.qc
@@ -8,7 +8,7 @@ void counter_use(entity this, entity actor, entity trigger)
        if (this.count < 0)
                return;
 
-       bool doactivate = (this.spawnflags & 4);
+       bool doactivate = (this.spawnflags & COUNTER_FIRE_AT_COUNT);
 
        if (this.count == 0)
        {
@@ -45,14 +45,15 @@ void counter_reset(entity this)
        this.count = this.cnt;
 }
 
-/*QUAKED spawnfunc_trigger_counter (.5 .5 .5) ? nomessage
+/*QUAKED spawnfunc_trigger_counter (.5 .5 .5) ? nomessage COUNTER_FIRE_AT_COUNT
 Acts as an intermediary for an action that takes multiple inputs.
 
 If nomessage is not set, it will print "1 more.. " etc when triggered and "sequence complete" when finished.
+If COUNTER_FIRE_AT_COUNT is set, it will also fire all of its targets at countdown, making it behave like trigger_mulitple with limited shots
 
 If respawntime is set, it will re-enable itself after the time once the sequence has been completed
 
-After the counter has been triggered "count" times (default 2), it will fire all of it's targets and remove itself.
+After the counter has been triggered "count" times (default 2), it will fire all of its targets.
 */
 spawnfunc(trigger_counter)
 {