X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=misc.c;h=5e7692149ed88697579374b023cd6facb21f05ae;hb=7eaefce61d74fbc73daabd3f42f048038366b5ad;hp=5eb1fa2f3d074ad3734e205723b836cb8ef8c789;hpb=0d0b8df0a3f6dc7b765c35fa7cc2d2fe52406d87;p=open-adventure.git

diff --git a/misc.c b/misc.c
index 5eb1fa2..5e76921 100644
--- a/misc.c
+++ b/misc.c
@@ -187,7 +187,7 @@ void vspeak(const char* msg, va_list ap)
         } else {
             long arg = va_arg(ap, long);
             if (arg == -1)
-                arg = 0;
+                arg = 0; // LCOV_EXCL_LINE - don't think we can get here.
             i++;
             // Integer specifier. In order to accommodate the fact
             // that PARMS can have both legitimate integers *and*
@@ -295,7 +295,7 @@ void rspeak(vocab_t i, ...)
     va_end(ap);
 }
 
-void echo_input(FILE* destination, char* input_prompt, char* input)
+void echo_input(FILE* destination, const char* input_prompt, const char* input)
 {
     size_t len = strlen(input_prompt) + strlen(input) + 1;
     char* prompt_and_input = (char*) xmalloc(len);
@@ -325,7 +325,7 @@ char* get_input()
 {
     // Set up the prompt
     char input_prompt[] = "> ";
-    if (!prompt)
+    if (!settings.prompt)
         input_prompt[0] = '\0';
 
     // Print a blank line if game.blklin tells us to.
@@ -353,8 +353,8 @@ char* get_input()
     if (!isatty(0))
         echo_input(stdout, input_prompt, input);
 
-    if (logfp)
-        echo_input(logfp, input_prompt, input);
+    if (settings.logfp)
+        echo_input(settings.logfp, "", input);
 
     return (input);
 }
@@ -459,7 +459,7 @@ int get_motion_vocab_id(const char* word)
 {
     for (int i = 0; i < NMOTIONS; ++i) {
         for (int j = 0; j < motions[i].words.n; ++j) {
-            if (strcasecmp(word, motions[i].words.strs[j]) == 0 && (strlen(word) > 1 || strchr(ignore, word[0]) == NULL || !oldstyle))
+            if (strcasecmp(word, motions[i].words.strs[j]) == 0 && (strlen(word) > 1 || strchr(ignore, word[0]) == NULL || !settings.oldstyle))
                 return (i);
         }
     }
@@ -485,7 +485,7 @@ int get_action_vocab_id(const char* word)
 {
     for (int i = 0; i < NACTIONS; ++i) {
         for (int j = 0; j < actions[i].words.n; ++j) {
-            if (strcasecmp(word, actions[i].words.strs[j]) == 0 && (strlen(word) > 1 || strchr(ignore, word[0]) == NULL || !oldstyle))
+            if (strcasecmp(word, actions[i].words.strs[j]) == 0 && (strlen(word) > 1 || strchr(ignore, word[0]) == NULL || !settings.oldstyle))
                 return (i);
         }
     }
@@ -633,8 +633,8 @@ long atdwrf(long where)
     return (at);
 }
 
-/*  Utility routines (SETBIT, TSTBIT, set_seed, get_next_lcg_value,
- *  randrange, RNDVOC) */
+/*  Utility routines (setbit, tstbit, set_seed, get_next_lcg_value,
+ *  randrange) */
 
 long setbit(long bit)
 /*  Returns 2**bit for use in constructing bit-masks. */
@@ -652,6 +652,9 @@ void set_seed(long seedval)
 /* Set the LCG seed */
 {
     game.lcg_x = (unsigned long) seedval % game.lcg_m;
+    
+    // once seed is set, we need to generate the Z`ZZZ word
+    make_zzword(game.zzword);
 }
 
 unsigned long get_next_lcg_value(void)
@@ -677,14 +680,6 @@ void make_zzword(char zzword[6])
     zzword[5] = '\0';
 }
 
-void datime(long* d, long* t)
-{
-    struct timeval tv;
-    gettimeofday(&tv, NULL);
-    *d = (long) tv.tv_sec;
-    *t = (long) tv.tv_usec;
-}
-
 // LCOV_EXCL_START
 void bug(enum bugtype num, const char *error_string)
 {