cleaned up the directory a bit. Removed winboard-dm-beta, merged the two Changelogs...

[xboard.git] / backend.c

diff --git a/backend.c b/backend.c
index 745a20b..84937ae 100644 (file)
--- a/backend.c
+++ b/backend.c
@@ -273,9 +273,9 @@ double
 u64ToDouble(u64 value)
 {
   double r;
-  u64 tmp = value & 0x7fffffffffffffff;
+  u64 tmp = value & u64Const(0x7fffffffffffffff);
   r = (double)(s64)tmp;
-  if (value & 0x8000000000000000)
+  if (value & u64Const(0x8000000000000000))
        r +=  9.2233720368547758080e18; /* 2^63 */
  return r;
 }
@@ -1492,7 +1492,6 @@ read_from_ics(isr, closure, data, count, error)
     int backup;
     char *p;
 
-#ifdef WIN32
     if (appData.debugMode) {
       if (!error) {
        fprintf(debugFP, "<ICS: ");
@@ -1500,7 +1499,6 @@ read_from_ics(isr, closure, data, count, error)
        fprintf(debugFP, "\n");
       }
     }
-#endif
 
     if (count > 0) {
        /* If last read ended with a partial line that we couldn't parse,
@@ -1752,11 +1750,11 @@ read_from_ics(isr, closure, data, count, error)
        #ifdef WIN32
                if (loggedOn == TRUE)
                        if (ZippyControl(buf, &backup) || ZippyConverse(buf, &backup) ||
-                               (appData.zippyPlay && ZippyMatch(buf, &backup)));
+                       (appData.zippyPlay && ZippyMatch(buf, &backup)));
                #else
-               if (ZippyControl(buf, &backup) ||
-                   ZippyConverse(buf, &backup) ||
-                   (appData.zippyPlay && ZippyMatch(buf, &backup))) {
+               if (ZippyControl(buf, &i) ||
+                   ZippyConverse(buf, &i) ||
+                   (appData.zippyPlay && ZippyMatch(buf, &i))) {
                    loggedOn = TRUE;
                    if (!appData.colorize) continue;
                }
@@ -2857,7 +2855,7 @@ ParseBoard12(string)
     /* Update currentMove and known move number limits */
     newMove = newGame || moveNum > forwardMostMove;
 
-       /* If we found takebacks during icsEngineAnalyze 
+       /* If we found takebacks during icsEngineAnalyze
           try send to engine */
        if (!newGame && appData.icsEngineAnalyze && moveNum < forwardMostMove) {
                takeback = forwardMostMove - moveNum;
@@ -4458,7 +4456,7 @@ HandleMachineMove(message, cps)
                         ToUpper(cps->twoMachinesColor[0]) : ' '),
                        ((double) curscore) / 100.0,
                        prefixHint ? lastHint : "",
-                       prefixHint ? " " : "", buf1);
+                       prefixHint ? " " : "", programStats.movelist);
 
                if (currentMove == forwardMostMove || gameMode == AnalyzeMode
                        || gameMode == AnalyzeFile || appData.icsEngineAnalyze) {
@@ -8923,12 +8921,12 @@ ReceiveFromProgram(isr, closure, message, count, error)
                cps->which, message);
     }
        /* if icsEngineAnalyze is active we block all
-          whisper and kibitz output, because nobody want 
-          see this 
+          whisper and kibitz output, because nobody want
+          see this
         */
        if (appData.icsEngineAnalyze) {
                if (strstr(message, "whisper") != NULL ||
-                   strstr(message, "kibitz") != NULL || 
+                   strstr(message, "kibitz") != NULL ||
                        strstr(message, "tellics") != NULL) return;
                HandleMachineMove(message, cps);
        } else {
@@ -9273,7 +9271,7 @@ DisplayAnalysisText(text)
 {
     char buf[MSG_SIZ];
 
-    if (gameMode == AnalyzeMode || gameMode == AnalyzeFile 
+    if (gameMode == AnalyzeMode || gameMode == AnalyzeFile
                || appData.icsEngineAnalyze) {
        sprintf(buf, "Analysis (%s)", first.tidy);
        AnalysisPopUp(buf, text);