Fix trailing whitespace

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

diff --git a/src/lib/player/init_nats.c b/src/lib/player/init_nats.c
index cfcfa944695dfbcd9ec1b904ddfa543230fb43eb..f1bfd2425d1c29a8d8f3b195ec0dd4a5d771369f 100644 (file)
--- a/src/lib/player/init_nats.c
+++ b/src/lib/player/init_nats.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,102 +19,69 @@
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
  *  init_nats.c: Initialize country and nation file stuff
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1994
  *     Steve McClure, 2000
+ *     Markus Armbruster, 2007
  */
 
-#include "prototypes.h"
+#include <config.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"
+#include "sect.h"
 
 int
 init_nats(void)
 {
     struct natstr *np;
 
-    if ((np = getnatp(player->cnum)) == 0)
+    np = getnatp(player->cnum);
+    if (CANT_HAPPEN(!np))
        return -1;
-    player->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;
-    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 ((player->nstat & NORM) == NORM) {
-       if (player->owner && (sect.sct_type == SCT_CAPIT ||
-                             sect.sct_type == SCT_MOUNT ||
-                             sect.sct_type == SCT_SANCT))
-           player->nstat |= CAP;
-       else
-           player->nstat &= ~CAP;
-       /* Ok, has the country owner reset his capital yet after it was sacked? */
-       if (np->nat_flags & NF_SACKED)
-           player->nstat &= ~CAP;      /* No capital yet */
-    }
-    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;
-       if ((sect.sct_effic) && (sect.sct_type != SCT_MOUNT))
-           delta = roundavg(d * civ * sect.sct_effic * btu_build_rate);
-       else                    /* Assume 1/2% efficiency minimum */
-           delta = roundavg(d * civ * btu_build_rate / 2.0);
+    static int nstat[] = {
+       /* must match nat_status */
+       0, VIS, VIS, SANCT, NORM, GOD | CAP | MONEY
+    };
 
-       if (delta + btu > max_btus)
-           np->nat_btu = max_btus;
-       else
-           np->nat_btu += delta;
-    }
-    if (np->nat_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;
+    pl->nstat |= EXEC;
+    return pl->nstat;
 }