X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=gnushogi%2Feval.c;h=8e7bd06540a1ece393d3c0376f190c92c1cf87e8;hb=89b2fc0e2d267a6bea4697ee655dc32ef5afb087;hp=3f44d9bc676a6ed6dde8f950b8cd1444271ddb61;hpb=82b026e6376b640a4d3409a461dd6bd83708e33e;p=gnushogi.git

diff --git a/gnushogi/eval.c b/gnushogi/eval.c
index 3f44d9b..8e7bd06 100644
--- a/gnushogi/eval.c
+++ b/gnushogi/eval.c
@@ -271,7 +271,7 @@ static small_short *fv1;
 static long *atk1, *atk2;
 static long  a1, a2;
 
-#define csquare(side, sq) ((side == black) ? sq : (NO_SQUARES_1 - sq))
+#define csquare(side, sq) ((side == black) ? sq : (NO_SQUARES - 1 - sq))
 #define crow(side, sq)    row(csquare(side, sq))
 #define ccolumn(side, sq) column(csquare(side, sq))
 
@@ -291,7 +291,7 @@ on_column(short side, short piece, short c)
 {
     short sq;
 
-    for (sq = c; sq < NO_SQUARES; sq += 9)
+    for (sq = c; sq < NO_SQUARES; sq += NO_COLS)
     {
         if (on_csquare(side, piece, sq))
             return true;
@@ -1002,7 +1002,7 @@ BRLscan(short sq, short *mob)
 { \
     if (color[u] != c2) \
     { \
-        if ((atk1[u] == 0) || ((atk2[u] & CNT_MASK) > 1)) \
+        if ((atk1[u] == 0) || ((atk2[u] & CNT_MASK) != 0)) \
         { \
             ++cnt; \
         } \
@@ -1277,7 +1277,7 @@ PawnValue(short sq, short side)
     PromotionZoneDistanceValue(sq, 3);
 
     /* pawn mobility */
-    if (color[(c1 == black) ? (sq + 9) : (sq - 9)] == neutral)
+    if (color[(c1 == black) ? (sq + NO_COLS) : (sq - NO_COLS)] == neutral)
     {
         s += (ds = MBLTY[pawn]);
     }
@@ -1291,7 +1291,8 @@ PawnValue(short sq, short side)
     {
         if (crow(c1, sq) == 2) /* pawn on 3d rank */
         {
-            if (board[(c1 == black) ? (sq + 27) : (sq - 27)] == pawn)
+            if (board[(c1 == black) ?
+		      (sq + 3*NO_COLS) : (sq - 3*NO_COLS)] == pawn)
             {
                 /* opposing pawn has been moved (even column == (sq & 1)) */