X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=misc.c;h=a656cbc24e22823699ec9c2a132942f9a0a03626;hp=320d002a753a6384c768ad5dd42d25809cade628;hb=f5cd343fc6cf580f8e723c30e8bdfd2ddd735e84;hpb=8a8770375ebcf69b18749be85838dc46132cbe9f

diff --git a/misc.c b/misc.c
index 320d002..a656cbc 100644
--- a/misc.c
+++ b/misc.c
@@ -1,6 +1,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include "main.h"
 #include "share.h"	/* for SETUP */
 #include "misc.h"
@@ -173,7 +174,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 +186,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 +197,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 +725,8 @@ L2:	ATDWRF=I;
 
 
 
-/*  Utility routines (SETBIT, TSTBIT, set_seed_from_time, get_next_lcg_value, randrange, RNDVOC, BUG) */
+/*  Utility routines (SETBIT, TSTBIT, set_seed, get_next_lcg_value,
+ *  randrange, RNDVOC, BUG) */
 
 #undef SETBIT
 long fSETBIT(long BIT) {
@@ -757,15 +760,10 @@ long TSTBIT;
 
 
 #define TSTBIT(MASK,BIT) fTSTBIT(MASK,BIT)
-#undef RNDVOC
 
-void set_seed_from_time(void)
+void set_seed(long seedval)
 {
-  /* Use the current system time to get seed the ISO rand() function, from which we get a seed for the LCG. */
-  struct timespec ts;
-  clock_gettime(CLOCK_REALTIME, &ts);
-  srand(ts.tv_nsec);
-  lcgstate.x = (unsigned long) rand() % lcgstate.m;
+  lcgstate.x = (unsigned long) seedval % lcgstate.m;
 }
 
 unsigned long get_next_lcg_value(void)
@@ -783,6 +781,7 @@ long randrange(long range)
   return(result);
 }
 
+#undef RNDVOC
 long fRNDVOC(long CHAR, long FORCE) {
 long DIV, I, J, RNDVOC;
 
@@ -886,17 +885,21 @@ long I, VAL;
 
 	if(MAP2[1] == 0)MPINIT();
 
-	if (!oldstyle && SETUP)
-	    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;