X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=saveresume.c;h=cf5a69626912d9bb166724c4d59ced0a48588a3a;hp=338615844b24cf6a945c4271d82a3ee887d2abf7;hb=bf2fa227f0786952ae4a632a1520bf1cf6663c98;hpb=59243cf8bc1939348467810bc63e107728a680c4

diff --git a/saveresume.c b/saveresume.c
index 3386158..cf5a696 100644
--- a/saveresume.c
+++ b/saveresume.c
@@ -2,8 +2,7 @@
 #include <string.h>
 
 #include "advent.h"
-#include "database.h"
-#include "newdb.h"
+#include "dungeon.h"
 #include "linenoise/linenoise.h"
 
 /*
@@ -27,6 +26,22 @@ struct save_t {
 };
 struct save_t save;
 
+int savefile(FILE *fp, long version)
+/* 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);
+}
+
 /* Suspend and resume */
 int suspend(void)
 {
@@ -38,7 +53,6 @@ int suspend(void)
 #ifdef ADVENT_NOSAVE
     return GO_UNKNOWN;
 #endif
-    long i, k;
     FILE *fp = NULL;
 
     rspeak(SUSPEND_WARNING);
@@ -55,13 +69,7 @@ int suspend(void)
         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));
-    IGNORE(fwrite(&save, sizeof(struct save_t), 1, fp));
+    savefile(fp, VRSION);
     fclose(fp);
     rspeak(RESUME_HELP);
     exit(0);
@@ -110,7 +118,8 @@ int restore(FILE* fp)
         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.zzword = rndvoc(3, game.zzword);
+        //game.zzword = rndvoc(3, game.zzword);
+        make_zzword(game.zzword);
     }
     return GO_TOP;
 }