#include <stdlib.h>
#include <stdio.h>
#include "main.h"
+#include "share.h" /* for SETUP */
#include "misc.h"
#include "funcs.h"
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;
#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);
+ if (feof(input))
+ return false;
WORD1=GETTXT(true,true,true,0);
- if(game.blklin && WORD1 < 0) goto L10;
+ if(BLKLIN && WORD1 < 0) goto L10;
WORD1X=GETTXT(false,true,true,0);
L12: JUNK=GETTXT(false,true,true,0);
if(JUNK > 0) goto L12;
WORD2X=GETTXT(false,true,true,0);
L22: JUNK=GETTXT(false,true,true,0);
if(JUNK > 0) goto L22;
- if(GETTXT(true,true,true,0) <= 0)return;
+ if(GETTXT(true,true,true,0) <= 0)return true;
RSPEAK(53);
goto L10;
}
/* 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_from_time, 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_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;
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 */
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(INLINE+1,sizeof(INLINE)-1,OPENED));
+ } while
+ (!feof(OPENED) && INLINE[1] == '#');
if (feof(OPENED)) {
- if (logfp)
+ if (logfp && OPENED == stdin)
fclose(logfp);
} else {
if (logfp)