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

(dchrstr): Rename member d_flg to d_nav. Users changed.

Browse source
This commit is contained in:
Ron Koenderink 2006-01-17 21:17:19 +00:00
parent 1d58f58e1b
commit 18902e45d0
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/sect.h
View file

@ -94,7 +94,7 @@ struct dchrstr {
int d_mnem; /* map symbol */ int d_mnem; /* map symbol */
int d_prd; /* product type */ int d_prd; /* product type */
int d_mcst; /* movement cost */ int d_mcst; /* movement cost */
int d_flg; /* movement flags */ int d_nav; /* navigation capability */
i_packing d_pkg; /* type of packaging in these sects */ i_packing d_pkg; /* type of packaging in these sects */
float d_ostr; /* offensive strength */ float d_ostr; /* offensive strength */
float d_dstr; /* defensive strength */ float d_dstr; /* defensive strength */
@ -107,7 +107,7 @@ struct dchrstr {
char *d_name; /* full name of sector type */ char *d_name; /* full name of sector type */
}; };
/* for d_flg */ /* for d_nav */
#define NAVOK 1 /* ships can always navigate */ #define NAVOK 1 /* ships can always navigate */
#define NAV_02 2 /* requires 2% effic to navigate */ #define NAV_02 2 /* requires 2% effic to navigate */
#define NAV_60 3 /* requires 60% effic to navigate */ #define NAV_60 3 /* requires 60% effic to navigate */

2
src/lib/global/nsc.c
View file

@ -167,7 +167,7 @@ struct castr dchr_ca[] = {
{NSC_INT, NSC_CONST, 0, offsetof(struct dchrstr, d_mnem), "mnem", EF_BAD}, {NSC_INT, NSC_CONST, 0, offsetof(struct dchrstr, d_mnem), "mnem", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct dchrstr, d_prd), "prd", EF_PRODUCT}, {NSC_INT, 0, 0, offsetof(struct dchrstr, d_prd), "prd", EF_PRODUCT},
{NSC_INT, 0, 0, offsetof(struct dchrstr, d_mcst), "mcst", EF_BAD}, {NSC_INT, 0, 0, offsetof(struct dchrstr, d_mcst), "mcst", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct dchrstr, d_flg), "flg", EF_BAD /* FIXME */}, {NSC_INT, 0, 0, offsetof(struct dchrstr, d_nav), "nav", EF_BAD /* FIXME */},
{NSC_SITYPE(i_packing), 0, 0, offsetof(struct dchrstr, d_pkg), "pkg", {NSC_SITYPE(i_packing), 0, 0, offsetof(struct dchrstr, d_pkg), "pkg",
EF_PACKING}, EF_PACKING},
{NSC_FLOAT, 0, 0, offsetof(struct dchrstr, d_ostr), "ostr", EF_BAD}, {NSC_FLOAT, 0, 0, offsetof(struct dchrstr, d_ostr), "ostr", EF_BAD},

2
src/lib/subs/shpsub.c
View file

@ -370,7 +370,7 @@ shp_mess(s_char *str, struct mlist *mlp)
int int
shp_check_nav(struct sctstr *sect) shp_check_nav(struct sctstr *sect)
{ {
switch (dchr[sect->sct_type].d_flg & 03) { switch (dchr[sect->sct_type].d_nav & 03) {
case NAVOK: case NAVOK:
break; break;