X-Git-Url: http://winboard.nl/cgi-bin?p=capablanca.git;a=blobdiff_plain;f=lasker-2.2.3%2Fsrc%2Fmovecheck.c;h=468a8a3c9840bbbef699d5d15a18af97c0a4779f;hp=1f6d69b57d6e58354c12b8d00e2f58831279cecb;hb=aabaa926fde2f7cd599776bd6ae0f6868eb892da;hpb=b0878c4bb13c5ba03f6defe11f903fa07247b718

diff --git a/lasker-2.2.3/src/movecheck.c b/lasker-2.2.3/src/movecheck.c
index 1f6d69b..468a8a3 100644
--- a/lasker-2.2.3/src/movecheck.c
+++ b/lasker-2.2.3/src/movecheck.c
@@ -218,7 +218,7 @@ static int legal_honorablehorse_move(struct game_state_t * gs, int ff, int fr, i
 
   dx = ff - tf;
   dy = fr - tr;
-  if (dy == gs->onMove == WHITE ? 2 : -2) {
+  if (dy == (gs->onMove == WHITE ? -2 : 2)) {
     if (abs(dx) == 1)
       return 1;
   }
@@ -1510,7 +1510,7 @@ static int move_calculate(struct game_state_t * gs, struct move_t * mt, int prom
       switch(piecetype(piece)) {
         case PAWN:
         case LANCE:
-        case KNIGHT:
+        case HONORABLEHORSE:
         case SILVER:
           promote = GOLD; break;
         case BISHOP:
@@ -1521,7 +1521,7 @@ static int move_calculate(struct game_state_t * gs, struct move_t * mt, int prom
       }
     } else
       switch(piecetype(piece)) { // force mandatory promotions
-        case KNIGHT:
+        case HONORABLEHORSE:
           if(mt->toRank == 1 || mt->toRank == gs->files-2) promote = GOLD;
         case PAWN:
         case LANCE:
@@ -1628,7 +1628,7 @@ int in_check(struct game_state_t * gs)
   }
   for (InitPieceLoop(gs->board, &f, &r, gs->onMove);
        NextPieceLoop(gs->board, &f, &r, gs->onMove, gs->files, gs->ranks);) {
-    if (legal_move(gs, f, r, kf, kr)) {	/* In Check? */
+    if (legal_move(gs, f, r, kf, kr)) {	/* In Check? */
       return 1;
     }
   }
@@ -1767,10 +1767,8 @@ int has_legal_move(struct game_state_t * gs)
 	  if(game_globals.garray[gs->gameNum].link < 0) {
 		// we have no partner, so we must have something to drop now
 		for(i=QUEEN; i>=PAWN; i--)
-			if(gs->holding[gs->onMove==WHITE ? 0 : 1][i-1]) break;
-		if(i > PAWN) return 1; // we have a non-Pawn to drop
-		// We have a Pawn, but check if it legal to drop it
-		if(i == PAWN && r != 0 && r != gs->ranks-1) return 1; // [HGM] todo: for Shogi there are extra conditions on Pawn drops!
+			if (legal_andcheck_move(gs, ALG_DROP, i, f, r)) return 1;
+		return 0;
 	  }
 	  return 1;
 	}