take3: format 903 files

[xonotic/xonotic-data.pk3dir.git] / qcsrc / lib / bits.qh

diff --git a/qcsrc/lib/bits.qh b/qcsrc/lib/bits.qh
index c158ea032d497cb29a8709c2e02ad4fa8e2bd610..d05a8e0e2406c8b53239f79ecf636a04bbdb61b9 100644 (file)
--- a/qcsrc/lib/bits.qh
+++ b/qcsrc/lib/bits.qh
@@ -5,9 +5,9 @@
 #define BIT(n) (1 << (n))
 #define BITS(n) (BIT(n) - 1)
 #ifndef BRANCHLESS_BITSET
-       #define BITSET(var, mask, flag) (flag ? (var) | (mask) : (var) & ~(mask))
+#define BITSET(var, mask, flag) (flag ? (var) | (mask) : (var) & ~(mask))
 #else
-       #define BITSET(var, mask, flag) ((var) ^ (-(flag) ^ (var)) & (mask))
+#define BITSET(var, mask, flag) ((var) ^ (-(flag) ^ (var)) & (mask))
 #endif
 
 ERASEABLE
@@ -24,21 +24,19 @@ int lowestbit(int f)
 ERASEABLE
 int randombit(int bits)
 {
-       if (!(bits & (bits - 1)))  // this ONLY holds for powers of two!
+       if (!(bits & (bits - 1))) { // this ONLY holds for powers of two!
                return bits;
+       }
 
        int r = random();
        int b = 0;
        int n = 0;
 
-       for (int f = 1; f <= bits; f *= 2)
-       {
-               if (bits & f)
-               {
+       for (int f = 1; f <= bits; f *= 2) {
+               if (bits & f) {
                        ++n;
                        r *= n;
-                       if (r <= 1) b = f;
-                       else r = (r - 1) / (n - 1);
+                       if (r <= 1) { b = f; } else { r = (r - 1) / (n - 1); }
                }
        }
        return b;
@@ -48,13 +46,12 @@ ERASEABLE
 int randombits(int bits, int k, bool error_return)
 {
        int r = 0;
-       while (k > 0 && bits != r)
-       {
+       while (k > 0 && bits != r) {
                r += randombit(bits - r);
                --k;
        }
-       if (error_return)
-               if (k > 0) return -1;
+       if (error_return) {
+               if (k > 0) { return -1; } }
        // all
        return r;
 }
@@ -62,11 +59,11 @@ int randombits(int bits, int k, bool error_return)
 /*
 void randombit_test(int bits, int iter)
 {
-       while (iter > 0)
-       {
-               LOG_INFO(ftos(randombit(bits)), "\n");
-               --iter;
-       }
+    while (iter > 0)
+    {
+        LOG_INFO(ftos(randombit(bits)), "\n");
+        --iter;
+    }
 }
 */
 
@@ -82,21 +79,19 @@ ERASEABLE
 bool GiveBit(entity e, .int fld, int bit, int op, int val)
 {
        int v0 = (e.(fld) & bit);
-       switch (op)
-       {
+       switch (op) {
                case OP_SET:
-                       if (val > 0) e.(fld) |= bit;
-                       else e.(fld) &= ~bit;
+                       if (val > 0) { e.(fld) |= bit; } else { e.(fld) &= ~bit; }
                        break;
                case OP_MIN:
                case OP_PLUS:
-                       if (val > 0) e.(fld) |= bit;
+                       if (val > 0) { e.(fld) |= bit; }
                        break;
                case OP_MAX:
-                       if (val <= 0) e.(fld) &= ~bit;
+                       if (val <= 0) { e.(fld) &= ~bit; }
                        break;
                case OP_MINUS:
-                       if (val > 0) e.(fld) &= ~bit;
+                       if (val > 0) { e.(fld) &= ~bit; }
                        break;
        }
        int v1 = (e.(fld) & bit);
@@ -107,13 +102,12 @@ ERASEABLE
 bool GiveValue(entity e, .int fld, int op, int val)
 {
        int v0 = e.(fld);
-       switch (op)
-       {
+       switch (op) {
                case OP_SET:
                        e.(fld) = val;
                        break;
                case OP_MIN:
-                       e.(fld) = max(e.(fld), val);  // min 100 cells = at least 100 cells
+                       e.(fld) = max(e.(fld), val); // min 100 cells = at least 100 cells
                        break;
                case OP_MAX:
                        e.(fld) = min(e.(fld), val);