Change the name of the KEY array to avoid an upcoming macro clash.

[open-adventure.git] / saveresume.c

diff --git a/saveresume.c b/saveresume.c
index c8ba37abb59a11b268d31790f010a768616e0d83..338615844b24cf6a945c4271d82a3ee887d2abf7 100644 (file)
--- a/saveresume.c
+++ b/saveresume.c
@@ -24,8 +24,6 @@ struct save_t {
     long mode;         /* not used, must be present for version detection */
     long version;
     struct game_t game;
-    long bird;
-    long bivalve;
 };
 struct save_t save;
 
@@ -44,7 +42,7 @@ 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) {
@@ -57,14 +55,12 @@ int suspend(void)
         linenoiseFree(name);
     }
 
-    DATIME(&i, &k);
+    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);
@@ -83,7 +79,7 @@ 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) {
@@ -114,9 +110,7 @@ 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));
-        OBJSND[BIRD] = save.bird;
-        OBJTXT[OYSTER] = save.bivalve;
-        game.zzword = RNDVOC(3, game.zzword);
+        game.zzword = rndvoc(3, game.zzword);
     }
     return GO_TOP;
 }