Merge branch 'master' into Mario/vaporizer_damage

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

diff --git a/qcsrc/common/util-pre.qh b/qcsrc/common/util-pre.qh
index 053261b10efac17e04a7bc79acc356751c8e23d4..b81fd2a6df81d409626458a4ba338a15273796f2 100644 (file)
--- a/qcsrc/common/util-pre.qh
+++ b/qcsrc/common/util-pre.qh
@@ -29,27 +29,21 @@
     #define itos(i) ftos(i)
 #endif
 
-#ifndef QCC_SUPPORT_BOOL
-    #define bool float
-
-    // Boolean Constants
-    const int true     = 1;
-    const int false = 0;
-#endif
-
-#ifndef QCC_SUPPORT_ENTITYCLASS
-    #define entityclass(name) typedef entity name
-    #define class(name)
-    #define new(class) spawn()
-#else
-    #define entityclass(name) entityclass name {}
-    #define class(name) [[class(name)]]
-    #define new(class) ((class) spawn())
-#endif
-
-// Transitional aliases
-[[deprecated("use true")]] [[alias("true")]] const bool TRUE;
-[[deprecated("use false")]] [[alias("false")]] const bool FALSE;
+#define FOREACH_ARRAY(arr, start, end, cond, body) do { \
+    for (int i = start; i < end; ++i) {                 \
+        const noref entity it = arr[i];                 \
+        if (cond) { body }                              \
+    }                                                   \
+} while(0)
+
+#define FOREACH_LIST(list, next, cond, body) do {               \
+    noref int i = 0;                                            \
+    for (entity it = list##_first; it; (it = it.next, ++i)) {   \
+        if (cond) { body }                                      \
+    }                                                           \
+} while(0)
+
+#define FOREACH(list, cond, body) FOREACH_LIST(list, enemy, cond, body)
 
 #ifdef GMQCC
     #define OVERLOAD(F, ...) F##_##__VA_COUNT__(__VA_ARGS__)
@@ -83,6 +77,10 @@
 
 #define IDENTITY(it) it
 
+#define UNWORDS(...) MAP(IDENTITY, __VA_ARGS__)
+
+#define APPLY(f, ...) f(__VA_ARGS__)
+
 #ifdef SVQC
     #define SV(f, ...) f(__VA_ARGS__)
 #else
@@ -95,9 +93,10 @@
     #define CL(f, ...)
 #endif
 
-#define ALL(f, ...) f(__VA_ARGS__)
+#define IF(cond, f, ...) cond(f, __VA_ARGS__)
 
-#define IF(pred, f, ...) pred(f, __VA_ARGS__)
+#define GET(name) name##get
+#define GETTER(type, name) type GET(name)() { return name; }
 
 #define BIT(n) (1 << (n))
 #ifndef BRANCHLESS_BITSET