X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=misc.c;h=fc7ac5f9a8af44059eefb5e73b803d7973c37c0d;hb=65e2e472dd604e93d566206c2267738767ca726b;hp=3eda32a951af9443e1fb90691060c32c592efe22;hpb=672ef17d4cf6741b23cefb30b144777190c03c80;p=open-adventure.git

diff --git a/misc.c b/misc.c
index 3eda32a..fc7ac5f 100644
--- a/misc.c
+++ b/misc.c
@@ -10,6 +10,17 @@
 #include "linenoise/linenoise.h"
 #include "newdb.h"
 
+void* xmalloc(size_t size)
+{
+  void* ptr = malloc(size);
+  if (ptr == NULL)
+    {
+      fprintf(stderr, "Out of memory!\n");
+      exit(EXIT_FAILURE);
+    }
+  return(ptr);
+}
+
 char* xstrdup(const char* s)
 {
     char* ptr = strdup(s);
@@ -162,7 +173,7 @@ bool GETIN(FILE *input,
 
     for (;;) {
         if (game.blklin)
-            TYPE0();
+            fputc('\n', stdout);;
         if (!MAPLIN(input))
             return false;
         *pword1 = GETTXT(true, true, true);
@@ -185,28 +196,106 @@ bool GETIN(FILE *input,
     }
 }
 
-long YES(FILE *input, vocab_t x, vocab_t y, vocab_t z)
+void echo_input(FILE* destination, char* input_prompt, char* input)
+{
+  size_t len = strlen(input_prompt) + strlen(input) + 1;
+  char* prompt_and_input = (char*) xmalloc(len);
+  strcpy(prompt_and_input, input_prompt);
+  strcat(prompt_and_input, input);
+  fprintf(destination, "%s\n", prompt_and_input);
+  free(prompt_and_input);
+}
+
+char* get_input()
+{ 
+  // Set up the prompt
+  char input_prompt[] = "> ";
+  if (!prompt)
+    input_prompt[0] = '\0';
+  
+  // Print a blank line if game.blklin tells us to.
+  if (game.blklin == true)
+    printf("\n");
+
+  char* input;
+  while (true)
+    {
+      if (editline)
+	input = linenoise(input_prompt);
+      else
+	{
+	  input = NULL;
+	  size_t n = 0;
+	  if (isatty(0))
+	    printf("%s", input_prompt);
+	  getline(&input, &n, stdin);
+	}
+      
+      if (input == NULL) // Got EOF; quit.
+	exit(EXIT_SUCCESS);
+      else if (input[0] == '#') // Ignore comments.
+	continue;
+      else // We have a 'normal' line; leave the loop.
+	break;
+    }
+
+  // Strip trailing newlines from the input
+  input[strcspn(input, "\n")] = 0;
+
+  linenoiseHistoryAdd(input);
+
+  if (!isatty(0))
+    echo_input(stdout, input_prompt, input);
+
+  if (logfp)
+    echo_input(logfp, input_prompt, input);
+    
+  return(input);
+}
+
+bool YES(vocab_t question, vocab_t yes_response, vocab_t no_response)
 /*  Print message X, wait for yes/no answer.  If yes, print Y and return true;
  *  if no, print Z and return false. */
 {
-    token_t reply, junk1, junk2, junk3;
-
+    char* reply;
+    bool outcome;
+   
     for (;;) {
-        RSPEAK(x);
-        GETIN(input, &reply, &junk1, &junk2, &junk3);
-        if (reply == MAKEWD(250519) || reply == MAKEWD(25)) {
-            RSPEAK(y);
-            return true;
-        }
-        if (reply == MAKEWD(1415) || reply == MAKEWD(14)) {
-            RSPEAK(z);
-            return false;
-        }
-        RSPEAK(PLEASE_ANSWER);
+	RSPEAK(question);
+
+	reply = get_input();
+
+	char* firstword = (char*) xmalloc(strlen(reply));
+	sscanf(reply, "%s", firstword);
+
+	for (int i = 0; i < strlen(firstword); ++i)
+	    firstword[i] = tolower(firstword[i]);
+	
+	int yes = strncmp("yes", firstword, sizeof("yes") - 1);
+	int y = strncmp("y", firstword, sizeof("y") - 1);
+	int no = strncmp("no", firstword, sizeof("no") - 1);
+	int n = strncmp("n", firstword, sizeof("n") - 1);
+
+	free(firstword);
+	
+	if (yes == 0 || y == 0) {
+	    RSPEAK(yes_response);
+	    outcome = true;
+	    break;
+	}
+	else if (no == 0 || n == 0) {
+   	    RSPEAK(no_response);
+	    outcome = false;
+	    break;
+	}
+	else
+	    RSPEAK(PLEASE_ANSWER);
     }
+    linenoiseFree(reply);
+    return(outcome);
 }
 
-/*  Line-parsing routines (GETTXT, MAKEWD, PUTTXT, SHFTXT, TYPE0) */
+/*  Line-parsing routines (GETTXT, MAKEWD, PUTTXT, SHFTXT) */
 
 long GETTXT(bool skip, bool onewrd, bool upper)
 /*  Take characters from an input line and pack them into 30-bit words.
@@ -278,19 +367,6 @@ token_t MAKEWD(long letters)
     return word;
 }
 
-void TYPE0(void)
-/*  Type a blank line.  This procedure is provided as a convenience for callers
- *  who otherwise have no use for MAPCOM. */
-{
-    long temp;
-
-    temp = LNLENG;
-    LNLENG = 0;
-    TYPE();
-    LNLENG = temp;
-    return;
-}
-
 /*  Data structure  routines */
 
 long VOCAB(long id, long init)
@@ -514,7 +590,7 @@ void BUG(long num)
     exit(0);
 }
 
-/*  Machine dependent routines (MAPLIN, TYPE, SAVEIO) */
+/*  Machine dependent routines (MAPLIN, SAVEIO) */
 
 bool MAPLIN(FILE *fp)
 {
@@ -585,8 +661,7 @@ bool MAPLIN(FILE *fp)
          *    63   = percent (%) [ASCII 45 octal, 37 decimal]
          *   64-73 = digits, 0 through 9
          *  Remaining characters can be translated any way that is convenient;
-         *  The "TYPE" routine below is used to map them back to characters when
-         *  necessary.  The above mappings are required so that certain special
+         *  The above mappings are required so that certain special
          *  characters are known to fit in 6 bits and/or can be easily spotted.
          *  Array elements beyond the end of the line should be filled with 0,
          *  and LNLENG should be set to the index of the last character.
@@ -610,26 +685,6 @@ bool MAPLIN(FILE *fp)
     }
 }
 
-void TYPE(void)
-/*  Type the first "LNLENG" characters stored in inline, mapping them
- *  from integers to text per the rules described above.  INLINE
- *  may be changed by this routine. */
-{
-    long i;
-
-    if (LNLENG == 0) {
-        printf("\n");
-        return;
-    }
-
-    for (i = 1; i <= LNLENG; i++) {
-        INLINE[i] = advent_to_ascii[(int) INLINE[i]];
-    }
-    INLINE[LNLENG + 1] = 0;
-    printf("%s\n", INLINE + 1);
-    return;
-}
-
 void DATIME(long* d, long* t)
 {
     struct timeval tv;