X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=misc.c;h=8ea3db40c6cde454344abef1f86fa9b338f1530c;hb=196a9e1a4960e01dcf4af9aef01a8daf3b5cbbc8;hp=2e68901161d0316bf18dae8ac795b5649b55e061;hpb=65c081a0acc24707915a2abf80ef64ed70e50f45;p=open-adventure.git

diff --git a/misc.c b/misc.c
index 2e68901..8ea3db4 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) {
@@ -758,11 +761,9 @@ long TSTBIT;
 
 #define TSTBIT(MASK,BIT) fTSTBIT(MASK,BIT)
 
-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. */
-  srand(time(NULL));
-  lcgstate.x = (unsigned long) rand() % lcgstate.m;
+  lcgstate.x = (unsigned long) seedval % lcgstate.m;
 }
 
 unsigned long get_next_lcg_value(void)
@@ -855,8 +856,8 @@ void fBUG(long NUM) {
 #define BUG(NUM) fBUG(NUM)
 #undef MAPLIN
 void fMAPLIN(FILE *OPENED) {
-	signed char *cp;
-    
+long I, VAL;
+
 /*  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:
@@ -884,20 +885,27 @@ void fMAPLIN(FILE *OPENED) {
 
 	if(MAP2[1] == 0)MPINIT();
 
-	if (!oldstyle && SETUP)
-	    fputs("> ", stdout);
-	IGNORE(fgets(raw_input,sizeof(INLINE)-1,OPENED));
+	if (!oldstyle && SETUP && OPENED == stdin)
+		fputs("> ", stdout);
+	do {
+		IGNORE(fgets(rawbuf,sizeof(INLINE)-1,OPENED));
+	} while
+		(!feof(OPENED) && INLINE[1] == '#');
 	if (feof(OPENED)) {
-		if (logfp)
+		if (logfp && OPENED == stdin)
 			fclose(logfp);
 	} else {
-		if (logfp)
-			IGNORE(fputs(raw_input, logfp));
+		if (logfp && OPENED == stdin)
+			IGNORE(fputs(rawbuf, 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);
+			IGNORE(fputs(rawbuf, stdout));
+		strcpy(INLINE+1, rawbuf);
+		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;
 	}
 }