From: Mario <mario.mario@y7mail.com>
Date: Sat, 28 Dec 2019 18:55:38 +0000 (+1000)
Subject: Add a compatibility hack for trigger_multiple and func_button (makes dfwc2017-2 playable)
X-Git-Tag: xonotic-v0.8.5~1171
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=546d1368a438563708870ff028c12d84fc9808d0;p=xonotic%2Fxonotic-data.pk3dir.git

Add a compatibility hack for trigger_multiple and func_button (makes dfwc2017-2 playable)
---

diff --git a/qcsrc/common/mapobjects/func/button.qc b/qcsrc/common/mapobjects/func/button.qc
index 56bfd4148..a9c0fa726 100644
--- a/qcsrc/common/mapobjects/func/button.qc
+++ b/qcsrc/common/mapobjects/func/button.qc
@@ -206,6 +206,9 @@ spawnfunc(func_button)
 	if (!this.lip)
 		this.lip = 4;
 
+	if(this.wait == -1 && autocvar_sv_vq3compat)
+		this.wait = 0.1; // compatibility for q3df: "instant" return
+
     if(this.noise != "")
         precache_sound(this.noise);
 
diff --git a/qcsrc/common/mapobjects/trigger/multi.qc b/qcsrc/common/mapobjects/trigger/multi.qc
index c71dc3794..1fef1ffb3 100644
--- a/qcsrc/common/mapobjects/trigger/multi.qc
+++ b/qcsrc/common/mapobjects/trigger/multi.qc
@@ -176,6 +176,9 @@ spawnfunc(trigger_multiple)
 		this.wait = 0;
 	this.use = multi_use;
 
+	if(this.wait == -1 && autocvar_sv_vq3compat)
+		this.wait = 0.1; // compatibility for q3df: "instant" return
+
 	EXACTTRIGGER_INIT;
 
 	this.team_saved = this.team;