Compile switch to disable save and restore

diff --git a/Makefile b/Makefile
index 62a4ee4fc91dd1bb775f6af2cebaa49b6f8ed2d4..b7328e649a7fe0759877dc6addcd2607f12839d1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,8 @@
 #
 # If you are using MacPorts on OS X:
 # port install py3{5,6}-yaml as appropriate for your Python 3 version.
+#
+# To build with save/resume disabled, pass CCFLAGS="-D ADVENT_NOSAVE"
 
 VERS=1.0
 

diff --git a/advent.adoc b/advent.adoc
index d0fd29b09918b1c54f4af0dcdfe3a0bbc6a57970..2ce8962dfaacaa5a21e57b1a4bc5fbf56301eea9 100644 (file)
--- a/advent.adoc
+++ b/advent.adoc
@@ -5,7 +5,7 @@
 advent - Colossal Cave Adventure
 
 == SYNOPSIS ==
-*advent* [-l logfile] [-o]
+*advent* [-l logfile] [-o] [-r savefile] [-s]
 
 == DESCRIPTION ==
 The original Colossal Cave Adventure from 1976-77 was the origin of all

diff --git a/saveresume.c b/saveresume.c
index 015b4be88c383440aae845e04715ae2192007416..5cc97267d1b5119f78e5283a5bcd0940ee30268c 100644 (file)
--- a/saveresume.c
+++ b/saveresume.c
@@ -31,13 +31,17 @@ struct save_t save;
 
 /* Suspend and resume */
 int suspend(FILE *input)
-{
+{   /*  Suspend.  Offer to save things in a file, but charging
+     *  some points (so can't win by using saved games to retry
+     *  battles or to start over after learning zzword).
+     *  If ADVENT_NOSAVE is defined, do nothing instead. */
+
+#ifdef ADVENT_NOSAVE
+    return GO_UNKNOWN;
+#endif
     long i, k;
     FILE *fp = NULL;
 
-    /*  Suspend.  Offer to save things in a file, but charging
-     *  some points (so can't win by using saved games to retry
-     *  battles or to start over after learning zzword). */
     RSPEAK(SUSPEND_WARNING);
     if (!YES(input,THIS_ACCEPTABLE,OK_MAN,OK_MAN)) return GO_CLEAROBJ;
     game.saved=game.saved+5;
@@ -67,10 +71,14 @@ int suspend(FILE *input)
 }
 
 int resume(FILE *input)
-{
+{   /*  Resume.  Read a suspended game back from a file.
+     *  If ADVENT_NOSAVE is defined, do nothing instead. */
+
+#ifdef ADVENT_NOSAVE
+    return GO_UNKNOWN;
+#endif
     FILE *fp = NULL;
-     
-    /*  Resume.  Read a suspended game back from a file. */
+
     if (game.loc != 1 || game.abbrev[1] != 1) {
        RSPEAK(RESUME_ABANDON);
        if (!YES(input,THIS_ACCEPTABLE,OK_MAN,OK_MAN)) return GO_CLEAROBJ;
@@ -86,10 +94,17 @@ int resume(FILE *input)
        linenoiseFree(name);
     }
 
-       return restore(fp);
+    return restore(fp);
 }
 
-int restore(FILE* fp){
+int restore(FILE* fp)
+{   /*  Read and restore game state from file, assuming
+     *  sane initial state.
+     *  If ADVENT_NOSAVE is defined, do nothing instead. */
+#ifdef ADVENT_NOSAVE
+    return GO_UNKNOWN;
+#endif
+
     IGNORE(fread(&save, sizeof(struct save_t), 1, fp));
     fclose(fp);
     if (save.version != VRSION) {