(var.h, plague.h): Since all that was left in var.h were some plague

defines, import these defines into plague.h, drop var.h and include
plague.h where appropriate.
Remove some 'register' keywords at the same time.
No functional changes.

diff --git a/include/plague.h b/include/plague.h
new file mode 100644 (file)
index 0000000..0134ec9
--- /dev/null
+++ b/include/plague.h
@@ -0,0 +1,41 @@
+/*
+ *  Empire - A multi-player, client/server Internet based war game.
+ *  Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                           Ken Stevens, Steve McClure
+ *
+ *  This program 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
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  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
+ *
+ *  ---
+ *
+ *  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.
+ *
+ *  ---
+ *
+ *  plague.h: plague defines.
+ * 
+ */
+
+#ifndef _PLAGUE_H_
+#define _PLAGUE_H_
+
+#define        PLG_HEALTHY     0
+#define        PLG_DYING       1
+#define        PLG_INFECT      2
+#define        PLG_INCUBATE    3
+#define        PLG_EXPOSED     4
+
+#endif /* _PLAGUE_H_ */

diff --git a/include/var.h b/include/var.h
deleted file mode 100644 (file)
index 28bfbff..0000000
--- a/include/var.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
- *
- *  This program 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
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  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
- *
- *  ---
- *
- *  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.
- *
- *  ---
- *
- *  var.h: various variable definitions
- * 
- *  Known contributors to this file:
- *     
- */
-
-#ifndef _VAR_H_
-#define _VAR_H_
-
-#define        PLG_HEALTHY     0
-#define        PLG_DYING       1
-#define        PLG_INFECT      2
-#define        PLG_INCUBATE    3
-#define        PLG_EXPOSED     4
-
-#endif /* _VAR_H_ */

diff --git a/src/lib/commands/add.c b/src/lib/commands/add.c
index eba63769933fd5569e9409cf960183492d533cc6..5342a1b6eab04727d7615aec41824b4037f6dd19 100644 (file)
--- a/src/lib/commands/add.c
+++ b/src/lib/commands/add.c
@@ -36,7 +36,7 @@
 #include <string.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
+#include "plague.h"
 #include "sect.h"
 #include "nat.h"
 #include "xy.h"
@@ -53,7 +53,7 @@ add(void)
     struct natstr *natp;
     struct sctstr sect;
     struct nstr_sect nstr;
-    register int i;
+    int i;
     s_char cntryname[21];
     s_char pname[21];
     natid coun;

diff --git a/src/lib/commands/buil.c b/src/lib/commands/buil.c
index b689a96fc709f5b7e7e8cbbeac08261f25dd5ced..1a1e1250850fcb4ad12d116ac88316b96eccd7f1 100644 (file)
--- a/src/lib/commands/buil.c
+++ b/src/lib/commands/buil.c
@@ -35,7 +35,7 @@
 #include <string.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
+#include "plague.h"
 #include "sect.h"
 #include "nat.h"
 #include "ship.h"
@@ -50,18 +50,18 @@
 #include "optlist.h"
 #include "commands.h"
 
