X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=misc.c;h=b10a76857b6d845376049a4c47b0e7e0d13dc043;hp=4f32246c75ff69802e23fb8d0a42888b8df89b92;hb=8bc08773fa4ac22f7fd3c89d8e8be92d2cab616a;hpb=bf2fa227f0786952ae4a632a1520bf1cf6663c98 diff --git a/misc.c b/misc.c index 4f32246..b10a768 100644 --- a/misc.c +++ b/misc.c @@ -10,38 +10,6 @@ #include "linenoise/linenoise.h" #include "dungeon.h" -const char new_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', -}; - -const char new_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, -}; - char* xstrdup(const char* s) { char* ptr = strdup(s); @@ -69,10 +37,22 @@ void* xmalloc(size_t size) 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', +}; + // Unpack and map back to ASCII. for (int i = 0; i < 5; ++i) { char advent = (packed >> i * 6) & 63; - token[i] = new_advent_to_ascii[(int) advent]; + token[i] = advent_to_ascii[(int) advent]; } // Ensure the last character is \0. @@ -89,10 +69,31 @@ void packed_to_token(long packed, char token[6]) 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, +}; + size_t t_len = strlen(token); long packed = 0; for (size_t i = 0; i < t_len; ++i) { - char mapped = new_ascii_to_advent[(int) token[i]]; + char mapped = ascii_to_advent[(int) token[i]]; packed |= (mapped << (6 * i)); } return (packed); @@ -106,8 +107,8 @@ void tokenize(char* raw, long tokens[4]) // grab the first two words char* words[2]; - words[0] = (char*) xmalloc(strlen(raw)); - words[1] = (char*) xmalloc(strlen(raw)); + words[0] = (char*) xmalloc(strlen(raw) + 1); + words[1] = (char*) xmalloc(strlen(raw) + 1); int word_count = sscanf(raw, "%s%s", words[0], words[1]); // make space for substrings and zero it out @@ -152,7 +153,7 @@ void wordclear(token_t *v) *v = 0; } -/* I/O routines (speak, pspeak, rspeak, GETIN, YES) */ +/* I/O routines (speak, pspeak, rspeak, get_input, yes) */ void vspeak(const char* msg, va_list ap) { @@ -175,7 +176,9 @@ void vspeak(const char* msg, va_list ap) char* rendered = xmalloc(size); char* renderp = rendered; - // Handle format specifiers (including the custom %C, %L, %S) by adjusting the parameter accordingly, and replacing the specifier with %s. + // Handle format specifiers (including the custom %C, %L, %S) by + // adjusting the parameter accordingly, and replacing the + // specifier with %s. long previous_arg = 0; for (int i = 0; i < msglen; i++) { if (msg[i] != '%') { @@ -186,7 +189,10 @@ void vspeak(const char* msg, va_list ap) if (arg == -1) arg = 0; i++; - // Integer specifier. In order to accommodate the fact that PARMS can have both legitimate integers *and* packed tokens, stringify everything. Future work may eliminate the need for this. + // Integer specifier. In order to accommodate the fact + // that PARMS can have both legitimate integers *and* + // packed tokens, stringify everything. Future work may + // eliminate the need for this. if (msg[i] == 'd') { int ret = snprintf(renderp, size, "%ld", arg); if (ret < size) { @@ -211,6 +217,14 @@ void vspeak(const char* msg, va_list ap) } } + /* Version specifier */ + if (msg[i] == 'V') { + 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 */ @@ -228,7 +242,7 @@ void vspeak(const char* msg, va_list ap) } } *renderp = 0; - + // Print the message. printf("%s\n", rendered); @@ -337,9 +351,10 @@ char* get_input() if (input == NULL) // Got EOF; return with it. return (input); - else if (input[0] == '#') // Ignore comments. + else if (input[0] == '#') { // Ignore comments. + linenoiseFree(input); continue; - else // We have a 'normal' line; leave the loop. + } else // We have a 'normal' line; leave the loop. break; } @@ -375,6 +390,8 @@ bool silent_yes() char* firstword = (char*) xmalloc(strlen(reply) + 1); sscanf(reply, "%s", firstword); + linenoiseFree(reply); + for (int i = 0; i < (int)strlen(firstword); ++i) firstword[i] = tolower(firstword[i]); @@ -394,7 +411,6 @@ bool silent_yes() } else rspeak(PLEASE_ANSWER); } - linenoiseFree(reply); return (outcome); } @@ -421,6 +437,8 @@ bool yes(const char* question, const char* yes_response, const char* no_response char* firstword = (char*) xmalloc(strlen(reply) + 1); sscanf(reply, "%s", firstword); + linenoiseFree(reply); + for (int i = 0; i < (int)strlen(firstword); ++i) firstword[i] = tolower(firstword[i]); @@ -441,8 +459,9 @@ bool yes(const char* question, const char* yes_response, const char* no_response break; } else rspeak(PLEASE_ANSWER); + } - linenoiseFree(reply); + return (outcome); }