tests: New test-suite-only command __cmd

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

diff --git a/src/lib/player/init_nats.c b/src/lib/player/init_nats.c
index f1bfd2425d1c29a8d8f3b195ec0dd4a5d771369f..705229be4fdd2f28a9ba0b25cec3285b9e5e75e2 100644 (file)
--- a/src/lib/player/init_nats.c
+++ b/src/lib/player/init_nats.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-2014, 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/>.
  *
  *  ---
  *
@@ -30,7 +29,7 @@
  *  Known contributors to this file:
  *     Dave Pare, 1994
  *     Steve McClure, 2000
- *     Markus Armbruster, 2007
+ *     Markus Armbruster, 2007-2014
  */
 
 #include <config.h>
@@ -42,7 +41,6 @@
 #include "optlist.h"
 #include "player.h"
 #include "prototypes.h"
-#include "sect.h"
 
 int
 init_nats(void)
@@ -71,7 +69,8 @@ player_set_nstat(struct player *pl, struct natstr *np)
 {
     static int nstat[] = {
        /* must match nat_status */
-       0, VIS, VIS, SANCT, NORM, GOD | CAP | MONEY
+       0, NONVIS, 0, SANCT | NONVIS, NORM | NONVIS,
+       GOD | NORM | NONVIS | CAP | MONEY
     };
 
     if (CANT_HAPPEN(pl->cnum != np->nat_cnum))
@@ -82,6 +81,8 @@ player_set_nstat(struct player *pl, struct natstr *np)
        pl->nstat |= MONEY;
     if (np->nat_stat == STAT_ACTIVE && !influx(np))
        pl->nstat |= CAP;
+    if (running_test_suite)
+       pl->nstat |= TESTING;
     pl->nstat |= EXEC;
     return pl->nstat;
 }