empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update: Clean up misuse of wu() in prod_nat()

Browse source 
Don't use multiple calls of wu() to print a single line, because that
creates a separate telegram for each part.  The read command normally
merges the telegrams, but if they are more than five seconds apart
(clock jumped somehow), we get a telegram header in the middle of a
line.  Unlikely to happen, but clean it up anyway.

The misuse has always been there.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2015-01-11 12:25:03 +01:00
parent 9a4f1ce9ef
commit 9e643dad00
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/lib/update/nat.c
View file

@ -29,6 +29,7 @@
* Known contributors to this file: * Known contributors to this file:
* Dave Pare, 1989 * Dave Pare, 1989
* Steve McClure, 1997 * Steve McClure, 1997
* Markus Armbruster, 2006-2015
*/ */
#include <config.h> #include <config.h>
@ -188,9 +189,9 @@ prod_nat(int etu)
tlev = levels[n][NAT_TLEV]; tlev = levels[n][NAT_TLEV];
rlev = levels[n][NAT_RLEV]; rlev = levels[n][NAT_RLEV];
if (tech[n] != 0.0 || res[n] != 0.0) { if (tech[n] != 0.0 || res[n] != 0.0) {
wu(0, n, "%5.4f technology (%5.4f + %5.4f), ", wu(0, n, "%5.4f technology (%5.4f + %5.4f), "
tlev + tech[n], tlev, tech[n]); "%5.4f research (%5.4f + %5.4f) produced\n",
wu(0, n, "%5.4f research (%5.4f + %5.4f) produced\n", tlev + tech[n], tlev, tech[n],
rlev + res[n], rlev, res[n]); rlev + res[n], rlev, res[n]);
} else } else
wu(0, n, "%5.4f tech, %5.4f research produced\n", tlev, rlev); wu(0, n, "%5.4f tech, %5.4f research produced\n", tlev, rlev);