From: bones_was_here Date: Tue, 11 Aug 2020 07:52:37 +0000 (+1000) Subject: Fix trigger_once and trigger_multiple.wait == -1 allowing multiple activations by... X-Git-Tag: xonotic-v0.8.5~352^2~48 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=49780802334dbf886d3803c58ff7a783416cd241;p=xonotic%2Fxonotic-data.pk3dir.git Fix trigger_once and trigger_multiple.wait == -1 allowing multiple activations by another map entity --- diff --git a/qcsrc/common/mapobjects/trigger/multi.qc b/qcsrc/common/mapobjects/trigger/multi.qc index 3887d7cac..0b0efc21c 100644 --- a/qcsrc/common/mapobjects/trigger/multi.qc +++ b/qcsrc/common/mapobjects/trigger/multi.qc @@ -52,6 +52,7 @@ void multi_trigger(entity this) { // we can't just delete(this) here, because this is a touch function // called while C code is looping through area links... settouch(this, func_null); + this.use = func_null; } } @@ -133,6 +134,7 @@ void multi_reset(entity this) setthink(this, func_null); this.nextthink = 0; this.team = this.team_saved; + this.use = multi_use; } /*QUAKED spawnfunc_trigger_multiple (.5 .5 .5) ? notouch