Localize KK.

diff --git a/actions1.c b/actions1.c
index e887e569bafce5edef43070dd97527b676b601b8..100ef83608950d9368bf7c8407e4f7a444014d33 100644 (file)
--- a/actions1.c
+++ b/actions1.c
@@ -15,6 +15,7 @@
  */
 
 int action(FILE *input, long STARTAT, long verb, long obj) {
  */
 
 int action(FILE *input, long STARTAT, long verb, long obj) {

+       int kk;

        switch(STARTAT) {
           case 4000: goto L4000;
           case 4090: goto L4090;
        switch(STARTAT) {
           case 4000: goto L4000;
           case 4090: goto L4090;


@@ -517,14 +518,14 @@ L8300:    SPK=201;
        RSPEAK(260);
        if(!YES(input,200,54,54)) return(2012);
        game.saved=game.saved+5;
        RSPEAK(260);
        if(!YES(input,200,54,54)) return(2012);
        game.saved=game.saved+5;

-       KK= -1;
+       kk= -1;

 
 /*  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);
        K=I+650*K;
 
 /*  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);
        K=I+650*K;

-       SAVWRD(KK,K);
+       SAVWRD(kk,K);

        K=VRSION;
        SAVWRD(0,K);
        if(K != VRSION) goto L8312;
        K=VRSION;
        SAVWRD(0,K);
        if(K != VRSION) goto L8312;


@@ -552,17 +553,17 @@ L8305:    DATIME(&I,&K);
        SAVARR(game.odloc,NDWARVES);
        SAVARR(game.place,NOBJECTS);
        SAVARR(game.prop,NOBJECTS);
        SAVARR(game.odloc,NDWARVES);
        SAVARR(game.place,NOBJECTS);
        SAVARR(game.prop,NOBJECTS);

-       SAVWRD(KK,K);
+       SAVWRD(kk,K);

        if(K != 0) goto L8318;
        K=NUL;
        game.zzword=RNDVOC(3,game.zzword);
        if(K != 0) goto L8318;
        K=NUL;
        game.zzword=RNDVOC(3,game.zzword);

-       if(KK > 0) return(8);
+       if(kk > 0) return(8);

        RSPEAK(266);
        exit(0);
 
 /*  Resume.  Read a suspended game back from a file. */
 
        RSPEAK(266);
        exit(0);
 
 /*  Resume.  Read a suspended game back from a file. */
 

-L8310: KK=1;
+L8310: kk=1;

        if(game.loc == 1 && game.abbrev[1] == 1) goto L8305;
        RSPEAK(268);
        if(!YES(input,200,54,54)) return(2012);
        if(game.loc == 1 && game.abbrev[1] == 1) goto L8305;
        RSPEAK(268);
        if(!YES(input,200,54,54)) return(2012);

diff --git a/advent.h b/advent.h
index 007217555f1e06e7b4a980d80b34c3ad99e49d0c..824c4967d37dbfd33d152597555553f33ff1da77 100644 (file)
--- a/advent.h
+++ b/advent.h
@@ -134,9 +134,8 @@ extern void score(long);
 extern long AMBER, ATTACK, AXE, BACK, BATTER, BEAR,
    BIRD, BLOOD, BOTTLE, CAGE, CAVE, CAVITY, CHAIN, CHASM, CHEST,
    CLAM, COINS, DALTLC, DOOR, DPRSSN, DRAGON, DWARF, EGGS,
 extern long AMBER, ATTACK, AXE, BACK, BATTER, BEAR,
    BIRD, BLOOD, BOTTLE, CAGE, CAVE, CAVITY, CHAIN, CHASM, CHEST,
    CLAM, COINS, DALTLC, DOOR, DPRSSN, DRAGON, DWARF, EGGS,

-   EMRALD, ENTER, ENTRNC, FIND, FISSUR, FOOD,
-   GRATE, HINT, I, INVENT, IGO, J, JADE, K, K2, KEYS, KK,
-   KNIFE, L, LAMP, LOCK, LOOK,
+   EMRALD, ENTER, ENTRNC, FIND, FISSUR, FOOD, GRATE, HINT, I, INVENT,
+   IGO, J, JADE, K, K2, KEYS, KNIFE, L, LAMP, LOCK, LOOK,

    MAGZIN, MAXDIE, MAXTRS, MESSAG, MIRROR, MXSCOR, NUGGET, NUL,
    OGRE, OIL, OLDOBJ, OYSTER, PANIC, PEARL, PILLOW, PLANT, PLANT2, PYRAM,
    RESER, ROD, ROD2, RUBY, RUG, SAPPH, SAY,
    MAGZIN, MAXDIE, MAXTRS, MESSAG, MIRROR, MXSCOR, NUGGET, NUL,
    OGRE, OIL, OLDOBJ, OYSTER, PANIC, PEARL, PILLOW, PLANT, PLANT2, PYRAM,
    RESER, ROD, ROD2, RUBY, RUG, SAPPH, SAY,

diff --git a/main.c b/main.c
index a90f77af7e9c0174fe9fa12faa3ad2ae625ba21e..2d7f09d72a239cd5d0c72724e4b93fe9cda1f3f0 100644 (file)
--- a/main.c
+++ b/main.c
@@ -21,7 +21,7 @@ long AMBER, ATTACK, AXE, BACK, BATTER, BEAR, BIRD, BLOOD,
                BOTTLE, CAGE, CAVE, CAVITY, CHAIN, CHASM, CHEST,
                CLAM, COINS, DALTLC, DOOR, DPRSSN, DRAGON, DWARF, EGGS,
                EMRALD, ENTER, ENTRNC, FIND, FISSUR, FOOD,
                BOTTLE, CAGE, CAVE, CAVITY, CHAIN, CHASM, CHEST,
                CLAM, COINS, DALTLC, DOOR, DPRSSN, DRAGON, DWARF, EGGS,
                EMRALD, ENTER, ENTRNC, FIND, FISSUR, FOOD,

-               GRATE, HINT, I, INVENT, IGO, J, JADE, K, K2, KEYS, KK,
+               GRATE, HINT, I, INVENT, IGO, J, JADE, K, K2, KEYS,

                KNIFE, L, LAMP, LOCK, LOOK, MAGZIN, MAXDIE, MAXTRS,
                MESSAG, MIRROR, MXSCOR, NUGGET, NUL, OGRE, OIL, OYSTER,
                PEARL, PILLOW, PLANT, PLANT2, PYRAM, RESER, ROD, ROD2,
                KNIFE, L, LAMP, LOCK, LOOK, MAGZIN, MAXDIE, MAXTRS,
                MESSAG, MIRROR, MXSCOR, NUGGET, NUL, OGRE, OIL, OYSTER,
                PEARL, PILLOW, PLANT, PLANT2, PYRAM, RESER, ROD, ROD2,


@@ -153,7 +153,7 @@ static bool fallback_handler(char *buf)
 }
 
 static bool do_command(FILE *cmdin) {
 }
 
 static bool do_command(FILE *cmdin) {

-       long LL, KQ, VERB;
+    long LL, KQ, VERB, KK;

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