Merge branch 'master' into martin-t/globals

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / sounds / sound.qh

diff --git a/qcsrc/common/sounds/sound.qh b/qcsrc/common/sounds/sound.qh
index d46ac9eafc7c36cccbeb07c7d302fe9b25f250d3..b3eb1ea861397547734d91eaef173e8f1f9b59a1 100644 (file)
--- a/qcsrc/common/sounds/sound.qh
+++ b/qcsrc/common/sounds/sound.qh
@@ -41,11 +41,10 @@ const float VOL_MUFFLED = 0.35;
 #ifdef SVQC
        #define _sound(e, c, s, v, a) \
                MACRO_BEGIN \
-               { \
                        entity __e = e; \
                        if (sound_allowed(MSG_BROADCAST, __e)) \
                                sound7(__e, c, s, v, a, 0, 0); \
-               } MACRO_END
+               MACRO_END
 #else
        #define _sound(e, c, s, v, a) sound7(e, c, s, v, a, 0, 0)
 #endif
@@ -65,7 +64,6 @@ const float VOL_MUFFLED = 0.35;
  */
 #define sound8(e, o, chan, samp, vol, atten, speed, sf) \
        MACRO_BEGIN \
-       { \
                entity __e; \
                int __chan = chan; \
                string __samp = samp; \
@@ -90,7 +88,7 @@ const float VOL_MUFFLED = 0.35;
                        setorigin(__e, old_origin); \
                        setsize(__e, old_mins, old_maxs); \
                } \
-       } MACRO_END
+       MACRO_END
 
 string _Sound_fixpath(string base)
 {
@@ -128,7 +126,7 @@ CLASS(Sound, Object)
        }
        METHOD(Sound, sound_precache, void(Sound this))
        {
-           TC(Sound, this);
+               TC(Sound, this);
                string s = _Sound_fixpath(this.sound_str());
                if (!s) return;
                profile(sprintf("precache_sound(\"%s\")", s));