empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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.
This commit is contained in:
Marc Olzheim 2004-10-12 20:25:33 +00:00
parent e9a040adb9
commit 39facfbf53
18 changed files with 43 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/var.h → include/plague.h
View file

@ -25,14 +25,12 @@
* *
* --- * ---
* *
* var.h: various variable definitions * plague.h: plague defines.
* *
* Known contributors to this file:
*
*/ */
#ifndef _VAR_H_ #ifndef _PLAGUE_H_
#define _VAR_H_ #define _PLAGUE_H_
#define PLG_HEALTHY 0 #define PLG_HEALTHY 0
#define PLG_DYING 1 #define PLG_DYING 1
@ -40,4 +38,4 @@
#define PLG_INCUBATE 3 #define PLG_INCUBATE 3
#define PLG_EXPOSED 4 #define PLG_EXPOSED 4
#endif /* _VAR_H_ */ #endif /* _PLAGUE_H_ */

4
src/lib/commands/add.c
View file

@ -36,7 +36,7 @@
#include <string.h> #include <string.h>
#include "misc.h" #include "misc.h"
#include "player.h" #include "player.h"
#include "var.h" #include "plague.h"
#include "sect.h" #include "sect.h"
#include "nat.h" #include "nat.h"
#include "xy.h" #include "xy.h"
@ -53,7 +53,7 @@ add(void)
struct natstr *natp; struct natstr *natp;
struct sctstr sect; struct sctstr sect;
struct nstr_sect nstr; struct nstr_sect nstr;
register int i; int i;
s_char cntryname[21]; s_char cntryname[21];
s_char pname[21]; s_char pname[21];
natid coun; natid coun;

34
src/lib/commands/buil.c
View file

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

2
src/lib/commands/edit.c
View file

@ -40,7 +40,7 @@
#include <string.h> #include <string.h>
#include "misc.h" #include "misc.h"
#include "player.h" #include "player.h"
#include "var.h" #include "plague.h"
#include "xy.h" #include "xy.h"
#include "sect.h" #include "sect.h"
#include "nat.h" #include "nat.h"

4
src/lib/commands/expl.c
View file

@ -33,7 +33,7 @@
#include "misc.h" #include "misc.h"
#include "player.h" #include "player.h"
#include "var.h" #include "plague.h"
#include "sect.h" #include "sect.h"
#include "xy.h" #include "xy.h"
#include "nsc.h" #include "nsc.h"
@ -48,7 +48,7 @@ static int explore_map(s_char *what, coord curx, coord cury, s_char *arg);
int int
explore(void) explore(void)
{ {
register int amount; int amount;
struct sctstr sect; struct sctstr sect;
struct sctstr endsect; struct sctstr endsect;
struct sctstr start; struct sctstr start;

2
src/lib/commands/fuel.c
View file

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

2
src/lib/commands/load.c
View file

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

2
src/lib/commands/lten.c
View file

@ -37,7 +37,7 @@
#include "misc.h" #include "misc.h"
#include "player.h" #include "player.h"
#include "var.h" #include "plague.h"
#include "xy.h" #include "xy.h"
#include "file.h" #include "file.h"
#include "ship.h" #include "ship.h"

4
src/lib/commands/move.c
View file

@ -33,7 +33,7 @@
#include "misc.h" #include "misc.h"
#include "player.h" #include "player.h"
#include "var.h" #include "plague.h"
#include "sect.h" #include "sect.h"
#include "item.h" #include "item.h"
#include "file.h" #include "file.h"
@ -51,7 +51,7 @@ static int cmd_move_map(s_char *what, coord curx, coord cury, s_char *arg);
int int
move(void) move(void)
{ {
register int amount; int amount;
struct sctstr sect; struct sctstr sect;
struct sctstr endsect; struct sctstr endsect;
struct sctstr start; struct sctstr start;

2
src/lib/commands/tend.c
View file

@ -36,7 +36,7 @@
#include <string.h> #include <string.h>
#include "misc.h" #include "misc.h"
#include "player.h" #include "player.h"
#include "var.h" #include "plague.h"
#include "xy.h" #include "xy.h"
#include "file.h" #include "file.h"
#include "ship.h" #include "ship.h"

6
src/lib/common/bridgefall.c
View file

@ -32,7 +32,7 @@
*/ */
#include "misc.h" #include "misc.h"
#include "var.h" #include "plague.h"
#include "sect.h" #include "sect.h"
#include "path.h" #include "path.h"
#include "file.h" #include "file.h"
@ -48,8 +48,8 @@
void void
bridgefall(struct sctstr *sp, struct emp_qelem *list) bridgefall(struct sctstr *sp, struct emp_qelem *list)
{ {
register int i; int i;
register int j; int j;
struct sctstr sect; struct sctstr sect;
struct sctstr bh_sect; struct sctstr bh_sect;
int nx; int nx;

4
src/lib/subs/attsub.c
View file

@ -36,7 +36,7 @@
#include "misc.h" #include "misc.h"
#include "player.h" #include "player.h"
#include "file.h" #include "file.h"
#include "var.h" #include "plague.h"
#include "sect.h" #include "sect.h"
#include "ship.h" #include "ship.h"
#include "path.h" #include "path.h"
@ -2619,7 +2619,7 @@ take_move_in_mob(int combat_mode, struct llist *llp, struct combat *off,
static void static void
free_list(struct emp_qelem *list) free_list(struct emp_qelem *list)
{ {
register struct emp_qelem *qp, *next; struct emp_qelem *qp, *next;
if (!list || QEMPTY(list)) if (!list || QEMPTY(list))
return; return;

2
src/lib/update/deliver.c
View file

@ -32,7 +32,7 @@
*/ */
#include "misc.h" #include "misc.h"
#include "var.h" #include "plague.h"
#include "sect.h" #include "sect.h"
#include "item.h" #include "item.h"
#include "path.h" #include "path.h"

2
src/lib/update/distribute.c
View file

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

2
src/lib/update/land.c
View file

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

2
src/lib/update/nav_util.c
View file

@ -34,7 +34,7 @@
#include "misc.h" #include "misc.h"
#include <ctype.h> #include <ctype.h>
#include "var.h" #include "plague.h"
#include "ship.h" #include "ship.h"
#include "plane.h" #include "plane.h"
#include "land.h" #include "land.h"

2
src/lib/update/plague.c
View file

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

2
src/lib/update/ship.c
View file

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