X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=misc.c;h=784ae534320d0acb01224a1c7ef463d7af8a6007;hb=62ee15c892eb1cd1e0333ff8d83888765923e1b4;hp=1224bc0cf4e56ad4ad669b5d83a644fd11737aa2;hpb=ab46b5261b3069badea188418c4e3254caa2aa43;p=open-adventure.git diff --git a/misc.c b/misc.c index 1224bc0..784ae53 100644 --- a/misc.c +++ b/misc.c @@ -12,17 +12,17 @@ /* I/O routines (SPEAK, PSPEAK, RSPEAK, SETPRM, GETIN, YES) */ -void SPEAK(long N) { +void SPEAK(vocab_t N) { long BLANK, CASE, I, K, L, NEG, NPARMS, PARM, PRMTYP, STATE; /* Print the message which starts at LINES(N). Precede it with a blank line - * unless BLKLIN is false. */ + * unless game.blklin is false. */ if(N == 0)return; - BLANK=BLKLIN; + BLANK=game.blklin; K=N; NPARMS=1; -L10: L=IABS(LINES[K])-1; +L10: L=labs(LINES[K])-1; K=K+1; LNLENG=0; LNPOSN=1; @@ -52,7 +52,7 @@ L32: if(LNPOSN > LNLENG) goto L40; if(PRMTYP < 1 || PRMTYP > 9) goto L30; SHFTXT(LNPOSN+2,PRMTYP-2); LNPOSN=LNPOSN+PRMTYP; - PARM=IABS(PARMS[NPARMS]); + PARM=labs(PARMS[NPARMS]); NEG=0; if(PARMS[NPARMS] < 0)NEG=9; /* 390 */ for (I=1; I<=PRMTYP; I++) { @@ -111,7 +111,7 @@ L40: if(BLANK)TYPE0(); return; } -void PSPEAK(long MSG,long SKIP) { +void PSPEAK(vocab_t MSG,int SKIP) { long I, M; /* Find the skip+1st message from msg and print it. MSG should be the index of @@ -121,7 +121,7 @@ long I, M; M=PTEXT[MSG]; if(SKIP < 0) goto L9; for (I=0; I<=SKIP; I++) { -L1: M=IABS(LINES[M]); +L1: M=labs(LINES[M]); if(LINES[M] >= 0) goto L1; /*etc*/ ; } /* end loop */ @@ -129,7 +129,7 @@ L9: SPEAK(M); return; } -void RSPEAK(long I) { +void RSPEAK(vocab_t I) { /* Print the I-TH "random" message (section 6 of database). */ @@ -168,12 +168,12 @@ long JUNK; * WORD2 (chars 6 thru 10 in WORD2X), else WORD2 is -1. */ -L10: if(BLKLIN)TYPE0(); +L10: if(game.blklin)TYPE0(); MAPLIN(input); if (feof(input)) return false; WORD1=GETTXT(true,true,true); - if(BLKLIN && WORD1 < 0) goto L10; + if(game.blklin && WORD1 < 0) goto L10; WORD1X=GETTXT(false,true,true); L12: JUNK=GETTXT(false,true,true); if(JUNK > 0) goto L12; @@ -194,8 +194,8 @@ L22: JUNK=GETTXT(false,true,true); #undef WORD2X #define GETIN(SRC,WORD1,WORD1X,WORD2,WORD2X) fGETIN(SRC,&WORD1,&WORD1X,&WORD2,&WORD2X) -long YES(FILE *input, long X, long Y, long Z) { -long YEAH, REPLY, JUNK1, JUNK2, JUNK3; +long YES(FILE *input, vocab_t X, vocab_t Y, vocab_t Z) { +token_t YEAH, REPLY, JUNK1, JUNK2, JUNK3; /* Print message X, wait for yes/no answer. If yes, print Y and return true; * if no, print Z and return false. */ @@ -215,7 +215,7 @@ L20: YEAH=false; } -/* Line-parsing routines (GETNUM, GETTXT, MAKEWD, PUTTXT, SHFTXT, TYPE0) +/* Line-parsing routines (GETTXT, MAKEWD, PUTTXT, SHFTXT, TYPE0) */ /* The routines on this page handle all the stuff that would normally be * taken care of by format statements. We do it this way instead so that @@ -223,47 +223,13 @@ L20: YEAH=false; * machine dependent i/o stuff is on the following page. See that page * for a description of MAPCOM's inline array. */ -long GETNUM(FILE *source) { -long DIGIT, NUMBER, SIGN; - -/* Obtain the next integer from an input line. If K>0, we first read a - * new input line from a file; if K<0, we read a line from the keyboard; - * if K=0 we use a line that has already been read (and perhaps partially - * scanned). If we're at the end of the line or encounter an illegal - * character (not a digit, hyphen, or blank), we return 0. */ - - - if(source != NULL)MAPLIN(source); - NUMBER=0; -L10: if(LNPOSN > LNLENG)return(NUMBER); - if(INLINE[LNPOSN] != 0) goto L20; - LNPOSN=LNPOSN+1; - goto L10; - -L20: SIGN=1; - if(INLINE[LNPOSN] != 9) goto L32; - SIGN= -1; -L30: LNPOSN=LNPOSN+1; -L32: if(LNPOSN > LNLENG || INLINE[LNPOSN] == 0) goto L42; - DIGIT=INLINE[LNPOSN]-64; - if(DIGIT < 0 || DIGIT > 9) goto L40; - NUMBER=NUMBER*10+DIGIT; - goto L30; - -L40: NUMBER=0; -L42: NUMBER=NUMBER*SIGN; - LNPOSN=LNPOSN+1; - return(NUMBER); -} - -long GETTXT(long SKIP,long ONEWRD, long UPPER) { +long GETTXT(bool SKIP,bool ONEWRD, bool UPPER) { /* Take characters from an input line and pack them into 30-bit words. * Skip says to skip leading blanks. ONEWRD says stop if we come to a * blank. UPPER says to map all letters to uppercase. If we reach the * end of the line, the word is filled up with blanks (which encode as 0's). * If we're already at end of line when TEXT is called, we return -1. */ - long CHAR; long TEXT; static long SPLITTING = -1; @@ -279,16 +245,16 @@ long GETTXT(long SKIP,long ONEWRD, long UPPER) { } TEXT=0; - for (int I=1; I<=5; I++) { + for (int I=1; I<=TOKLEN; I++) { TEXT=TEXT*64; if(LNPOSN > LNLENG || (ONEWRD && INLINE[LNPOSN] == 0)) continue; - CHAR=INLINE[LNPOSN]; - if(CHAR < 63) { + char current=INLINE[LNPOSN]; + if(current < 63) { SPLITTING = -1; - if(UPPER && CHAR >= 37) - CHAR=CHAR-26; - TEXT=TEXT+CHAR; + if(UPPER && current >= 37) + current=current-26; + TEXT=TEXT+current; LNPOSN=LNPOSN+1; continue; } @@ -298,7 +264,7 @@ long GETTXT(long SKIP,long ONEWRD, long UPPER) { continue; } - TEXT=TEXT+CHAR-63; + TEXT=TEXT+current-63; SPLITTING = -1; LNPOSN=LNPOSN+1; } @@ -306,25 +272,24 @@ long GETTXT(long SKIP,long ONEWRD, long UPPER) { return(TEXT); } -long MAKEWD(long LETTRS) { +token_t MAKEWD(long LETTRS) { long I, L, WORD; -/* Combine five uppercase letters (represented by pairs of decimal digits - * in lettrs) to form a 30-bit value matching the one that GETTXT would - * return given those characters plus trailing blanks. Caution: - * lettrs will overflow 31 bits if 5-letter word starts with V-Z. As a - * kludgey workaround, you can increment a letter by 5 by adding 50 to - * the next pair of digits. */ - +/* Combine TOKLEN (currently 5) uppercase letters (represented by + * pairs of decimal digits in lettrs) to form a 30-bit value matching + * the one that GETTXT would return given those characters plus + * trailing blanks. Caution: lettrs will overflow 31 bits if + * 5-letter word starts with V-Z. As a kludgey workaround, you can + * increment a letter by 5 by adding 50 to the next pair of + * digits. */ WORD=0; I=1; - L=LETTRS; -L10: WORD=WORD+I*(MOD(L,50)+10); - I=I*64; - if(MOD(L,100) > 50)WORD=WORD+I*5; - L=L/100; - if(L != 0) goto L10; + for (L=LETTRS; L != 0; L=L/100) { + WORD=WORD+I*(MOD(L,50)+10); + I=I*64; + if(MOD(L,100) > 50)WORD=WORD+I*5; + } I=64L*64L*64L*64L*64L/I; WORD=WORD*I; return(WORD); @@ -332,28 +297,30 @@ L10: WORD=WORD+I*(MOD(L,50)+10); #define STATE (*sTATE) -void fPUTTXT(long WORD, long *sTATE, long CASE) { +void fPUTTXT(token_t WORD, long *sTATE, long CASE) { long ALPH1, ALPH2, BYTE, DIV, I, W; -/* Unpack the 30-bit value in word to obtain up to 5 integer-encoded chars, - * and store them in inline starting at LNPOSN. If LNLENG>=LNPOSN, shift - * existing characters to the right to make room. STATE will be zero when - * puttxt is called with the first of a sequence of words, but is thereafter - * unchanged by the caller, so PUTTXT can use it to maintain state across - * calls. LNPOSN and LNLENG are incremented by the number of chars stored. - * If CASE=1, all letters are made uppercase; if -1, lowercase; if 0, as is. - * any other value for case is the same as 0 but also causes trailing blanks - * to be included (in anticipation of subsequent additional text). */ +/* 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 + * to make room. STATE will be zero when puttxt is called with the + * first of a sequence of words, but is thereafter unchanged by the + * caller, so PUTTXT can use it to maintain state across calls. + * LNPOSN and LNLENG are incremented by the number of chars stored. + * If CASE=1, all letters are made uppercase; if -1, lowercase; if 0, + * as is. any other value for case is the same as 0 but also causes + * trailing blanks to be included (in anticipation of subsequent + * additional text). */ ALPH1=13*CASE+24; - ALPH2=26*IABS(CASE)+ALPH1; - if(IABS(CASE) > 1)ALPH1=ALPH2; + ALPH2=26*labs(CASE)+ALPH1; + if(labs(CASE) > 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; - /* 18 */ for (I=1; I<=5; I++) { - if(W <= 0 && STATE == 0 && IABS(CASE) <= 1)return; + /* 18 */ for (I=1; I<=TOKLEN; I++) { + if(W <= 0 && STATE == 0 && labs(CASE) <= 1)return; BYTE=W/DIV; if(STATE != 0 || BYTE != 63) goto L12; STATE=63; @@ -545,7 +512,7 @@ long I, J; I=PLACE[OBJECT]; J=FIXED[OBJECT]; MOVE(OBJECT,I); - MOVE(OBJECT+100,J); + MOVE(OBJECT+NOBJECTS,J); return; } @@ -557,10 +524,10 @@ long FROM; * are not at any loc, since carry wants to remove objects from ATLOC chains. */ - if(OBJECT > 100) goto L1; + if(OBJECT > NOBJECTS) goto L1; FROM=PLACE[OBJECT]; goto L2; -L1: {long x = OBJECT-100; FROM=FIXED[x];} +L1: {long x = OBJECT-NOBJECTS; FROM=FIXED[x];} L2: if(FROM > 0 && FROM <= 300)CARRY(OBJECT,FROM); DROP(OBJECT,WHERE); return; @@ -581,10 +548,10 @@ void CARRY(long OBJECT, long WHERE) { long TEMP; /* Start toting an object, removing it from the list of things at its former - * location. Incr holdng unless it was already being toted. If OBJECT>100 + * location. Incr holdng unless it was already being toted. If OBJECT>NOBJECTS * (moving "fixed" second loc), don't change PLACE or HOLDNG. */ - if(OBJECT > 100) goto L5; + if(OBJECT > NOBJECTS) goto L5; if(PLACE[OBJECT] == -1)return; PLACE[OBJECT]= -1; HOLDNG=HOLDNG+1; @@ -603,11 +570,11 @@ void DROP(long OBJECT, long WHERE) { /* Place an object at a given loc, prefixing it onto the ATLOC list. Decr * HOLDNG if the object was being toted. */ - if(OBJECT > 100) goto L1; + if(OBJECT > NOBJECTS) goto L1; if(PLACE[OBJECT] == -1)HOLDNG=HOLDNG-1; PLACE[OBJECT]=WHERE; goto L2; -L1: {long x = OBJECT-100; FIXED[x]=WHERE;} +L1: {long x = OBJECT-NOBJECTS; FIXED[x]=WHERE;} L2: if(WHERE <= 0)return; LINK[OBJECT]=ATLOC[WHERE]; ATLOC[WHERE]=OBJECT; @@ -627,9 +594,9 @@ long AT, I; AT=0; if(DFLAG < 2)return(AT); AT= -1; - for (I=1; I<=5; I++) { - if(DLOC[I] == WHERE) goto L2; - if(DLOC[I] != 0)AT=0; + for (I=1; I<=NDWARVES-1; I++) { + if(game.dloc[I] == WHERE) goto L2; + if(game.dloc[I] != 0)AT=0; } /* end loop */ return(AT); @@ -642,7 +609,7 @@ L2: AT=I; long SETBIT(long bit) { /* Returns 2**bit for use in constructing bit-masks. */ - 2 << bit; + return(2 << bit); } bool TSTBIT(long mask, int bit) { @@ -769,7 +736,7 @@ long I, VAL; if(MAP2[1] == 0)MPINIT(); - if (!oldstyle && SETUP && OPENED == stdin) + if (!oldstyle && OPENED == stdin) fputs("> ", stdout); do { IGNORE(fgets(rawbuf,sizeof(rawbuf)-1,OPENED)); @@ -886,5 +853,4 @@ void DATIME(long* D, long* T) { *T = (long) tv.tv_usec; } -long IABS(N)long N; {return(N<0? -N : N);} long MOD(N,M)long N, M; {return(N%M);}