centralize calls to make_zzword()

[open-adventure.git] / misc.c

diff --git a/misc.c b/misc.c
index 0d2311c945318805be770491ae9890b035d535ce..b71969e2918dcd32f7f695753b33bdb2d889d921 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -5,9 +5,9 @@
 #include <stdarg.h>
 #include <sys/time.h>
 #include <ctype.h>
+#include <editline/readline.h>
 
 #include "advent.h"
-#include "linenoise/linenoise.h"
 #include "dungeon.h"
 
 char* xstrdup(const char* s)
@@ -37,17 +37,17 @@ void* xmalloc(size_t size)
 
 void packed_to_token(long packed, char token[6])
 {
-  // The advent->ascii mapping.
-  const char advent_to_ascii[] = {
-    ' ', '!', '"', '#', '$', '%', '&', '\'',
-    '(', ')', '*', '+', ',', '-', '.', '/',
-    '0', '1', '2', '3', '4', '5', '6', '7',
-    '8', '9', ':', ';', '<', '=', '>', '?',
-    '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G',
-    'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
-    'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
-    'X', 'Y', 'Z', '\0', '\0', '\0', '\0', '\0',
-};
+    // The advent->ascii mapping.
+    const char advent_to_ascii[] = {
+        ' ', '!', '"', '#', '$', '%', '&', '\'',
+        '(', ')', '*', '+', ',', '-', '.', '/',
+        '0', '1', '2', '3', '4', '5', '6', '7',
+        '8', '9', ':', ';', '<', '=', '>', '?',
+        '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G',
+        'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
+        'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
+        'X', 'Y', 'Z', '\0', '\0', '\0', '\0', '\0',
+    };
 
     // Unpack and map back to ASCII.
     for (int i = 0; i < 5; ++i) {
@@ -69,26 +69,26 @@ void packed_to_token(long packed, char token[6])
 
 long token_to_packed(const char token[6])
 {
-  const char ascii_to_advent[] = {
-    63, 63, 63, 63, 63, 63, 63, 63,
-    63, 63, 63, 63, 63, 63, 63, 63,
-    63, 63, 63, 63, 63, 63, 63, 63,
-    63, 63, 63, 63, 63, 63, 63, 63,
-
-    0, 1, 2, 3, 4, 5, 6, 7,
-    8, 9, 10, 11, 12, 13, 14, 15,
-    16, 17, 18, 19, 20, 21, 22, 23,
-    24, 25, 26, 27, 28, 29, 30, 31,
-    32, 33, 34, 35, 36, 37, 38, 39,
-    40, 41, 42, 43, 44, 45, 46, 47,
-    48, 49, 50, 51, 52, 53, 54, 55,
-    56, 57, 58, 59, 60, 61, 62, 63,
-
-    63, 63, 63, 63, 63, 63, 63, 63,
-    63, 63, 63, 63, 63, 63, 63, 63,
-    63, 63, 63, 63, 63, 63, 63, 63,
-    63, 63, 63, 63, 63, 63, 63, 63,
-};
+    const char ascii_to_advent[] = {
+        63, 63, 63, 63, 63, 63, 63, 63,
+        63, 63, 63, 63, 63, 63, 63, 63,
+        63, 63, 63, 63, 63, 63, 63, 63,
+        63, 63, 63, 63, 63, 63, 63, 63,
+
+        0, 1, 2, 3, 4, 5, 6, 7,
+        8, 9, 10, 11, 12, 13, 14, 15,
+        16, 17, 18, 19, 20, 21, 22, 23,
+        24, 25, 26, 27, 28, 29, 30, 31,
+        32, 33, 34, 35, 36, 37, 38, 39,
+        40, 41, 42, 43, 44, 45, 46, 47,
+        48, 49, 50, 51, 52, 53, 54, 55,
+        56, 57, 58, 59, 60, 61, 62, 63,
+
+        63, 63, 63, 63, 63, 63, 63, 63,
+        63, 63, 63, 63, 63, 63, 63, 63,
+        63, 63, 63, 63, 63, 63, 63, 63,
+        63, 63, 63, 63, 63, 63, 63, 63,
+    };
 
     size_t t_len = strlen(token);
     long packed = 0;
@@ -217,14 +217,14 @@ void vspeak(const char* msg, va_list ap)
                 }
             }
 
-           /* Version specifier */
+            /* Version specifier */
             if (msg[i] == 'V') {
-               strcpy(renderp, VERSION);
+                strcpy(renderp, VERSION);
                 size_t len = strlen(VERSION);
                 renderp += len;
                 size -= len;
-           }
-           
+            }
+
             // All-lowercase specifier.
             if (msg[i] == 'L' || msg[i] == 'C') {
                 packed_to_token(arg, renderp); /* unpack directly to destination */
@@ -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);
@@ -334,39 +334,27 @@ char* get_input()
 
     char* input;
     while (true) {
-        if (editline)
-            input = linenoise(input_prompt);
-        else {
-            input = NULL;
-            size_t n = 0;
-            if (isatty(0))
-                // LCOV_EXCL_START
-                // Should be unreachable in tests, as they will use a non-interactive shell.
-                printf("%s", input_prompt);
-            // LCOV_EXCL_STOP
-            ssize_t numread = getline(&input, &n, stdin);
-            if (numread == -1) // Got EOF; return with it.
-                return (NULL);
-        }
+        input = readline(input_prompt);
 
         if (input == NULL) // Got EOF; return with it.
             return (input);
-        else if (input[0] == '#') // Ignore comments.
+        else if (input[0] == '#') { // Ignore comments.
+            free(input);
             continue;
-        else // We have a 'normal' line; leave the loop.
+        } else // We have a 'normal' line; leave the loop.
             break;
     }
 
     // Strip trailing newlines from the input
     input[strcspn(input, "\n")] = 0;
 
