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

another pile on the trunk

Browse Source
This commit is contained in:
keni
2012-01-04 18:14:41 +00:00
parent e3856eead3
commit f95549512a
6 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/sounds.c
View File

@@ -48,7 +48,7 @@ dosounds()
"the splashing of a naiad.",
"a soda fountain!",
};
You_hear(fountain_msg[rn2(3)+hallu]);
You_hear1(fountain_msg[rn2(3)+hallu]);
}
#ifdef SINK
if (level.flags.nsinks && !rn2(300)) {
@@ -57,7 +57,7 @@ dosounds()
"a gurgling noise.",
"dishes being washed!",
};
You_hear(sink_msg[rn2(2)+hallu]);
You_hear1(sink_msg[rn2(2)+hallu]);
}
#endif
if (level.flags.has_court && !rn2(200)) {
@@ -76,7 +76,7 @@ dosounds()
/* finding one is enough, at least for now */
int which = rn2(3)+hallu;
if (which != 2) You_hear(throne_msg[which]);
if (which != 2) You_hear1(throne_msg[which]);
else pline(throne_msg[2], uhis());
return;
}
@@ -88,7 +88,7 @@ dosounds()
"smell marsh gas!", /* so it's a smell...*/
"hear Donald Duck!",
};
You(swamp_msg[rn2(2)+hallu]);
You1(swamp_msg[rn2(2)+hallu]);
return;
}
if (level.flags.has_vault && !rn2(200)) {
@@ -198,7 +198,7 @@ dosounds()
mon_in_room(mtmp, BARRACKS) &&
/* sleeping implies not-yet-disturbed (usually) */
(mtmp->msleeping || ++count > 5)) {
You_hear(barracks_msg[rn2(3)+hallu]);
You_hear1(barracks_msg[rn2(3)+hallu]);
return;
}
}
@@ -213,7 +213,7 @@ dosounds()
if (DEADMONSTER(mtmp)) continue;
if ((mtmp->msleeping || is_animal(mtmp->data)) &&
mon_in_room(mtmp, ZOO)) {
You_hear(zoo_msg[rn2(2)+hallu]);
You_hear1(zoo_msg[rn2(2)+hallu]);
return;
}
}
@@ -231,7 +231,7 @@ dosounds()
"the chime of a cash register.",
"Neiman and Marcus arguing!",
};
You_hear(shop_msg[rn2(2)+hallu]);
You_hear1(shop_msg[rn2(2)+hallu]);
}
return;
}
@@ -277,7 +277,7 @@ dosounds()
if (index(msg, '%'))
You_hear(msg, halu_gname(EPRI(mtmp)->shralign));
else
You_hear(msg);
You_hear1(msg);
return;
}
}
@@ -297,7 +297,7 @@ dosounds()
"someone say \"No more woodchucks!\"",
"a loud ZOT!" /* both rec.humor.oracle */
};
You_hear(ora_msg[rn2(3)+hallu*2]);
You_hear1(ora_msg[rn2(3)+hallu*2]);
}
return;
}
@@ -913,8 +913,8 @@ register struct monst *mtmp;
}
if (pline_msg) pline("%s %s", Monnam(mtmp), pline_msg);
else if (mtmp->mcan && verbl_msg_mcan) verbalize(verbl_msg_mcan);
else if (verbl_msg) verbalize(verbl_msg);
else if (mtmp->mcan && verbl_msg_mcan) verbalize1(verbl_msg_mcan);
else if (verbl_msg) verbalize1(verbl_msg);
return(1);
}