* crossing. */
if (game.place[EGGS] == LOC_NOWHERE && game.place[TROLL] == LOC_NOWHERE && game.prop[TROLL] == TROLL_UNPAID)
game.prop[TROLL] = TROLL_PAIDONCE;
- int k;
if (HERE(EGGS))
- k = EGGS_VANISHED;
+ pspeak(EGGS, look, EGGS_VANISHED, true);
else if (game.loc == objects[EGGS].plac)
- k = EGGS_HERE;
+ pspeak(EGGS, look, EGGS_HERE, true);
else
- k = EGGS_DONE;
+ pspeak(EGGS, look, EGGS_DONE, true);
move(EGGS, objects[EGGS].plac);
- pspeak(EGGS, look, k, true);
+
return GO_CLEAROBJ;
}
} else {
game.fixed[VASE] = IS_FIXED;
break;
}
+ /* FALLTHRU */
default:
speak(actions[verb].message);
}
case INTRANSITIVE:
if (!HERE(FOOD))
return GO_UNKNOWN;
+ /* FALLTHRU */
case FOOD:
DESTROY(FOOD);
rspeak(THANKS_DELICIOUS);
static int say(struct command_t *command)
/* Say. Echo WD2 (or WD1 if no WD2 (SAY WHAT?, etc.).) Magic words override. */
{
- if (command->wd2 > 0) {
- command->wd1 = command->wd2;
- strncpy(command->raw1, command->raw2, LINESIZE - 1);
- }
- char word1[TOKLEN + 1];
- packed_to_token(command->wd1, word1);
+ char word2[TOKLEN + 1];
+ packed_to_token(command->wd2, word2);
long wd;
enum wordtype type;
- get_vocab_metadata(word1, &wd, &type);
+ get_vocab_metadata(word2, &wd, &type);
if (wd == XYZZY ||
wd == PLUGH ||
wd == PLOVER ||
wd == FOO ||
wd == FUM ||
wd == PART) {
- /* FIXME: scribbles on the interpreter's command block */
- wordclear(&command->wd2);
- return GO_LOOKUP;
+ return GO_WORD2;
}
- sspeak(OKEY_DOKEY, command->raw1);
+ sspeak(OKEY_DOKEY, command->raw2);
return GO_CLEAROBJ;
}
if (game.loc == LOC_START ||
game.loc == LOC_VALLEY ||
game.loc == LOC_SLIT) {
- command->obj = DPRSSN;
+ command->obj = DEPRESSION;
}
if (game.loc == LOC_COBBLE ||
game.loc == LOC_DEBRIS ||
game.loc == LOC_AWKWARD ||
game.loc == LOC_BIRD ||
game.loc == LOC_PITTOP) {
- command->obj = ENTRNC;
+ command->obj = ENTRANCE;
}
} else if (command->obj == DWARF && atdwrf(game.loc) > 0)
/* FALL THROUGH */;
switch (command->part) {
case intransitive:
- if (command->wd2 > 0 && command->verb != SAY)
+ if (command->raw2[0] != '\0' && command->verb != SAY)
return GO_WORD2;
if (command->verb == SAY)
command->obj = command->wd2;