projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace linenoise with libedit in code and build.
[open-adventure.git]
/
main.c
diff --git
a/main.c
b/main.c
index 1e2a1fd68722f850afdb45a80588cc344fc53ac0..ce383a0fbd2366cf2c86ffc09ced36c8cdc1795f 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-21,7
+21,6
@@
#include <signal.h>
#include <string.h>
#include "advent.h"
#include <signal.h>
#include <string.h>
#include "advent.h"
-#include "linenoise/linenoise.h"
#include "dungeon.h"
#define DIM(a) (sizeof(a)/sizeof(a[0]))
#include "dungeon.h"
#define DIM(a) (sizeof(a)/sizeof(a[0]))
@@
-115,13
+114,13
@@
int main(int argc, char *argv[])
}
}
}
}
- linenoiseHistorySetMaxLen(350);
-
/* Initialize game variables */
long seedval = initialise();
/* Start-up, dwarf stuff */
make_zzword(game.zzword);
/* Initialize game variables */
long seedval = initialise();
/* Start-up, dwarf stuff */
make_zzword(game.zzword);
+
+#ifndef ADVENT_NOSAVE
if (!rfp) {
game.novice = yes(arbitrary_messages[WELCOME_YOU], arbitrary_messages[CAVE_NEARBY], arbitrary_messages[NO_MESSAGE]);
if (game.novice)
if (!rfp) {
game.novice = yes(arbitrary_messages[WELCOME_YOU], arbitrary_messages[CAVE_NEARBY], arbitrary_messages[NO_MESSAGE]);
if (game.novice)
@@
-129,6
+128,7
@@
int main(int argc, char *argv[])
} else {
restore(rfp);
}
} else {
restore(rfp);
}
+#endif
if (logfp)
fprintf(logfp, "seed %ld\n", seedval);
if (logfp)
fprintf(logfp, "seed %ld\n", seedval);
@@
-1033,7
+1033,7
@@
L2600:
}
strncpy(inputbuf, input, LINESIZE - 1);
}
strncpy(inputbuf, input, LINESIZE - 1);
-
linenoiseF
ree(input);
+
f
ree(input);
long tokens[4];
tokenize(inputbuf, tokens);
long tokens[4];
tokenize(inputbuf, tokens);
@@
-1090,12
+1090,12
@@
L2607:
wordclear(&command.wd2);
} else {
/* FIXME: Magic numbers related to vocabulary */
wordclear(&command.wd2);
} else {
/* FIXME: Magic numbers related to vocabulary */
- if (!((V1 != PROMOTE_WORD(WATER) && V1 != PROMOTE_WORD(OIL)) ||
- (V2 != PROMOTE_WORD(PLANT) && V2 != PROMOTE_WORD(DOOR)))) {
- if (AT(DEMOTE_WORD(V2)))
+
if (!((V1 != PROMOTE_WORD(WATER) && V1 != PROMOTE_WORD(OIL)) ||
+
(V2 != PROMOTE_WORD(PLANT) && V2 != PROMOTE_WORD(DOOR)))) {
+
if (AT(DEMOTE_WORD(V2)))
command.wd2 = token_to_packed("POUR");
}
command.wd2 = token_to_packed("POUR");
}
- if (V1 == PROMOTE_WORD(CAGE) && V2 == PROMOTE_WORD(BIRD) && HERE(CAGE) && HERE(BIRD))
+
if (V1 == PROMOTE_WORD(CAGE) && V2 == PROMOTE_WORD(BIRD) && HERE(CAGE) && HERE(BIRD))
command.wd1 = token_to_packed("CATCH");
}
L2620:
command.wd1 = token_to_packed("CATCH");
}
L2620: