X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=misc.c;h=9502c8b039228e1e8e5ac790d66dae43a6772812;hb=ff9c73a37d898d824aa9f8ecd4b670acd84d37e7;hp=968e2a1840d5a6acc6c04a79c44bfcaf418a95ee;hpb=732b5810314b7d41d424a56644e66d849a9c5e73;p=open-adventure.git diff --git a/misc.c b/misc.c index 968e2a1..9502c8b 100644 --- a/misc.c +++ b/misc.c @@ -1,9 +1,9 @@ /* - * I/O and support riutines. + * I/O and support routines. * - * Copyright (c) 1977, 2005 by Will Crowther and Don Woods - * Copyright (c) 2017 by Eric S. Raymond - * SPDX-License-Identifier: BSD-2-clause + * SPDX-FileCopyrightText: 1977, 2005 by Will Crowther and Don Woods + * SPDX-FileCopyrightText: 2017 by Eric S. Raymond + * SPDX-License-Identifier: BSD-2-Clause */ #include @@ -35,6 +35,7 @@ static void* xcalloc(size_t size) /* I/O routines (speak, pspeak, rspeak, sspeak, get_input, yes) */ static void vspeak(const char* msg, bool blank, va_list ap) +/* Engine for various speak functions */ { // Do nothing if we got a null pointer. if (msg == NULL) @@ -122,6 +123,7 @@ static void vspeak(const char* msg, bool blank, va_list ap) } void speak(const char* msg, ...) +/* speak a specified string */ { va_list ap; va_start(ap, msg); @@ -130,6 +132,7 @@ void speak(const char* msg, ...) } void sspeak(const int msg, ...) +/* Speak a message from the arbitrary-messages list */ { va_list ap; va_start(ap, msg); @@ -219,7 +222,7 @@ static char* get_input(void) printf("\n"); char* input; - while (true) { + for (;;) { input = myreadline(input_prompt); if (input == NULL) // Got EOF; return with it. @@ -280,12 +283,10 @@ bool silent_yes_or_no(void) free(firstword); - if (yes == 0 || - y == 0) { + if (yes == 0 || y == 0) { outcome = true; break; - } else if (no == 0 || - n == 0) { + } else if (no == 0 || n == 0) { outcome = false; break; } else @@ -334,13 +335,11 @@ bool yes_or_no(const char* question, const char* yes_response, const char* no_re free(firstword); - if (yes == 0 || - y == 0) { + if (yes == 0 || y == 0) { speak(yes_response); outcome = true; break; - } else if (no == 0 || - n == 0) { + } else if (no == 0 || n == 0) { speak(no_response); outcome = false; break; @@ -410,7 +409,7 @@ static bool is_valid_int(const char *str) if (!*str) return false; // LCOV_EXCL_LINE - // Check for non-digit chars in the rest of the stirng. + // Check for non-digit chars in the rest of the string. while (*str) { if (!isdigit(*str)) return false; @@ -475,7 +474,7 @@ static void get_vocab_metadata(const char* word, vocab_t* id, word_type_t* type) static void tokenize(char* raw, command_t *cmd) { /* - * Be caereful about modifing this. We do not want to nuke the + * Be careful about modifying 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)); @@ -489,7 +488,7 @@ static void tokenize(char* raw, command_t *cmd) /* (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 + * because archaic FORTRAN had no string types. Don Wood's * mechanical translation of 2.5 to C retained the packing and * thus this misfeature. * @@ -566,7 +565,6 @@ void clear_command(command_t *cmd) cmd->state = EMPTY; } - 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. */ @@ -602,7 +600,7 @@ loc_t put(obj_t object, loc_t where, int pval) * negated game.prop values for the repository objects. */ { move(object, where); - return STASHED(pval); + return (-1) - pval;; // Needs to stay sinchronized with STASHED } void carry(obj_t object, loc_t where) @@ -617,6 +615,13 @@ void carry(obj_t object, loc_t where) return; game.place[object] = CARRIED; + /* + * Without this conditional your inventory is overcounted + * when you pick up the bird while it's caged. This fixes + * a cosmetic bug in the original. + * + * Possibly this check should be skipped whwn oldstyle is on. + */ if (object != BIRD) ++game.holdng; } @@ -641,7 +646,7 @@ void drop(obj_t object, loc_t where) if (game.place[object] == CARRIED) if (object != BIRD) /* The bird has to be weightless. This ugly hack (and the - * corresponding code in the drop function) brought to you + * corresponding code in the carry 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. @@ -649,8 +654,7 @@ void drop(obj_t object, loc_t where) --game.holdng; game.place[object] = where; } - if (where == LOC_NOWHERE || - where == CARRIED) + if (where == LOC_NOWHERE || where == CARRIED) return; game.link[object] = game.atloc[where]; game.atloc[where] = object; @@ -668,9 +672,9 @@ int atdwrf(loc_t where) return at; at = -1; for (int i = 1; i <= NDWARVES - 1; i++) { - if (game.dloc[i] == where) + if (game.dwarves[i].loc == where) return i; - if (game.dloc[i] != 0) + if (game.dwarves[i].loc != 0) at = 0; } return at; @@ -692,7 +696,7 @@ bool tstbit(int mask, int bit) } void set_seed(int32_t seedval) -/* Set the LCG seed */ +/* Set the LCG1 seed */ { game.lcg_x = seedval % LCG_M; if (game.lcg_x < 0) { @@ -711,6 +715,9 @@ static int32_t get_next_lcg_value(void) { int32_t old_x = game.lcg_x; game.lcg_x = (LCG_A * game.lcg_x + LCG_C) % LCG_M; + if (settings.debug) { + printf("# random %d\n", old_x); // LCOV_EXCL_LINE + } return old_x; }