Compile switch to disable save and restore

This commit is contained in:
NHOrus 2017-06-18 10:34:44 +03:00
parent d844c2a391
commit a37e578f63
3 changed files with 27 additions and 10 deletions

View file

@ -21,6 +21,8 @@
# #
# If you are using MacPorts on OS X: # If you are using MacPorts on OS X:
# port install py3{5,6}-yaml as appropriate for your Python 3 version. # 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 VERS=1.0

View file

@ -5,7 +5,7 @@
advent - Colossal Cave Adventure advent - Colossal Cave Adventure
== SYNOPSIS == == SYNOPSIS ==
*advent* [-l logfile] [-o] *advent* [-l logfile] [-o] [-r savefile] [-s]
== DESCRIPTION == == DESCRIPTION ==
The original Colossal Cave Adventure from 1976-77 was the origin of all The original Colossal Cave Adventure from 1976-77 was the origin of all

View file

@ -31,13 +31,17 @@ struct save_t save;
/* Suspend and resume */ /* Suspend and resume */
int suspend(FILE *input) 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; long i, k;
FILE *fp = NULL; 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); RSPEAK(SUSPEND_WARNING);
if (!YES(input,THIS_ACCEPTABLE,OK_MAN,OK_MAN)) return GO_CLEAROBJ; if (!YES(input,THIS_ACCEPTABLE,OK_MAN,OK_MAN)) return GO_CLEAROBJ;
game.saved=game.saved+5; game.saved=game.saved+5;
@ -67,10 +71,14 @@ int suspend(FILE *input)
} }
int resume(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; FILE *fp = NULL;
/* Resume. Read a suspended game back from a file. */
if (game.loc != 1 || game.abbrev[1] != 1) { if (game.loc != 1 || game.abbrev[1] != 1) {
RSPEAK(RESUME_ABANDON); RSPEAK(RESUME_ABANDON);
if (!YES(input,THIS_ACCEPTABLE,OK_MAN,OK_MAN)) return GO_CLEAROBJ; if (!YES(input,THIS_ACCEPTABLE,OK_MAN,OK_MAN)) return GO_CLEAROBJ;
@ -86,10 +94,17 @@ int resume(FILE *input)
linenoiseFree(name); 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)); IGNORE(fread(&save, sizeof(struct save_t), 1, fp));
fclose(fp); fclose(fp);
if (save.version != VRSION) { if (save.version != VRSION) {