X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=misc.c;h=546cf48cfb9d9aacd2d28586e77dc2102891efce;hp=18a2175e3711b2d36358f4f141068e5859709178;hb=3af993abcacd18f114e8dd54f9d3be6a3a62ea2e;hpb=7fa8757ad4bc587e7dddf1e6c0916d376b49a5f3 diff --git a/misc.c b/misc.c index 18a2175..546cf48 100644 --- a/misc.c +++ b/misc.c @@ -3,138 +3,140 @@ #include #include #include + #include "advent.h" -#include "funcs.h" #include "database.h" +#include "linenoise/linenoise.h" + +#define PERCENT 63 /* partly hide the packed encoding */ -/* hack to ignore GCC Unused Result */ -#define IGNORE(r) do{if(r){}}while(0) +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 N) -/* Print the message which starts at LINES(N). Precede it with a blank line +void SPEAK(vocab_t msg) +/* Print the message which starts at LINES[N]. Precede it with a blank line * unless game.blklin is false. */ { - long blank, casemake, I, K, L, NEG, NPARMS, PARM, PRMTYP, state; + long blank, casemake, i, nxt, neg, nparms, param, prmtyp, state; - if (N == 0) + if (msg == 0) return; blank=game.blklin; - K=N; - NPARMS=1; -L10: - L=labs(LINES[K])-1; - K=K+1; - LNLENG=0; - LNPOSN=1; - state=0; - for (I=K; I<=L; I++) { - PUTTXT(LINES[I],state,2); - } /* end loop */ - LNPOSN=0; -L30: - LNPOSN=LNPOSN+1; -L32: - if(LNPOSN > LNLENG) - goto L40; - if(INLINE[LNPOSN] != 63) - goto L30; - {long x = LNPOSN+1; PRMTYP=INLINE[x];} - /* 63 is a "%"; the next character determine the type of - * parameter: 1 (!) = suppress message completely, 29 (S) = NULL - * If PARM=1, else 'S' (optional plural ending), 33 (W) = word - * (two 30-bit values) with trailing spaces suppressed, 22 (L) or - * 31 (U) = word but map to lower/upper case, 13 (C) = word in - * lower case with first letter capitalised, 30 (T) = text ending - * with a word of -1, 65-73 (1-9) = number using that many - * characters, 12 (B) = variable number of blanks. */ - if(PRMTYP == 1) - return; - if(PRMTYP == 29) - goto L320; - if(PRMTYP == 30) - goto L340; - if(PRMTYP == 12) - goto L360; - if(PRMTYP == 33 || PRMTYP == 22 || PRMTYP == 31 || PRMTYP == 13) - goto L380; - PRMTYP=PRMTYP-64; - if(PRMTYP < 1 || PRMTYP > 9) goto L30; - SHFTXT(LNPOSN+2,PRMTYP-2); - LNPOSN=LNPOSN+PRMTYP; - PARM=labs(PARMS[NPARMS]); - NEG=0; - if(PARMS[NPARMS] < 0) - NEG=9; - /* 390 */ for (I=1; I<=PRMTYP; I++) { - LNPOSN=LNPOSN-1; - INLINE[LNPOSN]=MOD(PARM,10)+64; - if(I == 1 || PARM != 0) - goto L390; - INLINE[LNPOSN]=NEG; - NEG=0; -L390: - PARM=PARM/10; - } - LNPOSN=LNPOSN+PRMTYP; -L395: - NPARMS=NPARMS+1; - goto L32; - -L320: - SHFTXT(LNPOSN+2,-1); - INLINE[LNPOSN]=55; - if(PARMS[NPARMS] == 1) - SHFTXT(LNPOSN+1,-1); - goto L395; - -L340: - SHFTXT(LNPOSN+2,-2); - state=0; - casemake=2; -L345: - if(PARMS[NPARMS] < 0) goto L395; - {long x = NPARMS+1; if(PARMS[x] < 0) - casemake=0;} - PUTTXT(PARMS[NPARMS],state,casemake); - NPARMS=NPARMS+1; - goto L345; - -L360: - PRMTYP=PARMS[NPARMS]; - SHFTXT(LNPOSN+2,PRMTYP-2); - if(PRMTYP == 0) goto L395; - for (I=1; I<=PRMTYP; I++) { - INLINE[LNPOSN]=0; - LNPOSN=LNPOSN+1; - } - goto L395; - -L380: - SHFTXT(LNPOSN+2,-2); - state=0; - casemake= -1; - if(PRMTYP == 31) - casemake=1; - if(PRMTYP == 33) - casemake=0; - I=LNPOSN; - PUTTXT(PARMS[NPARMS],state,casemake); - {long x = NPARMS+1; PUTTXT(PARMS[x],state,casemake);} - if(PRMTYP == 13 && INLINE[I] >= 37 && INLINE[I] <= - 62)INLINE[I]=INLINE[I]-26; - NPARMS=NPARMS+2; - goto L32; - -L40: - if (blank) - TYPE0(); - blank=false; - TYPE(); - K=L+1; - if(LINES[K] >= 0) - goto L10; + nparms=1; + do { + nxt=labs(LINES[msg])-1; + msg=msg+1; + LNLENG=0; + LNPOSN=1; + state=0; + for (i = msg; i <= nxt; i++) { + PUTTXT(LINES[i],&state,2); + } + LNPOSN=0; + ++LNPOSN; + + while (LNPOSN <= LNLENG) { + if (INLINE[LNPOSN] != PERCENT) { + ++LNPOSN; + continue; + } + prmtyp = INLINE[LNPOSN+1]; + /* A "%"; the next character determine the type of + * parameter: 1 (!) = suppress message completely, 29 (S) = NULL + * If PARAM=1, else 'S' (optional plural ending), 33 (W) = word + * (two 30-bit values) with trailing spaces suppressed, 22 (L) or + * 31 (U) = word but map to lower/upper case, 13 (C) = word in + * lower case with first letter capitalised, 30 (T) = text ending + * with a word of -1, 65-73 (1-9) = number using that many + * characters, 12 (B) = variable number of blanks. */ + if (prmtyp == 1) + return; + if (prmtyp == 29) { + SHFTXT(LNPOSN+2,-1); + INLINE[LNPOSN] = 55; + if (PARMS[nparms] == 1) + SHFTXT(LNPOSN+1,-1); + ++nparms; + continue; + } + if (prmtyp == 30) { + SHFTXT(LNPOSN+2,-2); + state=0; + casemake=2; + + while (PARMS[nparms] > 0) { + if (PARMS[nparms+1] < 0) + casemake=0; + PUTTXT(PARMS[nparms],&state,casemake); + nparms=nparms+1; + } + ++nparms; + continue; + } + if (prmtyp == 12) { + prmtyp=PARMS[nparms]; + SHFTXT(LNPOSN+2,prmtyp-2); + if (prmtyp != 0) { + for (i=1; i<=prmtyp; i++) { + INLINE[LNPOSN]=0; + ++LNPOSN; + } + } + ++nparms; + continue; + } + if (prmtyp == 33 || prmtyp == 22 || prmtyp == 31 || prmtyp == 13) { + SHFTXT(LNPOSN+2,-2); + state = 0; + casemake = -1; + if (prmtyp == 31) + casemake=1; + if (prmtyp == 33) + casemake=0; + i = LNPOSN; + 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; + continue; + } + + prmtyp=prmtyp-64; + if (prmtyp < 1 || prmtyp > 9) { + ++LNPOSN; + continue; + } + SHFTXT(LNPOSN+2,prmtyp-2); + LNPOSN += prmtyp; + param=labs(PARMS[nparms]); + neg=0; + if (PARMS[nparms] < 0) + neg=9; + for (i=1; i <= prmtyp; i++) { + --LNPOSN; + INLINE[LNPOSN]=MOD(param,10)+64; + if (i != 1 && param == 0) { + INLINE[LNPOSN]=neg; + neg=0; + } + param=param/10; + } + LNPOSN += prmtyp; + ++nparms; + continue; + } + + if (blank) + TYPE0(); + blank=false; + TYPE(); + msg = nxt + 1; + } while + (LINES[msg] >= 0); } void PSPEAK(vocab_t msg,int skip) @@ -142,18 +144,20 @@ void PSPEAK(vocab_t msg,int skip) * the index of the inventory message for object. (INVEN+N+1 message * is game.prop=N message). */ { - long I, M; - - M=PTEXT[msg]; - if(skip >= 0) { - for (I=0; I<=skip; I++) { -L1: M=labs(LINES[M]); - if (LINES[M] >= 0) - goto L1; + long i, m; + + m=PTEXT[msg]; + if (skip >= 0) { + for (i=0; i <=skip; i++) { + do { + m=labs(LINES[m]); + } while + (LINES[m] >= 0); } } - SPEAK(M); + SPEAK(m); } + void RSPEAK(vocab_t i) /* Print the i-th "random" message (section 6 of database). */ { @@ -165,7 +169,7 @@ void SETPRM(long first, long p1, long p2) /* Stores parameters into the PRMCOM parms array for use by speak. P1 and P2 * are stored into PARMS(first) and PARMS(first+1). */ { - if(first >= MAXPARMS) + if (first >= MAXPARMS) BUG(29); else { PARMS[first] = p1; @@ -173,61 +177,61 @@ void SETPRM(long first, long p1, long p2) } } -#undef GETIN -#define WORD1 (*wORD1) -#define WORD1X (*wORD1X) -#define WORD2 (*wORD2) -#define WORD2X (*wORD2X) -bool fGETIN(FILE *input, long *wORD1, long *wORD1X, long *wORD2, long *wORD2X) +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 * blanks, and return it in WORD1. Chars 6 thru 10 are returned in WORD1X, in * case we need to print out the whole word in an error message. Any number of * blanks may follow the word. If a second word appears, it is returned in * WORD2 (chars 6 thru 10 in WORD2X), else WORD2 is -1. */ { - long JUNK; + long junk; for (;;) { - if(game.blklin) + if (game.blklin) TYPE0(); - MAPLIN(input); - if (feof(input)) + if (!MAPLIN(input)) return false; - WORD1=GETTXT(true,true,true); - if (game.blklin && WORD1 < 0) + *pword1=GETTXT(true,true,true); + if (game.blklin && *pword1 < 0) continue; - WORD1X=GETTXT(false,true,true); -L12: JUNK=GETTXT(false,true,true); - if(JUNK > 0) goto L12; - WORD2=GETTXT(true,true,true); - WORD2X=GETTXT(false,true,true); -L22: JUNK=GETTXT(false,true,true); - if(JUNK > 0) goto L22; - if(GETTXT(true,true,true) <= 0) + *pword1x=GETTXT(false,true,true); + do { + junk=GETTXT(false,true,true); + } while + (junk > 0); + *pword2=GETTXT(true,true,true); + *pword2x=GETTXT(false,true,true); + do { + junk=GETTXT(false,true,true); + } while + (junk > 0); + if (GETTXT(true,true,true) <= 0) return true; RSPEAK(53); } } -#define GETIN(SRC,WORD1,WORD1X,WORD2,WORD2X) fGETIN(SRC,&WORD1,&WORD1X,&WORD2,&WORD2X) long YES(FILE *input, vocab_t x, vocab_t y, vocab_t z) /* Print message X, wait for yes/no answer. If yes, print Y and return true; * if no, print Z and return false. */ { - token_t yeah, reply, junk1, junk2, junk3; - -L1: RSPEAK(x); - GETIN(input, reply,junk1,junk2,junk3); - if(reply == MAKEWD(250519) || reply == MAKEWD(25)) goto L10; - if(reply == MAKEWD(1415) || reply == MAKEWD(14)) goto L20; - RSPEAK(185); - goto L1; -L10: yeah=true; - RSPEAK(y); - return(yeah); -L20: yeah=false; - RSPEAK(z); - return(yeah); + token_t reply, junk1, junk2, junk3; + + for (;;) { + RSPEAK(x); + GETIN(input, &reply, &junk1, &junk2, &junk3); + if (reply == MAKEWD(250519) || reply == MAKEWD(25)) { + RSPEAK(y); + return true; + } + if (reply == MAKEWD(1415) || reply == MAKEWD(14)) { + RSPEAK(z); + return false; + } + RSPEAK(185); + } } /* Line-parsing routines (GETTXT, MAKEWD, PUTTXT, SHFTXT, TYPE0) */ @@ -242,13 +246,13 @@ long GETTXT(bool skip, bool onewrd, bool upper) long text; static long splitting = -1; - if(LNPOSN != splitting) + if (LNPOSN != splitting) splitting = -1; text= -1; while (true) { - if(LNPOSN > LNLENG) + if (LNPOSN > LNLENG) return(text); - if((!skip) || INLINE[LNPOSN] != 0) + if ((!skip) || INLINE[LNPOSN] != 0) break; LNPOSN=LNPOSN+1; } @@ -256,24 +260,24 @@ long GETTXT(bool skip, bool onewrd, bool upper) text=0; for (int I=1; I<=TOKLEN; I++) { text=text*64; - if(LNPOSN > LNLENG || (onewrd && INLINE[LNPOSN] == 0)) + if (LNPOSN > LNLENG || (onewrd && INLINE[LNPOSN] == 0)) continue; char current=INLINE[LNPOSN]; - if(current < 63) { + if (current < PERCENT) { splitting = -1; - if(upper && current >= 37) + if (upper && current >= 37) current=current-26; text=text+current; LNPOSN=LNPOSN+1; continue; } - if(splitting != LNPOSN) { - text=text+63; + if (splitting != LNPOSN) { + text=text+PERCENT; splitting = LNPOSN; continue; } - text=text+current-63; + text=text+current-PERCENT; splitting = -1; LNPOSN=LNPOSN+1; } @@ -295,14 +299,14 @@ token_t MAKEWD(long letters) for (long k=letters; k != 0; k=k/100) { word=word+i*(MOD(k,50)+10); i=i*64; - if(MOD(k,100) > 50)word=word+i*5; + if (MOD(k,100) > 50)word=word+i*5; } i=64L*64L*64L*64L*64L/i; word=word*i; 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 @@ -319,27 +323,27 @@ void fPUTTXT(token_t word, long *state, long casemake) alph1=13*casemake+24; alph2=26*labs(casemake)+alph1; - if(labs(casemake) > 1) + if (labs(casemake) > 1) alph1=alph2; /* alph1&2 define range of wrong-case chars, 11-36 or 37-62 or empty. */ div=64L*64L*64L*64L; w=word; for (i=1; i<=TOKLEN; i++) { - if(w <= 0 && *state == 0 && labs(casemake) <= 1) + if (w <= 0 && *state == 0 && labs(casemake) <= 1) return; byte=w/div; - if(*state != 0 || byte != 63) goto L12; - *state=63; - goto L18; - -L12: SHFTXT(LNPOSN,1); + w=(w-byte*div)*64; + if (!(*state != 0 || byte != PERCENT)) { + *state=PERCENT; + continue; + } + SHFTXT(LNPOSN,1); *state=*state+byte; - if(*state < alph2 && *state >= alph1)*state=*state-26*casemake; + if (*state < alph2 && *state >= alph1)*state=*state-26*casemake; INLINE[LNPOSN]=*state; LNPOSN=LNPOSN+1; *state=0; -L18: w=(w-byte*div)*64; } } #define PUTTXT(WORD,STATE,CASE) fPUTTXT(WORD,&STATE,CASE) @@ -353,17 +357,15 @@ void SHFTXT(long from, long delta) if (!(LNLENG < from || delta == 0)) { for (I=from; I<=LNLENG; I++) { k=I; - if(delta > 0) + if (delta > 0) k=from+LNLENG-I; j=k+delta; INLINE[j]=INLINE[k]; - } /* end loop */ + } } LNLENG=LNLENG+delta; - return; } - void TYPE0(void) /* Type a blank line. This procedure is provided as a convenience for callers * who otherwise have no use for MAPCOM. */ @@ -377,92 +379,6 @@ void TYPE0(void) return; } -/* Suspend/resume I/O routines (SAVWDS, SAVARR, SAVWRD) */ - -#undef SAVWDS -void fSAVWDS(long *W1, long *W2, long *W3, long *W4, - long *W5, long *W6, long *W7) -/* Write or read 7 variables. See SAVWRD. */ -{ - SAVWRD(0,(*W1)); - SAVWRD(0,(*W2)); - SAVWRD(0,(*W3)); - SAVWRD(0,(*W4)); - SAVWRD(0,(*W5)); - SAVWRD(0,(*W6)); - SAVWRD(0,(*W7)); - return; -} -#define SAVWDS(W1,W2,W3,W4,W5,W6,W7) fSAVWDS(&W1,&W2,&W3,&W4,&W5,&W6,&W7) - -#undef SAVARR -void fSAVARR(long arr[], long n) -/* Write or read an array of n words. See SAVWRD. */ -{ - long i; - - for (i=1; i<=n; i++) { - SAVWRD(0,arr[i]); - } - return; -} -#define SAVARR(ARR,N) fSAVARR(ARR,N) - -#undef SAVWRD -#define WORD (*wORD) -void fSAVWRD(long OP, long *wORD) { -static long BUF[250], CKSUM = 0, H1, HASH = 0, N = 0, STATE = 0; - -/* If OP<0, start writing a file, using word to initialise encryption; save - * word in the file. If OP>0, start reading a file; read the file to find - * the value with which to decrypt the rest. In either case, if a file is - * already open, finish writing/reading it and don't start a new one. If OP=0, - * read/write a single word. Words are buffered in case that makes for more - * efficient disk use. We also compute a simple checksum to catch elementary - * poking within the saved file. When we finish reading/writing the file, - * we store zero into WORD if there's no checksum error, else nonzero. */ - - if(OP != 0){long ifvar; ifvar=(STATE); switch (ifvar<0? -1 : ifvar>0? 1 : - 0) { case -1: goto L30; case 0: goto L10; case 1: goto L30; }} - if(STATE == 0)return; - if(N == 250)SAVEIO(1,STATE > 0,BUF); - N=MOD(N,250)+1; - H1=MOD(HASH*1093L+221573L,1048576L); - HASH=MOD(H1*1093L+221573L,1048576L); - H1=MOD(H1,1234)*765432+MOD(HASH,123); - N--; - if(STATE > 0)WORD=BUF[N]+H1; - BUF[N]=WORD-H1; - N++; - CKSUM=MOD(CKSUM*13+WORD,1000000000L); - return; - -L10: STATE=OP; - SAVEIO(0,STATE > 0,BUF); - N=1; - if(STATE > 0) goto L15; - HASH=MOD(WORD,1048576L); - BUF[0]=1234L*5678L-HASH; -L13: CKSUM=BUF[0]; - return; - -L15: SAVEIO(1,true,BUF); - HASH=MOD(1234L*5678L-BUF[0],1048576L); - goto L13; - -L30: if(N == 250)SAVEIO(1,STATE > 0,BUF); - N=MOD(N,250)+1; - if(STATE > 0) goto L32; - N--; BUF[N]=CKSUM; N++; - SAVEIO(1,false,BUF); -L32: N--; WORD=BUF[N]-CKSUM; N++; - SAVEIO(-1,STATE > 0,BUF); - STATE=0; - return; -} -#undef WORD -#define SAVWRD(OP,WORD) fSAVWRD(OP,&WORD) - /* Data structure routines */ long VOCAB(long id, long init) @@ -476,24 +392,22 @@ long VOCAB(long id, long init) long i, lexeme; for (i=1; i<=TABSIZ; i++) { - if(KTAB[i] == -1) - goto L2; - if(init >= 0 && KTAB[i]/1000 != init) - goto L1; - if(ATAB[i] == id) - goto L3; -L1:; + if (KTAB[i] == -1) { + lexeme= -1; + if (init < 0) + return(lexeme); + BUG(5); + } + if (init >= 0 && KTAB[i]/1000 != init) + continue; + if (ATAB[i] == id) { + lexeme=KTAB[i]; + if (init >= 0) + lexeme=MOD(lexeme,1000); + return(lexeme); + } } BUG(21); - -L2: lexeme= -1; - if(init < 0) - return(lexeme); - BUG(5); - -L3: lexeme=KTAB[i]; - if(init >= 0)lexeme=MOD(lexeme,1000); - return(lexeme); } void DSTROY(long object) @@ -522,14 +436,11 @@ void MOVE(long object, long where) { long from; - if(object > NOBJECTS) - goto L1; - from=game.place[object]; - goto L2; -L1: - from=game.fixed[object-NOBJECTS]; -L2: - if(from > 0 && from <= 300) + if (object > NOBJECTS) + from=game.fixed[object-NOBJECTS]; + else + from=game.place[object]; + if (from > 0 && from <= 300) CARRY(object,from); DROP(object,where); } @@ -549,39 +460,39 @@ void CARRY(long object, long where) { long temp; - if(object <= NOBJECTS) { - if(game.place[object] == -1) + if (object <= NOBJECTS) { + if (game.place[object] == -1) return; game.place[object]= -1; game.holdng=game.holdng+1; } - if(game.atloc[where] == object) { + if (game.atloc[where] == object) { game.atloc[where]=game.link[object]; return; } temp=game.atloc[where]; -L7: if(game.link[temp] == object) - goto L8; - temp=game.link[temp]; - goto L7; -L8: game.link[temp]=game.link[object]; + while (game.link[temp] != object) { + temp=game.link[temp]; + } + game.link[temp]=game.link[object]; } void DROP(long object, long where) /* Place an object at a given loc, prefixing it onto the game.atloc list. Decr * game.holdng if the object was being toted. */ { - if(object > NOBJECTS) - goto L1; - if(game.place[object] == -1) - game.holdng=game.holdng-1; - game.place[object]=where; - goto L2; -L1: game.fixed[object-NOBJECTS]=where; -L2: if(where <= 0) + if (object > NOBJECTS) + game.fixed[object-NOBJECTS] = where; + else + { + if (game.place[object] == -1) + --game.holdng; + game.place[object] = where; + } + if (where <= 0) return; - game.link[object]=game.atloc[where]; - game.atloc[where]=object; + game.link[object] = game.atloc[where]; + game.atloc[where] = object; } long ATDWRF(long where) @@ -592,13 +503,13 @@ long ATDWRF(long where) long at, i; at =0; - if(game.dflag < 2) + if (game.dflag < 2) return(at); at = -1; for (i=1; i<=NDWARVES-1; i++) { - if(game.dloc[i] == where) + if (game.dloc[i] == where) return i; - if(game.dloc[i] != 0) + if (game.dloc[i] != 0) at=0; } return(at); @@ -610,7 +521,7 @@ long ATDWRF(long where) long SETBIT(long bit) /* Returns 2**bit for use in constructing bit-masks. */ { - return(2 << bit); + return(1 << bit); } bool TSTBIT(long mask, int bit) @@ -699,11 +610,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; + 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 @@ -730,17 +642,28 @@ 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) + if (!oldstyle && !isatty(1)) 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)); @@ -748,12 +671,14 @@ void MAPLIN(FILE *fp) IGNORE(fputs(rawbuf, stdout)); strcpy(INLINE+1, rawbuf); LNLENG=0; - for (I=1; I<=(long)sizeof(INLINE) && INLINE[I]!=0; I++) { - VAL=INLINE[I]+1; - INLINE[I]=MAP1[VAL]; - if(INLINE[I] != 0)LNLENG=I; - } /* end loop */ + for (i=1; i<=(long)sizeof(INLINE) && INLINE[i]!=0; i++) { + val=INLINE[i]+1; + INLINE[i]=ascii_to_advent[val]; + if (INLINE[i] != 0) + LNLENG=i; + } LNPOSN=1; + return true; } } @@ -764,90 +689,19 @@ void TYPE(void) { long i; - if(LNLENG == 0) { + if (LNLENG == 0) { printf("\n"); 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 - * file. (ARR is a 250-integer array.) If OP<0, finish reading/writing the - * file. (Finishing writing can be a no-op if a "stop" statement does it - * automatically. Finishing reading can be a no-op as long as a subsequent - * SAVEIO(0,false,X) will still work.) */ -{ - static FILE *fp = NULL; - char name[50]; - - switch (op < 0 ? -1 : (op > 0 ? 1 : 0)) - { - case -1: - fclose(fp); - break; - case 0: - while (fp == NULL) { - printf("\nFile name: "); - IGNORE(fgets(name, sizeof(name), stdin)); - fp = fopen(name,(in ? READ_MODE : WRITE_MODE)); - if(fp == NULL) - printf("Can't open file %s, try again.\n", name); - } - break; - case 1: - if (in) - IGNORE(fread(arr,sizeof(long),250,fp)); - else - IGNORE(fwrite(arr,sizeof(long),250,fp)); - break; - } -} - void DATIME(long* d, long* t) { struct timeval tv;