X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Ftarget%2Fvoicescript.qc;h=e8433177094dfec0337a9e101f878bface1873c4;hb=a823548db666d01ecf1ef8b8e559caa61334ce26;hp=c173d80eefe6867261105b427a509ea850ba2c51;hpb=2aed36e128f8f00da9c76f9e66baae89d5bb26b2;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/triggers/target/voicescript.qc b/qcsrc/common/triggers/target/voicescript.qc index c173d80ee..e84331770 100644 --- a/qcsrc/common/triggers/target/voicescript.qc +++ b/qcsrc/common/triggers/target/voicescript.qc @@ -9,13 +9,13 @@ void target_voicescript_clear(entity pl) pl.voicescript = world; } -void target_voicescript_use() +void target_voicescript_use(entity this, entity actor, entity trigger) { - if(activator.voicescript != self) + if(actor.voicescript != this) { - activator.voicescript = self; - activator.voicescript_index = 0; - activator.voicescript_nextthink = time + self.delay; + actor.voicescript = this; + actor.voicescript_index = 0; + actor.voicescript_nextthink = time + this.delay; } } @@ -73,7 +73,7 @@ void target_voicescript_next(entity pl) } } -void spawnfunc_target_voicescript() +spawnfunc(target_voicescript) { // netname: directory of the sound files // message: list of "sound file" duration "sound file" duration, a *, and again a list