/*
- * 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
/* 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)
}
void speak(const char* msg, ...)
+/* speak a specified string */
{
va_list ap;
va_start(ap, msg);
}
void sspeak(const int msg, ...)
+/* Speak a message from the arbitrary-messages list */
{
va_list ap;
va_start(ap, msg);
// Print a blank line
printf("\n");
- char* input;
- while (true) {
+ char* input = "";
+ for (;;) {
input = myreadline(input_prompt);
if (input == NULL) // Got EOF; return with it.
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
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;
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));
/* (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.
*
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. */
* 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)
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;
}
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.