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 04db2a03d591addd6d4b470c022653b9978705bb..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-2006, 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/>.
  *
  *  ---
  *
@@ -26,96 +25,64 @@
  *  ---
  *
  *  init_nats.c: Initialize country and nation file stuff
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1994
  *     Steve McClure, 2000
+ *     Markus Armbruster, 2007-2014
  */
 
 #include <config.h>
 
-#include "prototypes.h"
+#include "file.h"
+#include "game.h"
 #include "misc.h"
-#include "player.h"
-#include "sect.h"
 #include "nat.h"
-#include "file.h"
 #include "optlist.h"
-#include "common.h"
-#include "gen.h"
-
-static int nat_cap(int);
+#include "player.h"
+#include "prototypes.h"
 
 int
 init_nats(void)
 {
-    static int nstat[] = {
-       /* must match nat_status */
-       0, VIS, VIS, SANCT, NORM, GOD
-    };
     struct natstr *np;
 
-    if ((np = getnatp(player->cnum)) == 0)
+    np = getnatp(player->cnum);
+    if (CANT_HAPPEN(!np))
        return -1;
-    player->nstat = nstat[np->nat_stat];
-    player->god = np->nat_stat == STAT_GOD;
+
     player->map = ef_ptr(EF_MAP, player->cnum);
     player->bmap = ef_ptr(EF_BMAP, player->cnum);
-    if (opt_HIDDEN) {
+
+    if (opt_HIDDEN)
        putcontact(np, player->cnum, FOUND_SPY);
-    }
-    if (np->nat_money <= 0)
-       player->broke = 1;
-    else {
-       player->nstat |= MONEY;
-       player->broke = 0;
-    }
-    if (nat_cap(np->nat_btu) < 0)
-       return -1;
+
+    player_set_nstat(player, np);
+    grant_btus(np, game_tick_to_now(&np->nat_access));
+
+    putnat(np);
     return 0;
 }
 
-static int
-nat_cap(int btu)
+int
+player_set_nstat(struct player *pl, struct natstr *np)
 {
-    struct sctstr sect;
-    struct natstr *np;
-    double d, eff;
-    double civ;
-    int delta;
-
-    np = getnatp(player->cnum);
-    if (!getsect(np->nat_xcap, np->nat_ycap, &sect)) {
-       logerror("can't read %s's cap @ %d,%d",
-                np->nat_cnam, np->nat_xcap, np->nat_ycap);
-       return -1;
-    }
-    if (np->nat_stat >= STAT_ACTIVE) {
-       if (influx(np))
-           player->nstat &= ~CAP;
-       else
-           player->nstat |= CAP;
-    }
-    delta = 0;
-    if ((player->nstat & CAP) || player->god) {
-       d = (double)(player->curup - np->nat_last_login) / s_p_etu;
-       if (d > 336.0)
-           d = 336.0;
-       civ = sect.sct_item[I_CIVIL];
-       if (civ > 999)
-           civ = 999;
-       eff = sect.sct_effic * sect.sct_work / 100.0;
-       if (eff < 0.5 || sect.sct_type == SCT_MOUNT)
-           eff = 0.5;
-       delta = roundavg(d * civ * eff * btu_build_rate);
+    static int nstat[] = {
+       /* must match nat_status */
+       0, NONVIS, 0, SANCT | NONVIS, NORM | NONVIS,
+       GOD | NORM | NONVIS | CAP | MONEY
+    };
 
-       if (delta + btu > max_btus)
-           np->nat_btu = max_btus;
-       else
-           np->nat_btu += delta;
-    }
-    if (np->nat_stat == STAT_VIS)
-       np->nat_btu = max_btus;
-    putnat(np);
-    return 0;
+    if (CANT_HAPPEN(pl->cnum != np->nat_cnum))
+       return pl->nstat;
+    pl->god = np->nat_stat == STAT_GOD;
+    pl->nstat = nstat[np->nat_stat];
+    if (np->nat_money >= 0)
+       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;
 }