X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=misc.c;h=3e0bb4145adcc2182c4c32e1cdd4f3d294c3eab9;hb=3a2c0ca199cba2efbce5849285c910f02b961441;hp=a08720cbeb20b08cd7414d20eb743343bb3f1d83;hpb=2bc887c84efbcd9ea4ae589d29285bc187173e9a;p=open-adventure.git

diff --git a/misc.c b/misc.c
index a08720c..3e0bb41 100644
--- a/misc.c
+++ b/misc.c
@@ -173,7 +173,7 @@ void fSETPRM(long FIRST, long P1, long P2) {
 #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
@@ -185,7 +185,8 @@ long JUNK;
 
 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(BLKLIN && WORD1 < 0) goto L10;
 	WORD1X=GETTXT(false,true,true,0);
@@ -195,7 +196,7 @@ L12:	JUNK=GETTXT(false,true,true,0);
 	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;
 }
@@ -723,7 +724,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) {
@@ -757,31 +758,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;
@@ -795,7 +794,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 */
@@ -886,11 +885,11 @@ long I, VAL;
 
 	if(MAP2[1] == 0)MPINIT();
 
-	if (!oldstyle && SETUP)
+	if (!oldstyle && SETUP && OPENED == stdin)
 	    fputs("> ", stdout);
 	IGNORE(fgets(INLINE+1,sizeof(INLINE)-1,OPENED));
 	if (feof(OPENED)) {
-		if (logfp)
+		if (logfp && OPENED == stdin)
 			fclose(logfp);
 	} else {
 		if (logfp)