Properly split up notifications.qc into two files (one being .qh)

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

diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh
index 9a3821ed16b4e4f2d6ff43f687c852afa06bb913..a58438f0d87b6c1927ea7044d5fe7a3d40d7aad6 100644 (file)
--- a/qcsrc/common/util.qh
+++ b/qcsrc/common/util.qh
@@ -232,8 +232,13 @@ void WriteInt24_t(float dest, float val);
 #endif
 
 // the NULL function
+#ifdef GMQCC
+#define func_null nil
+#define string_null nil
+#else
 var void func_null(void);
 var string string_null;
+#endif
 float float2range11(float f);
 float float2range01(float f);
 
@@ -368,8 +373,8 @@ typedef entity(entity cur, entity near, entity pass) findNextEntityNearFunction_
 typedef float(entity a, entity b, entity pass) isConnectedFunction_t;
 void FindConnectedComponent(entity e, .entity fld, findNextEntityNearFunction_t nxt, isConnectedFunction_t iscon, entity pass);
 
-// expand multiple arguments into one argument
-#define XPD5(a,b,c,d,e) a, b, c, d, e
-#define XPD4(a,b,c,d) a, b, c, d
-#define XPD3(a,b,c) a, b, c
-#define XPD2(a,b) a, b
+// expand multiple arguments into one argument by stripping parenthesis
+#define XPD(...) __VA_ARGS__
+
+float Count_Proper_Strings(string improper, string...count);
+float Count_Proper_Floats(float improper, float...count);