/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
* Dave Pare, 1994
* Steve McClure, 1996
* Doug Hay, 1998
- * Markus Armbruster, 2006-2007
+ * Markus Armbruster, 2006-2009
*/
#include <config.h>
{
int etu = etu_per_update;
int n;
- int x;
+ int i;
struct bp *bp;
- int cn, cn2, rel;
- struct natstr *cnp;
+ int cn;
struct natstr *np;
logerror("production update (%d etus)", etu);
prepare_sects(etu, bp);
logerror("done preparing sectors.");
logerror("producing for countries...");
- for (x = 0; x < MAXNOC; x++) {
- long p_sect[SCT_TYPE_MAX+2][2];
+ for (i = 0; i < MAXNOC; i++) {
+ long p_sect[SCT_BUDG_MAX+1][2];
memset(p_sect, 0, sizeof(p_sect));
- if (!(np = getnatp(x)))
+ if (!(np = getnatp(i)))
continue;
if (np->nat_stat == STAT_SANCT) {
-#ifdef DEBUG
- logerror("Country %i is in sanctuary and did not update", x);
-#endif
continue;
}
np->nat_money += (int)(np->nat_reserve * money_res * etu);
/* maintain units */
- prod_ship(etu, x, bp, 0);
- prod_plane(etu, x, bp, 0);
- prod_land(etu, x, bp, 0);
+ prod_ship(etu, i, bp, 0);
+ prod_plane(etu, i, bp, 0);
+ prod_land(etu, i, bp, 0);
/* produce all sects */
- produce_sect(x, etu, bp, p_sect);
+ produce_sect(i, etu, bp, p_sect);
/* build units */
- prod_ship(etu, x, bp, 1);
- prod_plane(etu, x, bp, 1);
- prod_land(etu, x, bp, 1);
+ prod_ship(etu, i, bp, 1);
+ prod_plane(etu, i, bp, 1);
+ prod_land(etu, i, bp, 1);
}
logerror("done producing for countries.");
prod_nat(etu);
age_levels(etu);
free(bp);
- if (opt_SLOW_WAR) {
- /* Update war declarations */
- /* MOBILIZATION->SITZKRIEG->AT_WAR */
- for (cn = 1; cn < MAXNOC; cn++) {
- if ((cnp = getnatp(cn)) == 0)
- break;
- for (cn2 = 1; cn2 < MAXNOC; cn2++) {
- if (cn2 == cn)
- continue;
- rel = getrel(cnp, cn2);
- if (rel == MOBILIZATION) {
- rel = SITZKRIEG;
- setrel(cn, cn2, rel);
- } else if (rel == SITZKRIEG) {
- rel = AT_WAR;
- setrel(cn, cn2, rel);
- }
- }
- }
- }
+
/* Only update mobility for non-MOB_ACCESS here, since it doesn't
get done for MOB_ACCESS anyway during the update */
if (!opt_MOB_ACCESS) {