#include <stdarg.h>
#include <sys/time.h>
#include <ctype.h>
+#include <editline/readline.h>
#include "advent.h"
-#include "linenoise/linenoise.h"
#include "dungeon.h"
char* xstrdup(const char* s)
void packed_to_token(long packed, char token[6])
{
- // The advent->ascii mapping.
- const char advent_to_ascii[] = {
- ' ', '!', '"', '#', '$', '%', '&', '\'',
- '(', ')', '*', '+', ',', '-', '.', '/',
- '0', '1', '2', '3', '4', '5', '6', '7',
- '8', '9', ':', ';', '<', '=', '>', '?',
- '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G',
- 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
- 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
- 'X', 'Y', 'Z', '\0', '\0', '\0', '\0', '\0',
-};
+ // The advent->ascii mapping.
+ const char advent_to_ascii[] = {
+ ' ', '!', '"', '#', '$', '%', '&', '\'',
+ '(', ')', '*', '+', ',', '-', '.', '/',
+ '0', '1', '2', '3', '4', '5', '6', '7',
+ '8', '9', ':', ';', '<', '=', '>', '?',
+ '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G',
+ 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
+ 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
+ 'X', 'Y', 'Z', '\0', '\0', '\0', '\0', '\0',
+ };
// Unpack and map back to ASCII.
for (int i = 0; i < 5; ++i) {
long token_to_packed(const char token[6])
{
- const char ascii_to_advent[] = {
- 63, 63, 63, 63, 63, 63, 63, 63,
- 63, 63, 63, 63, 63, 63, 63, 63,
- 63, 63, 63, 63, 63, 63, 63, 63,
- 63, 63, 63, 63, 63, 63, 63, 63,
-
- 0, 1, 2, 3, 4, 5, 6, 7,
- 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23,
- 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39,
- 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55,
- 56, 57, 58, 59, 60, 61, 62, 63,
-
- 63, 63, 63, 63, 63, 63, 63, 63,
- 63, 63, 63, 63, 63, 63, 63, 63,
- 63, 63, 63, 63, 63, 63, 63, 63,
- 63, 63, 63, 63, 63, 63, 63, 63,
-};
+ const char ascii_to_advent[] = {
+ 63, 63, 63, 63, 63, 63, 63, 63,
+ 63, 63, 63, 63, 63, 63, 63, 63,
+ 63, 63, 63, 63, 63, 63, 63, 63,
+ 63, 63, 63, 63, 63, 63, 63, 63,
+
+ 0, 1, 2, 3, 4, 5, 6, 7,
+ 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39,
+ 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55,
+ 56, 57, 58, 59, 60, 61, 62, 63,
+
+ 63, 63, 63, 63, 63, 63, 63, 63,
+ 63, 63, 63, 63, 63, 63, 63, 63,
+ 63, 63, 63, 63, 63, 63, 63, 63,
+ 63, 63, 63, 63, 63, 63, 63, 63,
+ };
size_t t_len = strlen(token);
long packed = 0;
/* I/O routines (speak, pspeak, rspeak, get_input, yes) */
-void vspeak(const char* msg, va_list ap)
+void vspeak(const char* msg, bool blank, va_list ap)
{
// Do nothing if we got a null pointer.
if (msg == NULL)
if (strlen(msg) == 0)
return;
- // Print a newline if the global game.blklin says to.
- if (game.blklin == true)
- printf("\n");
+ if (blank == true)
+ printf("\n");
int msglen = strlen(msg);
} else {
long arg = va_arg(ap, long);
if (arg == -1)
- arg = 0;
+ arg = 0; // LCOV_EXCL_LINE - don't think we can get here.
i++;
// Integer specifier. In order to accommodate the fact
// that PARMS can have both legitimate integers *and*
}
}
- /* Version specifier */
+ /* Version specifier */
if (msg[i] == 'V') {
- strcpy(renderp, VERSION);
+ strcpy(renderp, VERSION);
size_t len = strlen(VERSION);
renderp += len;
size -= len;
- }
-
+ }
+
// All-lowercase specifier.
if (msg[i] == 'L' || msg[i] == 'C') {
packed_to_token(arg, renderp); /* unpack directly to destination */
{
va_list ap;
va_start(ap, msg);
- vspeak(msg, ap);
+ vspeak(msg, true, ap);
va_end(ap);
}
-void pspeak(vocab_t msg, enum speaktype mode, int skip, ...)
+void pspeak(vocab_t msg, enum speaktype mode, int skip, bool blank, ...)
/* Find the skip+1st message from msg and print it. Modes are:
* feel = for inventory, what you can touch
* look = the long description for the state the object is in
* study = text on the object. */
{
va_list ap;
- va_start(ap, skip);
+ va_start(ap, blank);
switch (mode) {
case touch:
- vspeak(objects[msg].inventory, ap);
+ vspeak(objects[msg].inventory, blank, ap);
break;
case look:
- vspeak(objects[msg].descriptions[skip], ap);
+ vspeak(objects[msg].descriptions[skip], blank, ap);
break;
case hear:
- vspeak(objects[msg].sounds[skip], ap);
+ vspeak(objects[msg].sounds[skip], blank, ap);
break;
case study:
- vspeak(objects[msg].texts[skip], ap);
+ vspeak(objects[msg].texts[skip], blank, ap);
break;
case change:
- vspeak(objects[msg].changes[skip], ap);
+ vspeak(objects[msg].changes[skip], blank, ap);
break;
}
va_end(ap);
{
va_list ap;
va_start(ap, i);
- vspeak(arbitrary_messages[i], ap);
+ vspeak(arbitrary_messages[i], true, ap);
va_end(ap);
}
-void echo_input(FILE* destination, char* input_prompt, char* input)
+void echo_input(FILE* destination, const char* input_prompt, const char* input)
{
size_t len = strlen(input_prompt) + strlen(input) + 1;
char* prompt_and_input = (char*) xmalloc(len);
{
// Set up the prompt
char input_prompt[] = "> ";
- if (!prompt)
+ if (!settings.prompt)
input_prompt[0] = '\0';
- // Print a blank line if game.blklin tells us to.
- if (game.blklin == true)
- printf("\n");
+ // Print a blank line
+ printf("\n");
char* input;
while (true) {
- if (editline)
- input = linenoise(input_prompt);
- else {
- input = NULL;
- size_t n = 0;
- if (isatty(0))
- // LCOV_EXCL_START
- // Should be unreachable in tests, as they will use a non-interactive shell.
- printf("%s", input_prompt);
- // LCOV_EXCL_STOP
- ssize_t numread = getline(&input, &n, stdin);
- if (numread == -1) // Got EOF; return with it.
- return (NULL);
- }
+ input = readline(input_prompt);
if (input == NULL) // Got EOF; return with it.
return (input);
- else if (input[0] == '#') // Ignore comments.
+ else if (input[0] == '#') { // Ignore comments.
+ free(input);
continue;
- else // We have a 'normal' line; leave the loop.
+ } else // We have a 'normal' line; leave the loop.
break;
}
// Strip trailing newlines from the input
input[strcspn(input, "\n")] = 0;
- linenoiseHistoryAdd(input);
+ add_history(input);
if (!isatty(0))
echo_input(stdout, input_prompt, input);
- if (logfp)
- echo_input(logfp, input_prompt, input);
+ if (settings.logfp)
+ echo_input(settings.logfp, "", input);
return (input);
}
if (reply == NULL) {
// LCOV_EXCL_START
// Should be unreachable. Reply should never be NULL
- linenoiseFree(reply);
+ free(reply);
exit(EXIT_SUCCESS);
// LCOV_EXCL_STOP
}
char* firstword = (char*) xmalloc(strlen(reply) + 1);
sscanf(reply, "%s", firstword);
+ free(reply);
+
for (int i = 0; i < (int)strlen(firstword); ++i)
firstword[i] = tolower(firstword[i]);
} else
rspeak(PLEASE_ANSWER);
}
- linenoiseFree(reply);
return (outcome);
}
if (reply == NULL) {
// LCOV_EXCL_START
// Should be unreachable. Reply should never be NULL
- linenoiseFree(reply);
+ free(reply);
exit(EXIT_SUCCESS);
// LCOV_EXCL_STOP
}
char* firstword = (char*) xmalloc(strlen(reply) + 1);
sscanf(reply, "%s", firstword);
+ free(reply);
+
for (int i = 0; i < (int)strlen(firstword); ++i)
firstword[i] = tolower(firstword[i]);
break;
} else
rspeak(PLEASE_ANSWER);
+
}
- linenoiseFree(reply);
+
return (outcome);
}
{
for (int i = 0; i < NMOTIONS; ++i) {
for (int j = 0; j < motions[i].words.n; ++j) {
- if (strcasecmp(word, motions[i].words.strs[j]) == 0)
+ if (strcasecmp(word, motions[i].words.strs[j]) == 0 && (strlen(word) > 1 || strchr(ignore, word[0]) == NULL || !settings.oldstyle))
return (i);
}
}
{
for (int i = 0; i < NACTIONS; ++i) {
for (int j = 0; j < actions[i].words.n; ++j) {
- if (strcasecmp(word, actions[i].words.strs[j]) == 0)
+ if (strcasecmp(word, actions[i].words.strs[j]) == 0 && (strlen(word) > 1 || strchr(ignore, word[0]) == NULL || !settings.oldstyle))
return (i);
}
}
{
long ref_num;
+ /* FIXME: Magic numbers related to vocabulary */
ref_num = get_motion_vocab_id(word);
if (ref_num != WORD_NOT_FOUND)
return (ref_num + 0); // FIXME: replace with a proper hash
return (at);
}
-/* Utility routines (SETBIT, TSTBIT, set_seed, get_next_lcg_value,
- * randrange, RNDVOC) */
+/* Utility routines (setbit, tstbit, set_seed, get_next_lcg_value,
+ * randrange) */
long setbit(long bit)
/* Returns 2**bit for use in constructing bit-masks. */
/* Set the LCG seed */
{
game.lcg_x = (unsigned long) seedval % game.lcg_m;
+
+ // once seed is set, we need to generate the Z`ZZZ word
+ make_zzword(game.zzword);
}
unsigned long get_next_lcg_value(void)
zzword[5] = '\0';
}
-void datime(long* d, long* t)
-{
- struct timeval tv;
- gettimeofday(&tv, NULL);
- *d = (long) tv.tv_sec;
- *t = (long) tv.tv_usec;
-}
-
// LCOV_EXCL_START
void bug(enum bugtype num, const char *error_string)
{