* to idiomatic C, the following is more appropriate:
*
* ESR apologizes for the remaing gotos (now confined to one function
- * in this file - there used to be over 350 of them, *everywhere*),
- * and for the offensive globals. Applying the Structured Program
- * Theorem can be hard.
+ * in this file - there used to be over 350 of them, *everywhere*).
+ * Applying the Structured Program Theorem can be hard.
*/
#include <stdlib.h>
* wander across and encounter the bear. (They
* won't follow the player there because that
* region is forbidden to the pirate.) If
- * game.prop(TROLL)=1, he's crossed since paying,
- * so step out and block him. (standard travel
- * entries check for game.prop(TROLL)=0.) Special
- * stuff for bear. */
+ * game.prop[TROLL]=TROLL_PAIDONCE, he's crossed
+ * since paying, so step out and block him.
+ * (standard travel entries check for
+ * game.prop[TROLL]=TROLL_UNPAID.) Special stuff
+ * for bear. */
if (game.prop[TROLL] == TROLL_PAIDONCE) {
pspeak(TROLL, look, TROLL_PAIDONCE, true);
game.prop[TROLL] = TROLL_UNPAID;
packed_to_token(command->wd2, word2);
command->id1 = get_vocab_id(word1);
command->id2 = get_vocab_id(word2);
-
+
return true;
}
game.wzdark = DARK(game.loc);
if (game.knfloc > 0 && game.knfloc != game.loc)
game.knfloc = 0;
-
+
// Get command input from user
- if(!get_command_input(&command))
+ if (!get_command_input(&command))
return false;
Lclosecheck:
if (command.id1 == ENTER && (command.id2 == STREAM ||
command.id2 == PROMOTE_WORD(WATER))) {
- if (LIQLOC(game.loc) == WATER)
+ if (LIQLOC(game.loc) == WATER)
rspeak(FEET_WET);
else
rspeak(WHERE_QUERY);
-
+
goto Lclearobj;
}
if (command.id1 == ENTER && command.id2 != WORD_NOT_FOUND && command.id2 != WORD_EMPTY) {
default:
BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE
}
-
+
switch (action(&command)) {
case GO_TERMINATE:
return true;
command.raw1[0] = toupper(command.raw1[0]);
sspeak(DO_WHAT, command.raw1);
command.obj = 0;
- // Fallthrough
+ // Fallthrough
case GO_CHECKHINT: // Fallthrough
case GO_CLEAROBJ:
goto Lclearobj;