From: Peje Nilsson Date: Fri, 16 Jun 2017 16:15:04 +0000 (+0200) Subject: Split saveresume to reduce complexity X-Git-Tag: 1.1~288 X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=a6feda53072426e635173a6a6c0e3aa95c2afc17;p=open-adventure.git Split saveresume to reduce complexity Fixed a bug where current time was printed as version of advent when loading an old savegame. --- diff --git a/actions.c b/actions.c index 80e24e0..ade5f6c 100644 --- a/actions.c +++ b/actions.c @@ -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 27: /* BREAK */ return GO_UNKNOWN; case 28: /* WAKE */ return GO_UNKNOWN; - case 29: /* SUSP */ return saveresume(input, false); - case 30: /* RESU */ return saveresume(input, true); + case 29: /* SUSP */ return suspend(input); + case 30: /* RESU */ return resume(input); case 31: /* FLY */ return fly(verb, INTRANSITIVE); case 32: /* LISTE */ return listen(); case 33: /* ZZZZ */ return reservoir(); diff --git a/advent.h b/advent.h index 469baa2..ffde43c 100644 --- a/advent.h +++ b/advent.h @@ -114,7 +114,8 @@ extern void set_seed(long); extern unsigned long get_next_lcg_value(void); extern long randrange(long); extern void score(enum termination); -extern int saveresume(FILE *, bool); +extern int suspend(FILE *); +extern int resume(FILE *); /* * MOD(N,M) = Arithmetic modulus diff --git a/saveresume.c b/saveresume.c index 19e65e1..e6961d2 100644 --- a/saveresume.c +++ b/saveresume.c @@ -29,68 +29,76 @@ struct save_t { }; struct save_t save; -int saveresume(FILE *input, bool resume) /* Suspend and resume */ +int suspend(FILE *input) { 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; + + while (fp == NULL) { + char* name = linenoise("\nFile name: "); + if (name == NULL) + return GO_TOP; + fp = fopen(name, WRITE_MODE); + if (fp == NULL) + printf("Can't open file %s, try again.\n", name); + linenoiseFree(name); + } + + DATIME(&i,&k); + k=i+650*k; + save.savetime = k; + save.mode = -1; + save.version = VRSION; + memcpy(&save.game, &game, sizeof(struct game_t)); + save.bird = OBJSND[BIRD]; + save.bivalve = OBJTXT[OYSTER]; + IGNORE(fwrite(&save, sizeof(struct save_t), 1, fp)); + fclose(fp); + RSPEAK(RESUME_HELP); + exit(0); +} + +int resume(FILE *input) +{ + FILE *fp = NULL; - if (!resume) { - /* 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); + /* 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; - 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) { char* name = linenoise("\nFile name: "); if (name == NULL) return GO_TOP; - fp = fopen(name,(resume ? READ_MODE : WRITE_MODE)); + fp = fopen(name, READ_MODE); if (fp == NULL) printf("Can't open file %s, try again.\n", name); linenoiseFree(name); } - - DATIME(&i,&k); - k=i+650*k; - if (!resume) - { - save.savetime = k; - save.mode = -1; - save.version = VRSION; - memcpy(&save.game, &game, sizeof(struct game_t)); - save.bird = OBJSND[BIRD]; - save.bivalve = OBJTXT[OYSTER]; - IGNORE(fwrite(&save, sizeof(struct save_t), 1, fp)); - fclose(fp); - RSPEAK(RESUME_HELP); - exit(0); + + IGNORE(fread(&save, sizeof(struct save_t), 1, fp)); + fclose(fp); + if (save.version != VRSION) { + SETPRM(1,save.version/10,MOD(save.version,10)); + SETPRM(3,VRSION/10,MOD(VRSION,10)); + RSPEAK(VERSION_SKEW); } else { - IGNORE(fread(&save, sizeof(struct save_t), 1, fp)); - fclose(fp); - if (save.version != VRSION) { - SETPRM(1,k/10,MOD(k,10)); - SETPRM(3,VRSION/10,MOD(VRSION,10)); - RSPEAK(VERSION_SKEW); - } else { - memcpy(&game, &save.game, sizeof(struct game_t)); - OBJSND[BIRD] = save.bird; - OBJTXT[OYSTER] = save.bivalve; - game.zzword=RNDVOC(3,game.zzword); - } - return GO_TOP; + memcpy(&game, &save.game, sizeof(struct game_t)); + OBJSND[BIRD] = save.bird; + OBJTXT[OYSTER] = save.bivalve; + game.zzword=RNDVOC(3,game.zzword); } + return GO_TOP; } /* end */