Fix trailing whitespace

[empserver] / src / lib / commands / powe.c

diff --git a/src/lib/commands/powe.c b/src/lib/commands/powe.c
index b05be45eb84c54d9a828ea5c0ccd58371476f48a..23670021c51812029b9a2e6a9d16f8543acd66dc 100644 (file)
--- a/src/lib/commands/powe.c
+++ b/src/lib/commands/powe.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -26,20 +26,18 @@
  *  ---
  *
  *  powe.c: Do a power report
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare
  *     Ken Stevens, 1995
  *     Steve McClure, 1998-2000
- *     Markus Armbruster, 2006
+ *     Markus Armbruster, 2004-2008
+ *     Ron Koenderink, 2005-2008
  */
 
 #include <config.h>
-
+#include <unistd.h>
 #include <math.h>
-#ifdef _WIN32
-#include <io.h>
-#endif
 
 #include "commands.h"
 #include "item.h"
@@ -97,9 +95,12 @@ powe(void)
 
     if (player->argp[i]) {
        if (player->argp[i][0] == 'c') {
-           snxtitem(&ni, EF_NATION, player->argp[i + 1]);
+           if (!snxtitem(&ni, EF_NATION, player->argp[i + 1], NULL))
+               return RET_SYN;
            while (nxtitem(&ni, &nat)) {
-               if (nat.nat_stat != STAT_ACTIVE)
+               if (nat.nat_stat == STAT_UNUSED)
+                   continue;
+               if (!player->god && nat.nat_stat != STAT_ACTIVE)
                    continue;
                targets[nat.nat_cnum] = 1;
            }
@@ -292,7 +293,7 @@ gen_power(struct powstr *powbuf, int save)
            pow->p_power += pow->p_sects
                * (pow->p_effic / pow->p_sects / 100.0)
                * 10.0;
-       pow->p_power *= MAX(1.0, natp->nat_level[NAT_TLEV] / 500.0);
+       pow->p_power *= MAX(1.0, natp->nat_level[NAT_TLEV]) / 500.0;
        /* ack.  add this vec to the "world power" element */
        f_pt2 = &powbuf[0].p_sects;
        f_ptr = &pow->p_sects;
@@ -320,10 +321,10 @@ gen_power(struct powstr *powbuf, int save)
 #ifdef _WIN32
     /*
      * At least some versions of Windows fail to update mtime on
-     * write().  Bad, because `power' displays that time.  Attempt to
-     * force an update.
+     * write(), they delay it until the write actually hits the disk.
+     * Bad, because `power' displays that time.  Force it.
      */
-    _commit(empfile[EF_POWER].fd);
+    fsync(empfile[EF_POWER].fd);
 #endif
 }