-    linenoiseHistoryAdd(input);
+    add_history(input);
 
     if (!isatty(0))
         echo_input(stdout, input_prompt, input);
 
     if (logfp)
-        echo_input(logfp, input_prompt, input);
+        echo_input(logfp, "", input);
 
     return (input);
 }
@@ -381,7 +369,7 @@ bool silent_yes()
         if (reply == NULL) {
             // LCOV_EXCL_START
             // Should be unreachable. Reply should never be NULL
-            linenoiseFree(reply);
+            free(reply);
             exit(EXIT_SUCCESS);
             // LCOV_EXCL_STOP
         }
@@ -389,6 +377,8 @@ bool silent_yes()
         char* firstword = (char*) xmalloc(strlen(reply) + 1);
         sscanf(reply, "%s", firstword);
 
+        free(reply);
+
         for (int i = 0; i < (int)strlen(firstword); ++i)
             firstword[i] = tolower(firstword[i]);
 
@@ -408,7 +398,6 @@ bool silent_yes()
         } else
             rspeak(PLEASE_ANSWER);
     }
-    linenoiseFree(reply);
     return (outcome);
 }
 
@@ -427,7 +416,7 @@ bool yes(const char* question, const char* yes_response, const char* no_response
         if (reply == NULL) {
             // LCOV_EXCL_START
             // Should be unreachable. Reply should never be NULL
-            linenoiseFree(reply);
+            free(reply);
             exit(EXIT_SUCCESS);
             // LCOV_EXCL_STOP
         }
@@ -435,6 +424,8 @@ bool yes(const char* question, const char* yes_response, const char* no_response
         char* firstword = (char*) xmalloc(strlen(reply) + 1);
         sscanf(reply, "%s", firstword);
 
+        free(reply);
+
         for (int i = 0; i < (int)strlen(firstword); ++i)
             firstword[i] = tolower(firstword[i]);
 
@@ -455,8 +446,9 @@ bool yes(const char* question, const char* yes_response, const char* no_response
             break;
         } else
             rspeak(PLEASE_ANSWER);
+
     }
-    linenoiseFree(reply);
+
     return (outcome);
 }
 
@@ -467,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)
+            if (strcasecmp(word, motions[i].words.strs[j]) == 0 && (strlen(word) > 1 || strchr(ignore, word[0]) == NULL || !oldstyle))
                 return (i);
         }
     }
@@ -493,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)
+            if (strcasecmp(word, actions[i].words.strs[j]) == 0 && (strlen(word) > 1 || strchr(ignore, word[0]) == NULL || !oldstyle))
                 return (i);
         }
     }
@@ -519,6 +511,7 @@ long get_vocab_id(const char* word)
 {
     long ref_num;
 
+    /* FIXME: Magic numbers related to vocabulary */
     ref_num = get_motion_vocab_id(word);
     if (ref_num != WORD_NOT_FOUND)
         return (ref_num + 0); // FIXME: replace with a proper hash
@@ -640,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. */
@@ -659,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)