Merge branch 'master' into Mirio/balance

[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 5ada6805fc067ae7d4410ca29a5fb39f4ec8fd57..8246aed7c329a67c8eaa10cf3f4822186ba62cfc 100644 (file)
--- a/qcsrc/common/triggers/trigger/counter.qc
+++ b/qcsrc/common/triggers/trigger/counter.qc
@@ -1,3 +1,4 @@
+#include "counter.qh"
 #ifdef SVQC
 void counter_use(entity this, entity actor, entity trigger)
 {
@@ -11,7 +12,7 @@ void counter_use(entity this, entity actor, entity trigger)
                        Send_Notification(NOTIF_ONE, actor, MSG_CENTER, CENTER_SEQUENCE_COMPLETED);
 
                this.enemy = actor;
-               WITHSELF(this, multi_trigger ());
+               multi_trigger(this);
        }
        else
        {
@@ -38,12 +39,12 @@ After the counter has been triggered "count" times (default 2), it will fire all
 */
 spawnfunc(trigger_counter)
 {
-       self.wait = -1;
-       if (!self.count)
-               self.count = 2;
-       self.cnt = self.count;
+       this.wait = -1;
+       if (!this.count)
+               this.count = 2;
+       this.cnt = this.count;
 
-       self.use = counter_use;
-       self.reset = counter_reset;
+       this.use = counter_use;
+       this.reset = counter_reset;
 }
 #endif