Merged master into Lyberta/TeamplayFixes_.

[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 1e02758580b7a7e2c982fd36dbd3019013809a61..8c4aecbda029829c753e9b1641ceeb490cc04259 100644 (file)
--- a/qcsrc/common/sounds/sound.qh
+++ b/qcsrc/common/sounds/sound.qh
@@ -1,5 +1,4 @@
-#ifndef SOUND_H
-#define SOUND_H
+#pragma once
 
 // negative = SVQC autochannels
 // positive = one per entity
@@ -35,18 +34,18 @@ const float ATTEN_MAX = 3.984375;
 
 const float VOL_BASE = 0.7;
 const float VOL_BASEVOICE = 1.0;
+const float VOL_MUFFLED = 0.35;
 
 // Play all sounds via sound7, for access to the extra channels.
 // Otherwise, channels 8 to 15 would be blocked for a weird QW feature.
 #ifdef SVQC
        #define _sound(e, c, s, v, a) \
-               do \
+               MACRO_BEGIN \
                { \
                        entity __e = e; \
-                       if (!sound_allowed(MSG_BROADCAST, __e)) break; \
-                       sound7(__e, c, s, v, a, 0, 0); \
-               } \
-               while (0)
+                       if (sound_allowed(MSG_BROADCAST, __e)) \
+                               sound7(__e, c, s, v, a, 0, 0); \
+               } MACRO_END
 #else
        #define _sound(e, c, s, v, a) sound7(e, c, s, v, a, 0, 0)
 #endif
@@ -65,7 +64,7 @@ const float VOL_BASEVOICE = 1.0;
  * @param sf
  */
 #define sound8(e, o, chan, samp, vol, atten, speed, sf) \
-       do \
+       MACRO_BEGIN \
        { \
                entity __e; \
                int __chan = chan; \
@@ -77,8 +76,7 @@ const float VOL_BASEVOICE = 1.0;
                        auto = true; \
                        __chan = fabs(__chan); \
                        entity tmp = __e = new(csqc_autochannel); \
-                       make_pure(tmp); \
-                       tmp.think = SUB_Remove_self; \
+                       setthink(tmp, SUB_Remove); \
                        tmp.nextthink = time + soundlength(__samp); \
                } \
                vector old_origin = __e.origin; \
@@ -87,15 +85,16 @@ const float VOL_BASEVOICE = 1.0;
                setorigin(__e, o); \
                setsize(__e, '0 0 0', '0 0 0'); \
                sound7(__e, __chan, __samp, vol, atten, speed, sf); \
-               if (auto) break; \
-               setorigin(__e, old_origin); \
-               setsize(__e, old_mins, old_maxs); \
-       } \
-       while (0)
+               if (!auto) \
+               { \
+                       setorigin(__e, old_origin); \
+                       setsize(__e, old_mins, old_maxs); \
+               } \
+       } MACRO_END
 
 CLASS(Sound, Object)
-       ATTRIB(Sound, m_id, int, 0)
-       ATTRIB(Sound, sound_str, string(), func_null)
+       ATTRIB(Sound, m_id, int, 0);
+       ATTRIB(Sound, sound_str, string());
        CONSTRUCTOR(Sound, string() path)
        {
                CONSTRUCT(Sound);
@@ -105,37 +104,28 @@ CLASS(Sound, Object)
        string _Sound_fixpath(string base)
        {
                if (base == "") return string_null;
+#ifdef SVQC
+               return strcat(base, ".wav");  // let the client engine decide
+#else
                #define extensions(x) \
                        x(wav) \
                        x(ogg) \
                        x(flac) \
                        /**/
-               string relative;
-               #define tryext(ext) { if (fexists(strcat("sound/", relative = strcat(base, "." #ext)))) break; }
-               do
-               {
-                       extensions(tryext);
-#undef tryext
-#undef extensions
-                       LOG_WARNINGF("Missing sound: \"%s\"\n", strcat("sound/", base));
-#ifdef CSQC
-                       return string_null;
-#endif
-               }
-               while (0);
-#ifdef SVQC
-               return strcat(base, ".wav");  // let the client engine decide
-#else
-               return relative;
+               #define tryext(ext) { string s = strcat(base, "." #ext); if (fexists(strcat("sound/", s))) return s; }
+               extensions(tryext);
+               LOG_WARNF("Missing sound: \"%s\"", strcat("sound/", base));
+               #undef tryext
+               #undef extensions
+               return string_null;
 #endif
        }
-       METHOD(Sound, sound_precache, void(entity this))
+       METHOD(Sound, sound_precache, void(Sound this))
        {
+           TC(Sound, this);
                string s = Sound_fixpath(this);
                if (!s) return;
-               LOG_TRACEF("precache_sound(\"%s\")\n", s);
+               profile(sprintf("precache_sound(\"%s\")", s));
                precache_sound(s);
        }
 ENDCLASS(Sound)
-
-#endif