+void clear_command(command_t *cmd)
+{
+ cmd->verb = ACT_NULL;
+ game.oldobj = cmd->obj;
+ cmd->obj = NO_OBJECT;
+}
+
+/*
+ * This function probably does too many disparate things. It checks for hints,
+ * sees if the gamed is closed, checks for darkness, gets user input, increments
+ * the turns in the game state, checks to see if we should be closing, gets the
+ * command input, and preprocesses some implied verbs in the case that the user
+ * put in a single word motion or object command.
+ *
+ * This was the lesser evil -- it got rid of a really nasty goto in the main
+ * input parser/state transition engine. This should be refactored further.
+ */
+bool get_preprocessed_command_input(command_t *command)
+{
+ bool preprocessed = false;
+
+ do {
+ preprocessed = true;
+ checkhints();
+
+ /* If closing time, check for any objects being toted with
+ * game.prop < 0 and stash them. This way objects won't be
+ * described until they've been picked up and put down
+ * separate from their respective piles. */
+ if (game.closed) {
+ if (game.prop[OYSTER] < 0 && TOTING(OYSTER))
+ pspeak(OYSTER, look, 1, true);
+ for (size_t i = 1; i <= NOBJECTS; i++) {
+ if (TOTING(i) && game.prop[i] < 0)
+ game.prop[i] = STASHED(i);
+ }
+ }
+ 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))
+ return false;
+
+#ifdef GDEBUG
+ /* Needs to stay synced with enum word_type_t */
+ const char *types[] = {"NO_WORD_TYPE", "MOTION", "OBJECT", "ACTION", "NUMERIC"};
+ /* needs to stay synced with enum speechpart */
+ const char *roles[] = {"unknown", "intransitive", "transitive"};
+ printf("Command: role = %s type1 = %s, id1 = %ld, type2 = %s, id2 = %ld\n",
+ roles[command->part],
+ types[command->word[0].type],
+ command->word[0].id,
+ types[command->word[1].type],
+ command->word[1].id);
+#endif
+
+ ++game.turns;
+
+ if (closecheck()) {
+ if (game.closed)
+ return false;
+ } else
+ lampcheck();
+
+ if (command->word[0].type == MOTION && command->word[0].id == ENTER
+ && (command->word[1].id == STREAM || command->word[1].id == WATER)) {
+ if (LIQLOC(game.loc) == WATER)
+ rspeak(FEET_WET);
+ else
+ rspeak(WHERE_QUERY);
+
+ clear_command(command);
+ preprocessed = false;
+ }
+
+ if (command->word[0].type == OBJECT) {
+ if (command->word[0].id == GRATE) {
+ command->word[0].type = MOTION;
+ if (game.loc == LOC_START ||
+ game.loc == LOC_VALLEY ||
+ game.loc == LOC_SLIT) {
+ command->word[0].id = DEPRESSION;
+ }
+ if (game.loc == LOC_COBBLE ||
+
+ game.loc == LOC_DEBRIS ||
+ game.loc == LOC_AWKWARD ||
+ game.loc == LOC_BIRD ||
+ game.loc == LOC_PITTOP) {
+ command->word[0].id = ENTRANCE;
+ }
+ }
+ if ((command->word[0].id == WATER || command->word[0].id == OIL) && (command->word[1].id == PLANT || command->word[1].id == DOOR)) {
+ if (AT(command->word[1].id)) {
+ command->word[1] = command->word[0];
+ command->word[0].id = POUR;
+ command->word[0].type = ACTION;
+ strncpy(command->word[0].raw, "pour", LINESIZE - 1);
+ }
+ }
+ if (command->word[0].id == CAGE && command->word[1].id == BIRD && HERE(CAGE) && HERE(BIRD)) {
+ command->word[0].id = CARRY;
+ command->word[0].type = ACTION;
+ }
+
+ /* From OV to VO form */
+ if (command->word[0].type == OBJECT && command->word[1].type == ACTION) {
+ command_word_t stage = command->word[0];
+ command->word[0] = command->word[1];
+ command->word[1] = stage;
+ }
+ }
+ } while (preprocessed == false);
+
+ return true;
+}
+
+
+static bool do_command()