X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=5ad2562b26dd91ea2b16f73ccccd4ae172b771f8;hb=64a3d6f1b363df4b2b11d8cb95a097f68612323d;hp=ab84abe4e119f41dba0d0bb5c59388d0a45a6a2a;hpb=5deaf4dafd42e67ed6c9037d40b9c7d777870e33;p=xboard.git

diff --git a/backend.c b/backend.c
index ab84abe..5ad2562 100644
--- a/backend.c
+++ b/backend.c
@@ -12609,6 +12609,15 @@ LoadGame (FILE *f, int gameNumber, char *title, int useList)
       AnalyzeFileEvent();
     }
 
+    if(gameInfo.result == GameUnfinished && gameInfo.resultDetails && appData.clockMode) {
+	long int w, b; // [HGM] adjourn: restore saved clock times
+	char *p = strstr(gameInfo.resultDetails, "(Clocks:");
+	if(p && sscanf(p+8, "%ld,%ld", &w, &b) == 2) {
+	    timeRemaining[0][forwardMostMove] = whiteTimeRemaining = 1000*w + 500;
+	    timeRemaining[1][forwardMostMove] = blackTimeRemaining = 1000*b + 500;
+	}
+    }
+
     if(creatingBook) return TRUE;
     if (!matchMode && pos > 0) {
 	ToNrEvent(pos); // [HGM] no autoplay if selected on position
@@ -13110,8 +13119,11 @@ SaveGamePGN (FILE *f)
     /* Print result */
     if (gameInfo.resultDetails != NULL &&
 	gameInfo.resultDetails[0] != NULLCHAR) {
-	fprintf(f, "{%s} %s\n\n", gameInfo.resultDetails,
-		PGNResult(gameInfo.result));
+	char buf[MSG_SIZ], *p = gameInfo.resultDetails;
+	if(gameInfo.result == GameUnfinished && appData.clockMode &&
+	   (gameMode == MachinePlaysWhite || gameMode == MachinePlaysBlack || gameMode == TwoMachinesPlay)) // [HGM] adjourn: save clock settings
+	    snprintf(buf, MSG_SIZ, "%s (Clocks: %ld, %ld)", p, whiteTimeRemaining/1000, blackTimeRemaining/1000), p = buf;
+	fprintf(f, "{%s} %s\n\n", p, PGNResult(gameInfo.result));
     } else {
 	fprintf(f, "%s\n\n", PGNResult(gameInfo.result));
     }
@@ -14144,7 +14156,7 @@ TwoMachinesEvent P((void))
       case MachinePlaysWhite:
       case MachinePlaysBlack:
 	if (WhiteOnMove(forwardMostMove) == (gameMode == MachinePlaysWhite)) {
-	    DisplayError(_("Wait until your turn,\nor select Move Now"), 0);
+	    DisplayError(_("Wait until your turn,\nor select 'Move Now'."), 0);
 	    return;
 	}
 	/* fall through */
@@ -15259,7 +15271,7 @@ RetractMoveEvent ()
       case MachinePlaysWhite:
       case MachinePlaysBlack:
 	if (WhiteOnMove(forwardMostMove) == (gameMode == MachinePlaysWhite)) {
-	    DisplayError(_("Wait until your turn,\nor select Move Now"), 0);
+	    DisplayError(_("Wait until your turn,\nor select 'Move Now'."), 0);
 	    return;
 	}
 	if (forwardMostMove < 2) return;
@@ -15357,14 +15369,14 @@ HintEvent ()
     switch (gameMode) {
       case MachinePlaysWhite:
 	if (WhiteOnMove(forwardMostMove)) {
-	    DisplayError(_("Wait until your turn"), 0);
+	    DisplayError(_("Wait until your turn."), 0);
 	    return;
 	}
 	break;
       case BeginningOfGame:
       case MachinePlaysBlack:
 	if (!WhiteOnMove(forwardMostMove)) {
-	    DisplayError(_("Wait until your turn"), 0);
+	    DisplayError(_("Wait until your turn."), 0);
 	    return;
 	}
 	break;
@@ -15417,14 +15429,14 @@ BookEvent ()
     switch (gameMode) {
       case MachinePlaysWhite:
 	if (WhiteOnMove(forwardMostMove)) {
-	    DisplayError(_("Wait until your turn"), 0);
+	    DisplayError(_("Wait until your turn."), 0);
 	    return;
 	}
 	break;
       case BeginningOfGame:
       case MachinePlaysBlack:
 	if (!WhiteOnMove(forwardMostMove)) {
-	    DisplayError(_("Wait until your turn"), 0);
+	    DisplayError(_("Wait until your turn."), 0);
 	    return;
 	}
 	break;