archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Eliminate last logic guard on a packed value.

Browse source
This commit is contained in:
Eric S. Raymond 2017-07-20 09:50:58 -04:00
parent 29b8f5b142
commit 08c40bc999
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
actions.c
View file

@ -1355,7 +1355,10 @@ int action(struct command_t *command)
if (command->raw2[0] != '\0' && command->verb != SAY) if (command->raw2[0] != '\0' && command->verb != SAY)
return GO_WORD2; return GO_WORD2;
if (command->verb == SAY) if (command->verb == SAY)
command->obj = command->wd2; /* KEYS is not special, anything not NO_OBJECT or INTRANSITIVE
* will do here. We're preventing interpretation as an intransitive
* verb when the word is unknown. */
command->obj = command->raw2[0] != '\0' ? KEYS : NO_OBJECT;
if (command->obj == NO_OBJECT || if (command->obj == NO_OBJECT ||
command->obj == INTRANSITIVE) { command->obj == INTRANSITIVE) {
/* Analyse an intransitive verb (ie, no object given yet). */ /* Analyse an intransitive verb (ie, no object given yet). */