Definition of TimeMark moved from 3 c files to backend.h

[xboard.git] / gamelist.c

diff --git a/gamelist.c b/gamelist.c
index 712d9b9..9cb3a58 100644 (file)
--- a/gamelist.c
+++ b/gamelist.c
@@ -217,20 +217,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 +241,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 +268,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 +293,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 +314,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 +339,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:
@@ -359,6 +367,9 @@ struct {
     }
     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 +380,10 @@ struct {
            PrintPGNTags(debugFP, &currentListGame->gameInfo);
        }
     }
+  }
 GetTimeMark(&t2);printf("GameListBuild %d msec\n", SubtractTimeMarks(&t2,&t));
     quickFlag = 0;
+    PackGame(boards[scratch]); // for appending end-of-game marker.
     DisplayTitle("WinBoard");
     rewind(f);
     yyskipmoves = FALSE;