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

Split saveresume to reduce complexity

Browse source 
Fixed a bug where current time was printed as version of advent
when loading an old savegame.
This commit is contained in:
Peje Nilsson 2017-06-16 18:15:04 +02:00 • committed by Eric S. Raymond
parent adbbd1df25
commit a6feda5307
3 changed files with 57 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

4
actions.c
View file

@ -1097,8 +1097,8 @@ int action(FILE *input, enum speechpart part, long verb, token_t obj)
case 26: /* READ */ return read(input, verb, INTRANSITIVE); case 26: /* READ */ return read(input, verb, INTRANSITIVE);
case 27: /* BREAK */ return GO_UNKNOWN; case 27: /* BREAK */ return GO_UNKNOWN;
case 28: /* WAKE */ return GO_UNKNOWN; case 28: /* WAKE */ return GO_UNKNOWN;
case 29: /* SUSP */ return saveresume(input, false); case 29: /* SUSP */ return suspend(input);
case 30: /* RESU */ return saveresume(input, true); case 30: /* RESU */ return resume(input);
case 31: /* FLY */ return fly(verb, INTRANSITIVE); case 31: /* FLY */ return fly(verb, INTRANSITIVE);
case 32: /* LISTE */ return listen(); case 32: /* LISTE */ return listen();
case 33: /* ZZZZ */ return reservoir(); case 33: /* ZZZZ */ return reservoir();

3
advent.h
View file

@ -114,7 +114,8 @@ extern void set_seed(long);
extern unsigned long get_next_lcg_value(void); extern unsigned long get_next_lcg_value(void);
extern long randrange(long); extern long randrange(long);
extern void score(enum termination); extern void score(enum termination);
extern int saveresume(FILE *, bool); extern int suspend(FILE *);
extern int resume(FILE *);
/* /*
* MOD(N,M) = Arithmetic modulus * MOD(N,M) = Arithmetic modulus

42
saveresume.c
View file

@ -29,34 +29,24 @@ struct save_t {
}; };
struct save_t save; struct save_t save;
int saveresume(FILE *input, bool resume)
/* Suspend and resume */ /* Suspend and resume */
int suspend(FILE *input)
{ {
long i, k; long i, k;
FILE *fp = NULL; FILE *fp = NULL;
if (!resume) {
/* Suspend. Offer to save things in a file, but charging /* Suspend. Offer to save things in a file, but charging
* some points (so can't win by using saved games to retry * some points (so can't win by using saved games to retry
* battles or to start over after learning zzword). */ * 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;
}
else
{
/* 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;
}
}
while (fp == NULL) { while (fp == NULL) {
char* name = linenoise("\nFile name: "); char* name = linenoise("\nFile name: ");
if (name == NULL) if (name == NULL)
return GO_TOP; return GO_TOP;
fp = fopen(name,(resume ? READ_MODE : WRITE_MODE)); fp = fopen(name, WRITE_MODE);
if (fp == NULL) if (fp == NULL)
printf("Can't open file %s, try again.\n", name); printf("Can't open file %s, try again.\n", name);
linenoiseFree(name); linenoiseFree(name);
@ -64,8 +54,6 @@ int saveresume(FILE *input, bool resume)
DATIME(&i,&k); DATIME(&i,&k);
k=i+650*k; k=i+650*k;
if (!resume)
{
save.savetime = k; save.savetime = k;
save.mode = -1; save.mode = -1;
save.version = VRSION; save.version = VRSION;
@ -76,11 +64,32 @@ int saveresume(FILE *input, bool resume)
fclose(fp); fclose(fp);
RSPEAK(RESUME_HELP); RSPEAK(RESUME_HELP);
exit(0); exit(0);
} else { }
int resume(FILE *input)
{
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;
}
while (fp == NULL) {
char* name = linenoise("\nFile name: ");
if (name == NULL)
return GO_TOP;
fp = fopen(name, READ_MODE);
if (fp == NULL)
printf("Can't open file %s, try again.\n", name);
linenoiseFree(name);
}
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) {
SETPRM(1,k/10,MOD(k,10)); SETPRM(1,save.version/10,MOD(save.version,10));
SETPRM(3,VRSION/10,MOD(VRSION,10)); SETPRM(3,VRSION/10,MOD(VRSION,10));
RSPEAK(VERSION_SKEW); RSPEAK(VERSION_SKEW);
} else { } else {
@ -90,7 +99,6 @@ int saveresume(FILE *input, bool resume)
game.zzword=RNDVOC(3,game.zzword); game.zzword=RNDVOC(3,game.zzword);
} }
return GO_TOP; return GO_TOP;
}
} }
/* end */ /* end */