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 061ec2c74bc228615786d4a2588e0a4a82856612..4bdadb3d9d008c7c54c4069f3185108d123956b1 100644 (file)
--- 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);
                                        }