X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=misc.c;h=2e68901161d0316bf18dae8ac795b5649b55e061;hb=65c081a0acc24707915a2abf80ef64ed70e50f45;hp=baa0d56c70c7a69f05f68c0f894cfe1c22bb651a;hpb=19b3e3e65697b39891e69639de460cbcc50f351e;p=open-adventure.git diff --git a/misc.c b/misc.c index baa0d56..2e68901 100644 --- a/misc.c +++ b/misc.c @@ -1,6 +1,8 @@ +#include #include #include #include "main.h" +#include "share.h" /* for SETUP */ #include "misc.h" #include "funcs.h" @@ -171,10 +173,10 @@ void fSETPRM(long FIRST, long P1, long P2) { #define WORD1X (*wORD1X) #define WORD2 (*wORD2) #define WORD2X (*wORD2X) -void fGETIN(long *wORD1, long *wORD1X, long *wORD2, long *wORD2X) { +void fGETIN(FILE *input, long *wORD1, long *wORD1X, long *wORD2, long *wORD2X) { long JUNK; -/* Get a command from the adventurer. snarf out the first word, pad it with +/* 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 @@ -182,7 +184,8 @@ long JUNK; L10: if(BLKLIN)TYPE0(); - MAPLIN(false); + MAPLIN(input); + if(input == stdin && feof(stdin)) score(1); WORD1=GETTXT(true,true,true,0); if(BLKLIN && WORD1 < 0) goto L10; WORD1X=GETTXT(false,true,true,0); @@ -203,9 +206,9 @@ L22: JUNK=GETTXT(false,true,true,0); #undef WORD1X #undef WORD2 #undef WORD2X -#define GETIN(WORD1,WORD1X,WORD2,WORD2X) fGETIN(&WORD1,&WORD1X,&WORD2,&WORD2X) +#define GETIN(SRC,WORD1,WORD1X,WORD2,WORD2X) fGETIN(SRC,&WORD1,&WORD1X,&WORD2,&WORD2X) #undef YES -long fYES(long X, long Y, long Z) { +long fYES(FILE *input, long X, long Y, long Z) { long YES, REPLY, JUNK1, JUNK2, JUNK3; @@ -213,7 +216,7 @@ long YES, REPLY, JUNK1, JUNK2, JUNK3; * if no, print Z and return false. */ L1: RSPEAK(X); - GETIN(REPLY,JUNK1,JUNK2,JUNK3); + 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); @@ -241,7 +244,7 @@ L20: YES=false; #define YES(X,Y,Z) fYES(X,Y,Z) #undef GETNUM -long fGETNUM(long K) { +long fGETNUM(FILE *source) { long DIGIT, GETNUM, SIGN; /* Obtain the next integer from an input line. If K>0, we first read a @@ -251,7 +254,7 @@ long DIGIT, GETNUM, SIGN; * character (not a digit, hyphen, or blank), we return 0. */ - if(K != 0)MAPLIN(K > 0); + if(source != NULL)MAPLIN(source); GETNUM=0; L10: if(LNPOSN > LNLENG)return(GETNUM); if(INLINE[LNPOSN] != 0) goto L20; @@ -720,7 +723,7 @@ L2: ATDWRF=I; -/* Utility routines (SETBIT, TSTBIT, RAN, RNDVOC, BUG) */ +/* Utility routines (SETBIT, TSTBIT, set_seed_from_time, get_next_lcg_value, randrange, RNDVOC, BUG) */ #undef SETBIT long fSETBIT(long BIT) { @@ -754,31 +757,29 @@ long TSTBIT; #define TSTBIT(MASK,BIT) fTSTBIT(MASK,BIT) -#undef RAN -long fRAN(long RANGE) { -static long D, R = 0, RAN, T; - -/* Since the ran function in LIB40 seems to be a real lose, we'll use one of - * our own. It's been run through many of the tests in Knuth vol. 2 and - * seems to be quite reliable. RAN returns a value uniformly selected - * between 0 and range-1. */ - - - D=1; - if(R != 0 && RANGE >= 0) goto L1; - DATIME(D,T); - R=MOD(T+5,1048576L); - D=1000+MOD(D,1000); -L1: for (T=1; T<=D; T++) { - R=MOD(R*1093L+221587L,1048576L); - } /* end loop */ - RAN=(RANGE*R)/1048576; - return(RAN); + +void set_seed_from_time(void) +{ + /* Use the current system time to get seed the ISO rand() function, from which we get a seed for the LCG. */ + srand(time(NULL)); + lcgstate.x = (unsigned long) rand() % lcgstate.m; } +unsigned long get_next_lcg_value(void) +{ + /* Return the LCG's current value, and then iterate it. */ + unsigned long old_x = lcgstate.x; + lcgstate.x = (lcgstate.a * lcgstate.x + lcgstate.c) % lcgstate.m; + return(old_x); +} +long randrange(long range) +{ + /* Return a random integer from [0, range). */ + long result = range * get_next_lcg_value() / lcgstate.m; + return(result); +} -#define RAN(RANGE) fRAN(RANGE) #undef RNDVOC long fRNDVOC(long CHAR, long FORCE) { long DIV, I, J, RNDVOC; @@ -792,7 +793,7 @@ long DIV, I, J, RNDVOC; RNDVOC=FORCE; if(RNDVOC != 0) goto L3; for (I=1; I<=5; I++) { - J=11+RAN(26); + J=11+randrange(26); if(I == 2)J=CHAR; RNDVOC=RNDVOC*64+J; } /* end loop */ @@ -853,11 +854,11 @@ void fBUG(long NUM) { #define BUG(NUM) fBUG(NUM) #undef MAPLIN -void fMAPLIN(long FIL) { -long I, VAL; static FILE *OPENED = NULL; - -/* Read a line of input, either from a file (if FIL=true) or from the - * keyboard, translate the chars to integers in the range 0-126 and store +void fMAPLIN(FILE *OPENED) { + signed char *cp; + +/* Read a line of input, from the specified input source, + * translate the chars to integers in the range 0-126 and store * them in the common array "INLINE". Integer values are as follows: * 0 = space [ASCII CODE 40 octal, 32 decimal] * 1-2 = !" [ASCII 41-42 octal, 33-34 decimal] @@ -879,42 +880,29 @@ long I, VAL; static FILE *OPENED = NULL; * This procedure may use the map1,map2 arrays to maintain static data for * the mapping. MAP2(1) is set to 0 when the program starts * and is not changed thereafter unless the routines on this page choose - * to do so. - * - * Note that MAPLIN is expected to open the file the first time it is - * asked to read a line from it. that is, there is no other place where - * the data file is opened. */ - + * to do so. */ if(MAP2[1] == 0)MPINIT(); - if(FIL) goto L15; - IGNORE(fgets(INLINE+1, sizeof(INLINE)-1, stdin)); - if(feof(stdin)) score(1); - goto L20; - -L15: if(!OPENED){ - OPENED=fopen("adventure.text","r" /* NOT binary */); - if(!OPENED){printf("Can't read adventure.text!\n"); exit(0);} - } - IGNORE(fgets(INLINE+1,sizeof(INLINE)-1,OPENED)); - -L20: LNLENG=0; - for (I=1; I<=sizeof(INLINE) && INLINE[I]!=0; I++) { - VAL=INLINE[I]+1; - INLINE[I]=MAP1[VAL]; - if(INLINE[I] != 0)LNLENG=I; - } /* end loop */ - LNPOSN=1; - if(FIL && LNLENG == 0) goto L15; -/* Above is to get around an F40 compiler bug wherein it reads a blank - * line whenever a crlf is broken across a record boundary. */ - return; + if (!oldstyle && SETUP) + fputs("> ", stdout); + IGNORE(fgets(raw_input,sizeof(INLINE)-1,OPENED)); + if (feof(OPENED)) { + if (logfp) + fclose(logfp); + } else { + if (logfp) + IGNORE(fputs(raw_input, logfp)); + else if (!isatty(0)) + IGNORE(fputs(raw_input, stdout)); + for (cp = raw_input; *cp; cp++) + INLINE[cp - raw_input + 1]=MAP1[*cp + 1]; + LNLENG = (cp - raw_input); + LNPOSN=1; + } } - - - #define MAPLIN(FIL) fMAPLIN(FIL) + #undef TYPE void fTYPE(void) { long I, VAL;