Merge branch 'Lyberta/PlayerDied' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / sounds / all.qc

diff --git a/qcsrc/common/sounds/all.qc b/qcsrc/common/sounds/all.qc
index 9096dddfa8c0e6a31dd1dc2d3f5f8ba069df4b56..203b643854c5d5cf6b7cf0aaba762390ec6fa7e4 100644 (file)
--- a/qcsrc/common/sounds/all.qc
+++ b/qcsrc/common/sounds/all.qc
@@ -1,3 +1,4 @@
+#include "all.qh"
 #ifdef SVQC
 
 bool autocvar_bot_sound_monopoly;
@@ -113,13 +114,13 @@ void play2(entity e, string filename)
 
 .float spamtime;
 /** use this one if you might be causing spam (e.g. from touch functions that might get called more than once per frame) */
-float spamsound(entity e, int chan, string samp, float vol, float _atten)
+float spamsound(entity e, int chan, Sound samp, float vol, float _atten)
 {
        if (!sound_allowed(MSG_BROADCAST, e)) return false;
        if (time > e.spamtime)
        {
                e.spamtime = time;
-               _sound(e, chan, samp, vol, _atten);
+               sound(e, chan, samp, vol, _atten);
                return true;
        }
        return false;