From: Eric S. Raymond <esr@thyrsus.com>
Date: Sat, 24 Jun 2017 14:20:36 +0000 (-0400)
Subject: LOCSIZ -> NLOCATIONS, finishing limit-name cleanup.
X-Git-Tag: 1.1~134
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=25077d0b4eb1d6a85140c01092be7203ca64a49c;p=open-adventure.git

LOCSIZ -> NLOCATIONS, finishing limit-name cleanup.
---

diff --git a/advent.h b/advent.h
index 63b16ff..379bb53 100644
--- a/advent.h
+++ b/advent.h
@@ -64,8 +64,8 @@ struct game_t {
     bool wzdark;	/* whether the loc he's leaving was dark */
     long zzword;
     bool blooded;	/* has player drunk of dragon's blood? */
-    long abbrev[LOCSIZ + 1];
-    long atloc[LOCSIZ + 1];
+    long abbrev[NLOCATIONS + 1];
+    long atloc[NLOCATIONS + 1];
     long dseen[NDWARVES + 1];
     long dloc[NDWARVES + 1];
     long odloc[NDWARVES + 1];
diff --git a/dungeon.c b/dungeon.c
index a8b5f16..fea3c6d 100644
--- a/dungeon.c
+++ b/dungeon.c
@@ -31,7 +31,7 @@ long LINUSE;
 long TRVS;
 long TRNVLS;
 long TABNDX;
-long KEY[LOCSIZ + 1];
+long KEY[NLOCATIONS + 1];
 long LINES[LINSIZ + 1];
 long TRAVEL[TRVSIZ + 1];
 long KTAB[TABSIZ + 1];
@@ -321,7 +321,7 @@ static int read_database(FILE* database)
      *  pointer-words in lines. PTEXT(N) points to
      *  message for game.prop(N)=0.  Successive prop messages are
      *  found by chasing pointers. */
-    for (int I = 1; I <= LOCSIZ; I++) {
+    for (int I = 1; I <= NLOCATIONS; I++) {
         KEY[I] = 0;
     }
 
@@ -431,7 +431,7 @@ static void write_file(FILE* header_file)
     fprintf(header_file, "\n");
 
     // 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, KTAB, TABSIZ + 1, "KTAB");
     write_1d(header_file, ATAB, TABSIZ + 1, "ATAB");
diff --git a/init.c b/init.c
index b7c0249..3d77a9c 100644
--- a/init.c
+++ b/init.c
@@ -167,7 +167,7 @@ void initialise(void)
         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;
         if (!(locations[i].description.big == 0 || KEY[i] == 0)) {
             int k = KEY[i];
diff --git a/newdungeon.py b/newdungeon.py
index 3614474..3b801da 100755
--- a/newdungeon.py
+++ b/newdungeon.py
@@ -70,7 +70,7 @@ extern obituary_t obituaries[];
 extern hint_t hints[];
 extern long conditions[];
 
-#define LOCSIZ		{}
+#define NLOCATIONS		{}
 #define NOBJECTS	{}
 #define NHINTS		{}
 #define NCLASSES	{}