X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=e13bd13ec934b0cfc0c0aa283098e6ae0bec97c1;hb=a56bd5ee92e43cbf5537d877fd4010e5e34a3e11;hp=8135410aa27a945f004c21698eec99203ac29c2f;hpb=0a797389e035002fbc00ed5f4c4f8bfe1812d6c4;p=xboard.git

diff --git a/backend.c b/backend.c
index 8135410..e13bd13 100644
--- a/backend.c
+++ b/backend.c
@@ -840,6 +840,8 @@ InitEngine (ChessProgramState *cps, int n)
 
 ChessProgramState *savCps;
 
+GameMode oldMode;
+
 void
 LoadEngine ()
 {
@@ -849,21 +851,25 @@ LoadEngine ()
     if(gameInfo.variant != StringToVariant(appData.variant)) {
 	// we changed variant when loading the engine; this forces us to reset
 	Reset(TRUE, savCps != &first);
-	EditGameEvent(); // for consistency with other path, as Reset changes mode
+	oldMode = BeginningOfGame; // to prevent restoring old mode
     }
     InitChessProgram(savCps, FALSE);
-    SendToProgram("force\n", savCps);
+    if(gameMode == EditGame) SendToProgram("force\n", savCps); // in EditGame mode engine must be in force mode
     DisplayMessage("", "");
     if (startedFromSetupPosition) SendBoard(savCps, backwardMostMove);
     for (i = backwardMostMove; i < currentMove; i++) SendMoveToProgram(i, savCps);
     ThawUI();
     SetGNUMode();
+    if(oldMode == AnalyzeMode) AnalyzeModeEvent();
 }
 
 void
 ReplaceEngine (ChessProgramState *cps, int n)
 {
-    EditGameEvent();
+    oldMode = gameMode; // remember mode, so it can be restored after loading sequence is complete
+    keepInfo = 1;
+    if(oldMode != BeginningOfGame) EditGameEvent();
+    keepInfo = 0;
     UnloadEngine(cps);
     appData.noChessProgram = FALSE;
     appData.clockMode = TRUE;
@@ -7757,13 +7763,21 @@ Adjudicate (ChessProgramState *cps)
 			boards[forwardMostMove][EP_STATUS] = nrW == nrB ? EP_STALEMATE :
 						   ((nrW < nrB) != WhiteOnMove(forwardMostMove) ?
 									EP_CHECKMATE : EP_WINS);
-		    else if(gameInfo.variant == VariantShatranj || gameInfo.variant == VariantXiangqi)
+		    else if(gameInfo.variant == VariantShatranj || gameInfo.variant == VariantXiangqi || gameInfo.variant == VariantShogi)
 		        boards[forwardMostMove][EP_STATUS] = EP_CHECKMATE; // and in these variants being stalemated loses
 		}
 		break;
 	      case MT_CHECKMATE:
 		reason = "Xboard adjudication: Checkmate";
 		boards[forwardMostMove][EP_STATUS] = (gameInfo.variant == VariantLosers ? EP_WINS : EP_CHECKMATE);
+		if(gameInfo.variant == VariantShogi) {
+		    if(forwardMostMove > backwardMostMove
+		       && moveList[forwardMostMove-1][1] == '@'
+		       && CharToPiece(ToUpper(moveList[forwardMostMove-1][0])) == WhitePawn) {
+			reason = "XBoard adjudication: pawn-drop mate";
+			boards[forwardMostMove][EP_STATUS] = EP_WINS;
+		    }
+		}
 		break;
 	    }
 
@@ -7859,7 +7873,7 @@ Adjudicate (ChessProgramState *cps)
                              /* adjudicate after user-specified nr of repeats */
 			     int result = GameIsDrawn;
 			     char *details = "XBoard adjudication: repetition draw";
