From df46df697917304a78ae9d3392ffff9b535ae5a5 Mon Sep 17 00:00:00 2001
From: "Jason S. Ninneman" <jsn@mbar.us>
Date: Sun, 28 May 2017 15:42:05 -0700
Subject: [PATCH 01/16] Factor out handling of variables populated from the
 database.

This reorganization is a first step toward handling database compilation separately.
---
 Makefile   | 16 +++++++++-------
 actions1.c |  1 +
 database.c | 36 ++++++++++++++++++++++++++++++++++++
 database.h | 34 ++++++++++++++++++++++++++++++++++
 funcs.h    |  1 +
 init.c     |  3 ++-
 main.c     | 50 ++++++++++++++++++++++----------------------------
 main.h     |  6 +++---
 misc.c     |  1 +
 score.c    |  1 +
 share.h    | 34 +++++++++++++++++-----------------
 11 files changed, 127 insertions(+), 56 deletions(-)
 create mode 100644 database.c
 create mode 100644 database.h

diff --git a/Makefile b/Makefile
index 84477c8..bd57958 100644
--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,28 @@
 # Makefile for the open-source release of adventure 2.5
 
 LIBS=-lrt
-OBJS=main.o init.o actions1.o actions2.o score.o misc.o
+OBJS=main.o init.o actions1.o actions2.o score.o misc.o database.o
 SOURCES=$(OBJS:.o=.c) COPYING NEWS README TODO advent.text control
 
 .c.o:
 	gcc -O $(DBX) -c $<
 
 advent:	$(OBJS)
-	gcc -std=c99 -O $(DBX) -o advent $(OBJS) $(LIBS)
+	gcc -Wall -std=c99 -O $(DBX) -o advent $(OBJS) $(LIBS)
 
-main.o:		main.h misc.h funcs.h
+main.o:		main.h misc.h funcs.h database.h
 
-init.o:		misc.h main.h share.h funcs.h
+init.o:		misc.h main.h share.h funcs.h database.h
 
-actions1.o:	misc.h main.h share.h funcs.h
+actions1.o:	misc.h main.h share.h funcs.h database.h
 
 actions2.o:	misc.h main.h share.h funcs.h
 
-score.o:	misc.h main.h share.h
+score.o:	misc.h main.h share.h database.h
 
-misc.o:		misc.h main.h
+misc.o:		misc.h main.h database.h
+
+database.o:	database.h
 
 clean:
 	rm -f *.o advent advent.html advent.6 adventure.data
diff --git a/actions1.c b/actions1.c
index 79c0ea7..0cf8e97 100644
--- a/actions1.c
+++ b/actions1.c
@@ -4,6 +4,7 @@
 #include "main.h"
 #include "share.h"
 #include "funcs.h"
+#include "database.h"
 
 /* This stuff was broken off as part of an effort to get the main program
  * to compile without running out of memory.  We're called with a number
diff --git a/database.c b/database.c
new file mode 100644
index 0000000..cacd79d
--- /dev/null
+++ b/database.c
@@ -0,0 +1,36 @@
+#include "database.h"
+
+const long RTXSIZ = 277;
+const long CLSMAX = 12;
+const long LOCSIZ = 185;
+const long LINSIZ = 12500;
+const long TRNSIZ = 5;
+const long TABSIZ = 330;
+const long VRBSIZ = 35;
+long LINUSE;
+long TRVS;
+long CLSSES;
+long TRNVLS;
+long TABNDX;
+long HNTMAX;
+long PTEXT[101];
+long RTEXT[278];
+long CTEXT[13];
+long OBJSND[101];
+long OBJTXT[101];
+long STEXT[186];
+long LTEXT[186];
+long COND[186];
+long KEY[186];
+long LOCSND[186];
+long LINES[12500];
+long CVAL[13];
+long TTEXT[6];
+long TRNVAL[6];
+long TRAVEL[886];
+long KTAB[331];
+long ATAB[331];
+long PLAC[101];
+long FIXD[101];
+long ACTSPK[36];
+long HINTS[21][5];
diff --git a/database.h b/database.h
new file mode 100644
index 0000000..c9b5167
--- /dev/null
+++ b/database.h
@@ -0,0 +1,34 @@
+extern const long RTXSIZ;
+extern const long CLSMAX;
+extern const long LOCSIZ;
+extern const long LINSIZ;
+extern const long TRNSIZ;
+extern const long TABSIZ;
+extern const long VRBSIZ;
+extern long LINUSE;
+extern long TRVS;
+extern long CLSSES;
+extern long TRNVLS;
+extern long TABNDX;
+extern long HNTMAX;
+extern long PTEXT[101];
+extern long RTEXT[278];
+extern long CTEXT[13];
+extern long OBJSND[101];
+extern long OBJTXT[101];
+extern long STEXT[186];
+extern long LTEXT[186];
+extern long COND[186];
+extern long KEY[186];
+extern long LOCSND[186];
+extern long LINES[12500];
+extern long CVAL[13];
+extern long TTEXT[6];
+extern long TRNVAL[6];
+extern long TRAVEL[886];
+extern long KTAB[331];
+extern long ATAB[331];
+extern long PLAC[101];
+extern long FIXD[101];
+extern long ACTSPK[36];
+extern long HINTS[21][5];
diff --git a/funcs.h b/funcs.h
index 5f7c01d..34f69cd 100644
--- a/funcs.h
+++ b/funcs.h
@@ -1,4 +1,5 @@
 #include <stdbool.h>
+#include "database.h"
 
 /*  Statement functions
  *
diff --git a/init.c b/init.c
index ba49245..d33dd92 100644
--- a/init.c
+++ b/init.c
@@ -7,6 +7,7 @@
 #include "main.h"
 #include "share.h"
 #include "funcs.h"
+#include "database.h"
 
 /*
  * Initialisation
@@ -175,7 +176,7 @@ static void quick_io(void);
 void initialise(void) {
 	if (oldstyle)
 		printf("Initialising...\n");
-	if(!quick_init()){raw_init(); report(); quick_save();}
+        if(!quick_init()){raw_init(); report(); quick_save();}
 	finish_init();
 }
 
diff --git a/main.c b/main.c
index d84e4f2..a72d3b5 100644
--- a/main.c
+++ b/main.c
@@ -9,37 +9,37 @@
 #include <getopt.h>
 #include <signal.h>
 #include "main.h"
-
+#include "database.h"
 #include "misc.h"
 
-long ABB[186], ATAB[331], ATLOC[186], BLKLIN = true, DFLAG,
+long ABB[186], ATLOC[186], BLKLIN = true, DFLAG,
 		DLOC[7], FIXED[101], HOLDNG,
-		KTAB[331], *LINES, LINK[201], LNLENG, LNPOSN,
-		PARMS[26], PLACE[101], PTEXT[101], RTEXT[278],
-		SETUP = 0, TABSIZ = 330;
+		LINK[201], LNLENG, LNPOSN,
+		PARMS[26], PLACE[101],
+		SETUP = 0;
 signed char rawbuf[LINESIZE], INLINE[LINESIZE+1], MAP1[129], MAP2[129];
 
-long ABBNUM, ACTSPK[36], AMBER, ATTACK, AXE, BACK, BATTER, BEAR, BIRD, BLOOD, BONUS,
+long ABBNUM, AMBER, ATTACK, AXE, BACK, BATTER, BEAR, BIRD, BLOOD, BONUS,
 		 BOTTLE, CAGE, CAVE, CAVITY, CHAIN, CHASM, CHEST, CHLOC, CHLOC2,
-		CLAM, CLOCK1, CLOCK2, CLOSED, CLOSNG, CLSHNT, CLSMAX = 12, CLSSES,
-		COINS, COND[186], CONDS, CTEXT[13], CVAL[13], DALTLC, DETAIL,
+		CLAM, CLOCK1, CLOCK2, CLOSED, CLOSNG, CLSHNT,
+		COINS, CONDS, DALTLC, DETAIL,
 		 DKILL, DOOR, DPRSSN, DRAGON, DSEEN[7], DTOTAL, DWARF, EGGS,
-		EMRALD, ENTER, ENTRNC, FIND, FISSUR, FIXD[101], FOOBAR, FOOD,
-		GRATE, HINT, HINTED[21], HINTLC[21], HINTS[21][5], HNTMAX,
-		HNTSIZ = 20, I, INVENT, IGO, IWEST, J, JADE, K, K2, KEY[186], KEYS, KK,
-		KNFLOC, KNIFE, KQ, L, LAMP, LIMIT, LINSIZ = 12500, LINUSE, LL,
-		LMWARN, LOC, LOCK, LOCSIZ = 185, LOCSND[186], LOOK, LTEXT[186],
+		EMRALD, ENTER, ENTRNC, FIND, FISSUR, FOOBAR, FOOD,
+		GRATE, HINT, HINTED[21], HINTLC[21],
+		HNTSIZ = 20, I, INVENT, IGO, IWEST, J, JADE, K, K2, KEYS, KK,
+		KNFLOC, KNIFE, KQ, L, LAMP, LIMIT, LL,
+		LMWARN, LOC, LOCK, LOOK,
 		MAGZIN, MAXDIE, MAXTRS, MESH = 123456789,
 		MESSAG, MIRROR, MXSCOR,
-		NEWLOC, NOVICE, NUGGET, NUL, NUMDIE, OBJ, OBJSND[101],
-		OBJTXT[101], ODLOC[7], OGRE, OIL, OLDLC2, OLDLOC, OLDOBJ, OYSTER,
-		PANIC, PEARL, PILLOW, PLAC[101], PLANT, PLANT2, PROP[101], PYRAM,
-		RESER, ROD, ROD2, RTXSIZ = 277, RUBY, RUG, SAPPH, SAVED, SAY,
-		SCORE, SECT, SIGN, SNAKE, SPK, STEPS, STEXT[186], STICK,
-		STREAM, TABNDX, TALLY, THRESH, THROW, TK[21], TRAVEL[886], TRIDNT,
-		TRNDEX, TRNLUZ, TRNSIZ = 5, TRNVAL[6], TRNVLS, TROLL, TROLL2, TRVS,
-		 TRVSIZ = 885, TTEXT[6], TURNS, URN, V1, V2, VASE, VEND, VERB,
-		VOLCAN, VRBSIZ = 35, VRSION = 25, WATER, WD1, WD1X, WD2, WD2X,
+		NEWLOC, NOVICE, NUGGET, NUL, NUMDIE, OBJ,
+		ODLOC[7], OGRE, OIL, OLDLC2, OLDLOC, OLDOBJ, OYSTER,
+		PANIC, PEARL, PILLOW, PLANT, PLANT2, PROP[101], PYRAM,
+		RESER, ROD, ROD2, RUBY, RUG, SAPPH, SAVED, SAY,
+		SCORE, SECT, SIGN, SNAKE, SPK, STEPS, STICK,
+		STREAM, TALLY, THRESH, THROW, TK[21], TRIDNT,
+		TRNDEX, TRNLUZ, TROLL, TROLL2,
+		 TRVSIZ = 885, TURNS, URN, V1, V2, VASE, VEND, VERB,
+		VOLCAN, VRSION = 25, WATER, WD1, WD1X, WD2, WD2X,
 		WZDARK = false, ZZWORD;
 FILE  *logfp;
 bool oldstyle = false;
@@ -114,12 +114,6 @@ int main(int argc, char *argv[]) {
 
 /*  Read the database if we have not yet done so */
 
-	LINES = (long *)calloc(LINSIZ+1,sizeof(long));
-	if(!LINES){
-		printf("Not enough memory!\n");
-		exit(1);
-	}
-
 	MAP2[1] = 0;
 	if(!SETUP)initialise();
 	if(SETUP > 0) goto L1;
diff --git a/main.h b/main.h
index 184acee..2b33735 100644
--- a/main.h
+++ b/main.h
@@ -7,9 +7,9 @@ typedef struct lcg_state
   unsigned long a, c, m, x;
 } lcg_state;
 
