License upgrade to GPL version 3 or later

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

diff --git a/src/lib/update/nat.c b/src/lib/update/nat.c
index e7d50b0eec86c2a2ee6686f746a619b065100262..ece9f503d78a02469b7eb1f4efd7311a47126c55 100644 (file)
--- a/src/lib/update/nat.c
+++ b/src/lib/update/nat.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2011, 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,
@@ -14,8 +14,7 @@
  *  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/>.
  *
  *  ---
  *
@@ -26,7 +25,7 @@
  *  ---
  *
  *  nat.c: Accumulate tech, edu, research and happiness.
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1989
  *     Steve McClure, 1997
@@ -152,7 +151,7 @@ prod_nat(int etu)
        hap = levels[n][NAT_HLEV] * hap_edu * hap_cons /
            ((float)pop * etu);
        edu = levels[n][NAT_ELEV] * edu_cons / ((float)pop * etu);
-       wu((natid)0, n, "%3.0f happiness, %3.0f education produced\n",
+       wu(0, n, "%3.0f happiness, %3.0f education produced\n",
           levels[n][NAT_HLEV], levels[n][NAT_ELEV]);
        hap = limit_level(hap, NAT_HLEV, 1);
        edu = limit_level(edu, NAT_ELEV, 1);
@@ -174,8 +173,7 @@ prod_nat(int etu)
            limit_level(levels[n][NAT_TLEV] / 1, NAT_TLEV, 0) * 1;
        levels[n][NAT_RLEV] =
            limit_level(levels[n][NAT_RLEV] / 1, NAT_RLEV, 0) * 1;
-       wu((natid)0, n,
-          "total pop was %ld, yielding %4.2f hap, %4.2f edu\n",
+       wu(0, n, "total pop was %ld, yielding %4.2f hap, %4.2f edu\n",
           pop - 1, hap, edu);
     }
     if (ally_factor > 0.0)
@@ -190,15 +188,12 @@ prod_nat(int etu)
        tlev = levels[n][NAT_TLEV];
        rlev = levels[n][NAT_RLEV];
        if (tech[n] != 0.0 || res[n] != 0.0) {
-           wu((natid)0, n,
-              "%5.4f technology (%5.4f + %5.4f), ",
+           wu(0, n, "%5.4f technology (%5.4f + %5.4f), ",
               tlev + tech[n], tlev, tech[n]);
-           wu((natid)0, n,
-              "%5.4f research (%5.4f + %5.4f) produced\n",
+           wu(0, n, "%5.4f research (%5.4f + %5.4f) produced\n",
               rlev + res[n], rlev, res[n]);
        } else
-           wu((natid)0, n,
-              "%5.4f tech, %5.4f research produced\n", tlev, rlev);
+           wu(0, n, "%5.4f tech, %5.4f research produced\n", tlev, rlev);
        rlev += res[n];
        tlev += tech[n];
        if (rlev != 0.0)
@@ -207,10 +202,10 @@ prod_nat(int etu)
            np->nat_level[NAT_TLEV] += tlev;
        if ((sea_money[n] != 0) || (air_money[n] != 0) ||
            (lnd_money[n] != 0))
-           wu((natid)0, n,
+           wu(0, 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 $%ld for this update\n",
+       wu(0, n, "money delta was $%ld for this update\n",
           np->nat_money - money[n]);
        if (opt_LOSE_CONTACT) {
            for (cn = 1; cn < MAXNOC; cn++) {
@@ -249,9 +244,9 @@ share_incr(double *res, double *tech)
                    continue;
            }
            if (!opt_ALL_BLEED) {
-               if (getrel(np, j) != ALLIED)
+               if (relations_with(i, j) != ALLIED)
                    continue;
-               if (getrel(other, i) != ALLIED)
+               if (relations_with(j, i) != ALLIED)
                    continue;
                res[i] += levels[j][NAT_RLEV];
                tech[i] += levels[j][NAT_TLEV];
@@ -274,6 +269,5 @@ share_incr(double *res, double *tech)
        if (tnc > 0) {
            tech[i] /= tnc * ally_factor;
        }
-/*             logerror("Country #%d gets %g res from %d allies, %g tech from %d allies", i, res[i], rnc, tech[i], tnc);*/
     }
 }