/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2013, 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,
* 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/>.
*
* ---
*
- * 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.
*
* ---
*
* prepare.c: Perform prelimiary updates of sectors
- *
+ *
* Known contributors to this file:
* Dave Pare, 1986
* Thomas Ruschak, 1992
* Steve McClure, 1997
*/
-#include <math.h>
-#include "misc.h"
-#include "var.h"
-#include "sect.h"
-#include "nat.h"
-#include "item.h"
-#include "news.h"
-#include "file.h"
-#include "xy.h"
-#include "path.h"
-#include "optlist.h"
+#include <config.h>
+
#include "budg.h"
+#include "item.h"
+#include "land.h"
#include "player.h"
#include "ship.h"
-#include "land.h"
#include "update.h"
-#include "gen.h"
-#include "common.h"
-
-extern float levels[MAXNOC][4];
void
-prepare_sects(int etu, int *bp)
+prepare_sects(int etu, struct bp *bp)
{
- extern long pops[];
- register struct sctstr *sp;
+ struct sctstr *sp;
struct natstr *np;
int n, civ_tax, uw_tax, mil_pay;
if (opt_FALLOUT) {
if (!player->simulation) {
/* First, we determine which sectors to process fallout in */
- for (n = 0; NULL != (sp = getsectid(n)); n++) {
- if (getvar(V_FALLOUT, (s_char *)sp, EF_SECTOR))
- sp->sct_updated = 1;
- else
- sp->sct_updated = 0;
- }
+ for (n = 0; NULL != (sp = getsectid(n)); n++)
+ sp->sct_updated = sp->sct_fallout != 0;
/* Next, we process the fallout there */
for (n = 0; NULL != (sp = getsectid(n)); n++)
if (sp->sct_updated)
spread_fallout(sp, etu);
/* Next, we decay the fallout */
for (n = 0; NULL != (sp = getsectid(n)); n++)
- if (getvar(V_FALLOUT, (s_char *)sp, EF_SECTOR))
+ if (sp->sct_fallout)
decay_fallout(sp, etu);
}
}
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)
- 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,
tax(struct sctstr *sp, struct natstr *np, int etu, long *pop, int *civ_tax,
int *uw_tax, int *mil_pay)
{
- int vec[I_MAX + 1];
-
*civ_tax = 0;
*uw_tax = 0;
*mil_pay = 0;
- if (getvec(VT_ITEM, vec, (s_char *)sp, EF_SECTOR) <= 0)
- return;
if (!player->simulation)
- populace(np, sp, vec, etu);
- *civ_tax = (int)(0.5 + vec[I_CIVIL] * sp->sct_effic *
+ populace(np, sp, etu);
+ *civ_tax = (int)(0.5 + sp->sct_item[I_CIVIL] * sp->sct_effic *
etu * money_civ / 100);
/*
* captured civs only pay 1/4 taxes
*/
if (sp->sct_own != sp->sct_oldown)
*civ_tax = *civ_tax / 4;
- *uw_tax = (int)(0.5 + vec[I_UW] * sp->sct_effic *
+ *uw_tax = (int)(0.5 + sp->sct_item[I_UW] * sp->sct_effic *
etu * money_uw / 100);
- *mil_pay = vec[I_MILIT] * etu * money_mil;
+ *mil_pay = sp->sct_item[I_MILIT] * etu * money_mil;
/*
* only non-captured civs add to census for nation
*/
if (sp->sct_oldown == sp->sct_own)
- *pop += vec[I_CIVIL];
+ *pop += sp->sct_item[I_CIVIL];
}
int
for (i = 0; NULL != (sp = getshipp(i)); i++) {
if (!sp->shp_own || sp->shp_own != n)
continue;
- if ((mil = getvar(V_MILIT, (s_char *)sp, EF_SHIP)) > 0)
+ if ((mil = sp->shp_item[I_MILIT]) > 0)
totalmil += mil;
}
for (i = 0; NULL != (lp = getlandp(i)); i++) {
if (!lp->lnd_own || lp->lnd_own != n)
continue;
- if ((mil = getvar(V_MILIT, (s_char *)lp, EF_LAND)) > 0)
+ if ((mil = lp->lnd_item[I_MILIT]) > 0)
totalmil += mil;
}
mil_pay = totalmil * etu * money_mil;
- return (mil_pay);
+ return mil_pay;
}
int
bank_income(struct sctstr *sp, int etu)
{
- int vec[I_MAX + 1];
-
- if (getvec(VT_ITEM, vec, (s_char *)sp, EF_SECTOR) <= 0)
- return 0;
- else
- return (int)(vec[I_BAR] * etu * bankint * sp->sct_effic / 100);
+ return (int)(sp->sct_item[I_BAR] * etu * bankint * sp->sct_effic / 100);
}
projects / empserver / blobdiff