Apply further polish and add in a couple of missing size variables.

[open-adventure.git] / database.h

diff --git a/database.h b/database.h
index c9b516747f60a488813f55d82f2436b792b5a706..0c253318cb8c6c9b90a8346213a092e32b7ac812 100644 (file)
--- 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];