#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
+#include <string.h>
+#include <sys/time.h>
#include "main.h"
+#include "share.h" /* for SETUP */
#include "misc.h"
#include "funcs.h"
+#include "database.h"
/* hack to ignore GCC Unused Result */
#define IGNORE(r) do{if(r){}}while(0)
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 game.blklin is false. */
+ * unless BLKLIN is false. */
if(N == 0)return;
- BLANK=game.blklin;
+ BLANK=BLKLIN;
K=N;
NPARMS=1;
L10: L=IABS(LINES[K])-1;
LNPOSN=1;
STATE=0;
for (I=K; I<=L; I++) {
- PUTTXT(LINES[I],STATE,2,I);
+ PUTTXT(LINES[I],STATE,2);
} /* end loop */
LNPOSN=0;
L30: LNPOSN=LNPOSN+1;
CASE=2;
L345: if(PARMS[NPARMS] < 0) goto L395;
{long x = NPARMS+1; if(PARMS[x] < 0)CASE=0;}
- PUTTXT(PARMS[NPARMS],STATE,CASE,0);
+ PUTTXT(PARMS[NPARMS],STATE,CASE);
NPARMS=NPARMS+1;
goto L345;
if(PRMTYP == 31)CASE=1;
if(PRMTYP == 33)CASE=0;
I=LNPOSN;
- PUTTXT(PARMS[NPARMS],STATE,CASE,0);
- {long x = NPARMS+1; PUTTXT(PARMS[x],STATE,CASE,0);}
+ PUTTXT(PARMS[NPARMS],STATE,CASE);
+ {long x = NPARMS+1; PUTTXT(PARMS[x],STATE,CASE);}
if(PRMTYP == 13 && INLINE[I] >= 37 && INLINE[I] <=
62)INLINE[I]=INLINE[I]-26;
NPARMS=NPARMS+2;
#define WORD1X (*wORD1X)
#define WORD2 (*wORD2)
#define WORD2X (*wORD2X)
-void fGETIN(FILE *input, long *wORD1, long *wORD1X, long *wORD2, long *wORD2X) {
+bool 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
* WORD2 (chars 6 thru 10 in WORD2X), else WORD2 is -1. */
-L10: if(game.blklin)TYPE0();
+L10: if(BLKLIN)TYPE0();
MAPLIN(input);
- if(input == stdin && feof(stdin)) score(1);
- WORD1=GETTXT(true,true,true,0);
- if(game.blklin && WORD1 < 0) goto L10;
- WORD1X=GETTXT(false,true,true,0);
-L12: JUNK=GETTXT(false,true,true,0);
+ if (feof(input))
+ return false;
+ WORD1=GETTXT(true,true,true);
+ if(BLKLIN && WORD1 < 0) goto L10;
+ WORD1X=GETTXT(false,true,true);
+L12: JUNK=GETTXT(false,true,true);
if(JUNK > 0) goto L12;
- WORD2=GETTXT(true,true,true,0);
- WORD2X=GETTXT(false,true,true,0);
-L22: JUNK=GETTXT(false,true,true,0);
+ 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) <= 0)return;
+ if(GETTXT(true,true,true) <= 0)return true;
RSPEAK(53);
goto L10;
}
#define GETNUM(K) fGETNUM(K)
#undef GETTXT
-long fGETTXT(long SKIP,long ONEWRD, long UPPER, long HASH) {
+long fGETTXT(long SKIP,long ONEWRD, long UPPER) {
long CHAR, GETTXT, I; static long SPLITTING = -1;
/* 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. HASH may be used
- * as a parameter for encrypting the text if desired; however, a hash of 0
- * should result in unmodified bytes being packed. If we reach the
+ * 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 GETTXT is called, we return -1. */
L15: /*etc*/ ;
} /* end loop */
- if(HASH)GETTXT=GETTXT+MOD(HASH*13579L+5432L,97531L)*12345L+HASH;
return(GETTXT);
}
-#define GETTXT(SKIP,ONEWRD,UPPER,HASH) fGETTXT(SKIP,ONEWRD,UPPER,HASH)
+#define GETTXT(SKIP,ONEWRD,UPPER) fGETTXT(SKIP,ONEWRD,UPPER)
#undef MAKEWD
long fMAKEWD(long LETTRS) {
long I, L, MAKEWD;
/* 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 and HASH=0. Caution:
+ * 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. */
#define MAKEWD(LETTRS) fMAKEWD(LETTRS)
#undef PUTTXT
#define STATE (*sTATE)
-void fPUTTXT(long WORD, long *sTATE, long CASE, long HASH) {
+void fPUTTXT(long 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. HASH must be the same
- * as it was when gettxt created the 30-bit word. STATE will be zero when
+ * 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.
/* ALPH1&2 DEFINE RANGE OF WRONG-CASE CHARS, 11-36 OR 37-62 OR EMPTY. */
DIV=64L*64L*64L*64L;
W=WORD;
- if(HASH)W=W-MOD(HASH*13579L+5432L,97531L)*12345L-HASH;
/* 18 */ for (I=1; I<=5; I++) {
if(W <= 0 && STATE == 0 && IABS(CASE) <= 1)return;
BYTE=W/DIV;
#undef STATE
-#define PUTTXT(WORD,STATE,CASE,HASH) fPUTTXT(WORD,&STATE,CASE,HASH)
+#define PUTTXT(WORD,STATE,CASE) fPUTTXT(WORD,&STATE,CASE)
#undef SHFTXT
void fSHFTXT(long FROM, long DELTA) {
long I, II, JJ;
#define SAVWRD(OP,WORD) fSAVWRD(OP,&WORD)
#undef VOCAB
long fVOCAB(long ID, long INIT) {
-long HASH, I, VOCAB;
+long I, VOCAB;
/* Look up ID in the vocabulary (ATAB) and return its "definition" (KTAB), or
* -1 if not found. If INIT is positive, this is an initialisation call setting
* (Thus "STEPS", which is a motion verb as well as an object, may be located
* as an object.) And it also means the KTAB value is taken modulo 1000. */
- HASH=10000;
/* 1 */ for (I=1; I<=TABSIZ; I++) {
if(KTAB[I] == -1) goto L2;
- HASH=HASH+7;
if(INIT >= 0 && KTAB[I]/1000 != INIT) goto L1;
- if(ATAB[I] == ID+HASH*HASH) goto L3;
+ if(ATAB[I] == ID) goto L3;
L1: /*etc*/ ;
} /* end loop */
BUG(21);
/* 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
- * (moving "fixed" second loc), don't change PLACE or game.holdng. */
+ * (moving "fixed" second loc), don't change PLACE or HOLDNG. */
if(OBJECT > 100) goto L5;
if(PLACE[OBJECT] == -1)return;
PLACE[OBJECT]= -1;
- game.holdng=game.holdng+1;
+ HOLDNG=HOLDNG+1;
L5: if(ATLOC[WHERE] != OBJECT) goto L6;
ATLOC[WHERE]=LINK[OBJECT];
return;
;
/* Place an object at a given loc, prefixing it onto the ATLOC list. Decr
- * game.holdng if the object was being toted. */
+ * HOLDNG if the object was being toted. */
if(OBJECT > 100) goto L1;
- if(PLACE[OBJECT] == -1)game.holdng=game.holdng-1;
+ if(PLACE[OBJECT] == -1)HOLDNG=HOLDNG-1;
PLACE[OBJECT]=WHERE;
goto L2;
L1: {long x = OBJECT-100; FIXED[x]=WHERE;}
ATDWRF=0;
- if(game.dflag < 2)return(ATDWRF);
+ if(DFLAG < 2)return(ATDWRF);
ATDWRF= -1;
for (I=1; I<=5; I++) {
if(DLOC[I] == WHERE) goto L2;
-/* Utility routines (SETBIT, TSTBIT, RAN, RNDVOC, BUG) */
+/* Utility routines (SETBIT, TSTBIT, set_seed, get_next_lcg_value,
+ * randrange, RNDVOC, BUG) */
#undef SETBIT
long fSETBIT(long BIT) {
#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(long seedval)
+{
+ lcgstate.x = (unsigned long) seedval % 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;
-
/* Searches the vocabulary for a word whose second character is char, and
* changes that word such that each of the other four characters is a
* random letter. If force is non-zero, it is used as the new word.
* Returns the new word. */
+ long RNDVOC;
RNDVOC=FORCE;
- if(RNDVOC != 0) goto L3;
- for (I=1; I<=5; I++) {
- J=11+RAN(26);
- if(I == 2)J=CHAR;
- RNDVOC=RNDVOC*64+J;
- } /* end loop */
-L3: J=10000;
- DIV=64L*64L*64L;
- for (I=1; I<=TABSIZ; I++) {
- J=J+7;
- if(MOD((ATAB[I]-J*J)/DIV,64L) == CHAR) goto L8;
- /*etc*/ ;
- } /* end loop */
- BUG(5);
-L8: ATAB[I]=RNDVOC+J*J;
+ if (RNDVOC == 0) {
+ for (int I = 1; I <= 5; I++) {
+ long J = 11 + randrange(26);
+ if (I == 2)
+ J = CHAR;
+ RNDVOC = RNDVOC * 64 + J;
+ }
+ }
+
+ long DIV = 64L * 64L * 64L;
+ for (int I = 1; I <= TABSIZ; I++) {
+ if (MOD(ATAB[I]/DIV, 64L) == CHAR)
+ {
+ ATAB[I] = RNDVOC;
+ break;
+ }
+ }
+
return(RNDVOC);
}
if(MAP2[1] == 0)MPINIT();
- if (!oldstyle && isatty(0))
- fputs("> ", stdout);
- IGNORE(fgets(INLINE+1,sizeof(INLINE)-1,OPENED));
+ if (!oldstyle && SETUP && OPENED == stdin)
+ fputs("> ", stdout);
+ do {
+ IGNORE(fgets(rawbuf,sizeof(rawbuf)-1,OPENED));
+ } while
+ (!feof(OPENED) && rawbuf[0] == '#');
if (feof(OPENED)) {
- if (logfp)
+ if (logfp && OPENED == stdin)
fclose(logfp);
} else {
- if (logfp)
- IGNORE(fputs(INLINE+1, logfp));
+ if (logfp && OPENED == stdin)
+ IGNORE(fputs(rawbuf, logfp));
else if (!isatty(0))
- IGNORE(fputs(INLINE+1, stdout));
+ IGNORE(fputs(rawbuf, stdout));
+ strcpy(INLINE+1, rawbuf);
LNLENG=0;
for (I=1; I<=sizeof(INLINE) && INLINE[I]!=0; I++) {
VAL=INLINE[I]+1;
+void DATIME(long* D, long* T) {
+ struct timeval tv;
+ gettimeofday(&tv, NULL);
+ *D = (long) tv.tv_sec;
+ *T = (long) tv.tv_usec;
+}
long fIABS(N)long N; {return(N<0? -N : N);}
long fMOD(N,M)long N, M; {return(N%M);}
projects / open-adventure.git / blobdiff