Fix trailing whitespace

[empserver] / src / lib / player / player.c

diff --git a/src/lib/player/player.c b/src/lib/player/player.c
index f87db4da7a433e8160acfe9c430d506487dd9559..14a7aaddac8e267840b9017d5afcb60ceb55b3c6 100644 (file)
--- a/src/lib/player/player.c
+++ b/src/lib/player/player.c
@@ -26,9 +26,11 @@
  *  ---
  *
  *  player.c: Main command loop for a player
- * 
+ *
  *  Known contributors to this file:
  *     Steve McClure, 2000
+ *     Markus Armbruster, 2004-2008
+ *     Ron Koenderink, 2004-2007
  */
 
 #include <config.h>
@@ -163,8 +165,17 @@ status(void)
        pr("That just cost you $%.2f\n", player->dolcost);
     else if (player->dolcost < -100.0)
        pr("You just made $%.2f\n", -player->dolcost);
-    natp->nat_money -= roundavg(player->dolcost);
-    player->dolcost = 0.0;
+    if (player->dolcost != 0.0) {
+       /*
+        * Hackish work around for a race condition in the nightly
+        * build's regression tests: sometimes the update starts right
+        * after the force command yields, sometimes a bit later.  If
+        * it is late, we use one random number here, for the bye,
+        * and throwing off the random sequence.
+        */
+       natp->nat_money -= roundavg(player->dolcost);
+       player->dolcost = 0.0;
+    }
 
     old_nstat = player->nstat;
     player_set_nstat(player, natp);
@@ -288,12 +299,12 @@ show_motd(void)
     char buf[MAXTELSIZE + 1];  /* UTF-8 */
 
     if ((motd_fp = fopen(motdfil, "rb")) == NULL) {
-       if (errno == ENOENT)
+       if (errno == ENOENT)
            return RET_OK;
        else {
            pr ("Could not open motd.\n");
            logerror("Could not open motd (%s).\n", motdfil);
-           return RET_SYS;
+           return RET_FAIL;
        }
     }
     if (fread(&tgm, sizeof(tgm), 1, motd_fp) != 1) {