Revert a variable name previously changed to be out of the way.

Also, make output from replays easier to interpret by adding prompts.

diff --git a/actions1.c b/actions1.c
index b84d62221b610d2291fb4283a75b32d49dce6476..2c6885c5864938236634cfd7a6a57fe644196753 100644 (file)
--- a/actions1.c
+++ b/actions1.c
@@ -23,7 +23,7 @@ int action(FILE *input, long STARTAT) {
        BUG(99);
 
 L4000: VERB=K;
-       game.spk=ACTVERB[VERB];
+       game.spk=ACTSPK[VERB];
        if(WD2 > 0 && VERB != SAY) return(2800);
        if(VERB == SAY)OBJ=WD2;
        if(OBJ > 0) goto L4090;

diff --git a/init.c b/init.c
index bde05122f16cace6c633c33c9cce7b08a11e4525..65a47d5307d2c2829f4e2957e9cad0f80baef15f 100644 (file)
--- a/init.c
+++ b/init.c
@@ -19,7 +19,7 @@
  *     185 locations (LTEXT, STEXT, KEY, COND, ABB, ATLOC, LOCSND, LOCSIZ).
  *     100 objects (PLAC, PLACE, FIXD, FIXED, LINK (TWICE), PTEXT, PROP,
  *                    OBJSND, OBJTXT).
- *      35 "action" verbs (ACTVERB, VRBSIZ).
+ *      35 "action" verbs (ACTSPK, VRBSIZ).
  *     277 random messages (RTEXT, RTXSIZ).
  *      12 different player classifications (CTEXT, CVAL, CLSMAX).
  *      20 hints (HINTLC, HINTED, HINTS, HNTSIZ).
@@ -324,11 +324,11 @@ L1050:    OBJ=GETNUM(OPENED);
        FIXD[OBJ]=GETNUM(NULL);
         goto L1050;
 
-/*  Read default message numbers for action verbs, store in ACTVERB. */
+/*  Read default message numbers for action verbs, store in ACTSPK. */
 
 L1060: VERB=GETNUM(OPENED);
        if(VERB == -1) goto L1002;
-       ACTVERB[VERB]=GETNUM(NULL);
+       ACTSPK[VERB]=GETNUM(NULL);
         goto L1060;
 
 /*  Read info about available liquids and other conditions, store in COND. */
@@ -697,7 +697,7 @@ static void quick_io(void) {
        quick_array(ATAB,TABSIZ);
        quick_array(PLAC,100);
        quick_array(FIXD,100);
-       quick_array(ACTVERB,VRBSIZ);
+       quick_array(ACTSPK,VRBSIZ);
        quick_array((long *)HINTS,(HNTMAX+1)*5-1);
 }
 

diff --git a/main.c b/main.c
index c0db18924314aa58b2fb258375191e8c5a6b2bd2..2027607c15736d32e4c34100b0116435f15be4fc 100644 (file)
--- a/main.c
+++ b/main.c
@@ -18,7 +18,7 @@ long ABB[186], ATAB[331], ATLOC[186],
                TABSIZ = 330;
 signed char INLINE[LINESIZE+1], MAP1[129], MAP2[129];
 
-long ACTVERB[36], AMBER, ATTACK, AXE, BACK, BATTER, BEAR, BIRD, BLOOD,
+long ACTSPK[36], AMBER, ATTACK, AXE, BACK, BATTER, BEAR, BIRD, BLOOD,
                 BOTTLE, CAGE, CAVE, CAVITY, CHAIN, CHASM, CHEST, CHLOC, CHLOC2,
                CLAM, CLSMAX = 12, CLSSES,
                COINS, COND[186], CONDS, CTEXT[13], CVAL[13], DALTLC,

diff --git a/misc.c b/misc.c
index 77fdd222e1221d36fa15b1220a07c1ec25a1161f..1bc963b0d465ca07d99108b0570e363a36cde481 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -894,8 +894,10 @@ long I, VAL;
        } else {
                if (logfp)
                        IGNORE(fputs(INLINE+1, logfp));
-               else if (!isatty(0))
+               else if (!isatty(0)) {
+                       IGNORE(fputs("> ", stdout));
                        IGNORE(fputs(INLINE+1, stdout));
+               }
                LNLENG=0;
                for (I=1; I<=sizeof(INLINE) && INLINE[I]!=0; I++) {
                VAL=INLINE[I]+1;

diff --git a/share.h b/share.h
index cf8693b7eb8e25c8e6a9c3c01ecc61251c24ba6c..ccb6a454d4a12b53b6cf062ae2a19de789c69b0f 100644 (file)
--- a/share.h
+++ b/share.h
@@ -1,5 +1,5 @@
 extern void score(long);
-extern long ACTVERB[], AMBER, ATTACK, AXE, BACK, BATTER, BEAR,
+extern long ACTSPK[], AMBER, ATTACK, AXE, BACK, BATTER, BEAR,
    BIRD, BLOOD,
    BOTTLE, CAGE, CAVE, CAVITY, CHAIN, CHASM, CHEST, CHLOC, CHLOC2,
    CLAM, CLSMAX, CLSSES, COINS, COND[], CONDS, CTEXT[], CVAL[], DALTLC,