-extern long ABB[], ATAB[], ATLOC[], BLKLIN, DFLAG, DLOC[], FIXED[], HOLDNG,
-		KTAB[], *LINES, LINK[], LNLENG, LNPOSN,
-		PARMS[], PLACE[], PTEXT[], RTEXT[], TABSIZ;
+extern long ABB[], ATLOC[], BLKLIN, DFLAG, DLOC[], FIXED[], HOLDNG,
+		LINK[], LNLENG, LNPOSN,
+		PARMS[], PLACE[];
 extern signed char rawbuf[LINESIZE], INLINE[LINESIZE+1], MAP1[], MAP2[];
 extern FILE *logfp;
 extern bool oldstyle;
diff --git a/misc.c b/misc.c
index 3fded19..111848e 100644
--- a/misc.c
+++ b/misc.c
@@ -6,6 +6,7 @@
 #include "share.h"	/* for SETUP */
 #include "misc.h"
 #include "funcs.h"
+#include "database.h"
 
 /* hack to ignore GCC Unused Result */
 #define IGNORE(r) do{if(r){}}while(0)
diff --git a/score.c b/score.c
index 162cc5d..4ef68ad 100644
--- a/score.c
+++ b/score.c
@@ -2,6 +2,7 @@
 #include "misc.h"
 #include "main.h"
 #include "share.h"
