projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Name the lamp, grate, and bird states.
[open-adventure.git]
/
saveresume.c
diff --git
a/saveresume.c
b/saveresume.c
index 6f570b9aab8a874fe4f0a3aad4b20468ef8ff4da..c8ba37abb59a11b268d31790f010a768616e0d83 100644
(file)
--- a/
saveresume.c
+++ b/
saveresume.c
@@
-30,7
+30,7
@@
struct save_t {
struct save_t save;
/* Suspend and resume */
struct save_t save;
/* Suspend and resume */
-int suspend(
FILE *input
)
+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
{
/* Suspend. Offer to save things in a file, but charging
* some points (so can't win by using saved games to retry
@@
-43,8
+43,8
@@
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;
+
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) {
game.saved = game.saved + 5;
while (fp == NULL) {
@@
-67,11
+67,11
@@
int suspend(FILE *input)
save.bivalve = OBJTXT[OYSTER];
IGNORE(fwrite(&save, sizeof(struct save_t), 1, fp));
fclose(fp);
save.bivalve = OBJTXT[OYSTER];
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
)
+int resume(
void
)
{
/* Resume. Read a suspended game back from a file.
* If ADVENT_NOSAVE is defined, do nothing instead. */
{
/* Resume. Read a suspended game back from a file.
* If ADVENT_NOSAVE is defined, do nothing instead. */
@@
-82,8
+82,8
@@
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) {
@@
-111,9
+111,7
@@
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));
OBJSND[BIRD] = save.bird;
} else {
memcpy(&game, &save.game, sizeof(struct game_t));
OBJSND[BIRD] = save.bird;
@@
-123,4
+121,4
@@
int restore(FILE* fp)
return GO_TOP;
}
return GO_TOP;
}
-/* end */
\ No newline at end of file
+/* end */