X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=engineoutput.c;h=11229b9bdafcbde2551588d10453eed7bad7d8de;hb=2987ec348b8b2cbf38ba9a6a0793652a6b238ae8;hp=1ca977b51f7f8ec5a8541f549331955330755be9;hpb=682bb14684d3d8be078029778e08ec2b48bae65e;p=xboard.git

diff --git a/engineoutput.c b/engineoutput.c
index 1ca977b..11229b9 100644
--- a/engineoutput.c
+++ b/engineoutput.c
@@ -446,7 +446,9 @@ Format(char *buf, int val)
             snprintf( buf, 24, "%d%s\t", val, spaces + 2*i);
         }
         else {
-            snprintf( buf, 24, "%.1fM%s\t", val/1000000.0, spaces + 8 + 2*(val > 1e7));
+            char unit = 'M';
+            if(val >= 1e9) val /= 1e3, unit = 'G';
+            snprintf( buf, 24, "%.*f%c%s\t", 1 + (val < 1e7), val/1e6, unit, spaces + 10 + 2*(val >= 1e8));
         }
 }
 
@@ -568,8 +570,11 @@ UpdateControls (EngineOutputData *ed)
             snprintf( s_nodes, sizeof(s_nodes)/sizeof(s_nodes[0]), u64Display "%s\t", ed->nodes, spaces + 2*i);
         }
         else {
-            snprintf( s_nodes, sizeof(s_nodes)/sizeof(s_nodes[0]), "%.1fM%s\t", u64ToDouble(ed->nodes) / 1000000.0,
-                      spaces + 8 + 2*(ed->nodes > 1e7));
+            double x = u64ToDouble(ed->nodes);
+            char unit = 'M';
+            if(x >= 1e9) x /= 1e3, unit = 'G';
+            snprintf( s_nodes, sizeof(s_nodes)/sizeof(s_nodes[0]), "%.*f%c%s\t", 1 + (x < 1e7), x / 1e6,
+                      unit, spaces + 10 + 2*(ed->nodes >= 1e8));
         }
 
         /* TB Hits etc. */
@@ -601,6 +606,9 @@ UpdateControls (EngineOutputData *ed)
         }
 
         /* Time */
+        if(time_secs >= 3600)
+            snprintf( s_time, sizeof(s_time)/sizeof(s_time[0]), "%d:%02d:%02d\t", time_secs / 3600, (time_secs / 60) % 60, time_secs % 60 );
+        else
         snprintf( s_time, sizeof(s_time)/sizeof(s_time[0]), "%d:%02d.%02d\t", time_secs / 60, time_secs % 60, time_cent );
 
         if(columnMask & 2) s_score[0] = NULLCHAR; // [HGM] hide: erase columns the user has hidden