Factor out handling of variables populated from the database.

[open-adventure.git] / main.c

diff --git a/main.c b/main.c
index d84e4f2ad85a9aa54a1d624162e273b91a401251..a72d3b55d88211a314a8253212628b42ed950887 100644 (file)
--- 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;