X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=saveresume.c;h=25757c4f24be83c82d66d9e71d0a70a7ff1b15b2;hb=94e7cc65050ddfd04a8a1606f8899c7e5be496e8;hp=15d14c1472dbbdc09b784581ee30f9e3c9fd1d80;hpb=0799bc2f7981e9138c15c801eb46e61e635e1c60;p=open-adventure.git diff --git a/saveresume.c b/saveresume.c index 15d14c1..25757c4 100644 --- a/saveresume.c +++ b/saveresume.c @@ -11,7 +11,6 @@ #include #include -#include #include #include @@ -69,12 +68,12 @@ int suspend(void) 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; while (fp == NULL) { - char* name = readline("\nFile name: "); + char* name = myreadline("\nFile name: "); if (name == NULL) return GO_TOP; fp = fopen(name, WRITE_MODE); @@ -102,15 +101,15 @@ 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])) + if (!yes_or_no(arbitrary_messages[THIS_ACCEPTABLE], arbitrary_messages[OK_MAN], arbitrary_messages[OK_MAN])) return GO_CLEAROBJ; } while (fp == NULL) { - char* name = readline("\nFile name: "); - // Autocomplete can leave the input with an extra traoling space. - if (name != NULL && strlen(name) > 0 && name[strlen(name) - 1] == ' ') - name[strlen(name) - 1] = '\0'; + 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'; if (name == NULL) return GO_TOP; fp = fopen(name, READ_MODE); @@ -144,8 +143,8 @@ int restore(FILE* fp) 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 invaild state. We check that state is + * With valid, reacheable state, with valid, but unreachable + * state and with invalid state. We check that state is * valid: no states are outside minimal or maximal value */