X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=gamelist.c;h=8497192f0c80dab2dfd358e4da3829fb5e5a565a;hb=259aca883470b6cd7fc47e417475f05120400d3c;hp=712d9b9593cc40ac678cdc101753d6c15526fc73;hpb=f214727e064bfa242138148a3993177f0aa7b5e7;p=xboard.git

diff --git a/gamelist.c b/gamelist.c
index 712d9b9..8497192 100644
--- a/gamelist.c
+++ b/gamelist.c
@@ -42,6 +42,16 @@
 #include "frontend.h"
 #include "backend.h"
 #include "parser.h"
+#include "moves.h"
+#include "gettext.h"
+
+#ifdef ENABLE_NLS
+# define  _(s) gettext (s)
+# define N_(s) gettext_noop (s)
+#else
+# define  _(s) (s)
+# define N_(s)  s
+#endif
 
 
 /* Variables
@@ -217,20 +227,20 @@ int GameListBuild(f)
     int error, scratch=100, plyNr=0, fromX, fromY, toX, toY;
     int offset;
     char lastComment[MSG_SIZ], buf[MSG_SIZ];
-struct {
-    long sec;  /* Assuming this is >= 32 bits */
-    int ms;    /* Assuming this is >= 16 bits */
-} t,t2; GetTimeMark(&t);
+    TimeMark t, t2;
+
+    GetTimeMark(&t);
     GameListFree(&gameList);
     yynewfile(f);
     gameNumber = 0;
-    quickFlag = 1;
+    movePtr = 0;
 
     lastStart = (ChessMove) 0;
     yyskipmoves = FALSE;
     do {
-        yyboardindex = scratch + (plyNr & 1);
+        yyboardindex = scratch;
 	offset = yyoffset();
+	quickFlag = plyNr + 1;
 	cm = (ChessMove) Myylex();
 	switch (cm) {
 	  case GNUChessGame:
@@ -241,6 +251,7 @@ struct {
 	    }
 	    currentListGame->number = ++gameNumber;
 	    currentListGame->offset = offset;
+	    if(1) { CopyBoard(boards[scratch], initialPosition); plyNr = 0; currentListGame->moves = PackGame(boards[scratch]); }
 	    if (currentListGame->gameInfo.event != NULL) {
 		free(currentListGame->gameInfo.event);
 	    }
@@ -267,6 +278,7 @@ struct {
 		}
 		currentListGame->number = ++gameNumber;
 		currentListGame->offset = offset;
+		if(1) { CopyBoard(boards[scratch], initialPosition); plyNr = 0; currentListGame->moves = PackGame(boards[scratch]); }
 		lastStart = cm;
 		break;
 	      default:
@@ -291,7 +303,13 @@ struct {
 		    ParsePGNTag(yy_text, &currentListGame->gameInfo);
 		}
 	    } while (cm == PGNTag || cm == Comment);
-	    if(1) { CopyBoard(boards[scratch], initialPosition); plyNr = 0; currentListGame->moves = PackGame(boards[scratch]); }
+	    if(1) {
+		int btm=0;
+		if(currentListGame->gameInfo.fen) ParseFEN(boards[scratch], &btm, currentListGame->gameInfo.fen);
+		else CopyBoard(boards[scratch], initialPosition);
+		plyNr = (btm != 0);
+		currentListGame->moves = PackGame(boards[scratch]);
+	    }
 	    if(cm != NormalMove) break;
 	  case IllegalMove:
 		if(appData.testLegality) break;
@@ -306,6 +324,7 @@ struct {
 	      }
 	      currentListGame->number = ++gameNumber;
 	      currentListGame->offset = offset;
+	      if(1) { CopyBoard(boards[scratch], initialPosition); plyNr = 0; currentListGame->moves = PackGame(boards[scratch]); }
 	      lastStart = MoveNumberOne;
 	    }
 	  case WhiteCapturesEnPassant:
@@ -330,10 +349,9 @@ struct {
 		fromY = currentMoveString[1] - ONE;
 		toX = currentMoveString[2] - AAA;
 		toY = currentMoveString[3] - ONE;
-		CopyBoard(boards[scratch + (plyNr+1&1)], boards[scratch + (plyNr&1)]);
 		plyNr++;
-		ApplyMove(fromX, fromY, toX, toY, currentMoveString[4], boards[scratch + (plyNr&1)]);
-		PackMove(fromX, fromY, toX, toY, currentMoveString[4]);
+		ApplyMove(fromX, fromY, toX, toY, currentMoveString[4], boards[scratch]);
+		if(currentListGame && currentListGame->moves) PackMove(fromX, fromY, toX, toY, boards[scratch][toY][toX]);
 	    break;
         case WhiteWins: // [HGM] rescom: save last comment as result details
         case BlackWins:
@@ -343,22 +361,26 @@ struct {
 	    if (currentListGame->gameInfo.resultDetails != NULL) {
 		free(currentListGame->gameInfo.resultDetails);
 	    }
-	    if(yy_text[0] == '{') { char *p;
-	      safeStrCpy(lastComment, yy_text+1, sizeof(lastComment)/sizeof(lastComment[0]));
-	      if(p = strchr(lastComment, '}')) *p = 0;
-	      currentListGame->gameInfo.resultDetails = StrSave(lastComment);
+	    if(yy_text[0] == '{') {
+		char *p;
+		safeStrCpy(lastComment, yy_text+1, sizeof(lastComment)/sizeof(lastComment[0]));
+		if((p = strchr(lastComment, '}'))) *p = 0;
+		currentListGame->gameInfo.resultDetails = StrSave(lastComment);
 	    }
 	    break;
 	  default:
 	    break;
 	}
 	if(gameNumber % 1000 == 0) {
-	    snprintf(buf, MSG_SIZ,"Reading game file (%d)", gameNumber);
+	    snprintf(buf, MSG_SIZ, _("Reading game file (%d)"), gameNumber);
 	    DisplayTitle(buf);
 	}
     }
     while (cm != (ChessMove) 0);
 
+ if(currentListGame) {
+    if(!currentListGame->moves) DisplayError("Game cache overflowed\nPosition-searching might not work properly", 0);
+
     if (appData.debugMode) {
 	for (currentListGame = (ListGame *) gameList.head;
 	     currentListGame->node.succ;
@@ -369,8 +391,10 @@ struct {
 	    PrintPGNTags(debugFP, &currentListGame->gameInfo);
 	}
     }
-GetTimeMark(&t2);printf("GameListBuild %d msec\n", SubtractTimeMarks(&t2,&t));
+  }
+GetTimeMark(&t2);printf("GameListBuild %ld msec\n", SubtractTimeMarks(&t2,&t));
     quickFlag = 0;
+    PackGame(boards[scratch]); // for appending end-of-game marker.
     DisplayTitle("WinBoard");
     rewind(f);
     yyskipmoves = FALSE;