COPYING duplicates information from README. Remove. Move GPL from

[empserver] / src / lib / subs / fortdef.c

diff --git a/src/lib/subs/fortdef.c b/src/lib/subs/fortdef.c
index 81b88d03bcf1091fad6619d5f9516cb880d1d057..29579937167e91f154a509b51c717016d42cad9d 100644 (file)
--- a/src/lib/subs/fortdef.c
+++ b/src/lib/subs/fortdef.c
@@ -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.
  *
  *  ---
  *
@@ -107,8 +107,8 @@ sd(natid att, natid own, coord x, coord y, int noisy, int defending,
        if (shell < ship.shp_glim)
            shell += supply_commod(ship.shp_own, ship.shp_x, ship.shp_y,
                                   I_SHELL, shell - ship.shp_glim);
-       nshot = min(min(ship.shp_item[I_GUN], shell), ship.shp_item[I_MILIT]);
-       nshot = min(nshot, ship.shp_glim);
+       nshot = MIN(MIN(ship.shp_item[I_GUN], shell), ship.shp_item[I_MILIT]);
+       nshot = MIN(nshot, ship.shp_glim);
        if (nshot <= 0)
            continue;
        ship.shp_item[I_SHELL] = shell - nshot;