From d803e6e7c40b12a0d9b26c17b7d43a3b3c3aad91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?IOhannes=20m=20zm=C3=B6lnig?=
 <zmoelnig@users.sourceforge.net>
Date: Fri, 12 Aug 2011 10:03:07 +0000
Subject: use logical AND rather than bitwise AND with boolean values

svn path=/trunk/externals/pmpd/; revision=15209
---
 pmpd~.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pmpd~.c')

diff --git a/pmpd~.c b/pmpd~.c
index db5d821..fd95655 100644
--- a/pmpd~.c
+++ b/pmpd~.c
@@ -163,7 +163,7 @@ t_int *pmpd_tilde_perform(t_int *w)
 			// compute forces generated by NLlinks (spring / dashpot)
 			{
 				L=x->NLlink[i].mass1->posX - x->NLlink[i].mass2->posX - x->NLlink[i].L0;
-				if (L<x->NLlink[i].Lmax & L>x->NLlink[i].Lmin)
+				if ((L < x->NLlink[i].Lmax) && (L > x->NLlink[i].Lmin))
 				{
 					F  = x->NLlink[i].K1 * pow(fabs(L) ,x->NLlink[i].Pow) ;
 					if (L < 0) F *= -1;
-- 
cgit v1.2.1