COPYING duplicates information from README. Remove. Move GPL from

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

diff --git a/src/lib/update/mobility.c b/src/lib/update/mobility.c
index 05d5300eda6846bb0285d8d21a7934463b60f98f..a3586e3f4f3f483e2e7bc15c04badec4e9cf2f87 100644 (file)
--- a/src/lib/update/mobility.c
+++ b/src/lib/update/mobility.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, 1998-1999
  */
 
+#include <config.h>
+
 #include "misc.h"
 #include "sect.h"
 #include "ship.h"
@@ -363,7 +365,7 @@ do_mob_ship(struct shpstr *sp, int etus)
        d *= (double)mchr[(int)sp->shp_type].m_fuelu;
        d /= (double)fuel_mult;
        sp->shp_fuel -= (u_char)ldround(d, 1);
-       sp->shp_fuel = (u_char)min(sp->shp_fuel,
+       sp->shp_fuel = (u_char)MIN(sp->shp_fuel,
                                   mchr[(int)sp->shp_type].m_fuelc);
        sp->shp_mobil += (s_char)total_add;
     }
@@ -476,7 +478,7 @@ do_mob_land(struct lndstr *lp, int etus)
        d *= (double)lp->lnd_fuelu;
        d /= (double)fuel_mult;
        lp->lnd_fuel -= (u_char)ldround(d, 1);
-       lp->lnd_fuel = (u_char)min(lp->lnd_fuel, lp->lnd_fuelc);
+       lp->lnd_fuel = (u_char)MIN(lp->lnd_fuel, lp->lnd_fuelc);
        if (total_add + lp->lnd_mobil > land_mob_max) {
            total_add = land_mob_max - lp->lnd_mobil;
        }