Merge branch 'master' into Mario/entrap_nade

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / effects / qc / globalsound.qc

diff --git a/qcsrc/common/effects/qc/globalsound.qc b/qcsrc/common/effects/qc/globalsound.qc
index 0768a71883a7f60aa1ac89a5e0c2086d15e5794e..a2653238e7ebea30ad5a22f26203adf9156c66e1 100644 (file)
--- a/qcsrc/common/effects/qc/globalsound.qc
+++ b/qcsrc/common/effects/qc/globalsound.qc
@@ -15,8 +15,6 @@
        string GlobalSound_sample(string pair, float r);
 
        #ifdef SVQC
-               /** Use new sound handling. TODO: use when sounds play correctly on clients */
-               bool autocvar_g_debug_globalsounds = false;
                /**
                 * @param from the source entity, its position is sent
                 * @param gs the global sound def
@@ -107,7 +105,7 @@
                        o.y = ReadCoord();
                        o.z = ReadCoord();
                        // TODO: is this really what we want to be doing? Footsteps that follow the player at head height?
-                       if (who == player_currententnum) e = findfloat(world, entnum, who);  // play at camera position for full volume
+                       if (who == player_currententnum) e = findfloat(NULL, entnum, who);  // play at camera position for full volume
                        else if (e) e.origin = o;
                        if (e)
                        {
@@ -138,7 +136,7 @@
                        o.x = ReadCoord();
                        o.y = ReadCoord();
                        o.z = ReadCoord();
-                       if (who == player_currententnum) e = findfloat(world, entnum, who);  // play at camera position for full volume
+                       if (who == player_currententnum) e = findfloat(NULL, entnum, who);  // play at camera position for full volume
                        else if (e) e.origin = o;
                        if (e)
                        {