X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=saveresume.c;h=4ce219af323e7e7ebff1cea80fbfa43f524b0b07;hp=ab47a3bfa56fd84a19c30e01848a7425963fc1a4;hb=d0a868bd4ac2bf4d3258f4fcdac328cef077eff5;hpb=83fb64b5a817de3f1023c79ab2319d01d9dce9ae diff --git a/saveresume.c b/saveresume.c index ab47a3b..4ce219a 100644 --- a/saveresume.c +++ b/saveresume.c @@ -2,7 +2,7 @@ #include #include "advent.h" -#include "newdb.h" +#include "dungeon.h" #include "linenoise/linenoise.h" /* @@ -27,19 +27,19 @@ struct save_t { struct save_t save; int savefile(FILE *fp, long version) - /* Save game to file. No input or output from user. */ +/* Save game to file. No input or output from user. */ { long i, k; datime(&i, &k); k = i + 650 * k; save.savetime = k; save.mode = -1; - + save.version = (version == 0) ? VRSION : version; - + memcpy(&save.game, &game, sizeof(struct game_t)); IGNORE(fwrite(&save, sizeof(struct save_t), 1, fp)); - return(0); + return (0); } /* Suspend and resume */ @@ -56,7 +56,8 @@ int suspend(void) FILE *fp = NULL; rspeak(SUSPEND_WARNING); - if (!yes(arbitrary_messages[THIS_ACCEPTABLE], arbitrary_messages[OK_MAN], arbitrary_messages[OK_MAN])) return GO_CLEAROBJ; + if (!yes(arbitrary_messages[THIS_ACCEPTABLE], arbitrary_messages[OK_MAN], arbitrary_messages[OK_MAN])) + return GO_CLEAROBJ; game.saved = game.saved + 5; while (fp == NULL) { @@ -87,7 +88,8 @@ int resume(void) 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; + if (!yes(arbitrary_messages[THIS_ACCEPTABLE], arbitrary_messages[OK_MAN], arbitrary_messages[OK_MAN])) + return GO_CLEAROBJ; } while (fp == NULL) { @@ -119,7 +121,7 @@ int restore(FILE* fp) } else { memcpy(&game, &save.game, sizeof(struct game_t)); //game.zzword = rndvoc(3, game.zzword); - make_zzword(game.zzword); + make_zzword(game.zzword); } return GO_TOP; }