Define TOPLEVEL in winboard.c

[xboard.git] / backend.c

diff --git a/backend.c b/backend.c
index 44806a8..0a8b682 100644 (file)
--- a/backend.c
+++ b/backend.c
@@ -2494,8 +2494,8 @@ PlotSeekAd (int i)
        xList[i] = yList[i] = -100; // outside graph, so cannot be clicked
        if(r < minRating+100 && r >=0 ) r = minRating+100;
        if(r > maxRating) r = maxRating;
-       if(tc < 1.) tc = 1.;
-       if(tc > 95.) tc = 95.;
+       if(tc < 1.f) tc = 1.f;
+       if(tc > 95.f) tc = 95.f;
        x = (w-hMargin-squareSize/8-7)* log(tc)/log(95.) + hMargin;
        y = ((double)r - minRating)/(maxRating - minRating)
            * (h-vMargin-squareSize/8-1) + vMargin;
@@ -6563,10 +6563,9 @@ void
 UserMoveEvent(int fromX, int fromY, int toX, int toY, int promoChar)
 {
     ChessMove moveType;
-    ChessSquare pdown, pup;
+    ChessSquare pup;
     int ff=fromX, rf=fromY, ft=toX, rt=toY;
 
-
     /* Check if the user is playing in turn.  This is complicated because we
        let the user "pick up" a piece before it is his turn.  So the piece he
        tried to pick up may have been captured by the time he puts it down!
@@ -6702,7 +6701,6 @@ UserMoveEvent(int fromX, int fromY, int toX, int toY, int promoChar)
     }
 
     if(toX < 0 || toY < 0) return;
-    pdown = boards[currentMove][fromY][fromX];
     pup = boards[currentMove][toY][toX];
 
     /* [HGM] If move started in holdings, it means a drop. Convert to standard form */
@@ -10928,7 +10926,7 @@ AutoPlayGameLoop ()
          continue;
        if (appData.timeDelay < 0)
          return;
-       StartLoadGameTimer((long)(1000.0 * appData.timeDelay));
+       StartLoadGameTimer((long)(1000.0f * appData.timeDelay));
        break;
     }
 }
@@ -11563,7 +11561,7 @@ QuickCompare (Board board, int *minCounts, int *maxCounts)
 int
 QuickScan (Board board, Move *move)
 {   // reconstruct game,and compare all positions in it
-    int cnt=0, stretch=0, total = MakePieceList(board, counts), delayedKing = -1;
+    int cnt=0, stretch=0, total = MakePieceList(board, counts);
     do {
        int piece = move->piece;
        int to = move->to, from = pieceList[piece];
@@ -11610,7 +11608,7 @@ QuickScan (Board board, Move *move)
            if(stretch++ == 0) for(i=0; i<EmptySquare; i++) lastCounts[i] = counts[i]; // remember actual material
        } else stretch = 0;
        if(stretch && (appData.searchMode == 1 || stretch >= appData.stretch)) return cnt + 1 - stretch;
-       move++; delayedKing = -1;
+       move++;
     } while(1);
 }
 
@@ -12545,7 +12543,6 @@ int
 SaveGamePGN (FILE *f)
 {
     int i, offset, linelen, newblock;
-    time_t tm;
 //    char *movetext;
     char numtext[32];
     int movelen, numlen, blank;
@@ -12553,8 +12550,6 @@ SaveGamePGN (FILE *f)
 
     offset = backwardMostMove & (~1L); /* output move numbers start at 1 */
 
-    tm = time((time_t *) NULL);
-
     PrintPGNTags(f, &gameInfo);
 
     if(appData.numberTag && matchMode) fprintf(f, "[Number \"%d\"]\n", nextGame+1); // [HGM] number tag
@@ -13373,7 +13368,7 @@ AnalyzeFileEvent ()
     StartAnalysisClock();
     GetTimeMark(&lastNodeCountTime);
     lastNodeCount = 0;
-    if(appData.timeDelay > 0) StartLoadGameTimer((long)(1000.0 * appData.timeDelay));
+    if(appData.timeDelay > 0) StartLoadGameTimer((long)(1000.0f * appData.timeDelay));
 }
 
 void
@@ -13607,11 +13602,6 @@ TwoMachinesEvent P((void))
 
     if (appData.noChessProgram) return;
 
-    if(second.protocolVersion >= 2 && !strstr(second.variants, VariantName(gameInfo.variant))) {
-       DisplayError("second engine does not play this", 0);
-       return;
-    }
-
     switch (gameMode) {
       case TwoMachinesPlay:
        return;
@@ -13650,6 +13640,12 @@ TwoMachinesEvent P((void))
       ScheduleDelayedEvent(TwoMachinesEventIfReady, 10);
       return;
     }
+
+    if(second.protocolVersion >= 2 && !strstr(second.variants, VariantName(gameInfo.variant))) {
+       DisplayError("second engine does not play this", 0);
+       return;
+    }
+
     if(!stalling) {
       InitChessProgram(&second, FALSE); // unbalances ping of second engine
       SendToProgram("force\n", &second);