From: Mario <mario@smbclan.net>
Date: Sun, 13 Mar 2016 21:44:03 +0000 (+1000)
Subject: Always precache trigger_multiple sound (reduces spam on some maps)
X-Git-Tag: xonotic-v0.8.2~1095
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=eb8cefbe0dbb3216366fa204a9871d6c164aba53;p=xonotic%2Fxonotic-data.pk3dir.git

Always precache trigger_multiple sound (reduces spam on some maps)
---

diff --git a/qcsrc/common/triggers/trigger/multi.qc b/qcsrc/common/triggers/trigger/multi.qc
index 500f8f32f..b9d3aeb96 100644
--- a/qcsrc/common/triggers/trigger/multi.qc
+++ b/qcsrc/common/triggers/trigger/multi.qc
@@ -147,19 +147,14 @@ spawnfunc(trigger_multiple)
 {
 	self.reset = multi_reset;
 	if (self.sounds == 1)
-	{
-		precache_sound ("misc/secret.wav");
 		self.noise = "misc/secret.wav";
-	}
 	else if (self.sounds == 2)
-	{
 		self.noise = strzone(SND(TALK));
-	}
 	else if (self.sounds == 3)
-	{
-		precache_sound ("misc/trigger1.wav");
 		self.noise = "misc/trigger1.wav";
-	}
+
+	if(self.noise)
+		precache_sound(self.noise);
 
 	if (!self.wait)
 		self.wait = 0.2;