nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

general musical instrument use while polymorphed

Browse Source 
Extend the previous patch to cover all blown instruments.  Also covers
the case of the player strangling.  The test is moved to a new can_blow
function to keep the test in one place.  It supports any monster, although
all current tests are for the player.
This commit is contained in:
cohrs
2004-01-27 00:23:31 +00:00
parent 661f91009b
commit 6f0fb33e9f
5 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/apply.c
View File

@@ -389,9 +389,7 @@ STATIC_OVL void
use_whistle(obj)
struct obj *obj;
{
if ((is_silent(youmonst.data) || youmonst.data->msound == MS_BUZZ) &&
(breathless(youmonst.data) || verysmall(youmonst.data) ||
!has_head(youmonst.data) || youmonst.data->mlet == S_EEL)) {
if (!can_blow(&youmonst)) {
You("are incapable of using the whistle.");
} else if(Underwater) {
You("blow bubbles through %s.", yname(obj));
@@ -407,9 +405,7 @@ struct obj *obj;
{
register struct monst *mtmp, *nextmon;
if ((is_silent(youmonst.data) || youmonst.data->msound == MS_BUZZ) &&
(breathless(youmonst.data) || verysmall(youmonst.data) ||
!has_head(youmonst.data) || youmonst.data->mlet == S_EEL)) {
if (!can_blow(&youmonst)) {
You("are incapable of using the whistle.");
} else if (obj->cursed && !rn2(2)) {
You("produce a %shigh-pitched humming noise.",