projects
/
open-adventure.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
11043b7
)
Replace some more wd? with id?.
245/head
author
Jason S. Ninneman
<jsn@mbar.us>
Wed, 12 Jul 2017 21:32:46 +0000
(14:32 -0700)
committer
Jason S. Ninneman
<jsn@mbar.us>
Fri, 14 Jul 2017 16:18:55 +0000
(09:18 -0700)
actions.c
patch
|
blob
|
history
diff --git
a/actions.c
b/actions.c
index 802c1f3303b6c233d8b648985b04d28fc7369b2c..6cff55ced3181400525f8601eb8ead9f5e1659da 100644
(file)
--- a/
actions.c
+++ b/
actions.c
@@
-1347,14
+1347,14
@@
int action(struct command_t *command)
command->obj = ROD2;
/* FALL THROUGH */;
} else if ((command->verb == FIND ||
command->obj = ROD2;
/* FALL THROUGH */;
} else if ((command->verb == FIND ||
- command->verb == INVENTORY) &&
command->wd2 <= 0
)
+ command->verb == INVENTORY) &&
(command->id2 == WORD_EMPTY || command->id2 == WORD_NOT_FOUND)
)
/* FALL THROUGH */;
else {
sspeak(NO_SEE, command->raw1);
return GO_CLEAROBJ;
}
/* FALL THROUGH */;
else {
sspeak(NO_SEE, command->raw1);
return GO_CLEAROBJ;
}
- if (command->
wd2 > 0
)
+ if (command->
id2 != WORD_EMPTY && command->id2 != WORD_NOT_FOUND
)
return GO_WORD2;
if (command->verb != 0)
command->part = transitive;
return GO_WORD2;
if (command->verb != 0)
command->part = transitive;