projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Expose a vocabulary[] array in newdb.c.
[open-adventure.git]
/
saveresume.c
diff --git
a/saveresume.c
b/saveresume.c
index 5cc97267d1b5119f78e5283a5bcd0940ee30268c..cf3274640e41de39700786f082a0adac71e4d548 100644
(file)
--- a/
saveresume.c
+++ b/
saveresume.c
@@
-24,14
+24,13
@@
struct save_t {
long mode; /* not used, must be present for version detection */
long version;
struct game_t game;
long mode; /* not used, must be present for version detection */
long version;
struct game_t game;
- long bird;
- long bivalve;
};
struct save_t save;
/* Suspend and resume */
};
struct save_t save;
/* Suspend and resume */
-int suspend(FILE *input)
-{ /* Suspend. Offer to save things in a file, but charging
+int suspend(void)
+{
+ /* 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).
* If ADVENT_NOSAVE is defined, do nothing instead. */
* some points (so can't win by using saved games to retry
* battles or to start over after learning zzword).
* If ADVENT_NOSAVE is defined, do nothing instead. */
@@
-42,36
+41,35
@@
int suspend(FILE *input)
long i, k;
FILE *fp = NULL;
long i, k;
FILE *fp = NULL;
-
RSPEAK
(SUSPEND_WARNING);
- if (!YES(
input,THIS_ACCEPTABLE,OK_MAN,OK_MAN
)) return GO_CLEAROBJ;
- game.saved
=game.saved+
5;
+
rspeak
(SUSPEND_WARNING);
+ 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) {
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);
+
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;
+ 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.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);
IGNORE(fwrite(&save, sizeof(struct save_t), 1, fp));
fclose(fp);
-
RSPEAK
(RESUME_HELP);
+
rspeak
(RESUME_HELP);
exit(0);
}
exit(0);
}
-int resume(FILE *input)
-{ /* Resume. Read a suspended game back from a file.
+int resume(void)
+{
+ /* Resume. Read a suspended game back from a file.
* If ADVENT_NOSAVE is defined, do nothing instead. */
#ifdef ADVENT_NOSAVE
* If ADVENT_NOSAVE is defined, do nothing instead. */
#ifdef ADVENT_NOSAVE
@@
-80,25
+78,26
@@
int resume(FILE *input)
FILE *fp = NULL;
if (game.loc != 1 || game.abbrev[1] != 1) {
FILE *fp = NULL;
if (game.loc != 1 || game.abbrev[1] != 1) {
-
RSPEAK
(RESUME_ABANDON);
-
if (!YES(input,THIS_ACCEPTABLE,OK_MAN,OK_MAN
)) return GO_CLEAROBJ;
+
rspeak
(RESUME_ABANDON);
+
if (!YES(arbitrary_messages[THIS_ACCEPTABLE], arbitrary_messages[OK_MAN], arbitrary_messages[OK_MAN]
)) return GO_CLEAROBJ;
}
while (fp == NULL) {
}
while (fp == NULL) {
- char* name = linenoise("\nFile name: ");
- if (name == NULL)
- return GO_TOP;
- fp = fopen(name, READ_MODE);
- if (fp == NULL)
- printf("Can't open file %s, try again.\n", name);
- linenoiseFree(name);
+
char* name = linenoise("\nFile name: ");
+
if (name == NULL)
+
return GO_TOP;
+
fp = fopen(name, READ_MODE);
+
if (fp == NULL)
+ printf("Can't open file %s, try again.\n", name);
+
linenoiseFree(name);
}
return restore(fp);
}
int restore(FILE* fp)
}
return restore(fp);
}
int restore(FILE* fp)
-{ /* Read and restore game state from file, assuming
+{
+ /* Read and restore game state from file, assuming
* sane initial state.
* If ADVENT_NOSAVE is defined, do nothing instead. */
#ifdef ADVENT_NOSAVE
* sane initial state.
* If ADVENT_NOSAVE is defined, do nothing instead. */
#ifdef ADVENT_NOSAVE
@@
-108,16
+107,12
@@
int restore(FILE* fp)
IGNORE(fread(&save, sizeof(struct save_t), 1, fp));
fclose(fp);
if (save.version != VRSION) {
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);
+ rspeak(VERSION_SKEW, save.version / 10, MOD(save.version, 10), VRSION / 10, MOD(VRSION, 10));
} else {
memcpy(&game, &save.game, sizeof(struct game_t));
} 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;
}
}
return GO_TOP;
}
-/* end */
\ No newline at end of file
+/* end */