X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=db32288b7dbec057a5ca718e7f4aa24dc27435ee;hb=f372265a57433a70c24a2298503f3537fbb78573;hp=bc25c5fa9d10467020fc19f26b7a031ff11bfcc0;hpb=19fb94c81f006ac504fdb3bf70ed34985de702cd;p=xboard.git

diff --git a/backend.c b/backend.c
index bc25c5f..db32288 100644
--- 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;
@@ -4242,10 +4242,12 @@ ParseBoard12 (char *string)
 	break;
     }
 
-    if((gameMode == IcsPlayingWhite || gameMode == IcsPlayingBlack)
+    if((gameMode == IcsPlayingWhite || gameMode == IcsPlayingBlack ||
+	gameMode == IcsObserving && appData.dualBoard) // also allow use of second board for observing two games
 	 && newGameMode == IcsObserving && gamenum != ics_gamenum && appData.bgObserve) {
       // [HGM] bughouse: don't act on alien boards while we play. Just parse the board and save it */
       int fac = strchr(elapsed_time, '.') ? 1 : 1000;
+      static int lastBgGame = -1;
       char *toSqr;
       for (k = 0; k < ranks; k++) {
         for (j = 0; j < files; j++)
@@ -4271,6 +4273,12 @@ ParseBoard12 (char *string)
 	  DisplayWhiteClock(white_time*fac, to_play == 'W');
 	  DisplayBlackClock(black_time*fac, to_play != 'W');
 	  activePartner = to_play;
+	  if(gamenum != lastBgGame) {
+	      char buf[MSG_SIZ];
+	      snprintf(buf, MSG_SIZ, "%s %s %s", white, _("vs."), black);
+	      DisplayTitle(buf);
+	  }
+	  lastBgGame = gamenum;
 	  activePartnerTime = to_play == 'W' ? white_time*fac : black_time*fac;
 	              partnerUp = 0; flipView = !flipView; } // [HGM] dual
       snprintf(partnerStatus, MSG_SIZ,"W: %d:%02d B: %d:%02d (%d-%d) %c", white_time*fac/60000, (white_time*fac%60000)/1000,
@@ -4280,6 +4288,16 @@ ParseBoard12 (char *string)
       return;
     }
 
+    if(appData.dualBoard && appData.bgObserve) {
+	if((newGameMode == IcsPlayingWhite || newGameMode == IcsPlayingBlack) && moveNum == 1)
+	    SendToICS(ics_prefix), SendToICS("pobserve\n");
+	else if(newGameMode == IcsObserving && (gameMode == BeginningOfGame || gameMode == IcsIdle)) {
+	    char buf[MSG_SIZ];
+	    snprintf(buf, MSG_SIZ, "%spobserve %s\n", ics_prefix, white);
+	    SendToICS(buf);
+	}
+    }
+
     /* Modify behavior for initial board display on move listing
        of wild games.
        */
@@ -6545,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!
@@ -6684,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 */
@@ -10910,7 +10926,7 @@ AutoPlayGameLoop ()
 	  continue;
 	if (appData.timeDelay < 0)
 	  return;
-	StartLoadGameTimer((long)(1000.0 * appData.timeDelay));
+	StartLoadGameTimer((long)(1000.0f * appData.timeDelay));
 	break;
     }
 }
@@ -11545,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];
@@ -11563,7 +11579,6 @@ QuickScan (Board board, Move *move)
 	    move++;
 	    continue;
 	  } else if(piece <= Q_BCASTL) { // castling, encoded as (Q_XCASTL, king-to) + (rook, rook-to)
-	    int rook;
 	    piece = pieceList[piece]; // first two elements of pieceList contain King numbers
 	    from  = pieceList[piece]; // so this must be King
 	    quickBoard[from] = 0;
@@ -11593,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);
 }
 
@@ -13356,7 +13371,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