From: TimePath Date: Sun, 28 Feb 2016 04:26:41 +0000 (+1100) Subject: Revert "Hopefully temporarily fix player sounds issue" X-Git-Tag: xonotic-v0.8.2~1174 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f54dfb4dcfa81e8fe145442f494d35f3511683d6;p=xonotic%2Fxonotic-data.pk3dir.git Revert "Hopefully temporarily fix player sounds issue" This reverts commit 504ce3314af20a0e541247d314995d842586118e. --- diff --git a/qcsrc/common/effects/qc/globalsound.qc b/qcsrc/common/effects/qc/globalsound.qc index 4bdadb3d9..1d634f6e5 100644 --- a/qcsrc/common/effects/qc/globalsound.qc +++ b/qcsrc/common/effects/qc/globalsound.qc @@ -368,13 +368,7 @@ ? bound(ATTEN_MIN, msg_entity.cvar_cl_voice_directional_taunt_attenuation, \ ATTEN_MAX) \ : ATTEN_NONE; \ - if (gs) \ - { \ - if(autocvar_g_debug_globalsounds) \ - globalsound(MSG_ONE, this, gs, r, chan, VOL_BASEVOICE, atten); \ - else \ - soundto(MSG_ONE, this, chan, GlobalSound_sample(gs.m_globalsoundstr, r), VOL_BASE, ATTEN_NORM); \ - } \ + if (gs) globalsound(MSG_ONE, this, gs, r, chan, VOL_BASEVOICE, atten); \ else if (ps) playersound(MSG_ONE, this, ps, r, chan, VOL_BASEVOICE, atten); \ else soundto(MSG_ONE, this, chan, sample, VOL_BASEVOICE, atten); \ } \