-static int build_nuke(register struct sctstr *sp,
-                     register struct nchrstr *np, short *vec);
-static int build_ship(register struct sctstr *sp,
-                     register struct mchrstr *mp, short *vec,
+static int build_nuke(struct sctstr *sp,
+                     struct nchrstr *np, short *vec);
+static int build_ship(struct sctstr *sp,
+                     struct mchrstr *mp, short *vec,
                      int tlev);
-static int build_land(register struct sctstr *sp,
-                     register struct lchrstr *lp, short *vec,
+static int build_land(struct sctstr *sp,
+                     struct lchrstr *lp, short *vec,
                      int tlev);
-static int build_bridge(register struct sctstr *sp, short *vec);
-static int build_tower(register struct sctstr *sp, short *vec);
-static int build_plane(register struct sctstr *sp,
-                      register struct plchrstr *pp, short *vec,
+static int build_bridge(struct sctstr *sp, short *vec);
+static int build_tower(struct sctstr *sp, short *vec);
+static int build_plane(struct sctstr *sp,
+                      struct plchrstr *pp, short *vec,
                       int tlev);
 
 static int cash;               /* static ok */
@@ -340,7 +340,7 @@ buil(void)
 }
 
 static int
-build_ship(register struct sctstr *sp, register struct mchrstr *mp,
+build_ship(struct sctstr *sp, struct mchrstr *mp,
           short *vec, int tlev)
 {
     struct shpstr ship;
@@ -456,7 +456,7 @@ build_ship(register struct sctstr *sp, register struct mchrstr *mp,
 }
 
 static int
-build_land(register struct sctstr *sp, register struct lchrstr *lp,
+build_land(struct sctstr *sp, struct lchrstr *lp,
           short *vec, int tlev)
 {
     struct lndstr land;
@@ -584,7 +584,7 @@ build_land(register struct sctstr *sp, register struct lchrstr *lp,
 }
 
 static int
-build_bridge(register struct sctstr *sp, short *vec)
+build_bridge(struct sctstr *sp, short *vec)
 {
     struct sctstr sect;
     int val;
@@ -734,7 +734,7 @@ build_bridge(register struct sctstr *sp, short *vec)
 }
 
 static int
-build_nuke(register struct sctstr *sp, register struct nchrstr *np,
+build_nuke(struct sctstr *sp, struct nchrstr *np,
           short *vec)
 {
     int avail;
@@ -790,7 +790,7 @@ build_nuke(register struct sctstr *sp, register struct nchrstr *np,
 }
 
 static int
-build_plane(register struct sctstr *sp, register struct plchrstr *pp,
+build_plane(struct sctstr *sp, struct plchrstr *pp,
            short *vec, int tlev)
 {
     struct plnstr plane;
@@ -895,7 +895,7 @@ build_plane(register struct sctstr *sp, register struct plchrstr *pp,
 }
 
 static int
-build_tower(register struct sctstr *sp, short *vec)
+build_tower(struct sctstr *sp, short *vec)
 {
     struct sctstr sect;
     int val;

diff --git a/src/lib/commands/edit.c b/src/lib/commands/edit.c
index fbdd9d0db5b671e8961122ce3099452fbad72653..dbd71b33377124ac2cdecd6161e236ebecab2c44 100644 (file)
--- a/src/lib/commands/edit.c
+++ b/src/lib/commands/edit.c
@@ -40,7 +40,7 @@
 #include <string.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
+#include "plague.h"
 #include "xy.h"
 #include "sect.h"
 #include "nat.h"

diff --git a/src/lib/commands/expl.c b/src/lib/commands/expl.c
index 38e7135df87a43e1361c1f702ce9aec64ba4c889..ec39cdfc0a3ae2e19d21281125258170ca729f21 100644 (file)
--- a/src/lib/commands/expl.c
+++ b/src/lib/commands/expl.c
@@ -33,7 +33,7 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
+#include "plague.h"
 #include "sect.h"
 #include "xy.h"
 #include "nsc.h"
@@ -48,7 +48,7 @@ static int explore_map(s_char *what, coord curx, coord cury, s_char *arg);
 int
 explore(void)
 {
-    register int amount;
+    int amount;
     struct sctstr sect;
     struct sctstr endsect;
     struct sctstr start;

diff --git a/src/lib/commands/fuel.c b/src/lib/commands/fuel.c
index de83513c967a6acfd65faddd4faaedd46b977713..21be5af7e234c294e0da83b63a763c38492051eb 100644 (file)
--- a/src/lib/commands/fuel.c
+++ b/src/lib/commands/fuel.c
@@ -33,7 +33,7 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
+#include "plague.h"
 #include "xy.h"
 #include "ship.h"
 #include "plane.h"

diff --git a/src/lib/commands/load.c b/src/lib/commands/load.c
index 6cc8ae6317b0f8c9ba825cd79711bc3f5d1f17c1..409fcb2229c770f132d67463f0c0d67e73463529 100644 (file)
--- a/src/lib/commands/load.c
+++ b/src/lib/commands/load.c
@@ -38,7 +38,7 @@
 #include "player.h"
 #include "xy.h"
 #include "file.h"
-#include "var.h"
+#include "plague.h"
 #include "sect.h"
 #include "ship.h"
 #include "plane.h"

diff --git a/src/lib/commands/lten.c b/src/lib/commands/lten.c
index 406d5dcb9c8bd4f68cca3f149612037629ae0c2e..086cffaa8ee0fb445750da8be220ab109160c31b 100644 (file)
--- a/src/lib/commands/lten.c
+++ b/src/lib/commands/lten.c
@@ -37,7 +37,7 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
+#include "plague.h"
 #include "xy.h"
 #include "file.h"
 #include "ship.h"

diff --git a/src/lib/commands/move.c b/src/lib/commands/move.c
index 5a226841802ca897cff04411e6cd0f83f32d6726..9ee170fecba9352597866376a1ca9554b50a0cc9 100644 (file)
--- a/src/lib/commands/move.c
+++ b/src/lib/commands/move.c
@@ -33,7 +33,7 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
+#include "plague.h"
 #include "sect.h"
 #include "item.h"
 #include "file.h"
@@ -51,7 +51,7 @@ static int cmd_move_map(s_char *what, coord curx, coord cury, s_char *arg);
 int
 move(void)
 {
-    register int amount;
+    int amount;
     struct sctstr sect;
     struct sctstr endsect;
     struct sctstr start;

diff --git a/src/lib/commands/tend.c b/src/lib/commands/tend.c
index 4dc4d8d4d47c0485e1450420fed2e453815084d9..79d813a0e119b1be093039e9426a96f64ef72ecb 100644 (file)
--- a/src/lib/commands/tend.c
+++ b/src/lib/commands/tend.c
@@ -36,7 +36,7 @@
 #include <string.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
+#include "plague.h"
 #include "xy.h"
 #include "file.h"
 #include "ship.h"

diff --git a/src/lib/common/bridgefall.c b/src/lib/common/bridgefall.c
index 51240610529d320bd7527732d7ac8c7a3e171a0b..05cc855cf15895d440d6eb02b9f727c9ef319945 100644 (file)
--- a/src/lib/common/bridgefall.c
+++ b/src/lib/common/bridgefall.c
@@ -32,7 +32,7 @@
  */
 
 #include "misc.h"
-#include "var.h"
+#include "plague.h"
 #include "sect.h"
 #include "path.h"
 #include "file.h"
@@ -48,8 +48,8 @@
 void
 bridgefall(struct sctstr *sp, struct emp_qelem *list)
 {
-    register int i;
-    register int j;
+    int i;
+    int j;
     struct sctstr sect;
     struct sctstr bh_sect;
     int nx;

diff --git a/src/lib/subs/attsub.c b/src/lib/subs/attsub.c
index 1bcb66907c21a059b72c44ae91c189070b05cb07..4cae696709df7fecade9b7a40fe8dc836eafcbe3 100644 (file)
--- a/src/lib/subs/attsub.c
+++ b/src/lib/subs/attsub.c
@@ -36,7 +36,7 @@
 #include "misc.h"
 #include "player.h"
 #include "file.h"
-#include "var.h"
+#include "plague.h"
 #include "sect.h"
 #include "ship.h"
 #include "path.h"
@@ -2619,7 +2619,7 @@ take_move_in_mob(int combat_mode, struct llist *llp, struct combat *off,
 static void
 free_list(struct emp_qelem *list)
 {
-    register struct emp_qelem *qp, *next;
+    struct emp_qelem *qp, *next;
 
     if (!list || QEMPTY(list))
        return;

diff --git a/src/lib/update/deliver.c b/src/lib/update/deliver.c
index 5829e6e97bc7e1c5b7a333d43626d7d105da2603..95ff75c3a967f2a585afefdb1b2aa6181b8c4c51 100644 (file)
--- a/src/lib/update/deliver.c
+++ b/src/lib/update/deliver.c
@@ -32,7 +32,7 @@
  */
 
 #include "misc.h"
-#include "var.h"
+#include "plague.h"
 #include "sect.h"
 #include "item.h"
 #include "path.h"

diff --git a/src/lib/update/distribute.c b/src/lib/update/distribute.c
index e9b97d2951cbfb190c7ae42ee50abdf303639cbf..98ce93e99e2d957af198a9aa100fc20eb79c2de5 100644 (file)
--- a/src/lib/update/distribute.c
+++ b/src/lib/update/distribute.c
@@ -34,7 +34,7 @@
 
 #include <stdlib.h>
 #include "misc.h"
-#include "var.h"
+#include "plague.h"
 #include "nat.h"
 #include "sect.h"
 #include "item.h"

diff --git a/src/lib/update/land.c b/src/lib/update/land.c
index 1f52ddbaec6fa4ed97b63901bcbeeda81aa145cc..b653ef8bd21bfeb1abefecee33164bd1ac9d122d 100644 (file)
--- a/src/lib/update/land.c
+++ b/src/lib/update/land.c
@@ -34,7 +34,7 @@
  */
 
 #include "misc.h"
-#include "var.h"
+#include "plague.h"
 #include "sect.h"
 #include "nat.h"
 #include "land.h"

diff --git a/src/lib/update/nav_util.c b/src/lib/update/nav_util.c
index f193cb0953189660ad99ece59bdb08ebad21a879..125e0a484666ecfff3b3faad9c447e98649d5c4a 100644 (file)
--- a/src/lib/update/nav_util.c
+++ b/src/lib/update/nav_util.c
@@ -34,7 +34,7 @@
 #include "misc.h"
 
 #include <ctype.h>
-#include "var.h"
+#include "plague.h"
 #include "ship.h"
 #include "plane.h"
 #include "land.h"

diff --git a/src/lib/update/plague.c b/src/lib/update/plague.c
index 20d09ff6c437b8c3f9241eab8f60d1c39bfe9111..7165e04bc9a49eeca5ba6db2a7ec284eb1374187 100644 (file)
--- a/src/lib/update/plague.c
+++ b/src/lib/update/plague.c
@@ -33,7 +33,7 @@
 
 #include <math.h>
 #include "misc.h"
-#include "var.h"
+#include "plague.h"
 #include "sect.h"
 #include "nat.h"
 #include "item.h"

diff --git a/src/lib/update/ship.c b/src/lib/update/ship.c
index 8d98a2ce1a9a290380aaa6952d2f4d7cba73f207..c5c090efa48f55cde7dcb3132938e8eac555f932 100644 (file)
--- a/src/lib/update/ship.c
+++ b/src/lib/update/ship.c
@@ -33,7 +33,7 @@
  */
 
 #include "misc.h"
-#include "var.h"
+#include "plague.h"
 #include "sect.h"
 #include "nat.h"
 #include "ship.h"