Update copyright notice

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

diff --git a/src/lib/player/init_nats.c b/src/lib/player/init_nats.c
index bb27b1fdab4269ac5dccf8bd7cdb8bf7fedba32e..4249ee5f591b232443f8ed65c6102a6b06cb754f 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-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2021, 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,23 +25,21 @@
  *  ---
  *
  *  init_nats.c: Initialize country and nation file stuff
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1994
  *     Steve McClure, 2000
- *     Markus Armbruster, 2007
+ *     Markus Armbruster, 2007-2016
  */
 
 #include <config.h>
 
-#include "file.h"
 #include "game.h"
 #include "misc.h"
 #include "nat.h"
 #include "optlist.h"
 #include "player.h"
 #include "prototypes.h"
-#include "sect.h"
 
 int
 init_nats(void)
@@ -56,9 +53,6 @@ init_nats(void)
     player->map = ef_ptr(EF_MAP, player->cnum);
     player->bmap = ef_ptr(EF_BMAP, player->cnum);
 
-    if (opt_HIDDEN)
-       putcontact(np, player->cnum, FOUND_SPY);
-
     player_set_nstat(player, np);
     grant_btus(np, game_tick_to_now(&np->nat_access));
 
@@ -71,7 +65,8 @@ player_set_nstat(struct player *pl, struct natstr *np)
 {
     static int nstat[] = {
        /* must match nat_status */
-       0, VIS, VIS, SANCT, NORM, GOD
+       0, NONVIS, 0, SANCT | NONVIS, NORM | NONVIS,
+       GOD | NORM | NONVIS | CAP | MONEY
     };
 
     if (CANT_HAPPEN(pl->cnum != np->nat_cnum))
@@ -80,7 +75,10 @@ player_set_nstat(struct player *pl, struct natstr *np)
     pl->nstat = nstat[np->nat_stat];
     if (np->nat_money >= 0)
        pl->nstat |= MONEY;
-    if (np->nat_stat >= STAT_ACTIVE && !influx(np))
+    if (np->nat_stat == STAT_ACTIVE && !influx(np))
        pl->nstat |= CAP;
+    if (running_test_suite)
+       pl->nstat |= TESTING;
+    pl->nstat |= EXEC;
     return pl->nstat;
 }