+#include "database.h"
 
 /*
  * scoring and wrap-up
diff --git a/share.h b/share.h
index ff4252b..59ef9bb 100644
--- a/share.h
+++ b/share.h
@@ -1,24 +1,24 @@
 extern void score(long);
-extern long ABBNUM, ACTSPK[], AMBER, ATTACK, AXE, BACK, BATTER, BEAR,
+extern long ABBNUM, AMBER, ATTACK, AXE, BACK, BATTER, BEAR,
    BIRD, BLOOD, BONUS,
    BOTTLE, CAGE, CAVE, CAVITY, CHAIN, CHASM, CHEST, CHLOC, CHLOC2,
-   CLAM, CLOCK1, CLOCK2, CLOSED, CLOSNG, CLSHNT, CLSMAX, CLSSES,
-   COINS, COND[], CONDS, CTEXT[], CVAL[], DALTLC, DETAIL,
+   CLAM, CLOCK1, CLOCK2, CLOSED, CLOSNG, CLSHNT,
+   COINS, CONDS, DALTLC, DETAIL,
    DKILL, DOOR, DPRSSN, DRAGON, DSEEN[], DTOTAL, DWARF, EGGS,
-   EMRALD, ENTER, ENTRNC, FIND, FISSUR, FIXD[], FOOBAR, FOOD,
-   GRATE, HINT, HINTED[], HINTLC[], HINTS[][5], HNTMAX,
-   HNTSIZ, I, INVENT, IGO, IWEST, J, JADE, K, K2, KEY[], KEYS, KK,
-   KNFLOC, KNIFE, KQ, L, LAMP, LIMIT, LINSIZ, LINUSE, LL,
-   LMWARN, LOC, LOCK, LOCSIZ, LOCSND[], LOOK, LTEXT[],
+   EMRALD, ENTER, ENTRNC, FIND, FISSUR, FOOBAR, FOOD,
+   GRATE, HINT, HINTED[], HINTLC[],
+   HNTSIZ, I, INVENT, IGO, IWEST, J, JADE, K, K2, KEYS, KK,
+   KNFLOC, KNIFE, KQ, L, LAMP, LIMIT, LL,
+  LMWARN, LOC, LOCK, LOOK,
    MAGZIN, MAXDIE, MAXTRS, MESH, MESSAG, MIRROR, MXSCOR,
-   NEWLOC, NOVICE, NUGGET, NUL, NUMDIE, OBJ, OBJSND[],
-   OBJTXT[], ODLOC[], OGRE, OIL, OLDLC2, OLDLOC, OLDOBJ, OYSTER,
-   PANIC, PEARL, PILLOW, PLAC[], PLANT, PLANT2, PROP[], PYRAM,
-   RESER, ROD, ROD2, RTXSIZ, RUBY, RUG, SAPPH, SAVED, SAY,
-   SCORE, SECT, SETUP, SIGN, SNAKE, SPK, STEPS, STEXT[], STICK,
-   STREAM, TABNDX, TALLY, THRESH, THROW, TK[], TRAVEL[], TRIDNT,
-   TRNDEX, TRNLUZ, TRNSIZ, TRNVAL[], TRNVLS, TROLL, TROLL2, TRVS,
-   TRVSIZ, TTEXT[], TURNS, URN, V1, V2, VASE, VEND, VERB,
-   VOLCAN, VRBSIZ, VRSION, WATER, WD1, WD1X, WD2, WD2X,
+   NEWLOC, NOVICE, NUGGET, NUL, NUMDIE, OBJ,
+   ODLOC[], OGRE, OIL, OLDLC2, OLDLOC, OLDOBJ, OYSTER,
+   PANIC, PEARL, PILLOW, PLANT, PLANT2, PROP[], PYRAM,
+   RESER, ROD, ROD2, RUBY, RUG, SAPPH, SAVED, SAY,
+   SCORE, SECT, SETUP, SIGN, SNAKE, SPK, STEPS, STICK,
+   STREAM, TALLY, THRESH, THROW, TK[], TRIDNT,
+   TRNDEX, TRNLUZ, TROLL, TROLL2,
+   TRVSIZ, TURNS, URN, V1, V2, VASE, VEND, VERB,
+   VOLCAN, VRSION, WATER, WD1, WD1X, WD2, WD2X,
    WZDARK, ZZWORD;
 
-- 
2.31.1


From d6b59a1c12ad8829de004dc3b478fde2a7ff197d Mon Sep 17 00:00:00 2001
From: "Jason S. Ninneman" <jsn@mbar.us>
Date: Sun, 28 May 2017 17:21:04 -0700
Subject: [PATCH 02/16] Apply further polish and add in a couple of missing
 size variables.

---
 database.c | 49 +++++++++++++++++++++----------------------------
 database.h | 49 ++++++++++++++++++++++++++-----------------------
 main.c     |  4 ++--
 share.h    |  4 ++--
 4 files changed, 51 insertions(+), 55 deletions(-)

diff --git a/database.c b/database.c
index cacd79d..2753966 100644
--- a/database.c
+++ b/database.c
@@ -1,36 +1,29 @@
 #include "database.h"
 
-const long RTXSIZ = 277;
-const long CLSMAX = 12;
-const long LOCSIZ = 185;
-const long LINSIZ = 12500;
-const long TRNSIZ = 5;
-const long TABSIZ = 330;
-const long VRBSIZ = 35;
 long LINUSE;
 long TRVS;
 long CLSSES;
 long TRNVLS;
 long TABNDX;
 long HNTMAX;
-long PTEXT[101];
-long RTEXT[278];
-long CTEXT[13];
-long OBJSND[101];
-long OBJTXT[101];
-long STEXT[186];
-long LTEXT[186];
-long COND[186];
-long KEY[186];
-long LOCSND[186];
-long LINES[12500];
-long CVAL[13];
-long TTEXT[6];
-long TRNVAL[6];
-long TRAVEL[886];
-long KTAB[331];
-long ATAB[331];
-long PLAC[101];
-long FIXD[101];
-long ACTSPK[36];
-long HINTS[21][5];
+long PTEXT[];
+long RTEXT[];
+long CTEXT[];
+long OBJSND[];
+long OBJTXT[];
+long STEXT[];
+long LTEXT[];
+long COND[];
+long KEY[];
+long LOCSND[];
+long LINES[];
+long CVAL[];
+long TTEXT[];
+long TRNVAL[];
+long TRAVEL[];
+long KTAB[];
+long ATAB[];
+long PLAC[];
+long FIXD[];
+long ACTSPK[];
+long HINTS[][5];
diff --git a/database.h b/database.h
index c9b5167..0c25331 100644
--- a/database.h
+++ b/database.h
@@ -1,10 +1,13 @@
-extern const long RTXSIZ;
-extern const long CLSMAX;
-extern const long LOCSIZ;
-extern const long LINSIZ;
-extern const long TRNSIZ;
-extern const long TABSIZ;
-extern const long VRBSIZ;
+#define RTXSIZ 277
+#define CLSMAX 12
+#define LOCSIZ 185
+#define LINSIZ 12500
+#define TRNSIZ 5
+#define TABSIZ 330
+#define VRBSIZ 35
+#define HNTSIZ 20
+#define TRVSIZ 885
+
 extern long LINUSE;
 extern long TRVS;
 extern long CLSSES;
@@ -12,23 +15,23 @@ extern long TRNVLS;
 extern long TABNDX;
 extern long HNTMAX;
 extern long PTEXT[101];
-extern long RTEXT[278];
-extern long CTEXT[13];
+extern long RTEXT[RTXSIZ + 1];
+extern long CTEXT[CLSMAX + 1];
 extern long OBJSND[101];
 extern long OBJTXT[101];
-extern long STEXT[186];
-extern long LTEXT[186];
-extern long COND[186];
-extern long KEY[186];
-extern long LOCSND[186];
-extern long LINES[12500];
-extern long CVAL[13];
-extern long TTEXT[6];
-extern long TRNVAL[6];
-extern long TRAVEL[886];
-extern long KTAB[331];
-extern long ATAB[331];
+extern long STEXT[LOCSIZ + 1];
+extern long LTEXT[LOCSIZ + 1];
+extern long COND[LOCSIZ + 1];
+extern long KEY[LOCSIZ + 1];
+extern long LOCSND[LOCSIZ + 1];
+extern long LINES[LINSIZ + 1];
+extern long CVAL[CLSMAX + 1];
+extern long TTEXT[TRNSIZ + 1];
+extern long TRNVAL[TRNSIZ + 1];
+extern long TRAVEL[TRVSIZ + 1];
+extern long KTAB[TABSIZ + 1];
+extern long ATAB[TABSIZ + 1];
 extern long PLAC[101];
 extern long FIXD[101];
-extern long ACTSPK[36];
-extern long HINTS[21][5];
+extern long ACTSPK[VRBSIZ + 1];
+extern long HINTS[HNTSIZ + 1][5];
diff --git a/main.c b/main.c
index a72d3b5..e2c24e5 100644
--- a/main.c
+++ b/main.c
@@ -26,7 +26,7 @@ long ABBNUM, AMBER, ATTACK, AXE, BACK, BATTER, BEAR, BIRD, BLOOD, BONUS,
 		 DKILL, DOOR, DPRSSN, DRAGON, DSEEN[7], DTOTAL, DWARF, EGGS,
 		EMRALD, ENTER, ENTRNC, FIND, FISSUR, FOOBAR, FOOD,
 		GRATE, HINT, HINTED[21], HINTLC[21],
-		HNTSIZ = 20, I, INVENT, IGO, IWEST, J, JADE, K, K2, KEYS, KK,
+		I, INVENT, IGO, IWEST, J, JADE, K, K2, KEYS, KK,
 		KNFLOC, KNIFE, KQ, L, LAMP, LIMIT, LL,
 		LMWARN, LOC, LOCK, LOOK,
 		MAGZIN, MAXDIE, MAXTRS, MESH = 123456789,
@@ -38,7 +38,7 @@ long ABBNUM, AMBER, ATTACK, AXE, BACK, BATTER, BEAR, BIRD, BLOOD, BONUS,
 		SCORE, SECT, SIGN, SNAKE, SPK, STEPS, STICK,
 		STREAM, TALLY, THRESH, THROW, TK[21], TRIDNT,
 		TRNDEX, TRNLUZ, TROLL, TROLL2,
-		 TRVSIZ = 885, TURNS, URN, V1, V2, VASE, VEND, VERB,
+		 TURNS, URN, V1, V2, VASE, VEND, VERB,
 		VOLCAN, VRSION = 25, WATER, WD1, WD1X, WD2, WD2X,
 		WZDARK = false, ZZWORD;
 FILE  *logfp;
diff --git a/share.h b/share.h
index 59ef9bb..5c1759c 100644
--- a/share.h
+++ b/share.h
@@ -7,7 +7,7 @@ extern long ABBNUM, AMBER, ATTACK, AXE, BACK, BATTER, BEAR,
    DKILL, DOOR, DPRSSN, DRAGON, DSEEN[], DTOTAL, DWARF, EGGS,
    EMRALD, ENTER, ENTRNC, FIND, FISSUR, FOOBAR, FOOD,
    GRATE, HINT, HINTED[], HINTLC[],
-   HNTSIZ, I, INVENT, IGO, IWEST, J, JADE, K, K2, KEYS, KK,
+   I, INVENT, IGO, IWEST, J, JADE, K, K2, KEYS, KK,
    KNFLOC, KNIFE, KQ, L, LAMP, LIMIT, LL,
   LMWARN, LOC, LOCK, LOOK,
    MAGZIN, MAXDIE, MAXTRS, MESH, MESSAG, MIRROR, MXSCOR,
@@ -18,7 +18,7 @@ extern long ABBNUM, AMBER, ATTACK, AXE, BACK, BATTER, BEAR,
    SCORE, SECT, SETUP, SIGN, SNAKE, SPK, STEPS, STICK,
    STREAM, TALLY, THRESH, THROW, TK[], TRIDNT,
    TRNDEX, TRNLUZ, TROLL, TROLL2,
-   TRVSIZ, TURNS, URN, V1, V2, VASE, VEND, VERB,
+   TURNS, URN, V1, V2, VASE, VEND, VERB,
    VOLCAN, VRSION, WATER, WD1, WD1X, WD2, WD2X,
    WZDARK, ZZWORD;
 
-- 
2.31.1


From f0528b0ded7e921510ecdece2a36ce94c6414044 Mon Sep 17 00:00:00 2001
From: "Jason S. Ninneman" <jsn@mbar.us>
Date: Sun, 28 May 2017 21:46:54 -0700
Subject: [PATCH 03/16] Move database compilation out into its own tool (for
 now).

---
 .gitignore                                |   5 +-
 Makefile                                  |  20 +-
 actions1.c                                |   2 +-
 database.c                                |  29 --
 database.h                                |  37 --
 database/Makefile                         |  17 +
 adventure.text => database/adventure.text |   0
 database/compile.c                        | 547 ++++++++++++++++++++++
 funcs.h                                   |   2 +-
 init.c                                    | 317 +------------
 main.c                                    |   2 +-
 misc.c                                    |   2 +-
 score.c                                   |   2 +-
 tests/Makefile                            |  10 +-
 14 files changed, 588 insertions(+), 404 deletions(-)
 delete mode 100644 database.c
 delete mode 100644 database.h
 create mode 100644 database/Makefile
 rename adventure.text => database/adventure.text (100%)
 create mode 100644 database/compile.c

diff --git a/.gitignore b/.gitignore
index babef26..2a6ad9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 advent
 *.o
-adventure.data
+database/compile
+database/database.h
+database/database.c
+
diff --git a/Makefile b/Makefile
index bd57958..435adc4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,32 +1,31 @@
 # Makefile for the open-source release of adventure 2.5
 
 LIBS=-lrt
-OBJS=main.o init.o actions1.o actions2.o score.o misc.o database.o
+OBJS=main.o init.o actions1.o actions2.o score.o misc.o database/database.o
 SOURCES=$(OBJS:.o=.c) COPYING NEWS README TODO advent.text control
 
 .c.o:
 	gcc -O $(DBX) -c $<
 
-advent:	$(OBJS)
+advent:	$(OBJS) database
 	gcc -Wall -std=c99 -O $(DBX) -o advent $(OBJS) $(LIBS)
 
-main.o:		main.h misc.h funcs.h database.h
+main.o:		main.h misc.h funcs.h database/database.h
 
-init.o:		misc.h main.h share.h funcs.h database.h
+init.o:		misc.h main.h share.h funcs.h database/database.h
 
-actions1.o:	misc.h main.h share.h funcs.h database.h
+actions1.o:	misc.h main.h share.h funcs.h database/database.h
 
 actions2.o:	misc.h main.h share.h funcs.h
 
-score.o:	misc.h main.h share.h database.h
+score.o:	misc.h main.h share.h database/database.h
 
-misc.o:		misc.h main.h database.h
-
-database.o:	database.h
+misc.o:		misc.h main.h database/database.h
 
 clean:
 	rm -f *.o advent advent.html advent.6 adventure.data
 	cd tests; $(MAKE) --quiet clean
+	cd database; $(MAKE) clean
 
 check: advent
 	cd tests; $(MAKE) --quiet
@@ -48,3 +47,6 @@ release: advent-$(VERS).tar.gz advent.html
 
 refresh: advent.html
 	shipper -N -w version=$(VERS) | sh -e -x
+
+database:
+	cd database; $(MAKE)
diff --git a/actions1.c b/actions1.c
index 0cf8e97..802a130 100644
--- a/actions1.c
+++ b/actions1.c
@@ -4,7 +4,7 @@
 #include "main.h"
 #include "share.h"
 #include "funcs.h"
-#include "database.h"
+#include "database/database.h"
 
 /* This stuff was broken off as part of an effort to get the main program
  * to compile without running out of memory.  We're called with a number
diff --git a/database.c b/database.c
deleted file mode 100644
index 2753966..0000000
--- a/database.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "database.h"
-
-long LINUSE;
-long TRVS;
-long CLSSES;
-long TRNVLS;
-long TABNDX;
-long HNTMAX;
-long PTEXT[];
-long RTEXT[];
-long CTEXT[];
-long OBJSND[];
-long OBJTXT[];
-long STEXT[];
-long LTEXT[];
-long COND[];
-long KEY[];
-long LOCSND[];
-long LINES[];
-long CVAL[];
-long TTEXT[];
-long TRNVAL[];
-long TRAVEL[];
-long KTAB[];
-long ATAB[];
-long PLAC[];
-long FIXD[];
-long ACTSPK[];
-long HINTS[][5];
diff --git a/database.h b/database.h
deleted file mode 100644
index 0c25331..0000000
--- a/database.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#define RTXSIZ 277
-#define CLSMAX 12
-#define LOCSIZ 185
-#define LINSIZ 12500
-#define TRNSIZ 5
-#define TABSIZ 330
-#define VRBSIZ 35
-#define HNTSIZ 20
-#define TRVSIZ 885
-
-extern long LINUSE;
-extern long TRVS;
-extern long CLSSES;
-extern long TRNVLS;
-extern long TABNDX;
-extern long HNTMAX;
-extern long PTEXT[101];
-extern long RTEXT[RTXSIZ + 1];
-extern long CTEXT[CLSMAX + 1];
-extern long OBJSND[101];
-extern long OBJTXT[101];
-extern long STEXT[LOCSIZ + 1];
-extern long LTEXT[LOCSIZ + 1];
-extern long COND[LOCSIZ + 1];
-extern long KEY[LOCSIZ + 1];
-extern long LOCSND[LOCSIZ + 1];
-extern long LINES[LINSIZ + 1];
-extern long CVAL[CLSMAX + 1];
-extern long TTEXT[TRNSIZ + 1];
-extern long TRNVAL[TRNSIZ + 1];
-extern long TRAVEL[TRVSIZ + 1];
-extern long KTAB[TABSIZ + 1];
-extern long ATAB[TABSIZ + 1];
-extern long PLAC[101];
-extern long FIXD[101];
-extern long ACTSPK[VRBSIZ + 1];
-extern long HINTS[HNTSIZ + 1][5];
diff --git a/database/Makefile b/database/Makefile
new file mode 100644
index 0000000..18795ed
--- /dev/null
+++ b/database/Makefile
@@ -0,0 +1,17 @@
+# Makefile for the open-adventure database
+
+OBJS=compile.o
+SOURCES=$(OBJS:.o=.c) adventure.text
+OPTIONS=-ggdb -Wall -std=c99
+
+.c.o:
+	gcc $(OPTIONS) -O $(DBX) -c $<
+
+database: compile
+	./compile
+	gcc $(OPTIONS) -O $(DBX) -c database.c
+
+compile: $(OBJS)
+
+clean:
+	rm -f $(OBJS) compile database.c database.h
diff --git a/adventure.text b/database/adventure.text
similarity index 100%
rename from adventure.text
rename to database/adventure.text
diff --git a/database/compile.c b/database/compile.c
new file mode 100644
index 0000000..9906f08
--- /dev/null
+++ b/database/compile.c
@@ -0,0 +1,547 @@
+#define LINESIZE 100
+#define RTXSIZ 277
+#define CLSMAX 12
+#define LOCSIZ 185
+#define LINSIZ 12500
+#define TRNSIZ 5
+#define TABSIZ 330
+#define VRBSIZ 35
+#define HNTSIZ 20
+#define TRVSIZ 885
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <unistd.h>
+
+const char advent_to_ascii[] = {0, 32, 33, 34, 39, 40, 41, 42, 43, 44, 45, 46, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 37, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 0, 1, 2, 3, 4, 5, 6, 7, 8, 0, 0, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 35, 36, 38, 47, 58, 59, 60, 61, 62, 63, 64, 91, 92, 93, 94, 95, 96, 123, 124, 125, 126, 0};
+/* Rendered from the now-gone MPINIT() function */
+const char ascii_to_advent[] = {0, 74, 75, 76, 77, 78, 79, 80, 81, 82, 0, 0, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 0, 1, 2, 106, 107, 63, 108, 3, 4, 5, 6, 7, 8, 9, 10, 109, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 110, 111, 112, 113, 114, 115, 116, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 117, 118, 119, 120, 121, 122, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 123, 124, 125, 126, 83};
+
+// Global variables for use in functions below that can gradually disappear as code is cleaned up
+long LNLENG;
+long LNPOSN;
+signed char INLINE[LINESIZE+1];
+long I;
+long K;
+long KK;
+long L;
+long LOC;
+long NEWLOC;
+long OBJ;
+long OLDLOC;
+long SECT;
+long VERB;
+
+// Storage for what comes out of the database
+long LINUSE;
+long TRVS;
+long CLSSES;
+long TRNVLS;
+long TABNDX;
+long HNTMAX;
+long PTEXT[101];
+long RTEXT[RTXSIZ + 1];
+long CTEXT[CLSMAX + 1];
+long OBJSND[101];
+long OBJTXT[101];
+long STEXT[LOCSIZ + 1];
+long LTEXT[LOCSIZ + 1];
+long COND[LOCSIZ + 1];
+long KEY[LOCSIZ + 1];
+long LOCSND[LOCSIZ + 1];
+long LINES[LINSIZ + 1];
+long CVAL[CLSMAX + 1];
+long TTEXT[TRNSIZ + 1];
+long TRNVAL[TRNSIZ + 1];
+long TRAVEL[TRVSIZ + 1];
+long KTAB[TABSIZ + 1];
+long ATAB[TABSIZ + 1];
+long PLAC[101];
+long FIXD[101];
+long ACTSPK[VRBSIZ + 1];
+long HINTS[HNTSIZ + 1][5];
+
+bool is_set(long, long);
+long GETTXT(long, long, long);
+void BUG(long);
+void MAPLIN(FILE*);
+long GETNUM(FILE*);
+int read_database(FILE*);
+void write_0d(FILE*, FILE*, long, char*);
+void write_1d(FILE*, FILE*, long[], long, char*);
+void write_hints(FILE*, FILE*, long[][5], long, long, char*);
+void write_files(FILE*, FILE*);
+
+bool is_set(long var, long position)
+{
+  long mask = 1l << position;
+  bool result = (var & mask) == mask;
+  return(result);
+}
+
+long GETTXT(long SKIP,long ONEWRD, long UPPER) {
+/*  Take characters from an input line and pack them into 30-bit words.
+ *  Skip says to skip leading blanks.  ONEWRD says stop if we come to a
+ *  blank.  UPPER says to map all letters to uppercase.  If we reach the
+ *  end of the line, the word is filled up with blanks (which encode as 0's).
+ *  If we're already at end of line when GETTXT is called, we return -1. */
+
+  long CHAR;
+  long GETTXT;
+  static long SPLITTING = -1;
+
+  if(LNPOSN != SPLITTING)
+    SPLITTING = -1;
+  GETTXT= -1;
+ L10:
+  if(LNPOSN > LNLENG)
+    return(GETTXT);
+  if((!SKIP) || INLINE[LNPOSN] != 0)
+    goto L11;
+  LNPOSN=LNPOSN+1;
+  goto L10;
+
+ L11:
+  GETTXT=0;
+  for (int I=1; I<=5; I++) {
+    GETTXT=GETTXT*64;
+    if(LNPOSN > LNLENG || (ONEWRD && INLINE[LNPOSN] == 0))
+      continue;
+    CHAR=INLINE[LNPOSN];
+    if(CHAR >= 63)
+      goto L12;
+    SPLITTING = -1;
+    if(UPPER && CHAR >= 37)
+      CHAR=CHAR-26;
+    GETTXT=GETTXT+CHAR;
+    goto L14;
+
+  L12:
+    if(SPLITTING == LNPOSN)
+      goto L13;
+    GETTXT=GETTXT+63;
+    SPLITTING = LNPOSN;
+    continue;
+
+  L13:
+    GETTXT=GETTXT+CHAR-63;
+    SPLITTING = -1;
+  L14:
+    LNPOSN=LNPOSN+1;
+  }
+
+  return(GETTXT);
+}
+
+void BUG(long NUM) {
+
+/*  The following conditions are currently considered fatal bugs.  Numbers < 20
+ *  are detected while reading the database; the others occur at "run time".
+ *	0	Message line > 70 characters
+ *	1	Null line in message
+ *	2	Too many words of messages
+ *	3	Too many travel options
+ *	4	Too many vocabulary words
+ *	5	Required vocabulary word not found
+ *	6	Too many RTEXT messages
+ *	7	Too many hints
+ *	8	Location has cond bit being set twice
+ *	9	Invalid section number in database
+ *	10	Too many locations
+ *	11	Too many class or turn messages
+ *	20	Special travel (500>L>300) exceeds goto list
+ *	21	Ran off end of vocabulary table
+ *	22	Vocabulary type (N/1000) not between 0 and 3
+ *	23	Intransitive action verb exceeds goto list
+ *	24	Transitive action verb exceeds goto list
+ *	25	Conditional travel entry with no alternative
+ *	26	Location has no travel entries
+ *	27	Hint number exceeds goto list
+ *	28	Invalid month returned by date function
+ *	29	Too many parameters given to SETPRM */
+
+  fprintf(stderr, "Fatal error %ld.  See source code for interpretation.\n", NUM);
+  exit(EXIT_FAILURE);
+}
+
+void MAPLIN(FILE *OPENED) {
+/*  Read a line of input, from the specified input source,
+ *  translate the chars to integers in the range 0-126 and store
+ *  them in the common array "INLINE".  Integer values are as follows:
+ *     0   = space [ASCII CODE 40 octal, 32 decimal]
+ *    1-2  = !" [ASCII 41-42 octal, 33-34 decimal]
+ *    3-10 = '()*+,-. [ASCII 47-56 octal, 39-46 decimal]
+ *   11-36 = upper-case letters
+ *   37-62 = lower-case letters
+ *    63   = percent (%) [ASCII 45 octal, 37 decimal]
+ *   64-73 = digits, 0 through 9
+ *  Remaining characters can be translated any way that is convenient;
+ *  The "TYPE" routine below is used to map them back to characters when
+ *  necessary.  The above mappings are required so that certain special
+ *  characters are known to fit in 6 bits and/or can be easily spotted.
+ *  Array elements beyond the end of the line should be filled with 0,
+ *  and LNLENG should be set to the index of the last character.
+ *
+ *  If the data file uses a character other than space (e.g., tab) to
+ *  separate numbers, that character should also translate to 0.
+ *
+ *  This procedure may use the map1,map2 arrays to maintain static data for
+ *  the mapping.  MAP2(1) is set to 0 when the program starts
+ *  and is not changed thereafter unless the routines on this page choose
+ *  to do so. */
+
+  do {
+    fgets(INLINE + 1, sizeof(INLINE) - 1, OPENED);
+  }
+  while (!feof(OPENED) && INLINE[1] == '#');
+  
+  LNLENG = 0;
+  for (int i = 1; i <= sizeof(INLINE) && INLINE[i] != 0; ++i)
+    {
+      char val = INLINE[i] + 1;
+      INLINE[i] = ascii_to_advent[val];
+      if (INLINE[i] != 0)
+	LNLENG = i;
+    }
+  LNPOSN = 1;
+}
+
+long GETNUM(FILE *source) {
+/*  Obtain the next integer from an input line.  If K>0, we first read a
+ *  new input line from a file; if K<0, we read a line from the keyboard;
+ *  if K=0 we use a line that has already been read (and perhaps partially
+ *  scanned).  If we're at the end of the line or encounter an illegal
+ *  character (not a digit, hyphen, or blank), we return 0. */
+  
+  long DIGIT, GETNUM, SIGN;
+
+  if(source != NULL) MAPLIN(source);
+  GETNUM = 0;
+
+  while (INLINE[LNPOSN] == 0)
+    {
+      if (LNPOSN > LNLENG) return(GETNUM);
+      ++LNPOSN;
+    }
+
+	SIGN=1;
+	if(INLINE[LNPOSN] != 9) goto L32;
+	SIGN= -1;
+L30:	LNPOSN=LNPOSN+1;
+L32:	if(LNPOSN > LNLENG || INLINE[LNPOSN] == 0) goto L42;
+	DIGIT=INLINE[LNPOSN]-64;
+	if(DIGIT < 0 || DIGIT > 9) goto L40;
+	GETNUM=GETNUM*10+DIGIT;
+	 goto L30;
+
+L40:	GETNUM=0;
+L42:	GETNUM=GETNUM*SIGN;
+	LNPOSN=LNPOSN+1;
+	return(GETNUM);
+}
+
+int read_database(FILE* database) {
+	
+/*  Clear out the various text-pointer arrays.  All text is stored in array
+ *  lines; each line is preceded by a word pointing to the next pointer (i.e.
+ *  the word following the end of the line).  The pointer is negative if this is
+ *  first line of a message.  The text-pointer arrays contain indices of
+ *  pointer-words in lines.  STEXT(N) is short description of location N.
+ *  LTEXT(N) is long description.  PTEXT(N) points to message for PROP(N)=0.
+ *  Successive prop messages are found by chasing pointers.  RTEXT contains
+ *  section 6's stuff.  CTEXT(N) points to a player-class message.  TTEXT is for
+ *  section 14.  We also clear COND (see description of section 9 for details). */
+
+  for (int I=1; I<=300; I++) {
+    if(I <= 100) PTEXT[I] = 0;
+    if(I <= RTXSIZ) RTEXT[I] = 0;
+    if(I <= CLSMAX) CTEXT[I] = 0;
+    if(I <= 100) OBJSND[I] = 0;
+    if(I <= 100) OBJTXT[I] = 0;
+    if(I > LOCSIZ) break;
+    STEXT[I] = 0;
+    LTEXT[I] = 0;
+    COND[I] = 0;
+    KEY[I] = 0;
+    LOCSND[I] = 0;
+  }
+
+  LINUSE = 1;
+  TRVS = 1;
+  CLSSES = 0;
+  TRNVLS = 0;
+
+/*  Start new data section.  Sect is the section number. */
+
+ L1002: SECT=GETNUM(database);
+  OLDLOC= -1;
+  switch (SECT) {
+  case 0: return(0);
+  case 1: goto L1004;
+  case 2: goto L1004;
+  case 3: goto L1030;
+  case 4: goto L1040;
+  case 5: goto L1004;
+  case 6: goto L1004;
+  case 7: goto L1050;
+  case 8: goto L1060;
+  case 9: goto L1070;
+  case 10: goto L1004;
+  case 11: goto L1080;
+  case 12: break;
+  case 13: goto L1090;
+  case 14: goto L1004;
+  default: BUG(9);
+  }
+
+/*  Sections 1, 2, 5, 6, 10, 14.  Read messages and set up pointers. */
+
+L1004:	KK=LINUSE;
+L1005:	LINUSE=KK;
+	LOC=GETNUM(database);
+	if(LNLENG >= LNPOSN+70)BUG(0);
+	if(LOC == -1) goto L1002;
+	if(LNLENG < LNPOSN)BUG(1);
+L1006:	KK=KK+1;
+	if(KK >= LINSIZ)BUG(2);
+	LINES[KK]=GETTXT(false,false,false);
+	if(LINES[KK] != -1) goto L1006;
+	LINES[LINUSE]=KK;
+	if(LOC == OLDLOC) goto L1005;
+	OLDLOC=LOC;
+	LINES[LINUSE]= -KK;
+	if(SECT == 14) goto L1014;
+	if(SECT == 10) goto L1012;
+	if(SECT == 6) goto L1011;
+	if(SECT == 5) goto L1010;
+	if(LOC > LOCSIZ)BUG(10);
+	if(SECT == 1) goto L1008;
+
+	STEXT[LOC]=LINUSE;
+	 goto L1005;
+
+L1008:	LTEXT[LOC]=LINUSE;
+	 goto L1005;
+
+L1010:	if(LOC > 0 && LOC <= 100)PTEXT[LOC]=LINUSE;
+	 goto L1005;
+
+L1011:	if(LOC > RTXSIZ)BUG(6);
+	RTEXT[LOC]=LINUSE;
+	 goto L1005;
+
+L1012:	CLSSES=CLSSES+1;
+	if(CLSSES > CLSMAX)BUG(11);
+	CTEXT[CLSSES]=LINUSE;
+	CVAL[CLSSES]=LOC;
+	 goto L1005;
+
+L1014:	TRNVLS=TRNVLS+1;
+	if(TRNVLS > TRNSIZ)BUG(11);
+	TTEXT[TRNVLS]=LINUSE;
+	TRNVAL[TRNVLS]=LOC;
+	 goto L1005;
+
+/*  The stuff for section 3 is encoded here.  Each "from-location" gets a
+ *  contiguous section of the "TRAVEL" array.  Each entry in travel is
+ *  NEWLOC*1000 + KEYWORD (from section 4, motion verbs), and is negated if
+ *  this is the last entry for this location.  KEY(N) is the index in travel
+ *  of the first option at location N. */
+
+L1030:	LOC=GETNUM(database);
+	if(LOC == -1) goto L1002;
+	NEWLOC=GETNUM(NULL);
+	if(KEY[LOC] != 0) goto L1033;
+	KEY[LOC]=TRVS;
+	 goto L1035;
+L1033:	TRVS--; TRAVEL[TRVS]= -TRAVEL[TRVS]; TRVS++;
+L1035:	L=GETNUM(NULL);
+	if(L == 0) goto L1039;
+	TRAVEL[TRVS]=NEWLOC*1000+L;
+	TRVS=TRVS+1;
+	if(TRVS == TRVSIZ)BUG(3);
+	 goto L1035;
+L1039:	TRVS--; TRAVEL[TRVS]= -TRAVEL[TRVS]; TRVS++;
+	 goto L1030;
+
+/*  Here we read in the vocabulary.  KTAB(N) is the word number, ATAB(N) is
+ *  the corresponding word.  The -1 at the end of section 4 is left in KTAB
+ *  as an end-marker. */
+
+L1040:
+	for (TABNDX=1; TABNDX<=TABSIZ; TABNDX++) {
+	KTAB[TABNDX]=GETNUM(database);
+	if(KTAB[TABNDX] == -1) goto L1002;
+	ATAB[TABNDX]=GETTXT(true,true,true);
+	} /* end loop */
+	BUG(4);
+
+/*  Read in the initial locations for each object.  Also the immovability info.
+ *  plac contains initial locations of objects.  FIXD is -1 for immovable
+ *  objects (including the snake), or = second loc for two-placed objects. */
+
+L1050:	OBJ=GETNUM(database);
+	if(OBJ == -1) goto L1002;
+	PLAC[OBJ]=GETNUM(NULL);
+	FIXD[OBJ]=GETNUM(NULL);
+	 goto L1050;
+
+/*  Read default message numbers for action verbs, store in ACTSPK. */
+
+L1060:	VERB=GETNUM(database);
+	if(VERB == -1) goto L1002;
+	ACTSPK[VERB]=GETNUM(NULL);
+	 goto L1060;
+
+/*  Read info about available liquids and other conditions, store in COND. */
+
+L1070:	K=GETNUM(database);
+	if(K == -1) goto L1002;
+L1071:	LOC=GETNUM(NULL);
+	if(LOC == 0) goto L1070;
+	if(is_set(COND[LOC],K)) BUG(8);
+	COND[LOC]=COND[LOC] + (1l << K);
+	 goto L1071;
+
+/*  Read data for hints. */
+
+L1080:	HNTMAX=0;
+L1081:	K=GETNUM(database);
+	if(K == -1) goto L1002;
+	if(K <= 0 || K > HNTSIZ)BUG(7);
+	for (int I=1; I<=4; I++) {
+	HINTS[K][I] =GETNUM(NULL);
+	} /* end loop */
+	HNTMAX=(HNTMAX>K ? HNTMAX : K);
+	 goto L1081;
+
+/*  Read the sound/text info, store in OBJSND, OBJTXT, LOCSND. */
+
+L1090:	K=GETNUM(database);
+	if(K == -1) goto L1002;
+	KK=GETNUM(NULL);
+	I=GETNUM(NULL);
+	if(I == 0) goto L1092;
+	OBJSND[K]=(KK>0 ? KK : 0);
+	OBJTXT[K]=(I>0 ? I : 0);
+	 goto L1090;
+
+L1092:	LOCSND[K]=KK;
+	 goto L1090;
+}
+
+/*  Finish constructing internal data format */
+
+/*  Having read in the database, certain things are now constructed.  PROPS are
+ *  set to zero.  We finish setting up COND by checking for forced-motion travel
+ *  entries.  The PLAC and FIXD arrays are used to set up ATLOC(N) as the first
+ *  object at location N, and LINK(OBJ) as the next object at the same location
+ *  as OBJ.  (OBJ>100 indicates that FIXED(OBJ-100)=LOC; LINK(OBJ) is still the
+ *  correct link to use.)  ABB is zeroed; it controls whether the abbreviated
+ *  description is printed.  Counts modulo 5 unless "LOOK" is used. */
+
+void write_0d(FILE* c_file, FILE* header_file, long single, char* varname)
+{
+  fprintf(c_file, "long %s = %ld;\n", varname, single);
+  fprintf(header_file, "extern long %s;\n", varname);
+}
+
+void write_1d(FILE* c_file, FILE* header_file, long array[], long dim, char* varname)
+{
+  fprintf(c_file, "long %s[] = {\n", varname);
+  for (int i = 0; i < dim; ++i)
+    {
+      if (i % 10 == 0)
+	{
+	  if (i > 0)
+	    fprintf(c_file, "\n");
+	  fprintf(c_file, "  ");
+	}
+      fprintf(c_file, "%ld, ", array[i]);
+    }
+  fprintf(c_file, "\n};\n");
+  fprintf(header_file, "extern long %s[%ld];\n", varname, dim);
+}
+
+void write_hints(FILE* c_file, FILE* header_file, long matrix[][5], long dim1, long dim2, char* varname)
+{
+  fprintf(c_file, "long %s[][%ld] = {\n", varname, dim2);
+  for (int i = 0; i < dim1; ++i)
+    {
+      fprintf(c_file, "  {");
+      for (int j = 0; j < dim2; ++j)
+	{
+	  fprintf(c_file, "%ld, ", matrix[i][j]);
+	}
+      fprintf(c_file, "},\n");
+    }
+  fprintf(c_file, "};\n");
+  fprintf(header_file, "extern long %s[%ld][%ld];\n", varname, dim1, dim2);
+}
+
+void write_files(FILE* c_file, FILE* header_file)
+{
+  // preprocessor defines for the header
+  fprintf(header_file, "#define RTXSIZ 277\n");
+  fprintf(header_file, "#define CLSMAX 12\n");
+  fprintf(header_file, "#define LOCSIZ 185\n");
+  fprintf(header_file, "#define LINSIZ 12500\n");
+  fprintf(header_file, "#define TRNSIZ 5\n");
+  fprintf(header_file, "#define TABSIZ 330\n");
+  fprintf(header_file, "#define VRBSIZ 35\n");
+  fprintf(header_file, "#define HNTSIZ 20\n");
+  fprintf(header_file, "#define TRVSIZ 885\n");
+  fprintf(header_file, "\n");
+
+  // include the header in the C file
+  fprintf(c_file, "#include \"database.h\"\n");
+  fprintf(c_file, "\n");
+  
+  // content variables
+  write_0d(c_file, header_file, LINUSE, "LINUSE");
+  write_0d(c_file, header_file, TRVS, "TRVS");
+  write_0d(c_file, header_file, CLSSES, "CLSSES");
+  write_0d(c_file, header_file, TRNVLS, "TRNVLS");
+  write_0d(c_file, header_file, TABNDX, "TABNDX");
+  write_0d(c_file, header_file, HNTMAX, "HNTMAX");
+  write_1d(c_file, header_file, PTEXT, 100 + 1, "PTEXT");
+  write_1d(c_file, header_file, RTEXT, RTXSIZ + 1, "RTEXT");
+  write_1d(c_file, header_file, CTEXT, CLSMAX + 1, "CTEXT");
+  write_1d(c_file, header_file, OBJSND, 100 + 1, "OBJSND");
+  write_1d(c_file, header_file, OBJTXT, 100 + 1, "OBJTXT");
+  write_1d(c_file, header_file, STEXT, LOCSIZ + 1, "STEXT");
+  write_1d(c_file, header_file, LTEXT, LOCSIZ + 1, "LTEXT");
+  write_1d(c_file, header_file, COND, LOCSIZ + 1, "COND");
+  write_1d(c_file, header_file, KEY, LOCSIZ + 1, "KEY");
+  write_1d(c_file, header_file, LOCSND, LOCSIZ + 1, "LOCSND");
+  write_1d(c_file, header_file, LINES, LINSIZ + 1, "LINES");
+  write_1d(c_file, header_file, CVAL, CLSMAX + 1, "CVAL");
+  write_1d(c_file, header_file, TTEXT, TRNSIZ + 1, "TTEXT");
+  write_1d(c_file, header_file, TRNVAL, TRNSIZ + 1, "TRNVAL");
+  write_1d(c_file, header_file, TRAVEL, TRVSIZ + 1, "TRAVEL");
+  write_1d(c_file, header_file, KTAB, TABSIZ + 1, "KTAB");
+  write_1d(c_file, header_file, ATAB, TABSIZ + 1, "ATAB");
+  write_1d(c_file, header_file, PLAC, 100 + 1, "PLAC");
+  write_1d(c_file, header_file, FIXD, 100 + 1, "FIXD");
+  write_1d(c_file, header_file, ACTSPK, VRBSIZ + 1, "ACTSPK");
+  write_hints(c_file, header_file, HINTS, HNTSIZ + 1, 5, "HINTS");
+}
+
+int main(int argc, char** argv)
+{
+  argc = argc;
+  argv = argv;
+
+  FILE* database = fopen("adventure.text", "r");
+  read_database(database);
+  fclose(database);
+
+  FILE* c_file = fopen("database.c", "w");
+  FILE* header_file = fopen("database.h", "w");
+  write_files(c_file, header_file);
+  fclose(c_file);
+  fclose(header_file);
+  
+  return(EXIT_SUCCESS);
+}
diff --git a/funcs.h b/funcs.h
index 34f69cd..468bc3f 100644
--- a/funcs.h
+++ b/funcs.h
@@ -1,5 +1,5 @@
 #include <stdbool.h>
