archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Also, make output from replays easier to interpret by adding prompts.
This commit is contained in:
Eric S. Raymond 2017-05-23 22:29:24 -04:00
parent f72141fbe3
commit f9eb6383f1
5 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
actions1.c
View file

@ -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;

8
init.c
View file

@ -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);
}

2
main.c
View file

@ -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,

4
misc.c
View file

@ -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;

2
share.h
View file

@ -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,