From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sun, 28 Feb 2016 04:25:09 +0000 (+1100)
Subject: Revert "Use a temporary hack to hide the jump sound issue"
X-Git-Tag: xonotic-v0.8.2~1175
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e61217508e62395281ff066fb851348aab8839c2;p=xonotic%2Fxonotic-data.pk3dir.git

Revert "Use a temporary hack to hide the jump sound issue"

This reverts commit c787284d1dfdc6191dc2bfc96ddaa2819a94224f.
---

diff --git a/qcsrc/common/effects/qc/globalsound.qc b/qcsrc/common/effects/qc/globalsound.qc
index 061ec2c74..4bdadb3d9 100644
--- a/qcsrc/common/effects/qc/globalsound.qc
+++ b/qcsrc/common/effects/qc/globalsound.qc
@@ -294,8 +294,6 @@
 
 	#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;
@@ -407,13 +405,7 @@
 					}
 					else
 					{
-						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);
-						}
+						if (gs) globalsound(MSG_ALL, this, gs, r, chan, 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);
 					}