-#include "database.h"
+#include "database/database.h"
 
 /*  Statement functions
  *
diff --git a/init.c b/init.c
index d33dd92..36c82b1 100644
--- a/init.c
+++ b/init.c
@@ -7,7 +7,7 @@
 #include "main.h"
 #include "share.h"
 #include "funcs.h"
-#include "database.h"
+#include "database/database.h"
 
 /*
  * Initialisation
@@ -166,216 +166,14 @@
  *	%B = Variable number of blanks
  *	%! = The entire message should be suppressed */
 
-static bool quick_init(void);
-static int raw_init(void);
-static void report(void);
-static void quick_save(void);
 static int finish_init(void);
-static void quick_io(void);
 
 void initialise(void) {
 	if (oldstyle)
 		printf("Initialising...\n");
-        if(!quick_init()){raw_init(); report(); quick_save();}
 	finish_init();
 }
 
-static int raw_init(void) {
-	printf("Couldn't find adventure.data, using adventure.text...\n");
-
-	FILE *OPENED=fopen("adventure.text","r" /* NOT binary */);
-	if(!OPENED){printf("Can't read adventure.text!\n"); exit(0);}
-	
-/*  Clear out the various text-pointer arrays.  All text is stored in array
- *  lines; each line is preceded by a word pointing to the next pointer (i.e.
- *  the word following the end of the line).  The pointer is negative if this is
- *  first line of a message.  The text-pointer arrays contain indices of
- *  pointer-words in lines.  STEXT(N) is short description of location N.
- *  LTEXT(N) is long description.  PTEXT(N) points to message for PROP(N)=0.
- *  Successive prop messages are found by chasing pointers.  RTEXT contains
- *  section 6's stuff.  CTEXT(N) points to a player-class message.  TTEXT is for
- *  section 14.  We also clear COND (see description of section 9 for details). */
-
-	/* 1001 */ for (I=1; I<=300; I++) {
-	if(I <= 100)PTEXT[I]=0;
-	if(I <= RTXSIZ)RTEXT[I]=0;
-	if(I <= CLSMAX)CTEXT[I]=0;
-	if(I <= 100)OBJSND[I]=0;
-	if(I <= 100)OBJTXT[I]=0;
-	if(I > LOCSIZ) goto L1001;
-	STEXT[I]=0;
-	LTEXT[I]=0;
-	COND[I]=0;
-	KEY[I]=0;
-	LOCSND[I]=0;
-L1001:	/*etc*/ ;
-	} /* end loop */
-
-	LINUSE=1;
-	TRVS=1;
-	CLSSES=0;
-	TRNVLS=0;
-
-/*  Start new data section.  Sect is the section number. */
-
-L1002:	SECT=GETNUM(OPENED);
-	OLDLOC= -1;
-	switch (SECT) { case 0: return(0); case 1: goto L1004; case 2: goto
-		L1004; case 3: goto L1030; case 4: goto L1040; case 5: goto L1004;
-		case 6: goto L1004; case 7: goto L1050; case 8: goto L1060; case
-		9: goto L1070; case 10: goto L1004; case 11: goto L1080; case 12:
-		break; case 13: goto L1090; case 14: goto L1004; }
-/*	      (0)  (1)  (2)  (3)  (4)  (5)  (6)  (7)  (8)  (9)
- *	     (10) (11) (12) (13) (14) */
-	BUG(9);
-
-/*  Sections 1, 2, 5, 6, 10, 14.  Read messages and set up pointers. */
-
-L1004:	KK=LINUSE;
-L1005:	LINUSE=KK;
-	LOC=GETNUM(OPENED);
-	if(LNLENG >= LNPOSN+70)BUG(0);
-	if(LOC == -1) goto L1002;
-	if(LNLENG < LNPOSN)BUG(1);
-L1006:	KK=KK+1;
-	if(KK >= LINSIZ)BUG(2);
-	LINES[KK]=GETTXT(false,false,false);
-	if(LINES[KK] != -1) goto L1006;
-	LINES[LINUSE]=KK;
-	if(LOC == OLDLOC) goto L1005;
-	OLDLOC=LOC;
-	LINES[LINUSE]= -KK;
-	if(SECT == 14) goto L1014;
-	if(SECT == 10) goto L1012;
-	if(SECT == 6) goto L1011;
-	if(SECT == 5) goto L1010;
-	if(LOC > LOCSIZ)BUG(10);
-	if(SECT == 1) goto L1008;
-
-	STEXT[LOC]=LINUSE;
-	 goto L1005;
-
-L1008:	LTEXT[LOC]=LINUSE;
-	 goto L1005;
-
-L1010:	if(LOC > 0 && LOC <= 100)PTEXT[LOC]=LINUSE;
-	 goto L1005;
-
-L1011:	if(LOC > RTXSIZ)BUG(6);
-	RTEXT[LOC]=LINUSE;
-	 goto L1005;
-
-L1012:	CLSSES=CLSSES+1;
-	if(CLSSES > CLSMAX)BUG(11);
-	CTEXT[CLSSES]=LINUSE;
-	CVAL[CLSSES]=LOC;
-	 goto L1005;
-
-L1014:	TRNVLS=TRNVLS+1;
-	if(TRNVLS > TRNSIZ)BUG(11);
-	TTEXT[TRNVLS]=LINUSE;
-	TRNVAL[TRNVLS]=LOC;
-	 goto L1005;
-
-/*  The stuff for section 3 is encoded here.  Each "from-location" gets a
- *  contiguous section of the "TRAVEL" array.  Each entry in travel is
- *  NEWLOC*1000 + KEYWORD (from section 4, motion verbs), and is negated if
- *  this is the last entry for this location.  KEY(N) is the index in travel
- *  of the first option at location N. */
-
-L1030:	LOC=GETNUM(OPENED);
-	if(LOC == -1) goto L1002;
-	NEWLOC=GETNUM(NULL);
-	if(KEY[LOC] != 0) goto L1033;
-	KEY[LOC]=TRVS;
-	 goto L1035;
-L1033:	TRVS--; TRAVEL[TRVS]= -TRAVEL[TRVS]; TRVS++;
-L1035:	L=GETNUM(NULL);
-	if(L == 0) goto L1039;
-	TRAVEL[TRVS]=NEWLOC*1000+L;
-	TRVS=TRVS+1;
-	if(TRVS == TRVSIZ)BUG(3);
-	 goto L1035;
-L1039:	TRVS--; TRAVEL[TRVS]= -TRAVEL[TRVS]; TRVS++;
-	 goto L1030;
-
-/*  Here we read in the vocabulary.  KTAB(N) is the word number, ATAB(N) is
- *  the corresponding word.  The -1 at the end of section 4 is left in KTAB
- *  as an end-marker. */
-
-L1040:	J=10000;
-	for (TABNDX=1; TABNDX<=TABSIZ; TABNDX++) {
-	KTAB[TABNDX]=GETNUM(OPENED);
-	if(KTAB[TABNDX] == -1) goto L1002;
-	J=J+7;
-	ATAB[TABNDX]=GETTXT(true,true,true);
-	} /* end loop */
-	BUG(4);
-
-/*  Read in the initial locations for each object.  Also the immovability info.
- *  plac contains initial locations of objects.  FIXD is -1 for immovable
- *  objects (including the snake), or = second loc for two-placed objects. */
-
-L1050:	OBJ=GETNUM(OPENED);
-	if(OBJ == -1) goto L1002;
-	PLAC[OBJ]=GETNUM(NULL);
-	FIXD[OBJ]=GETNUM(NULL);
-	 goto L1050;
-
-/*  Read default message numbers for action verbs, store in ACTSPK. */
-
-L1060:	VERB=GETNUM(OPENED);
-	if(VERB == -1) goto L1002;
-	ACTSPK[VERB]=GETNUM(NULL);
-	 goto L1060;
-
-/*  Read info about available liquids and other conditions, store in COND. */
-
-L1070:	K=GETNUM(OPENED);
-	if(K == -1) goto L1002;
-L1071:	LOC=GETNUM(NULL);
-	if(LOC == 0) goto L1070;
-	if(CNDBIT(LOC,K)) BUG(8);
-	COND[LOC]=COND[LOC]+SETBIT(K);
-	 goto L1071;
-
-/*  Read data for hints. */
-
-L1080:	HNTMAX=0;
-L1081:	K=GETNUM(OPENED);
-	if(K == -1) goto L1002;
-	if(K <= 0 || K > HNTSIZ)BUG(7);
-	for (I=1; I<=4; I++) {
-	HINTS[K][I] =GETNUM(NULL);
-	} /* end loop */
-	HNTMAX=(HNTMAX>K ? HNTMAX : K);
-	 goto L1081;
-
-/*  Read the sound/text info, store in OBJSND, OBJTXT, LOCSND. */
-
-L1090:	K=GETNUM(OPENED);
-	if(K == -1) goto L1002;
-	KK=GETNUM(NULL);
-	I=GETNUM(NULL);
-	if(I == 0) goto L1092;
-	OBJSND[K]=(KK>0 ? KK : 0);
-	OBJTXT[K]=(I>0 ? I : 0);
-	 goto L1090;
-
-L1092:	LOCSND[K]=KK;
-	 goto L1090;
-}
-
-/*  Finish constructing internal data format */
-
-/*  Having read in the database, certain things are now constructed.  PROPS are
- *  set to zero.  We finish setting up COND by checking for forced-motion travel
- *  entries.  The PLAC and FIXD arrays are used to set up ATLOC(N) as the first
- *  object at location N, and LINK(OBJ) as the next object at the same location
- *  as OBJ.  (OBJ>100 indicates that FIXED(OBJ-100)=LOC; LINK(OBJ) is still the
- *  correct link to use.)  ABB is zeroed; it controls whether the abbreviated
- *  description is printed.  Counts modulo 5 unless "LOOK" is used. */
-
 static int finish_init(void) {
 	for (I=1; I<=100; I++) {
 	PLACE[I]=0;
@@ -597,116 +395,3 @@ L1106:	/*etc*/ ;
 
 	return(0); /* then we won't actually return from initialisation */
 }
-
-/*  Report on amount of arrays actually used, to permit reductions. */
-
-static void report(void) {
-	for (K=1; K<=LOCSIZ; K++) {
-	KK=LOCSIZ+1-K;
-	if(LTEXT[KK] != 0) goto L1997;
-	/*etc*/ ;
-	} /* end loop */
-
-	OBJ=0;
-L1997:	for (K=1; K<=100; K++) {
-	if(PTEXT[K] != 0)OBJ=OBJ+1;
-	} /* end loop */
-
-	for (K=1; K<=TABNDX; K++) {
-	if(KTAB[K]/1000 == 2)VERB=KTAB[K]-2000;
-	} /* end loop */
-
-	for (K=1; K<=RTXSIZ; K++) {
-	J=RTXSIZ+1-K;
-	if(RTEXT[J] != 0) goto L1993;
-	/*etc*/ ;
-	} /* end loop */
-
-L1993:	SETPRM(1,LINUSE,LINSIZ);
-	SETPRM(3,TRVS,TRVSIZ);
-	SETPRM(5,TABNDX,TABSIZ);
-	SETPRM(7,KK,LOCSIZ);
-	SETPRM(9,OBJ,100);
-	SETPRM(11,VERB,VRBSIZ);
-	SETPRM(13,J,RTXSIZ);
-	SETPRM(15,CLSSES,CLSMAX);
-	SETPRM(17,HNTMAX,HNTSIZ);
-	SETPRM(19,TRNVLS,TRNSIZ);
-	RSPEAK(267);
-	TYPE0();
-}
-
-static long init_reading, init_cksum;
-static FILE *f;
-
-static void quick_item(long*);
-static void quick_array(long*, long);
-
-static bool quick_init(void) {
-	extern char *getenv();
-	char *adv = getenv("ADVENTURE");
-	f = NULL;
-	if(adv)f = fopen(adv,READ_MODE);
-	if(f == NULL)f = fopen("adventure.data",READ_MODE);
-	if(f == NULL)return(false);
-	init_reading = true;
-	init_cksum = 1;
-	quick_io();
-	if(fread(&K,sizeof(long),1,f) == 1) init_cksum -= K; else init_cksum = 1;
-	fclose(f);
-	if(init_cksum != 0)printf("Checksum error!\n");
-	return(init_cksum == 0);
-}
-
-static void quick_save(void) {
-	printf("Writing adventure.data...\n");
-	f = fopen("adventure.data",WRITE_MODE);
-	if(f == NULL){printf("Can't open file!\n"); return;}
-	init_reading = false;
-	init_cksum = 1;
-	quick_io();
-	fwrite(&init_cksum,sizeof(long),1,f);
-	fclose(f);
-}
-
-static void quick_io(void) {
-	quick_item(&LINUSE);
-	quick_item(&TRVS);
-	quick_item(&CLSSES);
-	quick_item(&TRNVLS);
-	quick_item(&TABNDX);
-	quick_item(&HNTMAX);
-	quick_array(PTEXT,100);
-	quick_array(RTEXT,RTXSIZ);
-	quick_array(CTEXT,CLSMAX);
-	quick_array(OBJSND,100);
-	quick_array(OBJTXT,100);
-	quick_array(STEXT,LOCSIZ);
-	quick_array(LTEXT,LOCSIZ);
-	quick_array(COND,LOCSIZ);
-	quick_array(KEY,LOCSIZ);
-	quick_array(LOCSND,LOCSIZ);
-	quick_array(LINES,LINSIZ);
-	quick_array(CVAL,CLSMAX);
-	quick_array(TTEXT,TRNSIZ);
-	quick_array(TRNVAL,TRNSIZ);
-	quick_array(TRAVEL,TRVSIZ);
-	quick_array(KTAB,TABSIZ);
-	quick_array(ATAB,TABSIZ);
-	quick_array(PLAC,100);
-	quick_array(FIXD,100);
-	quick_array(ACTSPK,VRBSIZ);
-	quick_array((long *)HINTS,(HNTMAX+1)*5-1);
-}
-
-static void quick_item(W)long *W; {
-	if(init_reading && fread(W,sizeof(long),1,f) != 1)return;
-	init_cksum = MOD(init_cksum*13+(*W),60000000);
-	if(!init_reading)fwrite(W,sizeof(long),1,f);
-}
-
-static void quick_array(A,N)long *A, N; { long I;
-	if(init_reading && fread(A,sizeof(long),N+1,f) != N+1)printf("Read error!\n");
-	for(I=1;I<=N;I++)init_cksum = MOD(init_cksum*13+A[I],60000000);
-	if(!init_reading && fwrite(A,sizeof(long),N+1,f)!=N+1)printf("Write error!\n");
-}
diff --git a/main.c b/main.c
index e2c24e5..53aff69 100644
--- a/main.c
+++ b/main.c
@@ -9,7 +9,7 @@
 #include <getopt.h>
 #include <signal.h>
 #include "main.h"
-#include "database.h"
+#include "database/database.h"
 #include "misc.h"
 
 long ABB[186], ATLOC[186], BLKLIN = true, DFLAG,
diff --git a/misc.c b/misc.c
index 111848e..40bb1b9 100644
--- a/misc.c
+++ b/misc.c
@@ -6,7 +6,7 @@
 #include "share.h"	/* for SETUP */
 #include "misc.h"
 #include "funcs.h"
-#include "database.h"
+#include "database/database.h"
 
 /* hack to ignore GCC Unused Result */
 #define IGNORE(r) do{if(r){}}while(0)
diff --git a/score.c b/score.c
index 4ef68ad..9bfca64 100644
--- a/score.c
+++ b/score.c
@@ -2,7 +2,7 @@
 #include "misc.h"
 #include "main.h"
 #include "share.h"
-#include "database.h"
+#include "database/database.h"
 
 /*
  * scoring and wrap-up
diff --git a/tests/Makefile b/tests/Makefile
index f7b6e2e..dddb8c2 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -14,7 +14,7 @@ all: regress
 .SUFFIXES: .chk
 
 clean:
-	rm -fr *~ adventure.text adventure.data
+	rm -fr *~ adventure.text
 
 # Show summary lines for all tests.
 testlist:
@@ -27,12 +27,12 @@ listcheck:
 # General regression testing of commands and output; look at the *.log and
 # corresponding *.chk files to see which tests this runs.
 TESTLOADS := $(shell ls -1 *.log | sed '/.log/s///')
-buildregress: adventure.data
+buildregress:
 	@for file in $(TESTLOADS); do \
 	    echo "Remaking $${file}.chk"; \
 	    advent <$${file}.log >$${file}.chk 2>&1 || exit 1; \
 	done
-regress: adventure.data
+regress:
 	@for file in $(TESTLOADS); do \
 	    $(ECHO) -n "  $${file} "; grep --text '##' $${file}.log  || echo ' ## (no description)'; \
 	    if advent < $${file}.log >/tmp/regress$$$$ 2>&1; \
@@ -41,8 +41,4 @@ regress: adventure.data
 	done
 	@rm -f /tmp/regress$$$$
 
-adventure.data: 
-	cp "$(realpath ..)"/adventure.text .
-	timeout 1 advent >/dev/null 2>&1; true
-
 # end
-- 
2.31.1


From 7e82c2f910b5ac1a9b9bb5b07741b3418423b27b Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Mon, 29 May 2017 01:16:08 -0400
Subject: [PATCH 04/16] Begin "Functional Changes" section.

---
 history.txt | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/history.txt b/history.txt
index 484d267..17127b2 100644
--- a/history.txt
+++ b/history.txt
@@ -75,6 +75,23 @@ best just to start a new numbering series while acknowledging the
 links back.  I have reverted to "Advent" to avoid a name collision
 with the BSD Games version.
 
+== Functional changes in Open Adventure ==
+
+A "seed" command has been added.  This is not intended for human use
+but as a way for game logs to set the PRNG (pseudorandom-number generator) so
+that random events (dwarf & pirate appearances, the bird's magic word)
+will be reproducible.
+
+A -l command-line option has been added. When this is given (with a
+file path argument) each command entered will be logged to the
+specified file.  Additionally, a generated "seed" command will be put
+early in the file capturing the randomized start state of the PRNG
+so that replays of the log will be reproducible.
+
+Using "seed" and -l, the distribution now includes a regression-test
+suite for the game.  Any log captured with -l (and thus containing
+a "seed" command) will replay relibly, including random events.
+
 == Sources ==
 
 [bibliography]
-- 
2.31.1


From 5ae76995d2e8d412f565481505e4c7bc37260bb1 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Mon, 29 May 2017 01:33:59 -0400
Subject: [PATCH 05/16] Simplify build: nested makefiles considered harmful.

---
 Makefile                                  | 21 ++++++++++++---------
 actions1.c                                |  2 +-
 database/adventure.text => adventure.text |  0
 database/compile.c => compile.c           |  0
 database/Makefile                         | 17 -----------------
 funcs.h                                   |  2 +-
 init.c                                    |  2 +-
 main.c                                    |  2 +-
 misc.c                                    |  2 +-
 score.c                                   |  2 +-
 10 files changed, 18 insertions(+), 32 deletions(-)
 rename database/adventure.text => adventure.text (100%)
 rename database/compile.c => compile.c (100%)
 delete mode 100644 database/Makefile

diff --git a/Makefile b/Makefile
index 435adc4..5eab9d5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,34 @@
 # Makefile for the open-source release of adventure 2.5
 
 LIBS=-lrt
-OBJS=main.o init.o actions1.o actions2.o score.o misc.o database/database.o
+OBJS=main.o init.o actions1.o actions2.o score.o misc.o database.o
 SOURCES=$(OBJS:.o=.c) COPYING NEWS README TODO advent.text control
 
 .c.o:
 	gcc -O $(DBX) -c $<
 
-advent:	$(OBJS) database
+advent:	$(OBJS)
 	gcc -Wall -std=c99 -O $(DBX) -o advent $(OBJS) $(LIBS)
 
-main.o:		main.h misc.h funcs.h database/database.h
+main.o:		main.h misc.h funcs.h database.h
 
-init.o:		misc.h main.h share.h funcs.h database/database.h
+init.o:		misc.h main.h share.h funcs.h database.h
 
-actions1.o:	misc.h main.h share.h funcs.h database/database.h
+actions1.o:	misc.h main.h share.h funcs.h database.h
 
 actions2.o:	misc.h main.h share.h funcs.h
 
-score.o:	misc.h main.h share.h database/database.h
+score.o:	misc.h main.h share.h database.h
 
-misc.o:		misc.h main.h database/database.h
+misc.o:		misc.h main.h database.h
+
+database.c database.h: compile
+	./compile
+	gcc $(OPTIONS) -O $(DBX) -c database.c
 
 clean:
-	rm -f *.o advent advent.html advent.6 adventure.data
+	rm -f *.o advent advent.html advent.6 database.[ch]
 	cd tests; $(MAKE) --quiet clean
-	cd database; $(MAKE) clean
 
 check: advent
 	cd tests; $(MAKE) --quiet
diff --git a/actions1.c b/actions1.c
index 802a130..0cf8e97 100644
--- a/actions1.c
+++ b/actions1.c
@@ -4,7 +4,7 @@
 #include "main.h"
 #include "share.h"
 #include "funcs.h"
-#include "database/database.h"
+#include "database.h"
 
 /* This stuff was broken off as part of an effort to get the main program
  * to compile without running out of memory.  We're called with a number
diff --git a/database/adventure.text b/adventure.text
similarity index 100%
rename from database/adventure.text
rename to adventure.text
diff --git a/database/compile.c b/compile.c
similarity index 100%
rename from database/compile.c
rename to compile.c
diff --git a/database/Makefile b/database/Makefile
deleted file mode 100644
index 18795ed..0000000
--- a/database/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# Makefile for the open-adventure database
-
-OBJS=compile.o
-SOURCES=$(OBJS:.o=.c) adventure.text
-OPTIONS=-ggdb -Wall -std=c99
-
-.c.o:
-	gcc $(OPTIONS) -O $(DBX) -c $<
-
-database: compile
-	./compile
-	gcc $(OPTIONS) -O $(DBX) -c database.c
-
-compile: $(OBJS)
-
-clean:
-	rm -f $(OBJS) compile database.c database.h
diff --git a/funcs.h b/funcs.h
index 468bc3f..34f69cd 100644
--- a/funcs.h
+++ b/funcs.h
@@ -1,5 +1,5 @@
 #include <stdbool.h>
-#include "database/database.h"
+#include "database.h"
 
 /*  Statement functions
  *
diff --git a/init.c b/init.c
index 36c82b1..69901c1 100644
--- a/init.c
+++ b/init.c
@@ -7,7 +7,7 @@
 #include "main.h"
 #include "share.h"
 #include "funcs.h"
-#include "database/database.h"
+#include "database.h"
 
 /*
  * Initialisation
diff --git a/main.c b/main.c
index 53aff69..e2c24e5 100644
--- a/main.c
+++ b/main.c
@@ -9,7 +9,7 @@
 #include <getopt.h>
 #include <signal.h>
 #include "main.h"
-#include "database/database.h"
+#include "database.h"
 #include "misc.h"
 
 long ABB[186], ATLOC[186], BLKLIN = true, DFLAG,
diff --git a/misc.c b/misc.c
index 40bb1b9..111848e 100644
--- a/misc.c
+++ b/misc.c
@@ -6,7 +6,7 @@
 #include "share.h"	/* for SETUP */
 #include "misc.h"
 #include "funcs.h"
-#include "database/database.h"
+#include "database.h"
 
 /* hack to ignore GCC Unused Result */
 #define IGNORE(r) do{if(r){}}while(0)
diff --git a/score.c b/score.c
index 9bfca64..4ef68ad 100644
--- a/score.c
+++ b/score.c
@@ -2,7 +2,7 @@
 #include "misc.h"
 #include "main.h"
 #include "share.h"
-#include "database/database.h"
+#include "database.h"
 
 /*
  * scoring and wrap-up
-- 
2.31.1


From d2ad61cbe1896678df6c43c08c67b1d9b769e499 Mon Sep 17 00:00:00 2001
From: "Jason S. Ninneman" <jsn@mbar.us>
Date: Sun, 28 May 2017 22:53:03 -0700
Subject: [PATCH 06/16] Remove 'compile' upon 'make clean'.

Also remove a disused rule.
---
 Makefile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 5eab9d5..d4c82b5 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ database.c database.h: compile
 	gcc $(OPTIONS) -O $(DBX) -c database.c
 
 clean:
-	rm -f *.o advent advent.html advent.6 database.[ch]
+	rm -f *.o advent advent.html advent.6 database.[ch] compile
 	cd tests; $(MAKE) --quiet clean
 
 check: advent
@@ -50,6 +50,3 @@ release: advent-$(VERS).tar.gz advent.html
 
 refresh: advent.html
 	shipper -N -w version=$(VERS) | sh -e -x
-
-database:
-	cd database; $(MAKE)
-- 
2.31.1


From 6facfe15888aedc39cfa47c8c251256bcabfe771 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Mon, 29 May 2017 08:50:17 -0400
Subject: [PATCH 07/16] MacOS port fix.

---
 Makefile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Makefile b/Makefile
index d4c82b5..362f586 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,11 @@
 # Makefile for the open-source release of adventure 2.5
 
 LIBS=-lrt
+UNAME_S := $(shell uname -s)
+ifeq ($(UNAME_S),Darwin)
+	LIBS=
+endif
+
 OBJS=main.o init.o actions1.o actions2.o score.o misc.o database.o
 SOURCES=$(OBJS:.o=.c) COPYING NEWS README TODO advent.text control
 
-- 
2.31.1


From 779a1cceae80608bb0976d20f69a6ded0d27b2d5 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Mon, 29 May 2017 09:02:02 -0400
Subject: [PATCH 08/16] Don't assume gcc.

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 362f586..8a30613 100644
--- a/Makefile
+++ b/Makefile
@@ -10,10 +10,10 @@ OBJS=main.o init.o actions1.o actions2.o score.o misc.o database.o
 SOURCES=$(OBJS:.o=.c) COPYING NEWS README TODO advent.text control
 
 .c.o:
-	gcc -O $(DBX) -c $<
+	$(CC) -O $(DBX) -c $<
 
 advent:	$(OBJS)
-	gcc -Wall -std=c99 -O $(DBX) -o advent $(OBJS) $(LIBS)
+	$(CC) -Wall -std=c99 -O $(DBX) -o advent $(OBJS) $(LIBS)
 
 main.o:		main.h misc.h funcs.h database.h
 
@@ -29,7 +29,7 @@ misc.o:		misc.h main.h database.h
 
 database.c database.h: compile
 	./compile
-	gcc $(OPTIONS) -O $(DBX) -c database.c
+	$(CC) $(OPTIONS) -O $(DBX) -c database.c
 
 clean:
 	rm -f *.o advent advent.html advent.6 database.[ch] compile
-- 
2.31.1


From 24912b237c3900e5af56b5d4d42ab70e1a3faad1 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Mon, 29 May 2017 09:08:44 -0400
Subject: [PATCH 09/16] Update history.txt.

---
 history.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/history.txt b/history.txt
index 17127b2..5fbf974 100644
--- a/history.txt
+++ b/history.txt
@@ -92,6 +92,10 @@ Using "seed" and -l, the distribution now includes a regression-test
 suite for the game.  Any log captured with -l (and thus containing
 a "seed" command) will replay relibly, including random events.
 
+The adventure.text file is no longer required at runtime.  Instead, it
+is compiled at build time to a source module containing C structures,
+which is then linked to the advent binary.
+
 == Sources ==
 
 [bibliography]
-- 
2.31.1


From bf0f604e34e90c914f19f60700d243cc8d9e9ab4 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Mon, 29 May 2017 09:14:56 -0400
Subject: [PATCH 10/16] Typo fixes.

---
 history.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/history.txt b/history.txt
index 5fbf974..d88dc70 100644
--- a/history.txt
+++ b/history.txt
@@ -9,7 +9,8 @@ The very first version was released by Crowther in 1976, in FORTRAN on
 the PDP-10 at Bolt, Beranek, and Newman. (Crowther was at the time
 writing what we could now call firmware for the earliest ARPANET
 routers.) It was a maze game based on the Colossal Cave complex in
-Kentucky, lacking the D&D-like elements now associated with the game.
+Kentucky, lacking most of the D&D-like elements now associated with
+the game.
 
 Adventure as we now know it, the ancestor of all later versions, was
 was released on a PDP-10 at the Stanford AI Lab by Don Woods in 1977
@@ -90,7 +91,7 @@ so that replays of the log will be reproducible.
 
 Using "seed" and -l, the distribution now includes a regression-test
 suite for the game.  Any log captured with -l (and thus containing
-a "seed" command) will replay relibly, including random events.
+a "seed" command) will replay reliably, including random events.
 
 The adventure.text file is no longer required at runtime.  Instead, it
 is compiled at build time to a source module containing C structures,
-- 
2.31.1


From ae3c34084f2afe7332973ab20fcaf1a29264c078 Mon Sep 17 00:00:00 2001
From: Warren Melnick <warrenmelnick@gmail.com>
Date: Mon, 29 May 2017 10:42:37 -0400
Subject: [PATCH 11/16] Test for >= gcc 4, and  change to g99 -std=gnu99 for
 the compiler if it is found.

---
 Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Makefile b/Makefile
index 8a30613..7526a71 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,10 @@ UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Darwin)
 	LIBS=
 endif
+GCCVERSIONGTEQ4 := $(shell expr `gcc -dumpversion | cut -f1 -d.` \>= 4)
+ifeq "$(GCCVERSIONGTEQ4)" "1"
+	CC=c99 --std=gnu99
+endif
 
 OBJS=main.o init.o actions1.o actions2.o score.o misc.o database.o
 SOURCES=$(OBJS:.o=.c) COPYING NEWS README TODO advent.text control
-- 
2.31.1


From 7555c5354a0db4b0eafe5e9b742068f01985860c Mon Sep 17 00:00:00 2001
From: Warren Melnick <warrenmelnick@gmail.com>
Date: Mon, 29 May 2017 10:52:51 -0400
Subject: [PATCH 12/16] Move the if for GCC 4 to an elseif so it does not
 interfere with MacOS

---
 Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 7526a71..22f1370 100644
--- a/Makefile
+++ b/Makefile
@@ -2,11 +2,10 @@
 
 LIBS=-lrt
 UNAME_S := $(shell uname -s)
+GCCVERSIONGTEQ4 := $(shell expr `gcc -dumpversion | cut -f1 -d.` \>= 4)
 ifeq ($(UNAME_S),Darwin)
 	LIBS=
-endif
-GCCVERSIONGTEQ4 := $(shell expr `gcc -dumpversion | cut -f1 -d.` \>= 4)
-ifeq "$(GCCVERSIONGTEQ4)" "1"
+else ifeq "$(GCCVERSIONGTEQ4)" "1"
 	CC=c99 --std=gnu99
 endif
 
-- 
2.31.1


From 270ecf8f02f4fc7f7186cbb9663007b562978e99 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Mon, 29 May 2017 11:39:19 -0400
Subject: [PATCH 13/16] Minor build tweaks.

---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 22f1370..7fae0ef 100644
--- a/Makefile
+++ b/Makefile
@@ -9,14 +9,14 @@ else ifeq "$(GCCVERSIONGTEQ4)" "1"
 	CC=c99 --std=gnu99
 endif
 
-OBJS=main.o init.o actions1.o actions2.o score.o misc.o database.o
-SOURCES=$(OBJS:.o=.c) COPYING NEWS README TODO advent.text control
+OBJS=main.o init.o actions1.o actions2.o score.o misc.o
+SOURCES=$(OBJS:.o=.c) COPYING NEWS README TODO adventure.text advent.text control misc.h main.h share.h funcs.h
 
 .c.o:
 	$(CC) -O $(DBX) -c $<
 
-advent:	$(OBJS)
-	$(CC) -Wall -std=c99 -O $(DBX) -o advent $(OBJS) $(LIBS)
+advent:	$(OBJS) database.o
+	$(CC) -Wall -std=c99 -O $(DBX) -o advent $(OBJS) database.o $(LIBS)
 
 main.o:		main.h misc.h funcs.h database.h
 
-- 
2.31.1


From 878aa0e455e75df8b4b81b3f55778a27b49a5cc2 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Mon, 29 May 2017 12:00:44 -0400
Subject: [PATCH 14/16] The ADVENTURE variable is no more.

---
 advent.txt | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/advent.txt b/advent.txt
index 7376fc0..f5234d0 100644
--- a/advent.txt
+++ b/advent.txt
@@ -16,13 +16,13 @@ This is the last version released by Crowther & Woods, its original
 authors, in 1995.  It has been known as "adventure 2.5" and "430-point
 adventure".
 
-This game is released as open source with the permission and encouragement of
-the authors.
+There is an 'adventure' in the BSD games package that is a C port by
+Jim Gillogly of the 1976 ancestor of this game.  To avoid a name
+collision, this game builds as 'advent', reflecting the fact that the
+PDP-10 on which it originally ran limited filenames to 6 characters.
 
-There is an 'adventure' in the BSD games package that is a C
-port of the 1976 ancestor of this game.  To avoid a name collision,
-this game builds as 'advent', reflecting the fact that the PDP-10
-on which it originally ran limited filenames to 6 characters.
+This version is released as open source with the permission and
+encouragement of the original authors.
 
 == OPTIONS ==
 
@@ -30,10 +30,6 @@ on which it originally ran limited filenames to 6 characters.
 
 -o:: Old-style.  Restores original interface, no prompt.
 
-== ENVIRONMENT VARIABLES ==
-ADVENTURE::
-   Path to the text database file describing Colossal Cave.
-
 == REPORTING BUGS ==
 Report bugs to Eric S. Raymond <esr@thyrsus.com>.  The project page is
 at http://catb.org/~esr/advent
-- 
2.31.1


From 4beb21e08fbffbca3b2745056b4fb55e626851db Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Mon, 29 May 2017 12:01:28 -0400
Subject: [PATCH 15/16] Add a qualification.

---
 advent.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/advent.txt b/advent.txt
index f5234d0..34cf115 100644
--- a/advent.txt
+++ b/advent.txt
@@ -9,8 +9,8 @@ advent - Colossal Cave Adventure
 
 == DESCRIPTION ==
 The original Colossal Cave Adventure from 1976 was the origin of all
-text adventures, dungeon-crawl games, and computer-hosted roleplaying
-games.
+text adventures, dungeon-crawl (computer) games, and computer-hosted
+roleplaying games.
 
 This is the last version released by Crowther & Woods, its original
 authors, in 1995.  It has been known as "adventure 2.5" and "430-point
-- 
2.31.1


From 519d8f07e636c3171ad8ce05e729abb0d5b3c4e1 Mon Sep 17 00:00:00 2001
From: "Jason S. Ninneman" <jsn@mbar.us>
Date: Mon, 29 May 2017 09:30:37 -0700
Subject: [PATCH 16/16] Really mean it about strict C99 compliance.

---
 Makefile   | 7 ++++---
 actions1.c | 2 +-
 main.c     | 2 ++
 misc.c     | 7 +++++++
 misc.h     | 3 +--
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 7fae0ef..4faf82e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 # Makefile for the open-source release of adventure 2.5
 
+CCFLAGS=-std=c99
 LIBS=-lrt
 UNAME_S := $(shell uname -s)
 GCCVERSIONGTEQ4 := $(shell expr `gcc -dumpversion | cut -f1 -d.` \>= 4)
@@ -13,10 +14,10 @@ OBJS=main.o init.o actions1.o actions2.o score.o misc.o
 SOURCES=$(OBJS:.o=.c) COPYING NEWS README TODO adventure.text advent.text control misc.h main.h share.h funcs.h
 
 .c.o:
-	$(CC) -O $(DBX) -c $<
+	$(CC) $(CCFLAGS) -O $(DBX) -c $<
 
 advent:	$(OBJS) database.o
-	$(CC) -Wall -std=c99 -O $(DBX) -o advent $(OBJS) database.o $(LIBS)
+	$(CC) $(CCFLAGS) -O $(DBX) -o advent $(OBJS) database.o $(LIBS)
 
 main.o:		main.h misc.h funcs.h database.h
 
@@ -32,7 +33,7 @@ misc.o:		misc.h main.h database.h
 
 database.c database.h: compile
 	./compile
-	$(CC) $(OPTIONS) -O $(DBX) -c database.c
+	$(CC) $(CCFLAGS) -O $(DBX) -c database.c
 
 clean:
 	rm -f *.o advent advent.html advent.6 database.[ch] compile
diff --git a/actions1.c b/actions1.c
index 0cf8e97..c82a7bc 100644
--- a/actions1.c
+++ b/actions1.c
@@ -523,7 +523,7 @@ L8300:	SPK=201;
 /*  This next part is shared with the "resume" code.  The two cases are
  *  distinguished by the value of kk (-1 for suspend, +1 for resume). */
 
-L8305:	DATIME(I,K);
+L8305:	DATIME(&I,&K);
 	K=I+650*K;
 	SAVWRD(KK,K);
 	K=VRSION;
diff --git a/main.c b/main.c
index e2c24e5..65726e1 100644
--- a/main.c
+++ b/main.c
@@ -8,6 +8,7 @@
 #include <stdbool.h>
 #include <getopt.h>
 #include <signal.h>
+#include <time.h>
 #include "main.h"
 #include "database.h"
 #include "misc.h"
@@ -920,4 +921,5 @@ L12400: LIMIT= -1;
 L18999: RSPEAK(SPK);
 L19000: RSPEAK(136);
 	score(0);
+	return true;
 }
