projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cppcheck cleanup.
[open-adventure.git]
/
saveresume.c
diff --git
a/saveresume.c
b/saveresume.c
index 783e6714262b8857b487bec49a4cdbaf2b0b97a0..f4d986a36ddb5312d0cfc0d10ef842213c96ccb7 100644
(file)
--- a/
saveresume.c
+++ b/
saveresume.c
@@
-11,7
+11,6
@@
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
-#include <editline/readline.h>
#include <time.h>
#include <inttypes.h>
#include <time.h>
#include <inttypes.h>
@@
-69,12
+68,12
@@
int suspend(void)
FILE *fp = NULL;
rspeak(SUSPEND_WARNING);
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) {
return GO_CLEAROBJ;
game.saved = game.saved + 5;
while (fp == NULL) {
- char* name = readline("\nFile name: ");
+ char* name =
my
readline("\nFile name: ");
if (name == NULL)
return GO_TOP;
fp = fopen(name, WRITE_MODE);
if (name == NULL)
return GO_TOP;
fp = fopen(name, WRITE_MODE);
@@
-102,12
+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) {
return GO_CLEAROBJ;
}
while (fp == NULL) {
- char* name = readline("\nFile name: ");
+ 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);
if (name == NULL)
return GO_TOP;
fp = fopen(name, READ_MODE);