/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2006, 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 <config.h>
+
#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 "optlist.h"
* level of 0 yields (1) 0.4, (6) 2.2, (12) 3.9, (18) 5.2.
*/
-extern float hap_avg;
-extern float edu_avg;
-extern float ally_factor;
-
-static void share_incr(register double *, register double *);
+static void share_incr(double *, double *);
/*
* for values below the "easy level" values, production is
above = logx(above_easy + 1.0, logbase);
if (above > 250)
above = 250;
- return ((above) < 0) ? easy : (easy + above);
+ return above < 0 ? easy : easy + above;
} else
return level;
}
double res[MAXNOC];
double newvalue;
natid n;
- int cn, cont;
+ int cn;
+ struct natstr *cnp;
for (n = 0; NULL != (np = getnatp(n)); n++) {
- if ((np->nat_stat & STAT_NORM) == 0)
+ if (np->nat_stat < STAT_ACTIVE)
continue;
/*
* hap_edu: the more education people have, the
levels[n][NAT_RLEV] =
limit_level(levels[n][NAT_RLEV] / 1, NAT_RLEV, 0) * 1;
wu((natid)0, n,
- "total pop is %d, yielding %4.2f hap, %4.2f edu\n",
+ "total pop is %ld, yielding %4.2f hap, %4.2f edu\n",
pop - 1, hap, edu);
}
if (ally_factor > 0.0)
memset(tech, 0, sizeof(tech));
}
for (n = 0; NULL != (np = getnatp(n)); n++) {
- if ((np->nat_stat & STAT_NORM) == 0)
+ if (np->nat_stat < STAT_ACTIVE)
continue;
tlev = levels[n][NAT_TLEV];
rlev = levels[n][NAT_RLEV];
if ((sea_money[n] != 0) || (air_money[n] != 0) ||
(lnd_money[n] != 0))
wu((natid)0, n,
- "Army delta $%d, Navy delta $%d, Air force delta $%d\n",
+ "Army delta $%ld, Navy delta $%ld, Air force delta $%ld\n",
lnd_money[n], sea_money[n], air_money[n]);
- wu((natid)0, n, "money delta was $%d for this update\n",
+ wu((natid)0, n, "money delta was $%ld for this update\n",
np->nat_money - money[n]);
if (opt_LOSE_CONTACT) {
- for (cn = 0; cn <= MAXNOC; cn++) {
- cont = getcontact(np, cn);
- if (cont > 0) {
- logerror("country %d at level %d with country %d.\n",
- n, cont, cn);
- setcont(n, cn, cont - 1);
- }
+ for (cn = 1; cn < MAXNOC; cn++) {
+ if ((cnp = getnatp(cn)) != NULL)
+ agecontact(cnp);
}
}
}
* find out everyones increment
*/
static void
-share_incr(register double *res, register double *tech)
+share_incr(double *res, double *tech)
{
- register struct natstr *np;
- register struct natstr *other;
- register natid i;
- register natid j;
+ struct natstr *np;
+ struct natstr *other;
+ natid i;
+ natid j;
int rnc;
int tnc;
for (i = 0; NULL != (np = getnatp(i)); i++) {
res[i] = tech[i] = 0.0;
- if ((np->nat_stat & STAT_INUSE) == 0)
- continue;
- if (np->nat_stat & STAT_GOD)
- continue;
- if (np->nat_stat == VIS)
+ if (np->nat_stat < STAT_SANCT || np->nat_stat == STAT_GOD)
continue;
rnc = tnc = 0;
for (j = 0; NULL != (other = getnatp(j)); j++) {
if (j == i)
continue;
- if (other->nat_stat & STAT_GOD)
- continue;
- if (other->nat_stat == VIS)
- continue;
- if ((other->nat_stat & STAT_INUSE) == 0)
+ if (other->nat_stat != STAT_ACTIVE)
continue;
if (opt_HIDDEN) {
if (!getcontact(np, j))
}
}
}
- if (rnc == 0 && tnc == 0)
- continue;
if (rnc > 0) {
res[i] /= rnc * ally_factor;
}