X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=misc.c;h=302e61cc641d4faeac7b176839ddd2aa05cac9a1;hp=ba2e2afffc0c637f8ec37aa2fef701035ec82cad;hb=9e2cb3c19196a26af8e20803314f42b69dc0e014;hpb=06c8c9773895430279e4c0e1aaf1e97ca3a86f0d diff --git a/misc.c b/misc.c index ba2e2af..302e61c 100644 --- a/misc.c +++ b/misc.c @@ -6,6 +6,7 @@ #include #include #include +#include #include "advent.h" #include "dungeon.h" @@ -66,8 +67,8 @@ static void vspeak(const char* msg, bool blank, va_list ap) i++; // Integer specifier. if (msg[i] == 'd') { - long arg = va_arg(ap, long); - int ret = snprintf(renderp, size, "%ld", arg); + int32_t arg = va_arg(ap, int32_t); + int ret = snprintf(renderp, size, "%" PRId32, arg); if (ret < size) { renderp += ret; size -= ret; @@ -388,22 +389,21 @@ static int get_action_vocab_id(const char* word) return (WORD_NOT_FOUND); } -static bool is_valid_int(const char *str) -/* Returns true if the string passed in is represents a valid integer, +static bool is_valid_int(const char *str) +/* Returns true if the string passed in is represents a valid integer, * that could then be parsed by atoi() */ { // Handle negative number if (*str == '-') ++str; - // Handle empty string or just "-". Should never reach this + // Handle empty string or just "-". Should never reach this // point, because this is only used with transitive verbs. if (!*str) return false; // LCOV_EXCL_LINE // Check for non-digit chars in the rest of the stirng. - while (*str) - { + while (*str) { if (!isdigit(*str)) return false; else @@ -413,65 +413,65 @@ static bool is_valid_int(const char *str) return true; } -static void get_vocab_metadata(const char* word, vocab_t* id, enum wordtype* type) +static void get_vocab_metadata(command_word_t* word) { /* Check for an empty string */ - if (strncmp(word, "", sizeof("")) == 0) { - *id = WORD_EMPTY; - *type = NO_WORD_TYPE; + if (strncmp(word->raw, "", sizeof("")) == 0) { + word->id = WORD_EMPTY; + word->type = NO_WORD_TYPE; return; } vocab_t ref_num; - ref_num = get_motion_vocab_id(word); + ref_num = get_motion_vocab_id(word->raw); if (ref_num != WORD_NOT_FOUND) { - *id = ref_num; - *type = MOTION; + word->id = ref_num; + word->type = MOTION; return; } - ref_num = get_object_vocab_id(word); + ref_num = get_object_vocab_id(word->raw); if (ref_num != WORD_NOT_FOUND) { - *id = ref_num; - *type = OBJECT; + word->id = ref_num; + word->type = OBJECT; return; } - ref_num = get_action_vocab_id(word); + ref_num = get_action_vocab_id(word->raw); if (ref_num != WORD_NOT_FOUND) { - *id = ref_num; - *type = ACTION; + word->id = ref_num; + word->type = ACTION; return; } // Check for the reservoir magic word. - if (strcasecmp(word, game.zzword) == 0) { - *id = PART; - *type = ACTION; + if (strcasecmp(word->raw, game.zzword) == 0) { + word->id = PART; + word->type = ACTION; return; } // Check words that are actually numbers. - if (is_valid_int(word)) { - *id = WORD_EMPTY; - *type = NUMERIC; + if (is_valid_int(word->raw)) { + word->id = WORD_EMPTY; + word->type = NUMERIC; return; } - *id = WORD_NOT_FOUND; - *type = NO_WORD_TYPE; + word->id = WORD_NOT_FOUND; + word->type = NO_WORD_TYPE; return; } -static void tokenize(char* raw, struct command_t *cmd) +static void tokenize(char* raw, command_t *cmd) { - memset(cmd, '\0', sizeof(struct command_t)); + memset(cmd, '\0', sizeof(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 entire input buffer. */ - sscanf(raw, "%s%s", cmd->raw1, cmd->raw2); + sscanf(raw, "%s%s", cmd->word[0].raw, cmd->word[1].raw); /* (ESR) In oldstyle mode, simulate the uppercasing and truncating * effect on raw tokens of packing them into sixbit characters, 5 @@ -488,19 +488,19 @@ static void tokenize(char* raw, struct command_t *cmd) * 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]); + cmd->word[0].raw[TOKLEN + TOKLEN] = cmd->word[1].raw[TOKLEN + TOKLEN] = '\0'; + for (size_t i = 0; i < strlen(cmd->word[0].raw); i++) + cmd->word[0].raw[i] = toupper(cmd->word[0].raw[i]); + for (size_t i = 0; i < strlen(cmd->word[1].raw); i++) + cmd->word[1].raw[i] = toupper(cmd->word[1].raw[i]); } /* populate command with parsed vocabulary metadata */ - get_vocab_metadata(cmd->raw1, &(cmd->id1), &(cmd->type1)); - get_vocab_metadata(cmd->raw2, &(cmd->id2), &(cmd->type2)); + get_vocab_metadata(&(cmd->word[0])); + get_vocab_metadata(&(cmd->word[1])); } -bool get_command_input(struct command_t *command) +bool get_command_input(command_t *command) /* Get user input on stdin, parse and map to command */ { char inputbuf[LINESIZE]; @@ -643,10 +643,10 @@ bool tstbit(long mask, int bit) return (mask & (1 << bit)) != 0; } -void set_seed(long seedval) +void set_seed(int32_t seedval) /* Set the LCG seed */ { - game.lcg_x = (unsigned long) seedval % game.lcg_m; + game.lcg_x = (uint32_t) seedval % LCG_M; // once seed is set, we need to generate the Z`ZZZ word for (int i = 0; i < 5; ++i) { @@ -656,18 +656,18 @@ void set_seed(long seedval) game.zzword[5] = '\0'; } -static unsigned long get_next_lcg_value(void) +static int32_t get_next_lcg_value(void) /* Return the LCG's current value, and then iterate it. */ { - unsigned long old_x = game.lcg_x; - game.lcg_x = (game.lcg_a * game.lcg_x + game.lcg_c) % game.lcg_m; + int32_t old_x = game.lcg_x; + game.lcg_x = (LCG_A * game.lcg_x + LCG_C) % LCG_M; return old_x; } -long randrange(long range) +int32_t randrange(int32_t range) /* Return a random integer from [0, range). */ { - return range * get_next_lcg_value() / game.lcg_m; + return range * get_next_lcg_value() / LCG_M; } // LCOV_EXCL_START