diff --git a/misc.c b/misc.c
index 111848e..1e72ba7 100644
--- a/misc.c
+++ b/misc.c
@@ -2,6 +2,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <sys/time.h>
 #include "main.h"
 #include "share.h"	/* for SETUP */
 #include "misc.h"
@@ -1002,5 +1003,11 @@ L30:	if(IN)IGNORE(fread(ARR,sizeof(long),250,F));
 
 
 
+void DATIME(long* D, long* T) {
+  struct timeval tv;
+  gettimeofday(&tv, NULL);
+  *D = (long) tv.tv_sec;
+  *T = (long) tv.tv_usec;
+}
 long fIABS(N)long N; {return(N<0? -N : N);}
 long fMOD(N,M)long N, M; {return(N%M);}
diff --git a/misc.h b/misc.h
index a42a5a3..e16c308 100644
--- a/misc.h
+++ b/misc.h
@@ -1,4 +1,3 @@
-#include <time.h>
 #include <stdio.h>
 #include <stdbool.h>
 
@@ -68,7 +67,7 @@ extern void fMPINIT();
 #define MPINIT() fMPINIT()
 extern void fSAVEIO(long,long,long*);
 #define SAVEIO(OP,IN,ARR) fSAVEIO(OP,IN,ARR)
-#define DATIME(D,T) do {struct timespec ts; clock_gettime(CLOCK_REALTIME, &ts); D=ts.tv_sec, T=ts.tv_nsec;} while (0)
+extern void DATIME(long*, long*);
 extern long fIABS(long);
 #define IABS(N) fIABS(N)
 extern long fMOD(long,long);
-- 
2.31.1