X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=saveresume.c;h=d8541748fbf25fe573770562028838c65248ac7a;hb=refs%2Ftags%2F1.4;hp=088bab150a17e62f561becd19b5151d4880fa19a;hpb=d23111dabab46a8bcdf7e453ec099e4521d1cad6;p=open-adventure.git diff --git a/saveresume.c b/saveresume.c index 088bab1..d854174 100644 --- a/saveresume.c +++ b/saveresume.c @@ -11,7 +11,7 @@ * see the history.adoc file in the source distribution for discussion. */ -#define VRSION 26 /* bump on save format change */ +#define VRSION 27 /* bump on save format change */ /* * If you change the first three members, the resume function may not properly @@ -36,7 +36,7 @@ int savefile(FILE *fp, long version) save.mode = -1; save.version = (version == 0) ? VRSION : version; - memcpy(&save.game, &game, sizeof(struct game_t)); + save.game = game; IGNORE(fwrite(&save, sizeof(struct save_t), 1, fp)); return (0); } @@ -85,7 +85,8 @@ int resume(void) #endif FILE *fp = NULL; - if (game.loc != 1 || game.abbrev[1] != 1) { + if (game.loc != 1 || + game.abbrev[1] != 1) { rspeak(RESUME_ABANDON); if (!yes(arbitrary_messages[THIS_ACCEPTABLE], arbitrary_messages[OK_MAN], arbitrary_messages[OK_MAN])) return GO_CLEAROBJ; @@ -118,7 +119,7 @@ int restore(FILE* fp) if (save.version != VRSION) { rspeak(VERSION_SKEW, save.version / 10, MOD(save.version, 10), VRSION / 10, MOD(VRSION, 10)); } else { - memcpy(&game, &save.game, sizeof(struct game_t)); + game = save.game; } return GO_TOP; }