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

include/land.h

@@ -41,7 +41,6 @@
 #include "queue.h"
 #include "nsc.h"
 #include "retreat.h"
-#include "var.h"
 
 #define LAND_MINEFF	10
 #define LAND_MINFIREEFF 40	/* arty must be this effic to fire */

include/prototypes.h

@@ -69,7 +69,7 @@ extern int display_mark(i_type, int);
 extern int want_to_abandon(struct sctstr *, i_type, int, struct lndstr *);
 extern int would_abandon(struct sctstr *, i_type, int, struct lndstr *);
 extern int nav_map(int, int, int);
-extern int count_pop(register int);
+extern int count_pop(int);
 extern int scuttle_tradeship(struct shpstr *, int);
 extern void scuttle_ship(struct shpstr *);
 extern void resnoise(struct sctstr *sptr, int public_amt, s_char *name,
@@ -95,12 +95,12 @@ extern void knockdown(struct sctstr *, struct emp_qelem *);
 /* damage.c */
 extern void landdamage(struct lndstr *, int);
 extern void ship_damage(struct shpstr *, int);
-extern int damage(register int, int);
+extern int damage(int, int);
 extern void shipdamage(struct shpstr *, int);
 extern void land_damage(struct lndstr *, int);
 extern void planedamage(struct plnstr *, int);
 extern int nukedamage(struct nchrstr *, int, int);
-extern int effdamage(register int, int);
+extern int effdamage(int, int);
 extern void item_damage(int, short *);
 extern int commdamage(int, int, i_type);
 /* check.c */
@@ -160,21 +160,21 @@ extern int max_pop(float, struct sctstr *);
 extern int sect_damage(struct sctstr *, int, struct emp_qelem *);
 extern int sectdamage(struct sctstr *, int, struct emp_qelem *);
 /* snxtit_subs.c */
-extern void snxtitem_area(register struct nstr_item *, int,
+extern void snxtitem_area(struct nstr_item *, int,
 			  struct range *);
-extern void snxtitem_dist(register struct nstr_item *, int, int, int, int);
+extern void snxtitem_dist(struct nstr_item *, int, int, int, int);
-extern void snxtitem_xy(register struct nstr_item *, int, coord, coord);
+extern void snxtitem_xy(struct nstr_item *, int, coord, coord);
-extern void snxtitem_all(register struct nstr_item *, int);
+extern void snxtitem_all(struct nstr_item *, int);
-extern void snxtitem_group(register struct nstr_item *, int, s_char);
+extern void snxtitem_group(struct nstr_item *, int, s_char);
 extern void snxtitem_rewind(struct nstr_item *);
-extern int snxtitem_list(register struct nstr_item *, int, int *, int);
+extern int snxtitem_list(struct nstr_item *, int, int *, int);
 /* snxtsect_subs.c */
-extern void snxtsct_area(register struct nstr_sect *, struct range *);
+extern void snxtsct_area(struct nstr_sect *, struct range *);
-extern void xydist_range(coord, coord, register int, struct range *);
+extern void xydist_range(coord, coord, int, struct range *);
-extern void xysize_range(register struct range *);
+extern void xysize_range(struct range *);
 extern void snxtsct_all(struct nstr_sect *);
 extern void snxtsct_rewind(struct nstr_sect *);
-extern void snxtsct_dist(register struct nstr_sect *, coord, coord, int);
+extern void snxtsct_dist(struct nstr_sect *, coord, coord, int);
 /* stmtch.c */
 /* in match.h */
 /* type.c */
@@ -376,7 +376,7 @@ extern void nuk_delete(struct nukstr *, int, int);
 /* nxtitem.c */
 extern int nxtitem(struct nstr_item *, void *);
 /* nxtsct.c */
-extern int nxtsct(register struct nstr_sect *, struct sctstr *);
+extern int nxtsct(struct nstr_sect *, struct sctstr *);
 /* plane.c */
 extern s_char *prplane(struct plnstr *);
 extern int pln_postread(int, s_char *);
@@ -507,7 +507,7 @@ extern int shp_missile_defense(coord, coord, natid, int);
 extern void shp_missdef(struct shpstr *, natid);
 extern void shp_set_tech(struct shpstr *, int);
 /* snxtitem.c */
-extern int snxtitem(register struct nstr_item *, int, s_char *);
+extern int snxtitem(struct nstr_item *, int, s_char *);
 /* snxtsct.c */
 extern int snxtsct(register struct nstr_sect *, s_char *);
 /* supply.c */
@@ -518,10 +518,10 @@ extern int try_supply_commod(int, int, int, i_type, int);
 extern int has_supply(struct lndstr *);
 extern int use_supply(struct lndstr *);
 /* takeover.c */
-extern void takeover_land(register struct lndstr *, natid, int);
+extern void takeover_land(struct lndstr *, natid, int);
-extern void takeover(register struct sctstr *, natid);
+extern void takeover(struct sctstr *, natid);
-extern void takeover_ship(register struct shpstr *, natid, int);
+extern void takeover_ship(struct shpstr *, natid, int);
-extern void takeover_plane(register struct plnstr *, natid);
+extern void takeover_plane(struct plnstr *, natid);
 /* trdsub.c */
 /* trechk.c */
 extern int trechk(register natid, register natid, int);
@@ -560,18 +560,18 @@ extern int feed_land(struct lndstr *, int, int *, int);
 /* material.c */
 /* in budg.h */
 /* mobility.c */
-extern void mob_sect(register int);
+extern void mob_sect(int);
-extern void mob_ship(register int);
+extern void mob_ship(int);
-extern void mob_land(register int);
+extern void mob_land(int);
-extern void mob_plane(register int);
+extern void mob_plane(int);
 extern void update_all_mob(void);
 extern void update_timestamps(time_t offset);
-extern void sct_do_upd_mob(register struct sctstr *sp);
+extern void sct_do_upd_mob(struct sctstr *sp);
-extern void shp_do_upd_mob(register struct shpstr *sp);
+extern void shp_do_upd_mob(struct shpstr *sp);
-extern void lnd_do_upd_mob(register struct lndstr *lp);
+extern void lnd_do_upd_mob(struct lndstr *lp);
-extern void pln_do_upd_mob(register struct plnstr *pp);
+extern void pln_do_upd_mob(struct plnstr *pp);
 /* move_sat.c */
-extern void move_sat(register struct plnstr *);
+extern void move_sat(struct plnstr *);
 /* nat.c */
 extern double logx(double, double);
 extern void prod_nat(int);

include/sect.h

@@ -38,7 +38,6 @@
 #define _SECT_H_
 
 #include "item.h"
-#include "var.h"
 
 /* The order of the following elements is there to match up with genitem */
 

include/ship.h

@@ -40,7 +40,6 @@
 #include "queue.h"
 #include "misc.h"
 #include "retreat.h"
-#include "var.h"
 
 #define	SHIP_MINEFF	20
 

include/xy.h

@@ -65,8 +65,8 @@ extern coord strtox(char *str, char **end);
 extern coord strtoy(char *str, char **end);
 extern coord xabs(struct natstr *np, coord relx);
 extern coord yabs(struct natstr *np, coord rely);
-extern coord xnorm(register coord x);
+extern coord xnorm(coord x);
-extern coord ynorm(register coord y);
+extern coord ynorm(coord y);
 extern int xyinrange(coord x, coord y, struct range *rp);
 
 #endif /* _XY_H_ */

src/lib/commands/acce.c

@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "nat.h"
 #include "sect.h"
 #include "file.h"

src/lib/commands/anti.c

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

src/lib/commands/arm.c

@@ -36,7 +36,6 @@
 #include <string.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "nuke.h"
 #include "plane.h"

src/lib/commands/army.c

@@ -34,7 +34,6 @@
 #include <ctype.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "land.h"
 #include "xy.h"
 #include "nsc.h"
@@ -46,7 +45,7 @@ int
 army(void)
 {
     struct lndstr land;
-    register int count;
+    int count;
     s_char *cp;
     s_char c;
     struct nstr_item nstr;

src/lib/commands/assa.c

@@ -36,7 +36,6 @@
 #include "misc.h"
 #include "player.h"
 #include "file.h"
-#include "var.h"
 #include "sect.h"
 #include "path.h"
 #include "news.h"

src/lib/commands/atta.c

@@ -37,7 +37,6 @@
 #include "misc.h"
 #include "player.h"
 #include "file.h"
-#include "var.h"
 #include "sect.h"
 #include "path.h"
 #include "news.h"

src/lib/commands/bdes.c

@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "item.h"
 #include "xy.h"

src/lib/commands/best.c

@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "item.h"
 #include "xy.h"

src/lib/commands/boar.c

@@ -35,7 +35,6 @@
 #include "misc.h"
 #include "player.h"
 #include "file.h"
-#include "var.h"
 #include "sect.h"
 #include "path.h"
 #include "news.h"

src/lib/commands/bomb.c

@@ -37,7 +37,6 @@
 #include <string.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "ship.h"
 #include "land.h"
@@ -361,7 +360,7 @@ pin_bomb(struct emp_qelem *list, struct sctstr *target)
 static void
 eff_bomb(struct emp_qelem *list, struct sctstr *target)
 {
-    register struct plist *plp;
+    struct plist *plp;
     struct emp_qelem *qp;
     struct sctstr sect;
     int oldeff, dam = 0;
@@ -411,7 +410,7 @@ eff_bomb(struct emp_qelem *list, struct sctstr *target)
 static void
 comm_bomb(struct emp_qelem *list, struct sctstr *target)
 {
-    register struct plist *plp;
+    struct plist *plp;
     float b;
     int i;
     int amt, before;
@@ -873,7 +872,7 @@ land_bomb(struct emp_qelem *list, struct sctstr *target)
 static void
 strat_bomb(struct emp_qelem *list, struct sctstr *target)
 {
-    register struct plist *plp;
+    struct plist *plp;
     int dam = 0;
     struct emp_qelem *qp;
     struct sctstr sect;

src/lib/commands/budg.c

@@ -36,7 +36,6 @@
 #include <string.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "nsc.h"
 #include "sect.h"
@@ -222,7 +221,7 @@ calc_all(long p_sect[][2],
 	 int *units, int *lbuild, int *nlbuild, int *lmaint,
 	 int *planes, int *pbuild, int *npbuild, int *pmaint)
 {
-    register int y, z;
+    int y, z;
     struct natstr *np;
     int sm = 0, sb = 0, pm = 0, pb = 0, lm = 0, lb = 0;
     int *bp;

src/lib/commands/buy.c

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

src/lib/commands/capi.c

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

src/lib/commands/carg.c

@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "ship.h"

src/lib/commands/cede.c

@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nsc.h"
@@ -51,8 +50,8 @@
 static void cede_hdr(void);
 static int cede_sect(struct nstr_sect *, natid);
 static int cede_ship(struct nstr_item *, natid);
-static void grab_sect(register struct sctstr *, natid);
+static void grab_sect(struct sctstr *, natid);
-static void grab_ship(register struct shpstr *, natid);
+static void grab_ship(struct shpstr *, natid);
 
 int
 cede(void)
@@ -195,7 +194,7 @@ cede_hdr(void)
 
 
 static void
-grab_sect(register struct sctstr *sp, natid to)
+grab_sect(struct sctstr *sp, natid to)
 {
     struct plnstr *pp;
     struct lndstr *lp;
@@ -332,10 +331,10 @@ cede_ship(struct nstr_item *ni, natid to)
 }
 
 static void
-grab_ship(register struct shpstr *sp, natid to)
+grab_ship(struct shpstr *sp, natid to)
 {
-    register struct plnstr *pp;
+    struct plnstr *pp;
-    register struct lndstr *lp;
+    struct lndstr *lp;
     struct nstr_item ni;
     struct plnstr p;
     struct lndstr l;

src/lib/commands/cens.c

@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nsc.h"

src/lib/commands/coas.c

@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "ship.h"
 #include "nat.h"
@@ -144,9 +143,9 @@ coas(void)
 static int
 showship(struct coast **cpp, int x, int y)
 {
-    register struct coast *cp;
+    struct coast *cp;
-    register struct coast *todelete = 0;
+    struct coast *todelete = 0;
-    register struct coast **prev;
+    struct coast **prev;
     int nship = 0;
 
     prev = 0;

src/lib/commands/coll.c

@@ -35,7 +35,6 @@
 #include <math.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "file.h"
 #include "sect.h"
 #include "item.h"
@@ -49,9 +48,9 @@
 int
 coll(void)
 {
-    register int arg;
+    int arg;
-    register int i;
+    int i;
-    register int val;
+    int val;
     time_t now;
     char *p;
     struct lonstr loan;

src/lib/commands/comm.c

@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "xy.h"
 #include "nsc.h"

src/lib/commands/conv.c

@@ -37,7 +37,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "nat.h"
 #include "xy.h"

src/lib/commands/coun.c

@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "nat.h"
 #include "xy.h"

src/lib/commands/cuto.c

@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "xy.h"
 #include "nsc.h"

src/lib/commands/deli.c

@@ -34,7 +34,6 @@
 #include "misc.h"
 #include "player.h"
 #include "xy.h"
-#include "var.h"
 #include "sect.h"
 #include "item.h"
 #include "file.h"
@@ -47,9 +46,9 @@ int
 deli(void)
 {
     struct sctstr sect;
-    register int dir, del;
+    int dir, del;
-    register struct ichrstr *ich;
+    struct ichrstr *ich;
-    register int thresh;
+    int thresh;
     int sx, sy;
     struct nstr_sect nstr;
     s_char buf[1024];

src/lib/commands/demo.c

@@ -34,7 +34,6 @@
 #include "misc.h"
 #include "player.h"
 #include "xy.h"
-#include "var.h"
 #include "sect.h"
 #include "nat.h"
 #include "nsc.h"

src/lib/commands/desi.c

@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "item.h"
 #include "xy.h"
@@ -70,7 +69,7 @@ static long
 do_desi(struct natstr *natp, s_char *sects, s_char *deschar, long int cash,
 	int for_real)
 {
-    register int n;
+    int n;
     s_char *p;
     int breaksanct;
     int cap_x;

src/lib/commands/dist.c

@@ -35,7 +35,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nsc.h"

src/lib/commands/drop.c

@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "ship.h"
 #include "item.h"

src/lib/commands/dump.c

@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nsc.h"

src/lib/commands/enli.c

@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nsc.h"

src/lib/commands/flee.c

@@ -34,7 +34,6 @@
 #include <ctype.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "ship.h"
 #include "xy.h"
 #include "nsc.h"
@@ -46,7 +45,7 @@ int
 flee(void)
 {
     struct shpstr ship;
-    register int count;
+    int count;
     s_char *cp;
     s_char c;
     struct nstr_item nstr;

src/lib/commands/fly.c

@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "ship.h"
 #include "item.h"

src/lib/commands/foll.c

@@ -34,7 +34,6 @@
 #include <ctype.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "ship.h"
 #include "xy.h"
 #include "nsc.h"

src/lib/commands/fort.c

@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "land.h"

src/lib/commands/give.c

@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "nat.h"
 #include "news.h"

src/lib/commands/grin.c

@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nat.h"

src/lib/commands/hard.c

@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "item.h"
 #include "plane.h"

src/lib/commands/hidd.c

@@ -35,7 +35,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "xy.h"
 #include "nsc.h"

src/lib/commands/improve.c

@@ -34,7 +34,6 @@
 #include <string.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nsc.h"

src/lib/commands/land.c

@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "land.h"

src/lib/commands/laun.c

@@ -36,7 +36,6 @@
 #include "misc.h"
 #include "player.h"
 #include "xy.h"
-#include "var.h"
 #include "sect.h"
 #include "item.h"
 #include "plane.h"

src/lib/commands/lboard.c

@@ -35,7 +35,6 @@
 #include "misc.h"
 #include "player.h"
 #include "file.h"
-#include "var.h"
 #include "sect.h"
 #include "path.h"
 #include "news.h"

src/lib/commands/ldump.c

@@ -41,7 +41,6 @@
 #include "nsc.h"
 #include "file.h"
 #include "optlist.h"
-#include "var.h"
 #include "commands.h"
 
 int

src/lib/commands/leve.c

@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "xy.h"
 #include "nsc.h"

src/lib/commands/look.c

@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "ship.h"
@@ -47,12 +46,12 @@
 #include "commands.h"
 #include "optlist.h"
 
-static void look_ship(register struct shpstr *lookship);
+static void look_ship(struct shpstr *lookship);
 
 int
 look(void)
 {
-    register int i;
+    int i;
     struct nstr_item ni;
     struct shpstr myship;
     struct sctstr sect;
@@ -113,11 +112,11 @@ look(void)
 }
 
 static void
-look_ship(register struct shpstr *lookship)
+look_ship(struct shpstr *lookship)
 {
-    register struct shpstr *sp;
+    struct shpstr *sp;
-    register struct mchrstr *smcp;
+    struct mchrstr *smcp;
-    register struct mchrstr *tmcp;
+    struct mchrstr *tmcp;
     struct sctstr sect;
     int range;
     int vrange;
@@ -172,12 +171,12 @@ look_ship(register struct shpstr *lookship)
     }
 }
 
-static void look_land(register struct lndstr *lookland);
+static void look_land(struct lndstr *lookland);
 
 int
 llook(void)
 {
-    register int i;
+    int i;
     struct nstr_item ni;
     struct lndstr myland;
     struct sctstr sect;
@@ -247,10 +246,10 @@ llook(void)
 }
 
 static void
-look_land(register struct lndstr *lookland)
+look_land(struct lndstr *lookland)
 {
-    register struct plnstr *pp;
+    struct plnstr *pp;
-    register struct lndstr *lp;
+    struct lndstr *lp;
     double drange;
     int range;
     int vrange;

src/lib/commands/lstat.c

@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "land.h"

src/lib/commands/marc.c

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

src/lib/commands/mark.c

@@ -35,7 +35,6 @@
 
 #include "misc.h"
 #include "nat.h"
-#include "var.h"
 #include "item.h"
 #include "commodity.h"
 #include "player.h"

src/lib/commands/mfir.c

@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "treaty.h"
 #include "nat.h"

src/lib/commands/mine.c

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

src/lib/commands/miss.c

@@ -35,7 +35,6 @@
 #include "options.h"
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "retreat.h"

src/lib/commands/mobq.c

@@ -34,7 +34,6 @@
 #include <ctype.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "ship.h"
 #include "xy.h"
 #include "nsc.h"

src/lib/commands/mobu.c

@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nsc.h"

src/lib/commands/mora.c

@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "land.h"
 #include "nsc.h"

src/lib/commands/name.c

@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "ship.h"
 #include "xy.h"

src/lib/commands/nati.c

@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "nat.h"
 #include "sect.h"
 #include "file.h"

src/lib/commands/navi.c

@@ -34,7 +34,6 @@
 #include <ctype.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "ship.h"
 #include "sect.h"
 #include "news.h"
@@ -219,7 +218,7 @@ navi(void)
 int
 nav_map(int x, int y, int show_designations)
 {
-    register s_char *ptr;
+    s_char *ptr;
     struct nstr_sect ns;
     struct natstr *np;
     struct sctstr sect;

src/lib/commands/ndump.c

@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "nuke.h"
 #include "xy.h"
@@ -46,7 +45,7 @@
 int
 ndump(void)
 {
-    register int i;
+    int i;
     struct nstr_item nstr;
     struct nukstr nuk;
     time_t now;

src/lib/commands/new.c

@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "nat.h"
 #include "sect.h"
 #include "path.h"

src/lib/commands/newe.c

@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "nsc.h"
 #include "sect.h"

src/lib/commands/nuke.c

@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "nuke.h"
 #include "xy.h"
@@ -45,10 +44,10 @@
 int
 nuke(void)
 {
-    register int first_line = 0;
+    int first_line = 0;
-    register int first_nuke;
+    int first_nuke;
-    register int show_comm;
+    int show_comm;
-    register int i;
+    int i;
     struct nstr_item nstr;
     struct nukstr nuk;
     struct sctstr sect;

src/lib/commands/orde.c

@@ -36,7 +36,6 @@
 #include <ctype.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "ship.h"
 #include "sect.h"
 #include "news.h"

src/lib/commands/para.c

@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "ship.h"
 #include "item.h"

src/lib/commands/path.c

@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "nsc.h"
 #include "nat.h"

src/lib/commands/payo.c

@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "ship.h"

src/lib/commands/pdump.c

@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "plane.h"
 #include "nsc.h"

src/lib/commands/plan.c

@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "plane.h"
 #include "nsc.h"

src/lib/commands/powe.c

@@ -36,7 +36,6 @@
 #include <string.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "nat.h"
 #include "ship.h"
@@ -59,7 +58,7 @@ struct powsort {
     natid cnum;
 };
 
-static void addtopow(register short *vec, register struct powstr *pow);
+static void addtopow(short *vec, struct powstr *pow);
 static void gen_power(void);
 static void out5(double value, int round_val, int round_flag);
 static int powcmp(struct powsort *p1, struct powsort *p2);
@@ -228,8 +227,8 @@ gen_power(void)
 {
     float *f_ptr;
     float *f_pt2;
-    register struct powstr *pow;
+    struct powstr *pow;
-    register int i;
+    int i;
     struct sctstr sect;
     struct plnstr plane;
     struct shpstr ship;

src/lib/commands/prod.c

@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "nsc.h"
 #include "sect.h"
@@ -46,10 +45,10 @@
 #include "commands.h"
 
 int
-count_pop(register int n)
+count_pop(int n)
 {
-    register int i;
+    int i;
-    register int pop = 0;
+    int pop = 0;
     struct sctstr *sp;
 
     for (i = 0; NULL != (sp = getsectid(i)); i++) {

src/lib/commands/pstat.c

@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "plane.h"
 #include "nsc.h"

src/lib/commands/rada.c

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

src/lib/commands/rang.c

@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "plane.h"
 #include "land.h"

src/lib/commands/reco.c

@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "ship.h"
 #include "item.h"

src/lib/commands/rela.c

@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "nat.h"
 #include "sect.h"
 #include "file.h"

src/lib/commands/repo.c

@@ -35,7 +35,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "nat.h"
 #include "file.h"

src/lib/commands/rese.c

@@ -36,7 +36,6 @@
 #include "misc.h"
 #include "xy.h"
 #include "file.h"
-#include "var.h"
 #include "sect.h"
 #include "item.h"
 #include "nsc.h"

src/lib/commands/reso.c

@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nsc.h"

src/lib/commands/retr.c

@@ -35,7 +35,6 @@
 #include "options.h"
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "retreat.h"

src/lib/commands/rout.c

@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "nat.h"
 #include "nsc.h"

src/lib/commands/sabo.c

@@ -32,7 +32,6 @@
  */
 
 #include "misc.h"
-#include "var.h"
 #include "land.h"
 #include "nsc.h"
 #include "file.h"

src/lib/commands/sail.c

@@ -34,7 +34,6 @@
 #include <ctype.h>
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "ship.h"
 #include "path.h"
 #include "xy.h"
@@ -47,7 +46,7 @@
 static int
 show_sail(struct nstr_item *nstr)
 {
-    register int count = 0;
+    int count = 0;
     struct shpstr ship;
 
     while (nxtitem(nstr, (s_char *)&ship)) {

src/lib/commands/sate.c

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

src/lib/commands/scra.c

@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "ship.h"

src/lib/commands/scut.c

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

src/lib/commands/sdump.c

@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "ship.h"

src/lib/commands/sect.c

@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nsc.h"

src/lib/commands/sell.c

@@ -37,7 +37,6 @@
 #include "misc.h"
 #include "xy.h"
 #include "file.h"
-#include "var.h"
 #include "sect.h"
 #include "item.h"
 #include "nsc.h"

src/lib/commands/set.c

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

src/lib/commands/setres.c

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

src/lib/commands/setsect.c

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

src/lib/commands/shark.c

@@ -34,7 +34,6 @@
 
 #include <math.h>
 #include "misc.h"
-#include "var.h"
 #include "file.h"
 #include "sect.h"
 #include "item.h"
@@ -49,7 +48,7 @@
 int
 shark(void)
 {
-    register int arg;
+    int arg;
     time_t now;
     char *p;
     struct lonstr loan;

src/lib/commands/shi.c

@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "ship.h"

src/lib/commands/shoo.c

@@ -34,7 +34,6 @@
 #include "misc.h"
 #include "player.h"
 #include "xy.h"
-#include "var.h"
 #include "sect.h"
 #include "news.h"
 #include "item.h"

src/lib/commands/sinf.c

@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nsc.h"

src/lib/commands/skyw.c

@@ -33,7 +33,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "plane.h"
 #include "nat.h"
@@ -136,10 +135,10 @@ skyw(void)
 static int
 showsat(struct sky **skypp, int x, int y)
 {
-    register struct sky *skyp;
+    struct sky *skyp;
-    register struct sky *todelete = 0;
+    struct sky *todelete = 0;
-    register struct sky **prev;
+    struct sky **prev;
-    register struct plchrstr *pcp;
+    struct plchrstr *pcp;
     s_char *name;
     int nsat = 0;
 

src/lib/commands/sona.c

@@ -34,7 +34,6 @@
 
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "xy.h"
 #include "sect.h"
 #include "nsc.h"