projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add token_to_packed() utility function.
[open-adventure.git]
/
actions.c
diff --git
a/actions.c
b/actions.c
index c547b3536c59bccfce75640f8ed71a4329be5b2b..2a223bc9a9e40b42626530ee93d8820937d1d0db 100644
(file)
--- a/
actions.c
+++ b/
actions.c
@@
-82,7
+82,7
@@
static int attack(FILE *input, token_t verb, token_t obj)
* too. Then do a null motion to get new description. */
RSPEAK(BARE_HANDS_QUERY);
GETIN(input, &WD1, &WD1X, &WD2, &WD2X);
* too. Then do a null motion to get new description. */
RSPEAK(BARE_HANDS_QUERY);
GETIN(input, &WD1, &WD1X, &WD2, &WD2X);
- if (WD1 != MAKEWD(
25) && WD1 != MAKEWD(250519
))
+ if (WD1 != MAKEWD(
WORD_YINIT) && WD1 != MAKEWD(WORD_YES
))
return GO_CHECKFOO;
PSPEAK(DRAGON, 3);
game.prop[DRAGON] = 1;
return GO_CHECKFOO;
PSPEAK(DRAGON, 3);
game.prop[DRAGON] = 1;
@@
-1054,7
+1054,8
@@
int action(FILE *input, enum speechpart part, token_t verb, token_t obj)
switch (part) {
case intransitive:
switch (part) {
case intransitive:
- if (WD2 > 0 && verb != SAY) return (2800);
+ if (WD2 > 0 && verb != SAY)
+ return GO_WORD2;
if (verb == SAY)obj = WD2;
if (obj == 0 || obj == INTRANSITIVE) {
/* Analyse an intransitive verb (ie, no object given yet). */
if (verb == SAY)obj = WD2;
if (obj == 0 || obj == INTRANSITIVE) {
/* Analyse an intransitive verb (ie, no object given yet). */