LOCSIZ -> NLOCATIONS, finishing limit-name cleanup.

This commit is contained in:
Eric S. Raymond 2017-06-24 10:20:36 -04:00
parent 64035d0026
commit 25077d0b4e
4 changed files with 7 additions and 7 deletions

View file

@ -64,8 +64,8 @@ struct game_t {
bool wzdark; /* whether the loc he's leaving was dark */ bool wzdark; /* whether the loc he's leaving was dark */
long zzword; long zzword;
bool blooded; /* has player drunk of dragon's blood? */ bool blooded; /* has player drunk of dragon's blood? */
long abbrev[LOCSIZ + 1]; long abbrev[NLOCATIONS + 1];
long atloc[LOCSIZ + 1]; long atloc[NLOCATIONS + 1];
long dseen[NDWARVES + 1]; long dseen[NDWARVES + 1];
long dloc[NDWARVES + 1]; long dloc[NDWARVES + 1];
long odloc[NDWARVES + 1]; long odloc[NDWARVES + 1];

View file

@ -31,7 +31,7 @@ long LINUSE;
long TRVS; long TRVS;
long TRNVLS; long TRNVLS;
long TABNDX; long TABNDX;
long KEY[LOCSIZ + 1]; long KEY[NLOCATIONS + 1];
long LINES[LINSIZ + 1]; long LINES[LINSIZ + 1];
long TRAVEL[TRVSIZ + 1]; long TRAVEL[TRVSIZ + 1];
long KTAB[TABSIZ + 1]; long KTAB[TABSIZ + 1];
@ -321,7 +321,7 @@ static int read_database(FILE* database)
* pointer-words in lines. PTEXT(N) points to * pointer-words in lines. PTEXT(N) points to
* message for game.prop(N)=0. Successive prop messages are * message for game.prop(N)=0. Successive prop messages are
* found by chasing pointers. */ * found by chasing pointers. */
for (int I = 1; I <= LOCSIZ; I++) { for (int I = 1; I <= NLOCATIONS; I++) {
KEY[I] = 0; KEY[I] = 0;
} }
@ -431,7 +431,7 @@ static void write_file(FILE* header_file)
fprintf(header_file, "\n"); fprintf(header_file, "\n");
// content variables // content variables
write_1d(header_file, KEY, LOCSIZ + 1, "KEY"); write_1d(header_file, KEY, NLOCATIONS + 1, "KEY");
write_1d(header_file, TRAVEL, TRVSIZ + 1, "TRAVEL"); write_1d(header_file, TRAVEL, TRVSIZ + 1, "TRAVEL");
write_1d(header_file, KTAB, TABSIZ + 1, "KTAB"); write_1d(header_file, KTAB, TABSIZ + 1, "KTAB");
write_1d(header_file, ATAB, TABSIZ + 1, "ATAB"); write_1d(header_file, ATAB, TABSIZ + 1, "ATAB");

2
init.c
View file

@ -167,7 +167,7 @@ void initialise(void)
game.link[i + NOBJECTS] = game.link[i] = 0; game.link[i + NOBJECTS] = game.link[i] = 0;
} }
for (int i = 1; i <= LOCSIZ; i++) { for (int i = 1; i <= NLOCATIONS; i++) {
game.abbrev[i] = 0; game.abbrev[i] = 0;
if (!(locations[i].description.big == 0 || KEY[i] == 0)) { if (!(locations[i].description.big == 0 || KEY[i] == 0)) {
int k = KEY[i]; int k = KEY[i];

View file

@ -70,7 +70,7 @@ extern obituary_t obituaries[];
extern hint_t hints[]; extern hint_t hints[];
extern long conditions[]; extern long conditions[];
#define LOCSIZ {} #define NLOCATIONS {}
#define NOBJECTS {} #define NOBJECTS {}
#define NHINTS {} #define NHINTS {}
#define NCLASSES {} #define NCLASSES {}