X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=fairymax.c;h=e615fd4064863efa5d03562f8323da3c92e933a8;hb=72b198f0b7575ff63748b7c02b1572ed162aef04;hp=92bf8a9616f304905b9cc3e65b9025fb4c0b469d;hpb=518211a4310898171d8bb4e0a865f97e9cbda28a;p=fairymax.git

diff --git a/fairymax.c b/fairymax.c
index 92bf8a9..e615fd4 100644
--- a/fairymax.c
+++ b/fairymax.c
@@ -319,10 +319,31 @@ int PrintResult(int s)
         }
         K=I;
         cnt = D(s,-I,I,Q,O,LL|4*S,3);
+#ifdef SHATRANJ
+        if(pl[s]==1 && pl[16-s]==1) {
+                printf("1/2-1/2 {Insufficient mating material}\n");
+                return 4;
+        }
+        if(pl[s]<=1 && pl[16-s]>1) {
+                if (s == BLACK)
+                        printf("0-1 {Bare King}\n");
+                else
+                        printf("1-0 {Bare King}\n");
+                return 5;
+        }
+        if(cnt>-I+1 && K==0 && L==0) {
+                if (s == WHITE)
+                        printf("0-1 {Stalemate}\n");
+                else
+                        printf("1-0 {Stalemate}\n");
+                return 2;
+        }
+#else
         if(cnt>-I+1 && K==0 && L==0) {
                 printf("1/2-1/2 {Stalemate}\n");
                 return 2;
         }
+#endif
         if(cnt==-I+1) {
                 if (s == WHITE)
                         printf("0-1 {Black mates}\n");
@@ -334,19 +355,6 @@ int PrintResult(int s)
                 printf("1/2-1/2 {Draw by fifty move rule}\n");
                 return 4;
         }
-#ifdef SHATRANJ
-        if(pl[s]==1 && pl[16-s]==1) {
-                printf("1/2-1/2 {Insufficient mating material}\n");
-                return 4;
-        }
-        if(pl[s]<=1 && pl[16-s]>1) {
-                if (s == BLACK)
-                        printf("0-1 {Bare King}\n");
-                else
-                        printf("1-0 {Bare King}\n");
-                return 5;
-        }
-#endif
         return 0;
 }
 
@@ -615,12 +623,14 @@ int main(int argc, char **argv)
 		}
 		if (!strcmp(command, "white")) {
                         /* set white to move in current position */
+                        if(Side == BLACK) Q = -Q;
                         Side     = WHITE;
                         Computer = BLACK;
 			continue;
 		}
 		if (!strcmp(command, "black")) {
                         /* set blck to move in current position */
+                        if(Side == WHITE) Q = -Q;
                         Side     = BLACK;
                         Computer = WHITE;
 			continue;