/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2004, 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
*
* ---
*
- * 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.
*
* ---
*
* Steve McClure, 1997
*/
-#include <math.h>
-#include "misc.h"
-#include "sect.h"
-#include "nat.h"
+#include <config.h>
+
+#include "budg.h"
#include "item.h"
-#include "news.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;
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,
totalmil += mil;
}
mil_pay = totalmil * etu * money_mil;
- return (mil_pay);
+ return mil_pay;
}
int