X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=saveresume.c;h=ad9f844b16b7e289d2924432d43f5913909024ac;hb=dfff80faa8b5cf4cd286fee2d1ef5eebcdb49829;hp=f02132103389142810d593043073349b7369317f;hpb=5ce427b62b7f15c5629fecf5bd948ab89407882f;p=open-adventure.git

diff --git a/saveresume.c b/saveresume.c
index f021321..ad9f844 100644
--- a/saveresume.c
+++ b/saveresume.c
@@ -11,19 +11,25 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <editline/readline.h>
 #include <time.h>
 #include <inttypes.h>
 
 #include "advent.h"
 #include "dungeon.h"
 
-#define VRSION	28	/* bump on save format change */
+/*
+ * Bump on save format change.
+ *
+ * Note: Verify that the tests run clean before bumping this, then rebuild the check
+ * files afterwards.  Otherwise you will get a spurious failure due to the old version
+ * having been generated into a check file.
+ */
+#define VRSION	29
 
 /*
  * If you change the first three members, the resume function may not properly
  * reject saves from older versions.  Yes, this glues us to a hardware-
- * dependent length of long.  Later members can change, but bump the version
+ * dependent length of int.  Later members can change, but bump the version
  * when you do that.
  */
 struct save_t {
@@ -56,18 +62,18 @@ int suspend(void)
      *  battles or to start over after learning zzword).
      *  If ADVENT_NOSAVE is defined, do nothing instead. */
 
-#ifdef ADVENT_NOSAVE
+#if defined ADVENT_NOSAVE || defined ADVENT_AUTOSAVE
     return GO_UNKNOWN;
 #endif
     FILE *fp = NULL;
 
     rspeak(SUSPEND_WARNING);
-    if (!yes(arbitrary_messages[THIS_ACCEPTABLE], arbitrary_messages[OK_MAN], arbitrary_messages[OK_MAN]))
+    if (!yes_or_no(arbitrary_messages[THIS_ACCEPTABLE], arbitrary_messages[OK_MAN], arbitrary_messages[OK_MAN]))
         return GO_CLEAROBJ;
     game.saved = game.saved + 5;
 
     while (fp == NULL) {
-        char* name = readline("\nFile name: ");
+        char* name = myreadline("\nFile name: ");
         if (name == NULL)
             return GO_TOP;
         fp = fopen(name, WRITE_MODE);
@@ -87,7 +93,7 @@ int resume(void)
     /*  Resume.  Read a suspended game back from a file.
      *  If ADVENT_NOSAVE is defined, do nothing instead. */
 
-#ifdef ADVENT_NOSAVE
+#if defined ADVENT_NOSAVE || defined ADVENT_AUTOSAVE
     return GO_UNKNOWN;
 #endif
     FILE *fp = NULL;
@@ -95,12 +101,15 @@ int resume(void)
     if (game.loc != 1 ||
         game.abbrev[1] != 1) {
         rspeak(RESUME_ABANDON);
-        if (!yes(arbitrary_messages[THIS_ACCEPTABLE], arbitrary_messages[OK_MAN], arbitrary_messages[OK_MAN]))
+        if (!yes_or_no(arbitrary_messages[THIS_ACCEPTABLE], arbitrary_messages[OK_MAN], arbitrary_messages[OK_MAN]))
             return GO_CLEAROBJ;
     }
 
     while (fp == NULL) {
-        char* name = readline("\nFile name: ");
+        char* name = myreadline("\nFile name: ");
+        // Autocomplete can leave the input with an extra trailing space.
+        if (name != NULL && strlen(name) > 0 && name[strlen(name) - 1] == ' ')
+            name[strlen(name) - 1] = '\0';
         if (name == NULL)
             return GO_TOP;
         fp = fopen(name, READ_MODE);
@@ -134,8 +143,8 @@ int restore(FILE* fp)
 bool is_valid(struct game_t valgame)
 {
     /*  Save files can be roughly grouped into three groups:
-     *  With valid, reaceable state, with valid, but unreachable
-     *  state and with invaild state. We check that state is
+     *  With valid, reacheable state, with valid, but unreachable
+     *  state and with invalid state. We check that state is
      *  valid: no states are outside minimal or maximal value
      */
 
@@ -146,7 +155,7 @@ bool is_valid(struct game_t valgame)
 
     /* Check for RNG overflow. Truncate */
     if (valgame.lcg_x >= LCG_M) {
-        valgame.lcg_x %= LCG_M;
+        valgame.lcg_x %= LCG_M; // LCOV_EXCL_LINE
     }
 
     /* Check for RNG underflow. Transpose */
@@ -190,7 +199,7 @@ bool is_valid(struct game_t valgame)
     }
 
     /* Recalculate tally, throw the towel if in disagreement */
-    long temp_tally = 0;
+    int temp_tally = 0;
     for (int treasure = 1; treasure <= NOBJECTS; treasure++) {
         if (objects[treasure].is_treasure) {
             if (valgame.prop[treasure] == STATE_NOTFOUND) {