Eliminate globals.

[open-adventure.git] / main.c

diff --git a/main.c b/main.c
index bdbb57524f69232ed15be5e31473e722c3f3e51d..c6a1eef1e7537d82317435a3e5401feea464080e 100644 (file)
--- a/main.c
+++ b/main.c
@@ -19,14 +19,14 @@ char rawbuf[LINESIZE], INLINE[LINESIZE+1], MAP1[129], MAP2[129];
 
 long AMBER, ATTACK, AXE, BACK, BATTER, BEAR, BIRD, BLOOD,
                BOTTLE, CAGE, CAVE, CAVITY, CHAIN, CHASM, CHEST,
 
 long AMBER, ATTACK, AXE, BACK, BATTER, BEAR, BIRD, BLOOD,
                BOTTLE, CAGE, CAVE, CAVITY, CHAIN, CHASM, CHEST,

-               CLAM, COINS, DALTLC, DOOR, DPRSSN, DRAGON, DWARF, EGGS,
+               CLAM, COINS, DOOR, DPRSSN, DRAGON, DWARF, EGGS,

                EMRALD, ENTER, ENTRNC, FIND, FISSUR, FOOD,
                GRATE, HINT, I, INVENT, J, JADE, K, KEYS,
                EMRALD, ENTER, ENTRNC, FIND, FISSUR, FOOD,
                GRATE, HINT, I, INVENT, J, JADE, K, KEYS,

-               KNIFE, L, LAMP, LOCK, LOOK, MAGZIN, MAXDIE, MAXTRS,
-               MESSAG, MIRROR, MXSCOR, NUGGET, NUL, OGRE, OIL, OYSTER,
+               KNIFE, L, LAMP, LOCK, LOOK, MAGZIN, MAXDIE,
+               MESSAG, MIRROR, NUGGET, NUL, OGRE, OIL, OYSTER,

                PEARL, PILLOW, PLANT, PLANT2, PYRAM, RESER, ROD, ROD2,
                RUBY, RUG, SAPPH, SAY, SCORE, SECT, SIGN, SNAKE, SPK,
                PEARL, PILLOW, PLANT, PLANT2, PYRAM, RESER, ROD, ROD2,
                RUBY, RUG, SAPPH, SAY, SCORE, SECT, SIGN, SNAKE, SPK,

-               STEPS, STICK, STREAM, THROW, TK[21], TRIDNT, TROLL, TROLL2,
+               STEPS, STICK, STREAM, THROW, TRIDNT, TROLL, TROLL2,

                URN, V1, V2, VASE, VEND,
                VOLCAN, VRSION = 25, WATER, WD1, WD1X, WD2, WD2X;
 FILE  *logfp;
                URN, V1, V2, VASE, VEND,
                VOLCAN, VRSION = 25, WATER, WD1, WD1X, WD2, WD2X;
 FILE  *logfp;


@@ -155,6 +155,7 @@ static bool fallback_handler(char *buf)
 static bool do_command(FILE *cmdin) {
        long LL, KQ, VERB, KK, K2;
        long obj;
 static bool do_command(FILE *cmdin) {
        long LL, KQ, VERB, KK, K2;
        long obj;

+       long TK[21];

        static long IGO = 0;
 
 /*  Can't leave cave once it's closing (except by main office). */
        static long IGO = 0;
 
 /*  Can't leave cave once it's closing (except by main office). */