Merge remote branch 'origin/master' into samual/updatecommands

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

diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh
index 9bfccb81836c72f8c3999d792b9c9698fa7b3ad5..9071c1c7cc1ae5aa4ab29d592e713e6621195be2 100644 (file)
--- a/qcsrc/common/util.qh
+++ b/qcsrc/common/util.qh
@@ -266,10 +266,6 @@ const float XENCODE_LEN = 5;
 string xencode(float f);
 float xdecode(string s);
 
-#ifdef COMPAT_XON010_CHANNELS
-#define asound(e,c,s,v,a) sound(e,c,s,v,a)
-#define csound(e,c,s,v,a) sound(e,c,s,v,a)
-#else
-#define asound(e,c,s,v,a) sound7(e,c,s,v,a,0,SOUNDFLAG_AUTO)
-#define csound(e,c,s,v,a) sound7(e,c,s,v,a,0,0)
+#ifndef COMPAT_XON010_CHANNELS
+#define sound(e,c,s,v,a) sound7(e,c,s,v,a,0,0)
 #endif