]> git.pond.sub.org Git - empserver/blobdiff - src/lib/commands/powe.c
Fix trailing whitespace
[empserver] / src / lib / commands / powe.c
index 91628424ff816da9652eac6dfe5c79b8a14e2c99..23670021c51812029b9a2e6a9d16f8543acd66dc 100644 (file)
  *  ---
  *
  *  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>
@@ -94,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;
            }