X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=misc.c;h=0eae1623a25bc4c95539df1825435ff628087f5d;hb=63e971fc4cfc4d7a5638da032326eaf016c62719;hp=cfca544393d7c064baa504efae952c2e8c8d8928;hpb=c8a231275555289cbfe215e7a4f49930eff691f2;p=open-adventure.git diff --git a/misc.c b/misc.c index cfca544..0eae162 100644 --- a/misc.c +++ b/misc.c @@ -13,6 +13,10 @@ #define PERCENT 63 /* partly hide the packed encoding */ +const char advent_to_ascii[] = {0, 32, 33, 34, 39, 40, 41, 42, 43, 44, 45, 46, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 37, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 0, 1, 2, 3, 4, 5, 6, 7, 8, 0, 0, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 35, 36, 38, 47, 58, 59, 60, 61, 62, 63, 64, 91, 92, 93, 94, 95, 96, 123, 124, 125, 126, 0}; +/* Rendered from the now-gone MPINIT() function */ +const char ascii_to_advent[] = {0, 74, 75, 76, 77, 78, 79, 80, 81, 82, 0, 0, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 0, 1, 2, 106, 107, 63, 108, 3, 4, 5, 6, 7, 8, 9, 10, 109, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 110, 111, 112, 113, 114, 115, 116, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 117, 118, 119, 120, 121, 122, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 123, 124, 125, 126, 83}; + /* I/O routines (SPEAK, PSPEAK, RSPEAK, SETPRM, GETIN, YES) */ void SPEAK(vocab_t msg) @@ -32,7 +36,7 @@ void SPEAK(vocab_t msg) LNPOSN=1; state=0; for (i = msg; i <= nxt; i++) { - PUTTXT(LINES[i],state,2); + PUTTXT(LINES[i],&state,2); } LNPOSN=0; ++LNPOSN; @@ -69,7 +73,7 @@ void SPEAK(vocab_t msg) while (PARMS[nparms] > 0) { if (PARMS[nparms+1] < 0) casemake=0; - PUTTXT(PARMS[nparms],state,casemake); + PUTTXT(PARMS[nparms],&state,casemake); nparms=nparms+1; } ++nparms; @@ -96,8 +100,8 @@ void SPEAK(vocab_t msg) if (prmtyp == 33) casemake=0; i = LNPOSN; - PUTTXT(PARMS[nparms],state,casemake); - PUTTXT(PARMS[nparms+1],state,casemake); + PUTTXT(PARMS[nparms],&state,casemake); + PUTTXT(PARMS[nparms+1],&state,casemake); if (prmtyp == 13 && INLINE[i] >= 37 && INLINE[i] <= 62) INLINE[i] -= 26; nparms += 2; @@ -176,7 +180,7 @@ void SETPRM(long first, long p1, long p2) } } -bool fGETIN(FILE *input, +bool GETIN(FILE *input, long *pword1, long *pword1x, long *pword2, long *pword2x) /* Get a command from the adventurer. Snarf out the first word, pad it with @@ -190,8 +194,7 @@ bool fGETIN(FILE *input, for (;;) { if (game.blklin) TYPE0(); - MAPLIN(input); - if (feof(input)) + if (!MAPLIN(input)) return false; *pword1=GETTXT(true,true,true); if (game.blklin && *pword1 < 0) @@ -221,7 +224,7 @@ long YES(FILE *input, vocab_t x, vocab_t y, vocab_t z) for (;;) { RSPEAK(x); - GETIN(input, reply,junk1,junk2,junk3); + GETIN(input, &reply, &junk1, &junk2, &junk3); if (reply == MAKEWD(250519) || reply == MAKEWD(25)) { RSPEAK(y); return true; @@ -306,7 +309,7 @@ token_t MAKEWD(long letters) return word; } -void fPUTTXT(token_t word, long *state, long casemake) +void PUTTXT(token_t word, long *state, long casemake) /* Unpack the 30-bit value in word to obtain up to TOKLEN (currently * 5) integer-encoded chars, and store them in inline starting at * LNPOSN. If LNLENG>=LNPOSN, shift existing characters to the right @@ -695,11 +698,12 @@ void BUG(long num) exit(0); } -/* Machine dependent routines (MAPLIN, TYPE, MPINIT, SAVEIO) */ +/* Machine dependent routines (MAPLIN, TYPE, SAVEIO) */ -void MAPLIN(FILE *fp) +bool MAPLIN(FILE *fp) { long i, val; + bool eof; /* Read a line of input, from the specified input source, * translate the chars to integers in the range 0-126 and store @@ -726,18 +730,26 @@ void MAPLIN(FILE *fp) * and is not changed thereafter unless the routines on this page choose * to do so. */ - if (MAP2[1] == 0) - MPINIT(); - - if (!oldstyle && fp == stdin) - fputs("> ", stdout); do { - IGNORE(fgets(rawbuf,sizeof(rawbuf)-1,fp)); + if (oldstyle) { + IGNORE(fgets(rawbuf,sizeof(rawbuf)-1,fp)); + eof = (feof(fp)); + } else { + char *cp = linenoise("> "); + eof = (cp == NULL); + if (!eof) { + strncpy(rawbuf, cp, sizeof(rawbuf)-1); + linenoiseHistoryAdd(rawbuf); + strncat(rawbuf, "\n", sizeof(rawbuf)-1); + linenoiseFree(cp); + } + } } while - (!feof(fp) && rawbuf[0] == '#'); - if (feof(fp)) { + (!eof && rawbuf[0] == '#'); + if (eof) { if (logfp && fp == stdin) fclose(logfp); + return false; } else { if (logfp && fp == stdin) IGNORE(fputs(rawbuf, logfp)); @@ -747,11 +759,12 @@ void MAPLIN(FILE *fp) LNLENG=0; for (i=1; i<=(long)sizeof(INLINE) && INLINE[i]!=0; i++) { val=INLINE[i]+1; - INLINE[i]=MAP1[val]; + INLINE[i]=ascii_to_advent[val]; if (INLINE[i] != 0) LNLENG=i; } LNPOSN=1; + return true; } } @@ -767,51 +780,14 @@ void TYPE(void) return; } - if (MAP2[1] == 0) - MPINIT(); for (i=1; i<=LNLENG; i++) { - INLINE[i]=MAP2[INLINE[i]+1]; + INLINE[i]=advent_to_ascii[INLINE[i]+1]; } INLINE[LNLENG+1]=0; printf("%s\n", INLINE+1); return; } -void MPINIT(void) -{ - long first, i, j, last, val; - static long RUNS[7][2] = { {32,34}, {39,46}, {65,90}, {97,122}, - {37,37}, {48,57}, {0,126} }; - for (i=1; i<=128; i++) { - MAP1[i]= -1; - } - val=0; - for (i=0; i<7; i++) { - first =RUNS[i][0]; - last = RUNS[i][1]; - for (j=first; j<=last; j++) { - j++; - if (MAP1[j] < 0) { - MAP1[j]=val; - ++val; - } - j--; - } - } - MAP1[128]=MAP1[10]; - /* For this version, tab (9) maps to space (32), so del (127) - * uses tab's value */ - MAP1[10]=MAP1[33]; - MAP1[11]=MAP1[33]; - - for (i=0; i<=126; i++) { - i++; val=MAP1[i]+1; i--; - MAP2[val] = i*('B'-'A'); - if (i >= 64) - MAP2[val]=(i-64)*('B'-'A')+'@'; - } -} - void fSAVEIO(long op, long in, long arr[]) /* If OP=0, ask for a file name and open a file. (If IN=true, the file is for * input, else output.) If OP>0, read/write ARR from/into the previously-opened