]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Revert "Hopefully temporarily fix player sounds issue"
authorTimePath <andrew.hardaker1995@gmail.com>
Sun, 28 Feb 2016 04:26:41 +0000 (15:26 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Sun, 28 Feb 2016 04:57:17 +0000 (15:57 +1100)
This reverts commit 504ce3314af20a0e541247d314995d842586118e.

qcsrc/common/effects/qc/globalsound.qc

index 4bdadb3d9d008c7c54c4069f3185108d123956b1..1d634f6e51e48ae150008aa1931cdfee2bd34244 100644 (file)
                                                                    ? 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); \
                                                        } \