Update copyright notice

[empserver] / src / lib / update / prepare.c

diff --git a/src/lib/update/prepare.c b/src/lib/update/prepare.c
index da8b193a3cfb4dcc066346b9ded5a7d3fb0477c9..13e44f263021126c5c5e772765986d3c304f63c0 100644 (file)
--- a/src/lib/update/prepare.c
+++ b/src/lib/update/prepare.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,9 +19,9 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
@@ -33,24 +33,18 @@
  *     Steve McClure, 1997
  */
 
-#include "misc.h"
-#include "sect.h"
-#include "nat.h"
+#include <config.h>
+
+#include "budg.h"
 #include "item.h"
-#include "file.h"
-#include "xy.h"
+#include "land.h"
 #include "path.h"
-#include "optlist.h"
-#include "budg.h"
 #include "player.h"
 #include "ship.h"
-#include "land.h"
 #include "update.h"
-#include "gen.h"
-#include "common.h"
 
 void
-prepare_sects(int etu, int *bp)
+prepare_sects(int etu, struct bp *bp)
 {
     struct sctstr *sp;
     struct natstr *np;
@@ -83,15 +77,15 @@ prepare_sects(int etu, int *bp)
 
        if (sp->sct_type == SCT_WATER)
            continue;
-       fill_update_array(bp, sp);
+       bp_set_from_sect(bp, sp);
        np = getnatp(sp->sct_own);
 
 #ifdef DEBUG
-       if (np->nat_stat & STAT_SANCT)
+       if (np->nat_stat == STAT_SANCT)
            logerror("Prepare.c: country in sanctuary skipped production");
 #endif /* DEBUG */
 
-       if (!(np->nat_stat & STAT_SANCT)) {
+       if (np->nat_stat != STAT_SANCT) {
            guerrilla(sp);
            do_plague(sp, np, etu);
            tax(sp, np, etu, &pops[sp->sct_own], &civ_tax, &uw_tax,
@@ -157,7 +151,7 @@ upd_slmilcosts(natid n, int etu)
            totalmil += mil;
     }
     mil_pay = totalmil * etu * money_mil;
-    return (mil_pay);
+    return mil_pay;
 }
 
 int