replace funky !!a ^ !!b XOR usage by a new boolxor(a, b) macro that does that interna...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7347 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/mathlib.h b/mathlib.h
index 2b6201dc802b4d6d7da70293ff1c2aac882e760d..4516a2762b7c4f398490f064f812579d2211c47a 100644 (file)
--- a/mathlib.h
+++ b/mathlib.h
@@ -60,6 +60,9 @@ extern vec3_t vec3_origin;
 // TOCHECK: what is this function supposed to do?
 #define bit2i(n) log2i((n) << 1)
 
+// boolean XOR (why doesn't C have the ^^ operator for this purpose?)
+#define boolxor(a,b) (!(a) != !(b))
+
 // returns the smallest integer greater than or equal to "value", or 0 if "value" is too big
 unsigned int CeilPowerOf2(unsigned int value);
 

diff --git a/snd_main.c b/snd_main.c
index 4dec22408f77b4d12a420c0c32cb133eac7e63d1..d71974a1d47d0de70eb8cea2c1e9ba02e30acd7f 100644 (file)
--- a/snd_main.c
+++ b/snd_main.c
@@ -401,7 +401,7 @@ static void S_SetChannelLayout (void)
        listeners = snd_speakerlayout.listeners;
 
        // Swap the left and right channels if snd_swapstereo is set
-       if (!!snd_swapstereo.integer ^ !!v_flipped.integer)
+       if (boolxor(snd_swapstereo.integer, v_flipped.integer))
        {
                switch (snd_speakerlayout.channels)
                {
@@ -455,7 +455,7 @@ static void S_SetChannelLayout (void)
                                   (layout == SND_CHANNELLAYOUT_ALSA) ? "ALSA" : "standard");
        }
 
-       current_swapstereo = !!snd_swapstereo.integer ^ !!v_flipped.integer;
+       current_swapstereo = boolxor(snd_swapstereo.integer, v_flipped.integer);
        current_channellayout = snd_channellayout.integer;
        current_channellayout_used = layout;
 }
@@ -1525,7 +1525,7 @@ void S_Update(const matrix4x4_t *listenermatrix)
                return;
 
        // If snd_swapstereo or snd_channellayout has changed, recompute the channel layout
-       if (current_swapstereo != (!!snd_swapstereo.integer ^ !!v_flipped.integer) ||
+       if (current_swapstereo != boolxor(snd_swapstereo.integer, v_flipped.integer) ||
                current_channellayout != snd_channellayout.integer)
                S_SetChannelLayout();