archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compile switch to disable save and restore

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -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

2
advent.adoc
View file

@ -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

31
saveresume.c
View file

@ -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) {