Update copyright notice

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

diff --git a/src/lib/commands/powe.c b/src/lib/commands/powe.c
index 91628424ff816da9652eac6dfe5c79b8a14e2c99..dcb0da8ae279da81c4baf0919cc71277a03077d4 100644 (file)
--- a/src/lib/commands/powe.c
+++ b/src/lib/commands/powe.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2013, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -26,12 +25,13 @@
  *  ---
  *
  *  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-2009
+ *     Ron Koenderink, 2005-2008
  */
 
 #include <config.h>
@@ -94,9 +94,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;
            }
@@ -320,7 +323,7 @@ gen_power(struct powstr *powbuf, int save)
      * write(), they delay it until the write actually hits the disk.
      * Bad, because `power' displays that time.  Force it.
      */
-    fsync(empfile[EF_POWER].fd);
+    _commit(empfile[EF_POWER].fd);
 #endif
 }