X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=6eba7f6b726eea12587e258756fecb88bcc15bf9;hb=b382d988c6f886f3a49483df9e3e36de0b6b0824;hp=75fc9a15573b2b823c502b6b20408dbddb590c37;hpb=e0691ae1d55be2a77484f99294ab28cd5f6e381a;p=xboard.git

diff --git a/backend.c b/backend.c
index 75fc9a1..6eba7f6 100644
--- a/backend.c
+++ b/backend.c
@@ -5,7 +5,7 @@
  * Massachusetts.
  *
  * Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006,
- * 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+ * 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
  *
  * Enhancements Copyright 2005 Alessandro Scotti
  *
@@ -5985,6 +5985,7 @@ UserMoveEvent(fromX, fromY, toX, toY, promoChar)
       case BeginningOfGame:
       case AnalyzeMode:
       case Training:
+	if(fromY == DROP_RANK) break; // [HGM] drop moves (entered through move type-in) are automatically assigned to side-to-move
 	if ((int) boards[currentMove][fromY][fromX] >= (int) BlackPawn &&
             (int) boards[currentMove][fromY][fromX] < (int) EmptySquare) {
 	    /* User is moving for Black */
@@ -6079,7 +6080,7 @@ UserMoveEvent(fromX, fromY, toX, toY, promoChar)
     pup = boards[currentMove][toY][toX];
 
     /* [HGM] If move started in holdings, it means a drop. Convert to standard form */
-    if( fromX == BOARD_LEFT-2 || fromX == BOARD_RGHT+1) { 
+    if( (fromX == BOARD_LEFT-2 || fromX == BOARD_RGHT+1) && fromY != DROP_RANK ) {
          if( pup != EmptySquare ) return;
          moveType = WhiteOnMove(currentMove) ? WhiteDrop : BlackDrop;
 	   if(appData.debugMode) fprintf(debugFP, "Drop move %d, curr=%d, x=%d,y=%d, p=%d\n", 
@@ -6242,6 +6243,7 @@ FinishMove(moveType, fromX, fromY, toX, toY, promoChar)
 
   switch (gameMode) {
   case EditGame:
+    if(appData.testLegality)
     switch (MateTest(boards[currentMove], PosFlags(currentMove)) ) {
     case MT_NONE:
     case MT_CHECK:
@@ -7328,11 +7330,6 @@ FakeBookMove: // [HGM] book: we jump here to simulate machine moves after book h
 	if (cps->sendTime == 2) cps->sendTime = 1;
 	if (cps->offeredDraw) cps->offeredDraw--;
 
-	/* currentMoveString is set as a side-effect of ParseOneMove */
-	safeStrCpy(machineMove, currentMoveString, sizeof(machineMove)/sizeof(machineMove[0]));
-	strcat(machineMove, "\n");
-	safeStrCpy(moveList[forwardMostMove], machineMove, sizeof(moveList[forwardMostMove])/sizeof(moveList[forwardMostMove][0]));
-
         /* [AS] Save move info*/
         pvInfoList[ forwardMostMove ].score = programStats.score;
         pvInfoList[ forwardMostMove ].depth = programStats.depth;
@@ -9928,8 +9925,6 @@ LoadGameOneMove(readAhead)
 	return FALSE;
     } else {
 	/* currentMoveString is set as a side-effect of yylex */
-	strcat(currentMoveString, "\n");
-	safeStrCpy(moveList[forwardMostMove], currentMoveString, sizeof(moveList[forwardMostMove])/sizeof(moveList[forwardMostMove][0]));
 
 	thinkOutput[0] = NULLCHAR;
 	MakeMove(fromX, fromY, toX, toY, promoChar);
@@ -12621,6 +12616,30 @@ CallFlagEvent()
 }
 
 void
+ClockClick(int which)
+{	// [HGM] code moved to back-end from winboard.c
+	if(which) { // black clock
+	  if (gameMode == EditPosition || gameMode == IcsExamining) {
+	    SetBlackToPlayEvent();
+	  } else if (gameMode == EditGame || shiftKey) {
+	    AdjustClock(which, -1);
+	  } else if (gameMode == IcsPlayingWhite ||
+	             gameMode == MachinePlaysBlack) {
+	    CallFlagEvent();
+	  }
+	} else { // white clock
+	  if (gameMode == EditPosition || gameMode == IcsExamining) {
+	    SetWhiteToPlayEvent();
+	  } else if (gameMode == EditGame || shiftKey) {
+	    AdjustClock(which, -1);
+	  } else if (gameMode == IcsPlayingBlack ||
+	           gameMode == MachinePlaysWhite) {
+	    CallFlagEvent();
+	  }
+	}
+}
+
+void
 DrawEvent()
 {
     /* Offer draw or accept pending draw offer from opponent */