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

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

diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh
index 0b1210a31fbc3ce50f04701427c68f677ad86b34..e2dfcb3b86b1257c7b440837e7714fc78a1e48ff 100644 (file)
--- a/qcsrc/common/util.qh
+++ b/qcsrc/common/util.qh
@@ -22,7 +22,7 @@ void wordwrap_cb(string s, float l, void(string) callback)
 
 float GameCommand_Generic(string cmd);
 // returns TRUE if handled, FALSE otherwise
-// uses tokenize on its argument!
+// tokenizes its input!
 
 // iterative depth-first search, with fields that go "up", "down left" and "right" in a tree
 // for each element, funcPre is called first, then funcPre and funcPost for all its children, and funcPost last
@@ -266,3 +266,11 @@ const float XENCODE_MAX = 21295; // 2*22*22*22-1
 const float XENCODE_LEN = 5;
 string xencode(float f);
 float xdecode(string s);
+
+#ifndef COMPAT_XON010_CHANNELS
+#define sound(e,c,s,v,a) sound7(e,c,s,v,a,0,0)
+#endif
+
+#ifdef CSQC
+entity ReadCSQCEntity()
+#endif