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 3157cbd872fc066410af03e7c8828d72586f041c..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-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
@@ -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,8 +32,9 @@
  *     Steve McClure, 1998-1999
  */
 
+#include <config.h>
+
 #include "misc.h"
-#include "var.h"
 #include "sect.h"
 #include "ship.h"
 #include "land.h"
@@ -41,7 +42,6 @@
 #include "nat.h"
 #include "file.h"
 #include "optlist.h"
-#include "mission.h"
 #include "update.h"
 #include "gen.h"
 #include "subs.h"
@@ -54,13 +54,13 @@ int updating_mob = 1;
 static int timestamp_fixing;
 static int do_upd_checking = 0;
 
-static void do_mob_land(register struct lndstr *, register int);
-static void do_mob_plane(register struct plnstr *, register int);
-static void do_mob_sect(register struct sctstr *sp, register int etus);
-static void do_mob_ship(register struct shpstr *, register int);
+static void do_mob_land(struct lndstr *, int);
+static void do_mob_plane(struct plnstr *, int);
+static void do_mob_sect(struct sctstr *sp, int etus);
+static void do_mob_ship(struct shpstr *, int);
 
 static int
-increase_mob(time_t * counter, float mult)
+increase_mob(time_t *counter, float mult)
 {
     time_t secs;
     time_t now;
@@ -93,7 +93,7 @@ increase_mob(time_t * counter, float mult)
     *counter = *counter - left;
 
     if (updating_mob)
-       return (newetus);
+       return newetus;
     return 0;
 }
 
@@ -155,7 +155,7 @@ update_all_mob(void)
 }
 
 void
-sct_do_upd_mob(register struct sctstr *sp)
+sct_do_upd_mob(struct sctstr *sp)
 {
     int etus;
 
@@ -174,7 +174,7 @@ sct_do_upd_mob(register struct sctstr *sp)
 }
 
 void
-shp_do_upd_mob(register struct shpstr *sp)
+shp_do_upd_mob(struct shpstr *sp)
 {
     int etus;
 
@@ -190,7 +190,7 @@ shp_do_upd_mob(register struct shpstr *sp)
 }
 
 void
-lnd_do_upd_mob(register struct lndstr *lp)
+lnd_do_upd_mob(struct lndstr *lp)
 {
     int etus;
 
@@ -207,7 +207,7 @@ lnd_do_upd_mob(register struct lndstr *lp)
 }
 
 void
-pln_do_upd_mob(register struct plnstr *pp)
+pln_do_upd_mob(struct plnstr *pp)
 {
     int etus;
 
@@ -224,10 +224,10 @@ pln_do_upd_mob(register struct plnstr *pp)
 }
 
 void
-mob_sect(register int etus)
+mob_sect(int etus)
 {
-    register struct sctstr *sp;
-    register int n;
+    struct sctstr *sp;
+    int n;
     time_t now;
 
     time(&now);
@@ -241,9 +241,9 @@ mob_sect(register int etus)
 }
 
 static void
-do_mob_sect(register struct sctstr *sp, register int etus)
+do_mob_sect(struct sctstr *sp, int etus)
 {
-    register int value;
+    int value;
 
     if (sp->sct_own == 0)
        return;
@@ -262,10 +262,10 @@ do_mob_sect(register struct sctstr *sp, register int etus)
 }
 
 void
-mob_ship(register int etus)
+mob_ship(int etus)
 {
-    register struct shpstr *sp;
-    register int n;
+    struct shpstr *sp;
+    int n;
     time_t now;
 
     time(&now);
@@ -279,10 +279,10 @@ mob_ship(register int etus)
 }
 
 static void
-do_mob_ship(register struct shpstr *sp, register int etus)
+do_mob_ship(struct shpstr *sp, int etus)
 {
     int newfuel = 0;
-    register int value;
+    int value;
     int can_add, have_fuel_for, total_add;
     double d;
 
@@ -365,17 +365,17 @@ do_mob_ship(register struct shpstr *sp, register 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;
     }
 }
 
 void
-mob_land(register int etus)
+mob_land(int etus)
 {
-    register struct lndstr *lp;
-    register int n;
+    struct lndstr *lp;
+    int n;
     time_t now;
 
     time(&now);
@@ -389,10 +389,10 @@ mob_land(register int etus)
 }
 
 static void
-do_mob_land(register struct lndstr *lp, register int etus)
+do_mob_land(struct lndstr *lp, int etus)
 {
     int newfuel = 0;
-    register int value;
+    int value;
     int can_add, have_fuel_for, total_add;
     double d;
 
@@ -478,7 +478,7 @@ do_mob_land(register struct lndstr *lp, register 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;
        }
@@ -489,10 +489,10 @@ do_mob_land(register struct lndstr *lp, register int etus)
 }
 
 void
-mob_plane(register int etus)
+mob_plane(int etus)
 {
-    register struct plnstr *pp;
-    register int n;
+    struct plnstr *pp;
+    int n;
     time_t now;
 
     time(&now);
@@ -506,9 +506,9 @@ mob_plane(register int etus)
 }
 
 static void
-do_mob_plane(register struct plnstr *pp, register int etus)
+do_mob_plane(struct plnstr *pp, int etus)
 {
-    register int value;
+    int value;
 
     if (pp->pln_own == 0)
        return;