X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=misc.c;h=56872582b95cfe80540da380c674346d715f1761;hp=5386ff786c27c06538d5bb1964f410ff4fcdb596;hb=6667ffd1f10e75ee4b75a3430d76e6f1b4e51090;hpb=24d102781c2ec6fef8246b53250dc7590e71fff7 diff --git a/misc.c b/misc.c index 5386ff7..5687258 100644 --- a/misc.c +++ b/misc.c @@ -1,3 +1,11 @@ +/* + * I/O and support riutines. + * + * Copyright (c) 1977, 2005 by Will Crowther and Don Woods + * Copyright (c) 2017 by Eric S. Raymond + * SPDX-License-Identifier: BSD-2-clause + */ + #include #include #include @@ -6,6 +14,7 @@ #include #include #include +#include #include "advent.h" #include "dungeon.h" @@ -66,8 +75,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; @@ -130,7 +139,7 @@ void sspeak(const int msg, ...) va_end(ap); } -void pspeak(vocab_t msg, enum speaktype mode, int skip, bool blank, ...) +void pspeak(vocab_t msg, enum speaktype mode, bool blank, int skip, ...) /* Find the skip+1st message from msg and print it. Modes are: * feel = for inventory, what you can touch * look = the full description for the state the object is in @@ -138,7 +147,7 @@ void pspeak(vocab_t msg, enum speaktype mode, int skip, bool blank, ...) * study = text on the object. */ { va_list ap; - va_start(ap, blank); + va_start(ap, skip); switch (mode) { case touch: vspeak(objects[msg].inventory, blank, ap); @@ -388,22 +397,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,60 +421,65 @@ static bool is_valid_int(const char *str) return true; } -static void get_vocab_metadata(command_word_t* word) +static void get_vocab_metadata(const char* word, vocab_t* id, word_type_t* type) { /* Check for an empty string */ - if (strncmp(word->raw, "", sizeof("")) == 0) { - word->id = WORD_EMPTY; - word->type = NO_WORD_TYPE; + if (strncmp(word, "", sizeof("")) == 0) { + *id = WORD_EMPTY; + *type = NO_WORD_TYPE; return; } vocab_t ref_num; - ref_num = get_motion_vocab_id(word->raw); + ref_num = get_motion_vocab_id(word); if (ref_num != WORD_NOT_FOUND) { - word->id = ref_num; - word->type = MOTION; + *id = ref_num; + *type = MOTION; return; } - ref_num = get_object_vocab_id(word->raw); + ref_num = get_object_vocab_id(word); if (ref_num != WORD_NOT_FOUND) { - word->id = ref_num; - word->type = OBJECT; + *id = ref_num; + *type = OBJECT; return; } - ref_num = get_action_vocab_id(word->raw); + ref_num = get_action_vocab_id(word); if (ref_num != WORD_NOT_FOUND) { - word->id = ref_num; - word->type = ACTION; + *id = ref_num; + *type = ACTION; return; } // Check for the reservoir magic word. - if (strcasecmp(word->raw, game.zzword) == 0) { - word->id = PART; - word->type = ACTION; + if (strcasecmp(word, game.zzword) == 0) { + *id = PART; + *type = ACTION; return; } // Check words that are actually numbers. - if (is_valid_int(word->raw)) { - word->id = WORD_EMPTY; - word->type = NUMERIC; + if (is_valid_int(word)) { + *id = WORD_EMPTY; + *type = NUMERIC; return; } - word->id = WORD_NOT_FOUND; - word->type = NO_WORD_TYPE; + *id = WORD_NOT_FOUND; + *type = NO_WORD_TYPE; return; } static void tokenize(char* raw, command_t *cmd) { - memset(cmd, '\0', sizeof(command_t)); + /* + * Be caereful about modifing this. We do not want to nuke the + * the speech part or ID from the previous turn. + */ + memset(&cmd->word[0].raw, '\0', sizeof(cmd->word[0].raw)); + memset(&cmd->word[1].raw, '\0', sizeof(cmd->word[1].raw)); /* Bound prefix on the %s would be needed to prevent buffer * overflow. but we shortstop this more simply by making each @@ -496,8 +509,8 @@ static void tokenize(char* raw, command_t *cmd) } /* populate command with parsed vocabulary metadata */ - get_vocab_metadata(&(cmd->word[0])); - get_vocab_metadata(&(cmd->word[1])); + get_vocab_metadata(cmd->word[0].raw, &(cmd->word[0].id), &(cmd->word[0].type)); + get_vocab_metadata(cmd->word[1].raw, &(cmd->word[1].id), &(cmd->word[1].type)); } bool get_command_input(command_t *command) @@ -577,7 +590,9 @@ void carry(obj_t object, loc_t where) if (game.place[object] == CARRIED) return; game.place[object] = CARRIED; - ++game.holdng; + + if (object != BIRD) + ++game.holdng; } if (game.atloc[where] == object) { game.atloc[where] = game.link[object]; @@ -598,7 +613,14 @@ void drop(obj_t object, loc_t where) game.fixed[object - NOBJECTS] = where; else { if (game.place[object] == CARRIED) - --game.holdng; + if (object != BIRD) + /* The bird has to be weightless. This ugly hack (and the + * corresponding code in the drop function) brought to you + * by the fact that when the bird is caged, we need to be able + * to either 'take bird' or 'take cage' and have the right thing + * happen. + */ + --game.holdng; game.place[object] = where; } if (where == LOC_NOWHERE || @@ -643,11 +665,13 @@ 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 = seedval % LCG_M; + if (game.lcg_x < 0) { + game.lcg_x = LCG_M + game.lcg_x; + } // once seed is set, we need to generate the Z`ZZZ word for (int i = 0; i < 5; ++i) { game.zzword[i] = 'A' + randrange(26); @@ -656,18 +680,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 @@ -684,7 +708,7 @@ void state_change(obj_t obj, int 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); + pspeak(obj, change, true, state); } /* end */