From: Mario <mario@smbclan.net>
Date: Sat, 5 Dec 2015 04:36:43 +0000 (+1000)
Subject: Use a temporary hack to hide the jump sound issue
X-Git-Tag: xonotic-v0.8.2~1553
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c787284d1dfdc6191dc2bfc96ddaa2819a94224f;p=xonotic%2Fxonotic-data.pk3dir.git

Use a temporary hack to hide the jump sound issue
---

diff --git a/qcsrc/common/effects/qc/globalsound.qc b/qcsrc/common/effects/qc/globalsound.qc
index 4b38615f6..6e0e461f2 100644
--- a/qcsrc/common/effects/qc/globalsound.qc
+++ b/qcsrc/common/effects/qc/globalsound.qc
@@ -296,6 +296,8 @@
 
 	#ifdef SVQC
 
+		bool autocvar_g_debug_globalsounds;
+
 		void _GlobalSound(entity this, entity gs, entity ps, string sample, int chan, int voicetype, bool fake)
 		{
 			if (gs == NULL && ps == NULL && sample == "") return;
@@ -402,7 +404,13 @@
 					}
 					else
 					{
-						if (gs) globalsound(MSG_ALL, this, gs, r, chan, VOL_BASE, ATTEN_NORM);
+						if (gs)
+						{
+							if(autocvar_g_debug_globalsounds)
+								globalsound(MSG_ALL, this, gs, r, chan, VOL_BASE, ATTEN_NORM);
+							else
+								_sound(this, chan, GlobalSound_sample(gs.m_globalsoundstr, r), VOL_BASE, ATTEN_NORM);
+						}
 						else if (ps) playersound(MSG_ALL, this, ps, r, chan, VOL_BASE, ATTEN_NORM);
 						else _sound(this, chan, sample, VOL_BASE, ATTEN_NORM);
 					}