X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=misc.c;h=4b9ac2c1e8253eb28a9fc2ee6965d50fd90dfa0f;hp=5b1068e379084b872f90ebcd6da91876b855ee2a;hb=342994376a6cc0fc9623cece2b9b85a7557ca47f;hpb=fd57b3b5bdf15fe7f8b861c2559c905269f9ac15 diff --git a/misc.c b/misc.c index 5b1068e..4b9ac2c 100644 --- a/misc.c +++ b/misc.c @@ -23,73 +23,6 @@ static void* xmalloc(size_t size) return (ptr); } -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[i] = advent_to_ascii[(int) advent]; - } - - // Ensure the last character is \0. - token[5] = '\0'; - - // Replace trailing whitespace with \0. - for (int i = 4; i >= 0; --i) { - if (token[i] == ' ' || - token[i] == '\t') - token[i] = '\0'; - else - break; - } -} - -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)); @@ -99,10 +32,6 @@ void tokenize(char* raw, struct command_t *cmd) * 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 @@ -118,34 +47,17 @@ void tokenize(char* raw, struct command_t *cmd) * possible an emulation of the original UI. */ if (settings.oldstyle) { - cmd->raw1[TOKLEN+TOKLEN] = cmd->raw1[TOKLEN+TOKLEN] = '\0'; - for (int i = 0; i < strlen(cmd->raw1); i++) - cmd->raw1[i] = toupper(cmd->raw1[i]); - for (int i = 0; i < strlen(cmd->raw2); i++) - cmd->raw2[i] = toupper(cmd->raw2[i]); + 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]); } } -/* Hide the fact that wods are corrently packed longs */ - -bool wordeq(token_t a, token_t b) -{ - return a == b; -} - -bool wordempty(token_t a) -{ - return a == 0; -} - -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) +static void vspeak(const char* msg, bool blank, va_list ap) { // Do nothing if we got a null pointer. if (msg == NULL) @@ -165,34 +77,43 @@ void vspeak(const char* msg, bool blank, va_list ap) char* rendered = xmalloc(size); char* renderp = rendered; - // Handle format specifiers (including the custom %C, %L, %S) by + // Handle format specifiers (including the custom %S) by // adjusting the parameter accordingly, and replacing the // specifier with %s. - long previous_arg = 0; + bool pluralize = false; for (int i = 0; i < msglen; i++) { if (msg[i] != '%') { - *renderp++ = msg[i]; - size--; + /* 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') { + long arg = va_arg(ap, long); int ret = snprintf(renderp, size, "%ld", arg); if (ret < size) { renderp += ret; size -= ret; } + pluralize = (arg != 1); } // Unmodified string specifier. if (msg[i] == 's') { - packed_to_token(arg, renderp); /* unpack directly to destination */ + char *arg = va_arg(ap, char *); + strncat(renderp, arg, size-1); size_t len = strlen(renderp); renderp += len; size -= len; @@ -200,7 +121,8 @@ void vspeak(const char* msg, bool blank, va_list ap) // Singular/plural specifier. if (msg[i] == 'S') { - if (previous_arg > 1) { // look at the *previous* parameter (which by necessity must be numeric) + // look at the *previous* numeric parameter + if (pluralize) { *renderp++ = 's'; size--; } @@ -213,8 +135,6 @@ void vspeak(const char* msg, bool blank, va_list ap) renderp += len; size -= len; } - - previous_arg = arg; } } *renderp = 0; @@ -328,11 +248,12 @@ char* get_input() if (input == NULL) // Got EOF; return with it. return (input); - else if (input[0] == '#') { // Ignore comments. + if (input[0] == '#') { // Ignore comments. free(input); continue; - } else // We have a 'normal' line; leave the loop. - break; + } + // We have a 'normal' line; leave the loop. + break; } // Strip trailing newlines from the input @@ -351,11 +272,10 @@ char* get_input() bool silent_yes() { - char* reply; - bool outcome; + bool outcome = false; for (;;) { - reply = get_input(); + char* reply = get_input(); if (reply == NULL) { // LCOV_EXCL_START // Should be unreachable. Reply should never be NULL @@ -363,6 +283,11 @@ bool silent_yes() exit(EXIT_SUCCESS); // LCOV_EXCL_STOP } + if (strlen(reply) == 0) { + free(reply); + rspeak(PLEASE_ANSWER); + continue; + } char* firstword = (char*) xmalloc(strlen(reply) + 1); sscanf(reply, "%s", firstword); @@ -398,13 +323,12 @@ 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. */ { - char* reply; - bool outcome; + bool outcome = false; for (;;) { speak(question); - reply = get_input(); + char* reply = get_input(); if (reply == NULL) { // LCOV_EXCL_START // Should be unreachable. Reply should never be NULL @@ -413,6 +337,12 @@ bool yes(const char* question, const char* yes_response, const char* no_response // LCOV_EXCL_STOP } + if (strlen(reply) == 0) { + free(reply); + rspeak(PLEASE_ANSWER); + continue; + } + char* firstword = (char*) xmalloc(strlen(reply) + 1); sscanf(reply, "%s", firstword); @@ -448,12 +378,12 @@ bool yes(const char* question, const char* yes_response, const char* no_response /* Data structure routines */ -int get_motion_vocab_id(const char* word) +static 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 || + if (strncasecmp(word, motions[i].words.strs[j], TOKLEN) == 0 && (strlen(word) > 1 || strchr(ignore, word[0]) == NULL || !settings.oldstyle)) return (i); @@ -463,12 +393,12 @@ int get_motion_vocab_id(const char* word) return (WORD_NOT_FOUND); } -int get_object_vocab_id(const char* word) +static 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) + if (strncasecmp(word, objects[i].words.strs[j], TOKLEN) == 0) return (i); } } @@ -476,12 +406,12 @@ int get_object_vocab_id(const char* word) return (WORD_NOT_FOUND); } -int get_action_vocab_id(const char* word) +static 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 || + if (strncasecmp(word, actions[i].words.strs[j], TOKLEN) == 0 && (strlen(word) > 1 || strchr(ignore, word[0]) == NULL || !settings.oldstyle)) return (i); @@ -491,12 +421,12 @@ int get_action_vocab_id(const char* word) return (WORD_NOT_FOUND); } -int get_special_vocab_id(const char* word) +static 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) + if (strncasecmp(word, specials[i].words.strs[j], TOKLEN) == 0) return (i); } } @@ -504,44 +434,62 @@ int get_special_vocab_id(const char* word) return (WORD_NOT_FOUND); } -long get_vocab_id(const char* word) -// Search the vocab categories in order for the supplied word. +void get_vocab_metadata(const char* word, long* id, enum wordtype* type) { /* Check for an empty string */ - if (strncmp(word, "", sizeof("")) == 0) - return (WORD_EMPTY); + if (strncmp(word, "", sizeof("")) == 0) { + *id = WORD_EMPTY; + *type = NO_WORD_TYPE; + return; + } long ref_num; - /* FIXME: Magic numbers related to vocabulary */ ref_num = get_motion_vocab_id(word); - if (ref_num != WORD_NOT_FOUND) - return MOTION_WORD(ref_num); + 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) - return OBJECT_WORD(ref_num); + 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) - return ACTION_WORD(ref_num); + 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) - return SPECIAL_WORD(ref_num); + if (ref_num != WORD_NOT_FOUND) { + *id = ref_num; + *type = SPECIAL; + return; + } // Check for the reservoir magic word. - if (strcasecmp(word, game.zzword) == 0) - return ACTION_WORD(PART); + if (strcasecmp(word, game.zzword) == 0) { + *id = PART; + *type = ACTION; + return; + } - return (WORD_NOT_FOUND); + *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]; @@ -549,7 +497,7 @@ void juggle(long object) 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 @@ -561,20 +509,21 @@ void move(long object, long where) from = game.fixed[object - NOBJECTS]; else from = game.place[object]; - if (from != LOC_NOWHERE && from != CARRIED && !SPECIAL(from)) + /* (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;; + 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. */ @@ -598,7 +547,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. */ { @@ -609,13 +558,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). */ @@ -691,3 +641,12 @@ void bug(enum bugtype num, const char *error_string) // LCOV_EXCL_STOP /* end */ + +void state_change(obj_t obj, long state) +/* Object must have a change-message list for this to be useful; only some do */ +{ + game.prop[obj] = state; + pspeak(obj, change, state, true); +} + +/* end */