Do not include var.h where no longer needed. Clean up register keywords in these file at the same time. No functional changes.

src/lib/common/bestpath.c

@@ -46,7 +46,6 @@
 #include "gamesdef.h"
 #include "misc.h"
 #include "xy.h"
-#include "var.h"
 #include "sect.h"
 #include "file.h"
 #include "nat.h"

src/lib/common/check.c

@@ -35,7 +35,6 @@
 #include "player.h"
 #include "xy.h"
 #include "file.h"
-#include "var.h"
 #include "sect.h"
 #include "ship.h"
 #include "plane.h"

src/lib/common/damage.c

@@ -33,7 +33,6 @@
  */
 
 #include "misc.h"
-#include "var.h"
 #include "sect.h"
 #include "ship.h"
 #include "land.h"
@@ -171,10 +170,10 @@ nukedamage(struct nchrstr *ncp, int range, int airburst)
 }
 
 int
-damage(register int amt, int pct)
+damage(int amt, int pct)
 {
-    register int tmp;
-    register int lost;
+    int tmp;
+    int lost;
 
     if (amt <= 0)
 	return 0;
@@ -187,7 +186,7 @@ damage(register int amt, int pct)
 
 /* asymptotic damage to commodities, efficiency, and sectors */
 int
-effdamage(register int amt, int dam)
+effdamage(int amt, int dam)
 {
     return damage(amt, PERCENT_DAMAGE(dam));
 }

src/lib/common/hap_fact.c

@@ -35,7 +35,6 @@
 #include <ctype.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nat.h"

src/lib/common/land.c

@@ -32,10 +32,8 @@
  */
 
 #include "misc.h"
-#include "var.h"
 #include "sect.h"
 #include "nat.h"
-#include "var.h"
 #include "file.h"
 #include "path.h"
 #include "xy.h"
@@ -47,7 +45,7 @@
 int
 adj_units(coord x, coord y, natid own)
 {
-    register int i;
+    int i;
     struct sctstr sect;
 
     for (i = DIR_FIRST; i <= DIR_LAST; i++) {
@@ -61,7 +59,7 @@ adj_units(coord x, coord y, natid own)
 int
 has_units(coord x, coord y, natid cn, struct lndstr *lp)
 {
-    register int n;
+    int n;
     struct lndstr land;
 
     for (n = 0; ef_read(EF_LAND, n, (s_char *)&land); n++) {

src/lib/common/maps.c

@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "xy.h"
 #include "nsc.h"
@@ -49,7 +48,7 @@
 #include "subs.h"
 #include "optlist.h"
 
-static int bmnxtsct(register struct nstr_sect *);
+static int bmnxtsct(struct nstr_sect *);
 static s_char map_char(u_char type, natid own, int owner_or_god);
 
 int
@@ -107,7 +106,7 @@ draw_map(int bmap, s_char origin, int map_flags, struct nstr_sect *nsp,
     border(&range, "     ", "");
     blankfill((s_char *)wmapbuf, &nsp->range, 1);
     if (bmap) {
-	register int c;
+	int c;
 	switch (bmap) {
 	case EF_BMAP:
 	    while (bmnxtsct(nsp) && !player->aborted) {
@@ -222,7 +221,7 @@ draw_map(int bmap, s_char origin, int map_flags, struct nstr_sect *nsp,
 	}
     }
     if (map_flags & MAP_HIGH) {
-	register s_char *ptr;
+	s_char *ptr;
 	struct sctstr sect;
 
 	snxtsct_rewind(nsp);
@@ -260,7 +259,7 @@ draw_map(int bmap, s_char origin, int map_flags, struct nstr_sect *nsp,
  * get the next sector in the range
  */
 static int
-bmnxtsct(register struct nstr_sect *np)
+bmnxtsct(struct nstr_sect *np)
 {
     while (1) {
 	np->dx++;

src/lib/common/move.c

@@ -34,7 +34,6 @@
 #include "gamesdef.h"
 #include "misc.h"
 #include "xy.h"
-#include "var.h"
 #include "sect.h"
 #include "file.h"
 #include "path.h"

src/lib/common/res_pop.c

@@ -34,7 +34,6 @@
 
 #include <math.h>
 #include "misc.h"
-#include "var.h"
 #include "sect.h"
 #include "nat.h"
 #include "item.h"

src/lib/common/sectdamage.c

@@ -33,7 +33,6 @@
  */
 
 #include "misc.h"
-#include "var.h"
 #include "sect.h"
 #include "ship.h"
 #include "land.h"

src/lib/common/xy.c

@@ -183,7 +183,7 @@ sctoff(coord x, coord y)
 }
 
 coord
-xnorm(register coord x)
+xnorm(coord x)
 {
     if (x < 0)
 	x = WORLD_X - (-x % WORLD_X);
@@ -191,7 +191,7 @@ xnorm(register coord x)
 }
 
 coord
-ynorm(register coord y)
+ynorm(coord y)
 {
     if (y < 0)
 	y = WORLD_Y - (-y % WORLD_Y);