projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up remnant magic labels.
[open-adventure.git]
/
saveresume.c
diff --git
a/saveresume.c
b/saveresume.c
index af94c4aa2043b8d5d7d16273bac2ae99036d15cc..62523f304a906a6714aab4f5e98b6b8ac7c6ef2e 100644
(file)
--- a/
saveresume.c
+++ b/
saveresume.c
@@
-3,6
+3,7
@@
#include "advent.h"
#include "database.h"
#include "advent.h"
#include "database.h"
+#include "newdb.h"
#include "linenoise/linenoise.h"
/*
#include "linenoise/linenoise.h"
/*
@@
-33,13
+34,12
@@
int saveresume(FILE *input, bool resume)
{
long i, k;
FILE *fp = NULL;
{
long i, k;
FILE *fp = NULL;
- char *name;
-
+
if (!resume) {
/* 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 (!resume) {
/* 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). */
- RSPEAK(260);
+ RSPEAK(
ARB_
260);
if (!YES(input,200,54,54)) return GO_CLEAROBJ;
game.saved=game.saved+5;
}
if (!YES(input,200,54,54)) return GO_CLEAROBJ;
game.saved=game.saved+5;
}
@@
-47,13
+47,13
@@
int saveresume(FILE *input, bool resume)
{
/* Resume. Read a suspended game back from a file. */
if (game.loc != 1 || game.abbrev[1] != 1) {
{
/* Resume. Read a suspended game back from a file. */
if (game.loc != 1 || game.abbrev[1] != 1) {
- RSPEAK(268);
+ RSPEAK(
ARB_
268);
if (!YES(input,200,54,54)) return GO_CLEAROBJ;
}
}
while (fp == NULL) {
if (!YES(input,200,54,54)) return GO_CLEAROBJ;
}
}
while (fp == NULL) {
- name = linenoise("\nFile name: ");
+
char*
name = linenoise("\nFile name: ");
if (name == NULL)
return GO_TOP;
fp = fopen(name,(resume ? READ_MODE : WRITE_MODE));
if (name == NULL)
return GO_TOP;
fp = fopen(name,(resume ? READ_MODE : WRITE_MODE));
@@
-74,7
+74,7
@@
int saveresume(FILE *input, bool resume)
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(266);
+ RSPEAK(
ARB_
266);
exit(0);
} else {
IGNORE(fread(&save, sizeof(struct save_t), 1, fp));
exit(0);
} else {
IGNORE(fread(&save, sizeof(struct save_t), 1, fp));
@@
-82,7
+82,7
@@
int saveresume(FILE *input, bool resume)
if (save.version != VRSION) {
SETPRM(1,k/10,MOD(k,10));
SETPRM(3,VRSION/10,MOD(VRSION,10));
if (save.version != VRSION) {
SETPRM(1,k/10,MOD(k,10));
SETPRM(3,VRSION/10,MOD(VRSION,10));
- RSPEAK(269);
+ RSPEAK(
ARB_
269);
} 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;