Stop command-logging from non-stdin sources.

[open-adventure.git] / misc.c

diff --git a/misc.c b/misc.c
index 3e0bb4145adcc2182c4c32e1cdd4f3d294c3eab9..4d0a89d482a59ba9d93d1ef5ca8fc44864f2a232 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -724,7 +724,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) {
@@ -759,11 +760,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)
@@ -886,13 +885,16 @@ long I, VAL;
        if(MAP2[1] == 0)MPINIT();
 
        if (!oldstyle && SETUP && OPENED == stdin)
-           fputs("> ", stdout);
-       IGNORE(fgets(INLINE+1,sizeof(INLINE)-1,OPENED));
+               fputs("> ", stdout);
+       do {
+               IGNORE(fgets(INLINE+1,sizeof(INLINE)-1,OPENED));
+       } while
+               (!feof(OPENED) && INLINE[1] == '#');
        if (feof(OPENED)) {
                if (logfp && OPENED == stdin)
                        fclose(logfp);
        } else {
-               if (logfp)
+               if (logfp && OPENED == stdin)
                        IGNORE(fputs(INLINE+1, logfp));
                else if (!isatty(0))
                        IGNORE(fputs(INLINE+1, stdout));