COPYING duplicates information from README. Remove. Move GPL from

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

diff --git a/src/lib/update/sect.c b/src/lib/update/sect.c
index d325694b9536a1c01f7f2aab022715e93334f318..e4e8b43b92aa3640cfcbeb46ccfd0579857c87ef 100644 (file)
--- a/src/lib/update/sect.c
+++ b/src/lib/update/sect.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, 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
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
@@ -32,6 +32,8 @@
  *     Steve McClure, 1996
  */
 
+#include <config.h>
+
 #include "misc.h"
 #include "sect.h"
 #include "nat.h"
@@ -84,20 +86,18 @@ upd_buildeff(struct natstr *np, struct sctstr *sp, int *workp,
        }
        neweff = n;
        *cost += work_cost;
-       if (opt_BIG_CITY) {
-           if (!n && dchr[old_type].d_pkg == UPKG &&
-               dchr[*desig].d_pkg != UPKG) {
-               int maxpop = max_population(np->nat_level[NAT_RLEV], *desig, n);
-               if (vec[I_CIVIL] > maxpop)
-                   vec[I_CIVIL] = maxpop;
-               if (vec[I_UW] > maxpop)
-                   vec[I_UW] = maxpop;
-               *workp = (vec[I_CIVIL] * sctwork) / 100.0
-                   + (vec[I_MILIT] * 2 / 5.0) + vec[I_UW];
-               *workp = roundavg((etu * (*workp)) / 100.0);
-
-               buildeff_work = min((int)(*workp / 2), buildeff_work);
-           }
+       if (!n && IS_BIG_CITY(old_type) &&
+           !IS_BIG_CITY(*desig)) {
+           int maxpop = max_population(np->nat_level[NAT_RLEV], *desig, n);
+           if (vec[I_CIVIL] > maxpop)
+               vec[I_CIVIL] = maxpop;
+           if (vec[I_UW] > maxpop)
+               vec[I_UW] = maxpop;
+           *workp = (vec[I_CIVIL] * sctwork) / 100.0
+               + (vec[I_MILIT] * 2 / 5.0) + vec[I_UW];
+           *workp = roundavg((etu * (*workp)) / 100.0);
+
+           buildeff_work = MIN((int)(*workp / 2), buildeff_work);
        }
     }
     if (np->nat_priorities[*desig]) {
@@ -177,15 +177,15 @@ meltitems(int etus, int fallout, int own, short *vec, int type, int x, int y,
        if (melt > 5 && own) {
            if (type == EF_SECTOR)
                wu(0, own, "Lost %d %s to radiation in %s.\n",
-                  melt < vec[n] ? melt : vec[n], ichr[n].i_name,
+                  melt, ichr[n].i_name,
                   xyas(x, y, own));
            else if (type == EF_LAND)
                wu(0, own, "Unit #%d lost %d %s to radiation in %s.\n",
-                  uid, melt < vec[n] ? melt : vec[n], ichr[n].i_name,
+                  uid, melt, ichr[n].i_name,
                   xyas(x, y, own));
            else if (type == EF_SHIP)
                wu(0, own, "Ship #%d lost %d %s to radiation in %s.\n",
-                  uid, melt < vec[n] ? melt : vec[n], ichr[n].i_name,
+                  uid, melt, ichr[n].i_name,
                   xyas(x, y, own));
        }
        vec[n] -= melt;
@@ -247,7 +247,7 @@ spread_fallout(struct sctstr *sp, int etus)
        inc = roundavg(etus * fallout_spread * (sp->sct_fallout)) - 1;
        if (inc < 0)
            inc = 0;
-       ap->sct_fallout = min(ap->sct_fallout + inc, FALLOUT_MAX);
+       ap->sct_fallout = MIN(ap->sct_fallout + inc, FALLOUT_MAX);
     }
 }