X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fcommon%2Ftriggers%2Ftrigger%2Frelay_activators.qc;h=147b6178a1e15abdeef8c6e924e295ce2137cfa1;hb=6f4c7132e635c0150e3894f2f9958b361ce0c238;hp=83c0103d09fe4ad2a2d61eaad361e49c48ac0e98;hpb=117fa45380851579df9e6c465a207d733f6ca748;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/triggers/trigger/relay_activators.qc b/qcsrc/common/triggers/trigger/relay_activators.qc index 83c0103d0..147b6178a 100644 --- a/qcsrc/common/triggers/trigger/relay_activators.qc +++ b/qcsrc/common/triggers/trigger/relay_activators.qc @@ -1,43 +1,39 @@ #ifdef SVQC void relay_activators_use() -{ - entity trg, os; - - os = self; - - for(trg = world; (trg = find(trg, targetname, os.target)); ) +{SELFPARAM(); + for(entity trg = world; (trg = find(trg, targetname, this.target)); ) { - self = trg; + setself(trg); if (trg.setactive) - trg.setactive(os.cnt); + trg.setactive(this.cnt); else { //bprint("Not using setactive\n"); - if(os.cnt == ACTIVE_TOGGLE) + if(this.cnt == ACTIVE_TOGGLE) if(trg.active == ACTIVE_ACTIVE) trg.active = ACTIVE_NOT; else trg.active = ACTIVE_ACTIVE; else - trg.active = os.cnt; + trg.active = this.cnt; } } - self = os; + setself(this); } -void spawnfunc_relay_activate() +spawnfunc(relay_activate) { self.cnt = ACTIVE_ACTIVE; self.use = relay_activators_use; } -void spawnfunc_relay_deactivate() +spawnfunc(relay_deactivate) { self.cnt = ACTIVE_NOT; self.use = relay_activators_use; } -void spawnfunc_relay_activatetoggle() +spawnfunc(relay_activatetoggle) { self.cnt = ACTIVE_TOGGLE; self.use = relay_activators_use;