projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
YAML coverage - TROLL_BLOCKS arbitrary message
[open-adventure.git]
/
actions.c
diff --git
a/actions.c
b/actions.c
index 802c1f3303b6c233d8b648985b04d28fc7369b2c..48de9d04a7f84763343d71627243b142e14a9470 100644
(file)
--- a/
actions.c
+++ b/
actions.c
@@
-545,9
+545,7
@@
static int discard(verb_t verb, obj_t obj)
} else
rspeak(OK_MAN);
} else
rspeak(OK_MAN);
- game.prop[BIRD] = BIRD_UNCAGED;
- if (FOREST(game.loc))
- game.prop[BIRD] = BIRD_FOREST_UNCAGED;
+ game.prop[BIRD] = FOREST(game.loc) ? BIRD_FOREST_UNCAGED : BIRD_UNCAGED;
drop(obj, game.loc);
return GO_CLEAROBJ;
}
drop(obj, game.loc);
return GO_CLEAROBJ;
}
@@
-1347,14
+1345,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;