projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add optional auto-save/restore feature using -a <filename> option
[open-adventure.git]
/
saveresume.c
diff --git
a/saveresume.c
b/saveresume.c
index 23050778b00c1fb0420a773c1f952b46025d7784..ad9f844b16b7e289d2924432d43f5913909024ac 100644
(file)
--- a/
saveresume.c
+++ b/
saveresume.c
@@
-62,13
+62,13
@@
int suspend(void)
* battles or to start over after learning zzword).
* If ADVENT_NOSAVE is defined, do nothing instead. */
* battles or to start over after learning zzword).
* If ADVENT_NOSAVE is defined, do nothing instead. */
-#if
def ADVENT_N
OSAVE
+#if
defined ADVENT_NOSAVE || defined ADVENT_AUT
OSAVE
return GO_UNKNOWN;
#endif
FILE *fp = NULL;
rspeak(SUSPEND_WARNING);
return GO_UNKNOWN;
#endif
FILE *fp = NULL;
rspeak(SUSPEND_WARNING);
- if (!yes(arbitrary_messages[THIS_ACCEPTABLE], arbitrary_messages[OK_MAN], arbitrary_messages[OK_MAN]))
+ if (!yes
_or_no
(arbitrary_messages[THIS_ACCEPTABLE], arbitrary_messages[OK_MAN], arbitrary_messages[OK_MAN]))
return GO_CLEAROBJ;
game.saved = game.saved + 5;
return GO_CLEAROBJ;
game.saved = game.saved + 5;
@@
-93,7
+93,7
@@
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. */
-#if
def ADVENT_N
OSAVE
+#if
defined ADVENT_NOSAVE || defined ADVENT_AUT
OSAVE
return GO_UNKNOWN;
#endif
FILE *fp = NULL;
return GO_UNKNOWN;
#endif
FILE *fp = NULL;
@@
-101,15
+101,15
@@
int resume(void)
if (game.loc != 1 ||
game.abbrev[1] != 1) {
rspeak(RESUME_ABANDON);
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]))
+ if (!yes
_or_no
(arbitrary_messages[THIS_ACCEPTABLE], arbitrary_messages[OK_MAN], arbitrary_messages[OK_MAN]))
return GO_CLEAROBJ;
}
while (fp == NULL) {
char* name = myreadline("\nFile name: ");
return GO_CLEAROBJ;
}
while (fp == NULL) {
char* name = myreadline("\nFile name: ");
- // Autocomplete can leave the input with an extra trailing space.
- if (name != NULL && strlen(name) > 0 && name[strlen(name) - 1] == ' ')
- name[strlen(name) - 1] = '\0';
+
// Autocomplete can leave the input with an extra trailing space.
+
if (name != NULL && strlen(name) > 0 && name[strlen(name) - 1] == ' ')
+
name[strlen(name) - 1] = '\0';
if (name == NULL)
return GO_TOP;
fp = fopen(name, READ_MODE);
if (name == NULL)
return GO_TOP;
fp = fopen(name, READ_MODE);
@@
-143,8
+143,8
@@
int restore(FILE* fp)
bool is_valid(struct game_t valgame)
{
/* Save files can be roughly grouped into three groups:
bool is_valid(struct game_t valgame)
{
/* Save files can be roughly grouped into three groups:
- * With valid, reaceable state, with valid, but unreachable
- * state and with inva
il
d state. We check that state is
+ * With valid, reac
h
eable state, with valid, but unreachable
+ * state and with inva
li
d state. We check that state is
* valid: no states are outside minimal or maximal value
*/
* valid: no states are outside minimal or maximal value
*/