-			     if(gameInfo.variant == VariantXiangqi && appData.testLegality) {
+			     if((gameInfo.variant == VariantXiangqi || gameInfo.variant == VariantShogi) && appData.testLegality) {
 				// [HGM] xiangqi: check for forbidden perpetuals
 				int m, ourPerpetual = 1, hisPerpetual = 1;
 				for(m=forwardMostMove; m>k; m-=2) {
@@ -7877,6 +7891,12 @@ Adjudicate (ChessProgramState *cps)
 				if(hisPerpetual && !ourPerpetual) { // he is checking us, but did not repeat yet
 				    break; // (or we would have caught him before). Abort repetition-checking loop.
 				} else
+				if(gameInfo.variant == VariantShogi) { // in Shogi other repetitions are draws
+				    if(BOARD_HEIGHT == 5 && BOARD_RGHT - BOARD_LEFT == 5) { // but in mini-Shogi gote wins!
+					result = BlackWins;
+					details = "Xboard adjudication: repetition";
+				    }
+				} else // it must be XQ
 				// Now check for perpetual chases
 				if(!ourPerpetual && !hisPerpetual) { // no perpetual check, test for chase
 				    hisPerpetual = PerpetualChase(k, forwardMostMove);
@@ -10024,7 +10044,7 @@ void
 TwoMachinesEventIfReady P((void))
 {
   static int curMess = 0;
-  if (first.lastPing != first.lastPong) {
+  if (first.lastPing != first.lastPong || !first.initDone) {
     if(curMess != 1) DisplayMessage("", _("Waiting for first chess program")); curMess = 1;
     ScheduleDelayedEvent(TwoMachinesEventIfReady, 10); // [HGM] fast: lowered from 1000
     return;
@@ -10332,6 +10352,13 @@ SetPlayer (int player, char *p)
 	ParseArgsFromString(resetOptions); appData.fenOverride[0] = NULL; appData.pvSAN[0] = FALSE;
 	appData.firstHasOwnBookUCI = !appData.defNoBook; appData.protocolVersion[0] = PROTOVER;
 	ParseArgsFromString(buf);
+    } else { // no engine with this nickname is installed!
+	snprintf(buf, MSG_SIZ, _("No engine %s is installed"), engineName);
+	ReserveGame(nextGame, ' '); // unreserve game and drop out of match mode with error
+	matchMode = FALSE; appData.matchGames = matchGame = roundNr = 0;
+	ModeHighlight();
+	DisplayError(buf, 0);
+	return 0;
     }
     free(engineName);
     return i;
@@ -10406,7 +10433,7 @@ int
 NextTourneyGame (int nr, int *swapColors)
 {   // !!!major kludge!!! fiddle appData settings to get everything in order for next tourney game
     char *p, *q;
-    int whitePlayer, blackPlayer, firstBusy=1000000000, syncInterval = 0, nPlayers;
+    int whitePlayer, blackPlayer, firstBusy=1000000000, syncInterval = 0, nPlayers, OK = 1;
     FILE *tf;
     if(appData.tourneyFile[0] == NULLCHAR) return 1; // no tourney, always allow next game
     tf = fopen(appData.tourneyFile, "r");
@@ -10458,18 +10485,18 @@ NextTourneyGame (int nr, int *swapColors)
     // redefine engines, engine dir, etc.
     NamesToList(firstChessProgramNames, command, mnemonic, "all"); // get mnemonics of installed engines
     if(first.pr == NoProc) {
-      SetPlayer(whitePlayer, appData.participants); // find white player amongst it, and parse its engine line
+      if(!SetPlayer(whitePlayer, appData.participants)) OK = 0; // find white player amongst it, and parse its engine line
       InitEngine(&first, 0);  // initialize ChessProgramStates based on new settings.
     }
     if(second.pr == NoProc) {
       SwapEngines(1);
-      SetPlayer(blackPlayer, appData.participants); // find black player amongst it, and parse its engine line
+      if(!SetPlayer(blackPlayer, appData.participants)) OK = 0; // find black player amongst it, and parse its engine line
       SwapEngines(1);         // and make that valid for second engine by swapping
       InitEngine(&second, 1);
     }
     CommonEngineInit();     // after this TwoMachinesEvent will create correct engine processes
     UpdateLogos(FALSE);     // leave display to ModeHiglight()
-    return 1;
+    return OK;
 }
 
 void
@@ -10994,7 +11021,7 @@ ResurrectChessProgram ()
 
     if (appData.noChessProgram) return 1;
 
-    if(matchMode && appData.tourneyFile[0]) { // [HGM] tourney: make sure we get features after engine replacement. (Should we always do this?)
+    if(matchMode /*&& appData.tourneyFile[0]*/) { // [HGM] tourney: make sure we get features after engine replacement. (Should we always do this?)
 	if(WaitForEngine(&first, TwoMachinesEventIfReady)) { doInit = 1; return 0; } // request to do init on next visit
 	if(!doInit) return 1; // this replaces testing first.pr != NoProc, which is true when we get here, but first time no reason to abort
 	doInit = 0; // we fell through (first time after starting the engine); make sure it doesn't happen again