Merge branch 'master' into morphed/hagar

[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 503290b6c03f916fbd0972eba1f767cef0360e5c..53185b0fb5f168a6953706e96baadafa67592f0a 100644 (file)
--- a/qcsrc/common/sounds/sound.qh
+++ b/qcsrc/common/sounds/sound.qh
@@ -40,13 +40,12 @@ const float VOL_BASEVOICE = 1.0;
 // 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,19 +64,34 @@ const float VOL_BASEVOICE = 1.0;
  * @param sf
  */
 #define sound8(e, o, chan, samp, vol, atten, speed, sf) \
-       do \
+       MACRO_BEGIN \
        { \
-               entity __e = e; \
+               entity __e; \
+               int __chan = chan; \
+               string __samp = samp; \
+               bool auto = false; \
+               if (__chan > 0) __e = e; \
+               else \
+               { \
+                       auto = true; \
+                       __chan = fabs(__chan); \
+                       entity tmp = __e = new(csqc_autochannel); \
+                       make_pure(tmp); \
+                       tmp.think = SUB_Remove_self; \
+                       tmp.nextthink = time + soundlength(__samp); \
+               } \
                vector old_origin = __e.origin; \
                vector old_mins = __e.mins; \
                vector old_maxs = __e.maxs; \
                setorigin(__e, o); \
                setsize(__e, '0 0 0', '0 0 0'); \
-               sound7(__e, chan, samp, vol, atten, speed, sf); \
-               setorigin(__e, old_origin); \
-               setsize(__e, old_mins, old_maxs); \
-       } \
-       while (0)
+               sound7(__e, __chan, __samp, vol, atten, speed, sf); \
+               if (!auto) \
+               { \
+                       setorigin(__e, old_origin); \
+                       setsize(__e, old_mins, old_maxs); \
+               } \
+       } MACRO_END
 
 CLASS(Sound, Object)
        ATTRIB(Sound, m_id, int, 0)
@@ -91,23 +105,21 @@ 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 full, relative;
-               #define tryext(ext) { if (fexists(full = strcat("sound/", relative = strcat(base, "." #ext)))) break; }
-               do
-               {
-                       extensions(tryext);
-#undef tryext
-#undef extensions
-                       LOG_WARNINGF("Missing sound: \"%s\"\n", full);
-                       return string_null;
-               }
-               while (0);
-               return relative;
+               #define tryext(ext) { string s = strcat(base, "." #ext); if (fexists(strcat("sound/", s))) return s; }
+               extensions(tryext);
+               LOG_WARNINGF("Missing sound: \"%s\"\n", strcat("sound/", base));
+               #undef tryext
+               #undef extensions
+               return string_null;
+#endif
        }
        METHOD(Sound, sound_precache, void(entity this))
        {