X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=misc.c;h=c4dc35124b4e9885007e4110f85cad7d7163125e;hp=fc7ac5f9a8af44059eefb5e73b803d7973c37c0d;hb=33dfafc705db5855b47e0427b2a4622dc03221a5;hpb=65e2e472dd604e93d566206c2267738767ca726b diff --git a/misc.c b/misc.c index fc7ac5f..c4dc351 100644 --- a/misc.c +++ b/misc.c @@ -2,41 +2,45 @@ #include #include #include +#include #include #include +#include #include "advent.h" -#include "database.h" -#include "linenoise/linenoise.h" -#include "newdb.h" +#include "dungeon.h" -void* xmalloc(size_t size) +static void* xmalloc(size_t size) { - void* ptr = malloc(size); - if (ptr == NULL) - { - fprintf(stderr, "Out of memory!\n"); - exit(EXIT_FAILURE); - } - return(ptr); -} - -char* xstrdup(const char* s) -{ - char* ptr = strdup(s); + void* ptr = malloc(size); if (ptr == NULL) { + // LCOV_EXCL_START + // exclude from coverage analysis because we can't simulate an out of memory error in testing fprintf(stderr, "Out of memory!\n"); exit(EXIT_FAILURE); + // LCOV_EXCL_STOP } return (ptr); } -void packed_to_token(long packed, char token[6]) +void packed_to_token(long packed, char token[TOKLEN + 1]) { + // 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[4 - i] = advent_to_ascii[(int) advent]; + token[i] = advent_to_ascii[(int) advent]; } // Ensure the last character is \0. @@ -44,16 +48,94 @@ void packed_to_token(long packed, char token[6]) // Replace trailing whitespace with \0. for (int i = 4; i >= 0; --i) { - if (token[i] == ' ' || token[i] == '\t') + if (token[i] == ' ' || + token[i] == '\t') token[i] = '\0'; else break; } } -/* I/O routines (SPEAK, PSPEAK, RSPEAK, SETPRM, GETIN, YES) */ +long token_to_packed(const char token[]) +{ + 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); + if (t_len > TOKLEN) + t_len = TOKLEN; + long packed = 0; + for (size_t i = 0; i < t_len; ++i) { + char mapped = ascii_to_advent[(int) toupper(token[i])]; + packed |= (mapped << (6 * i)); + } + return (packed); +} + +void tokenize(char* raw, struct command_t *cmd) +{ + memset(cmd, '\0', sizeof(struct command_t)); + + /* Bound prefix on the %s would be needed to prevent buffer + * overflow. but we shortstop this more simply by making each + * raw-input buffer as long as the enrire inout buffer. */ + sscanf(raw, "%s%s", cmd->raw1, cmd->raw2); + + // pack the substrings + cmd->wd1 = token_to_packed(cmd->raw1); + cmd->wd2 = token_to_packed(cmd->raw2); + + /* (ESR) In oldstyle mode, simulate the uppercasing and truncating + * effect on raw tokens of packing them into sixbit characters, 5 + * to a 32-bit word. This is something the FORTRAN version did + * becuse archaic FORTRAN had no string types. Don Wood's + * mechanical translation of 2.5 to C retained the packing and + * thus this misfeature. + * + * It's philosophically questionable whether this is the right + * thing to do even in oldstyle mode. On one hand, the text + * mangling was not authorial intent, but a result of limitations + * in their tools. On the other, not simulating this misbehavior + * goes against the goal of making oldstyle as accurate as + * possible an emulation of the original UI. + */ + if (settings.oldstyle) { + cmd->raw1[TOKLEN + TOKLEN] = cmd->raw2[TOKLEN + TOKLEN] = '\0'; + for (size_t i = 0; i < strlen(cmd->raw1); i++) + cmd->raw1[i] = toupper(cmd->raw1[i]); + for (size_t i = 0; i < strlen(cmd->raw2); i++) + cmd->raw2[i] = toupper(cmd->raw2[i]); + } +} -void speak(const char* msg) +/* Hide the fact that wods are corrently packed longs */ + +void wordclear(token_t *v) +{ + *v = 0; +} + +/* I/O routines (speak, pspeak, rspeak, sspeak, get_input, yes) */ + +void vspeak(const char* msg, bool blank, va_list ap) { // Do nothing if we got a null pointer. if (msg == NULL) @@ -63,354 +145,438 @@ void speak(const char* msg) if (strlen(msg) == 0) return; - // Print a newline if the global game.blklin says to. - if (game.blklin == true) + if (blank == true) printf("\n"); - // Create a copy of our string, so we can edit it. - char* copy = xstrdup(msg); - - // Staging area for stringified parameters. - char parameters[5][100]; // FIXME: to be replaced with dynamic allocation - - // Handle format specifiers (including the custom %C, %L, %S) by adjusting the parameter accordingly, and replacing the specifier with %s. - int pi = 0; // parameter index - for (int i = 0; i < (int)strlen(msg); ++i) { - if (msg[i] == '%') { - ++pi; - - // 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 + 1] == 'd') { - copy[i + 1] = 's'; - sprintf(parameters[pi], "%ld", PARMS[pi]); + int msglen = strlen(msg); + + // Rendered string + ssize_t size = 2000; /* msglen > 50 ? msglen*2 : 100; */ + 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. + long previous_arg = 0; + for (int i = 0; i < msglen; i++) { + if (msg[i] != '%') { + /* Ugh. Least obtrusive way to deal with artifacts "on the floor" + * being dropped outside of both cave and building. */ + if (strncmp(msg + i, "floor", 5) == 0 && strchr(" .", msg[i + 5]) && !INSIDE(game.loc)) { + strcpy(renderp, "ground"); + renderp += 6; + i += 4; + size -= 5; + } else { + *renderp++ = msg[i]; + size--; + } + } else { + long arg = va_arg(ap, long); + if (arg == -1) + 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* + // 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) { + renderp += ret; + size -= ret; + } } // Unmodified string specifier. - if (msg[i + 1] == 's') { - packed_to_token(PARMS[pi], parameters[pi]); + if (msg[i] == 's') { + packed_to_token(arg, renderp); /* unpack directly to destination */ + size_t len = strlen(renderp); + renderp += len; + size -= len; } // Singular/plural specifier. - if (msg[i + 1] == 'S') { - copy[i + 1] = 's'; - if (PARMS[pi - 1] > 1) { // look at the *previous* parameter (which by necessity must be numeric) - sprintf(parameters[pi], "%s", "s"); - } else { - sprintf(parameters[pi], "%s", ""); + if (msg[i] == 'S') { + if (previous_arg > 1) { // look at the *previous* parameter (which by necessity must be numeric) + *renderp++ = 's'; + size--; } } - // All-lowercase specifier. - if (msg[i + 1] == 'L') { - copy[i + 1] = 's'; - packed_to_token(PARMS[pi], parameters[pi]); - for (int j = 0; j < (int)strlen(parameters[pi]); ++j) { - parameters[pi][j] = tolower(parameters[pi][j]); - } + /* Version specifier */ + if (msg[i] == 'V') { + strcpy(renderp, VERSION); + size_t len = strlen(VERSION); + renderp += len; + size -= len; } - // First char uppercase, rest lowercase. - if (msg[i + 1] == 'C') { - copy[i + 1] = 's'; - packed_to_token(PARMS[pi], parameters[pi]); - for (int j = 0; j < (int)strlen(parameters[pi]); ++j) { - parameters[pi][j] = tolower(parameters[pi][j]); - } - parameters[pi][0] = toupper(parameters[pi][0]); - } + previous_arg = arg; } } - - // Render the final string. - char rendered[2000]; // FIXME: to be replaced with dynamic allocation - sprintf(rendered, copy, parameters[1], parameters[2], parameters[3], parameters[4]); // FIXME: to be replaced with vsprintf() + *renderp = 0; // Print the message. printf("%s\n", rendered); - free(copy); + free(rendered); } -void PSPEAK(vocab_t msg, int skip) -/* Find the skip+1st message from msg and print it. msg should be - * the index of the inventory message for object. (INVEN+N+1 message - * is game.prop=N message). */ +void speak(const char* msg, ...) { - if (skip >= 0) - speak(object_descriptions[msg].longs[skip]); - else - speak(object_descriptions[msg].inventory); + va_list ap; + va_start(ap, msg); + vspeak(msg, true, ap); + va_end(ap); } -void RSPEAK(vocab_t i) -/* Print the i-th "random" message (section 6 of database). */ +void sspeak(const long msg, ...) { - speak(arbitrary_messages[i]); + va_list ap; + va_start(ap, msg); + fputc('\n', stdout); + vprintf(arbitrary_messages[msg], ap); + fputc('\n', stdout); + va_end(ap); } -void SETPRM(long first, long p1, long p2) -/* Stores parameters into the PRMCOM parms array for use by speak. P1 and P2 - * are stored into PARMS(first) and PARMS(first+1). */ +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 + * listen = the sound for the state the object is in + * study = text on the object. */ { - if (first >= MAXPARMS) - BUG(29); - else { - PARMS[first] = p1; - PARMS[first + 1] = p2; + va_list ap; + va_start(ap, blank); + switch (mode) { + case touch: + vspeak(objects[msg].inventory, blank, ap); + break; + case look: + vspeak(objects[msg].descriptions[skip], blank, ap); + break; + case hear: + vspeak(objects[msg].sounds[skip], blank, ap); + break; + case study: + vspeak(objects[msg].texts[skip], blank, ap); + break; + case change: + vspeak(objects[msg].changes[skip], blank, ap); + break; } + va_end(ap); } -bool GETIN(FILE *input, - long *pword1, long *pword1x, - long *pword2, long *pword2x) -/* Get a command from the adventurer. Snarf out the first word, pad it with - * blanks, and return it in WORD1. Chars 6 thru 10 are returned in WORD1X, in - * case we need to print out the whole word in an error message. Any number of - * blanks may follow the word. If a second word appears, it is returned in - * WORD2 (chars 6 thru 10 in WORD2X), else WORD2 is -1. */ +void rspeak(vocab_t i, ...) +/* Print the i-th "random" message (section 6 of database). */ { - long junk; + va_list ap; + va_start(ap, i); + vspeak(arbitrary_messages[i], true, ap); + va_end(ap); +} - for (;;) { - if (game.blklin) - fputc('\n', stdout);; - if (!MAPLIN(input)) - return false; - *pword1 = GETTXT(true, true, true); - if (game.blklin && *pword1 < 0) - continue; - *pword1x = GETTXT(false, true, true); - do { - junk = GETTXT(false, true, true); - } while - (junk > 0); - *pword2 = GETTXT(true, true, true); - *pword2x = GETTXT(false, true, true); - do { - junk = GETTXT(false, true, true); - } while - (junk > 0); - if (GETTXT(true, true, true) <= 0) - return true; - RSPEAK(TWO_WORDS); - } +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); + strcpy(prompt_and_input, input_prompt); + strcat(prompt_and_input, input); + fprintf(destination, "%s\n", prompt_and_input); + free(prompt_and_input); } -void echo_input(FILE* destination, char* input_prompt, char* input) +int word_count(char* str) { - size_t len = strlen(input_prompt) + strlen(input) + 1; - char* prompt_and_input = (char*) xmalloc(len); - strcpy(prompt_and_input, input_prompt); - strcat(prompt_and_input, input); - fprintf(destination, "%s\n", prompt_and_input); - free(prompt_and_input); + char delims[] = " \t"; + int count = 0; + int inblanks = true; + + for (char *s = str; *s; s++) + if (inblanks) { + if (strchr(delims, *s) == 0) { + ++count; + inblanks = false; + } + } else { + if (strchr(delims, *s) != 0) { + inblanks = true; + } + } + + return (count); } char* get_input() -{ - // Set up the prompt - char input_prompt[] = "> "; - if (!prompt) - input_prompt[0] = '\0'; - - // Print a blank line if game.blklin tells us to. - if (game.blklin == true) +{ + // Set up the prompt + char input_prompt[] = "> "; + if (!settings.prompt) + input_prompt[0] = '\0'; + + // 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)) - printf("%s", input_prompt); - getline(&input, &n, stdin); - } - - if (input == NULL) // Got EOF; quit. - exit(EXIT_SUCCESS); - else if (input[0] == '#') // Ignore comments. - continue; - else // We have a 'normal' line; leave the loop. - break; + char* input; + while (true) { + input = readline(input_prompt); + + if (input == NULL) // Got EOF; return with it. + return (input); + if (input[0] == '#') { // Ignore comments. + free(input); + continue; + } + // We have a 'normal' line; leave the loop. + break; } - // Strip trailing newlines from the input - input[strcspn(input, "\n")] = 0; + // 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 (!isatty(0)) + echo_input(stdout, input_prompt, input); - if (logfp) - echo_input(logfp, input_prompt, input); - - return(input); + if (settings.logfp) + echo_input(settings.logfp, "", input); + + return (input); } -bool YES(vocab_t question, vocab_t yes_response, vocab_t no_response) -/* Print message X, wait for yes/no answer. If yes, print Y and return true; - * if no, print Z and return false. */ +bool silent_yes() { - char* reply; - bool outcome; - + bool outcome = false; + for (;;) { - RSPEAK(question); - - reply = get_input(); - - char* firstword = (char*) xmalloc(strlen(reply)); - sscanf(reply, "%s", firstword); - - for (int i = 0; i < strlen(firstword); ++i) - firstword[i] = tolower(firstword[i]); - - int yes = strncmp("yes", firstword, sizeof("yes") - 1); - int y = strncmp("y", firstword, sizeof("y") - 1); - int no = strncmp("no", firstword, sizeof("no") - 1); - int n = strncmp("n", firstword, sizeof("n") - 1); - - free(firstword); - - if (yes == 0 || y == 0) { - RSPEAK(yes_response); - outcome = true; - break; - } - else if (no == 0 || n == 0) { - RSPEAK(no_response); - outcome = false; - break; - } - else - RSPEAK(PLEASE_ANSWER); - } - linenoiseFree(reply); - return(outcome); -} + char* reply = get_input(); + if (reply == NULL) { + // LCOV_EXCL_START + // Should be unreachable. Reply should never be NULL + free(reply); + exit(EXIT_SUCCESS); + // LCOV_EXCL_STOP + } + if (strlen(reply) == 0) { + free(reply); + rspeak(PLEASE_ANSWER); + continue; + } -/* Line-parsing routines (GETTXT, MAKEWD, PUTTXT, SHFTXT) */ + char* firstword = (char*) xmalloc(strlen(reply) + 1); + sscanf(reply, "%s", firstword); -long GETTXT(bool skip, bool onewrd, bool upper) -/* Take characters from an input line and pack them into 30-bit words. - * Skip says to skip leading blanks. ONEWRD says stop if we come to a - * blank. UPPER says to map all letters to uppercase. If we reach the - * end of the line, the word is filled up with blanks (which encode as 0's). - * If we're already at end of line when TEXT is called, we return -1. */ -{ - long text; - static long splitting = -1; + free(reply); - if (LNPOSN != splitting) - splitting = -1; - text = -1; - while (true) { - if (LNPOSN > LNLENG) - return (text); - if ((!skip) || INLINE[LNPOSN] != 0) + for (int i = 0; i < (int)strlen(firstword); ++i) + firstword[i] = tolower(firstword[i]); + + int yes = strncmp("yes", firstword, sizeof("yes") - 1); + int y = strncmp("y", firstword, sizeof("y") - 1); + int no = strncmp("no", firstword, sizeof("no") - 1); + int n = strncmp("n", firstword, sizeof("n") - 1); + + free(firstword); + + if (yes == 0 || + y == 0) { + outcome = true; + break; + } else if (no == 0 || + n == 0) { + outcome = false; break; - ++LNPOSN; + } else + rspeak(PLEASE_ANSWER); } + return (outcome); +} - text = 0; - for (int I = 1; I <= TOKLEN; I++) { - text = text * 64; - if (LNPOSN > LNLENG || (onewrd && INLINE[LNPOSN] == 0)) - continue; - char current = INLINE[LNPOSN]; - if (current < ascii_to_advent['%']) { - splitting = -1; - if (upper && current >= ascii_to_advent['a']) - current = current - 26; - text = text + current; - ++LNPOSN; - continue; + +bool yes(const char* question, const char* yes_response, const char* no_response) +/* Print message X, wait for yes/no answer. If yes, print Y and return true; + * if no, print Z and return false. */ +{ + bool outcome = false; + + for (;;) { + speak(question); + + char* reply = get_input(); + if (reply == NULL) { + // LCOV_EXCL_START + // Should be unreachable. Reply should never be NULL + free(reply); + exit(EXIT_SUCCESS); + // LCOV_EXCL_STOP } - if (splitting != LNPOSN) { - text = text + ascii_to_advent['%']; - splitting = LNPOSN; + + if (strlen(reply) == 0) { + free(reply); + rspeak(PLEASE_ANSWER); continue; } - text = text + current - ascii_to_advent['%']; - splitting = -1; - ++LNPOSN; + 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]); + + int yes = strncmp("yes", firstword, sizeof("yes") - 1); + int y = strncmp("y", firstword, sizeof("y") - 1); + int no = strncmp("no", firstword, sizeof("no") - 1); + int n = strncmp("n", firstword, sizeof("n") - 1); + + free(firstword); + + if (yes == 0 || + y == 0) { + speak(yes_response); + outcome = true; + break; + } else if (no == 0 || + n == 0) { + speak(no_response); + outcome = false; + break; + } else + rspeak(PLEASE_ANSWER); + } - return text; + return (outcome); } -token_t MAKEWD(long letters) -/* Combine TOKLEN (currently 5) uppercase letters (represented by - * pairs of decimal digits in lettrs) to form a 30-bit value matching - * the one that GETTXT would return given those characters plus - * trailing blanks. Caution: lettrs will overflow 31 bits if - * 5-letter word starts with V-Z. As a kludgey workaround, you can - * increment a letter by 5 by adding 50 to the next pair of - * digits. */ -{ - long i = 1, word = 0; +/* Data structure routines */ - for (long k = letters; k != 0; k = k / 100) { - word = word + i * (MOD(k, 50) + 10); - i = i * 64; - if (MOD(k, 100) > 50)word = word + i * 5; +int get_motion_vocab_id(const char* word) +// Return the first motion number that has 'word' as one of its words. +{ + 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 && (strlen(word) > 1 || + strchr(ignore, word[0]) == NULL || + !settings.oldstyle)) + return (i); + } } - i = 64L * 64L * 64L * 64L * 64L / i; - word = word * i; - return word; + // If execution reaches here, we didn't find the word. + return (WORD_NOT_FOUND); } -/* Data structure routines */ +int get_object_vocab_id(const char* word) +// Return the first object number that has 'word' as one of its words. +{ + for (int i = 0; i < NOBJECTS + 1; ++i) { // FIXME: the + 1 should go when 1-indexing for objects is removed + for (int j = 0; j < objects[i].words.n; ++j) { + if (strcasecmp(word, objects[i].words.strs[j]) == 0) + return (i); + } + } + // If execution reaches here, we didn't find the word. + return (WORD_NOT_FOUND); +} -long VOCAB(long id, long init) -/* Look up ID in the vocabulary (ATAB) and return its "definition" (KTAB), or - * -1 if not found. If INIT is positive, this is an initialisation call setting - * up a keyword variable, and not finding it constitutes a bug. It also means - * that only KTAB values which taken over 1000 equal INIT may be considered. - * (Thus "STEPS", which is a motion verb as well as an object, may be located - * as an object.) And it also means the KTAB value is taken modulo 1000. */ -{ - long lexeme; - - for (long i = 1; i <= TABSIZ; i++) { - if (KTAB[i] == -1) { - lexeme = -1; - if (init < 0) - return (lexeme); - BUG(5); +int get_action_vocab_id(const char* word) +// Return the first motion number that has 'word' as one of its words. +{ + 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 && (strlen(word) > 1 || + strchr(ignore, word[0]) == NULL || + !settings.oldstyle)) + return (i); } - if (init >= 0 && KTAB[i] / 1000 != init) - continue; - if (ATAB[i] == id) { - lexeme = KTAB[i]; - if (init >= 0) - lexeme = MOD(lexeme, 1000); - return (lexeme); + } + // If execution reaches here, we didn't find the word. + return (WORD_NOT_FOUND); +} + +int get_special_vocab_id(const char* word) +// Return the first special number that has 'word' as one of its words. +{ + for (int i = 0; i < NSPECIALS; ++i) { + for (int j = 0; j < specials[i].words.n; ++j) { + if (strcasecmp(word, specials[i].words.strs[j]) == 0) + return (i); } } - BUG(21); + // If execution reaches here, we didn't find the word. + return (WORD_NOT_FOUND); +} + +void get_vocab_metadata(const char* word, long* id, enum wordtype* type) +{ + /* Check for an empty string */ + if (strncmp(word, "", sizeof("")) == 0) { + *id = WORD_EMPTY; + *type = NO_WORD_TYPE; + return; + } + + long ref_num; + + ref_num = get_motion_vocab_id(word); + if (ref_num != WORD_NOT_FOUND) { + *id = ref_num; + *type = MOTION; + return; + } + + ref_num = get_object_vocab_id(word); + if (ref_num != WORD_NOT_FOUND) { + *id = ref_num; + *type = OBJECT; + return; + } + + ref_num = get_action_vocab_id(word); + if (ref_num != WORD_NOT_FOUND) { + *id = ref_num; + *type = ACTION; + return; + } + + ref_num = get_special_vocab_id(word); + if (ref_num != WORD_NOT_FOUND) { + *id = ref_num; + *type = SPECIAL; + return; + } + + // Check for the reservoir magic word. + if (strcasecmp(word, game.zzword) == 0) { + *id = PART; + *type = ACTION; + return; + } + + *id = WORD_NOT_FOUND; + *type = NO_WORD_TYPE; + return; } -void JUGGLE(long object) +void juggle(obj_t object) /* Juggle an object by picking it up and putting it down again, the purpose * being to get the object to the front of the chain of things at its loc. */ { - long i, j; + loc_t i, j; i = game.place[object]; j = game.fixed[object]; - MOVE(object, i); - MOVE(object + NOBJECTS, j); + move(object, i); + move(object + NOBJECTS, j); } -void MOVE(long object, long where) +void move(obj_t object, loc_t where) /* Place any object anywhere by picking it up and dropping it. May * already be toting, in which case the carry is a no-op. Mustn't * pick up objects which are not at any loc, since carry wants to @@ -422,20 +588,21 @@ void MOVE(long object, long where) from = game.fixed[object - NOBJECTS]; else from = game.place[object]; - if (from != NOWHERE && from != CARRIED && !SPECIAL(from)) - CARRY(object, from); - DROP(object, where); + /* (ESR) Used to check for !SPECIAL(from). I *think* that was wrong... */ + if (from != LOC_NOWHERE && from != CARRIED) + carry(object, from); + drop(object, where); } -long PUT(long object, long where, long pval) -/* PUT is the same as MOVE, except it returns a value used to set up the +long put(obj_t object, loc_t where, long pval) +/* put() is the same as move(), except it returns a value used to set up the * negated game.prop values for the repository objects. */ { - MOVE(object, where); - return (-1) - pval;; + move(object, where); + return STASHED(pval); } -void CARRY(long object, long where) +void carry(obj_t object, loc_t where) /* Start toting an object, removing it from the list of things at its former * location. Incr holdng unless it was already being toted. If object>NOBJECTS * (moving "fixed" second loc), don't change game.place or game.holdng. */ @@ -459,7 +626,7 @@ void CARRY(long object, long where) game.link[temp] = game.link[object]; } -void DROP(long object, long where) +void drop(obj_t object, loc_t where) /* Place an object at a given loc, prefixing it onto the game.atloc list. Decr * game.holdng if the object was being toted. */ { @@ -470,13 +637,14 @@ void DROP(long object, long where) --game.holdng; game.place[object] = where; } - if (where <= 0) + if (where == LOC_NOWHERE || + where == CARRIED) return; game.link[object] = game.atloc[where]; game.atloc[where] = object; } -long ATDWRF(long where) +long atdwrf(loc_t where) /* Return the index of first dwarf at the given location, zero if no dwarf is * there (or if dwarves not active yet), -1 if all dwarves are dead. Ignore * the pirate (6th dwarf). */ @@ -496,16 +664,16 @@ long ATDWRF(long where) return (at); } -/* Utility routines (SETBIT, TSTBIT, set_seed, get_next_lcg_value, - * randrange, RNDVOC, BUG) */ +/* Utility routines (setbit, tstbit, set_seed, get_next_lcg_value, + * randrange) */ -long SETBIT(long bit) +long setbit(long bit) /* Returns 2**bit for use in constructing bit-masks. */ { - return (1 << bit); + return (1L << bit); } -bool TSTBIT(long mask, int bit) +bool tstbit(long mask, int bit) /* Returns true if the specified bit is set in the mask. */ { return (mask & (1 << bit)) != 0; @@ -515,6 +683,9 @@ void set_seed(long seedval) /* 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) @@ -531,166 +702,30 @@ long randrange(long range) return range * get_next_lcg_value() / game.lcg_m; } -long RNDVOC(long second, long force) -/* Searches the vocabulary ATAB for a word whose second character is - * char, and changes that word such that each of the other four - * characters is a random letter. If force is non-zero, it is used - * as the new word. Returns the new word. */ +void make_zzword(char zzword[TOKLEN + 1]) { - long rnd = force; - - if (rnd == 0) { - for (int i = 1; i <= 5; i++) { - long j = 11 + randrange(26); - if (i == 2) - j = second; - rnd = rnd * 64 + j; - } - } - - long div = 64L * 64L * 64L; - for (int i = 1; i <= TABSIZ; i++) { - if (MOD(ATAB[i] / div, 64L) == second) { - ATAB[i] = rnd; - break; - } + for (int i = 0; i < 5; ++i) { + zzword[i] = 'A' + randrange(26); } + zzword[1] = '\''; // force second char to apostrophe + zzword[5] = '\0'; +} - return rnd; -} - -void BUG(long num) -/* The following conditions are currently considered fatal bugs. Numbers < 20 - * are detected while reading the database; the others occur at "run time". - * 0 Message line > 70 characters - * 1 Null line in message - * 2 Too many words of messages - * 3 Too many travel options - * 4 Too many vocabulary words - * 5 Required vocabulary word not found - * 6 Too many RTEXT messages - * 7 Too many hints - * 8 Location has cond bit being set twice - * 9 Invalid section number in database - * 10 Too many locations - * 11 Too many class or turn messages - * 20 Special travel (500>L>300) exceeds goto list - * 21 Ran off end of vocabulary table - * 22 Vocabulary type (N/1000) not between 0 and 3 - * 23 Intransitive action verb exceeds goto list - * 24 Transitive action verb exceeds goto list - * 25 Conditional travel entry with no alternative - * 26 Location has no travel entries - * 27 Hint number exceeds goto list - * 28 Invalid month returned by date function - * 29 Too many parameters given to SETPRM */ -{ - - printf("Fatal error %ld. See source code for interpretation.\n", num); - exit(0); -} - -/* Machine dependent routines (MAPLIN, SAVEIO) */ - -bool MAPLIN(FILE *fp) -{ - bool eof; - - /* Read a line of input, from the specified input source. - * This logic is complicated partly because it has to serve - * several cases with different requirements and partly because - * of a quirk in linenoise(). - * - * The quirk shows up when you paste a test log from the clipboard - * to the program's command prompt. While fgets (as expected) - * consumes it a line at a time, linenoise() returns the first - * line and discards the rest. Thus, there needs to be an - * editline (-s) option to fall back to fgets while still - * prompting. Note that linenoise does behave properly when - * fed redirected stdin. - * - * The logging is a bit of a mess because there are two distinct cases - * in which you want to echo commands. One is when shipping them to - * a log under the -l option, in which case you want to suppress - * prompt generation (so test logs are unadorned command sequences). - * On the other hand, if you redirected stdin and are feeding the program - * a logfile, you *do* want prompt generation - it makes checkfiles - * easier to read when the commands are marked by a preceding prompt. - */ - do { - if (!editline) { - if (prompt) - fputs("> ", stdout); - IGNORE(fgets(rawbuf, sizeof(rawbuf) - 1, fp)); - eof = (feof(fp)); - } else { - char *cp = linenoise("> "); - eof = (cp == NULL); - if (!eof) { - strncpy(rawbuf, cp, sizeof(rawbuf) - 1); - linenoiseHistoryAdd(rawbuf); - strncat(rawbuf, "\n", sizeof(rawbuf) - strlen(rawbuf) - 1); - linenoiseFree(cp); - } - } - } while - (!eof && rawbuf[0] == '#'); - if (eof) { - if (logfp && fp == stdin) - fclose(logfp); - return false; - } else { - FILE *efp = NULL; - if (logfp && fp == stdin) - efp = logfp; - else if (!isatty(0)) - efp = stdout; - if (efp != NULL) { - if (prompt && efp == stdout) - fputs("> ", efp); - IGNORE(fputs(rawbuf, efp)); - } - strcpy(INLINE + 1, rawbuf); - /* translate the chars to integers in the range 0-126 and store - * them in the common array "INLINE". Integer values are as follows: - * 0 = space [ASCII CODE 40 octal, 32 decimal] - * 1-2 = !" [ASCII 41-42 octal, 33-34 decimal] - * 3-10 = '()*+,-. [ASCII 47-56 octal, 39-46 decimal] - * 11-36 = upper-case letters - * 37-62 = lower-case letters - * 63 = percent (%) [ASCII 45 octal, 37 decimal] - * 64-73 = digits, 0 through 9 - * Remaining characters can be translated any way that is convenient; - * The above mappings are required so that certain special - * characters are known to fit in 6 bits and/or can be easily spotted. - * Array elements beyond the end of the line should be filled with 0, - * and LNLENG should be set to the index of the last character. - * - * If the data file uses a character other than space (e.g., tab) to - * separate numbers, that character should also translate to 0. - * - * This procedure may use the map1,map2 arrays to maintain static data for - * the mapping. MAP2(1) is set to 0 when the program starts - * and is not changed thereafter unless the routines on this page choose - * to do so. */ - LNLENG = 0; - for (long i = 1; i <= (long)sizeof(INLINE) && INLINE[i] != 0; i++) { - long val = INLINE[i]; - INLINE[i] = ascii_to_advent[val]; - if (INLINE[i] != 0) - LNLENG = i; - } - LNPOSN = 1; - return true; - } +// LCOV_EXCL_START +void bug(enum bugtype num, const char *error_string) +{ + fprintf(stderr, "Fatal error %d, %s.\n", num, error_string); + exit(EXIT_FAILURE); } +// LCOV_EXCL_STOP + +/* end */ -void DATIME(long* d, long* t) +void state_change(obj_t obj, long state) +/* Object must have a change-message list for this to be useful; only some do */ { - struct timeval tv; - gettimeofday(&tv, NULL); - *d = (long) tv.tv_sec; - *t = (long) tv.tv_usec; + game.prop[obj] = state; + pspeak(obj, change, state, true); } /* end */