-/* NetHack 3.6 sounds.c $NHDT-Date: 1446713641 2015/11/05 08:54:01 $ $NHDT-Branch: master $:$NHDT-Revision: 1.74 $ */
+/* NetHack 3.6 sounds.c $NHDT-Date: 1452992329 2016/01/17 00:58:49 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.78 $ */
/* Copyright (c) 1989 Janet Walz, Mike Threepoint */
/* NetHack may be freely redistributed. See license for details. */
You_hear("\92N\82©\82ª\91{\8dõ\82µ\82Ä\82¢\82é\89¹\82ð\95·\82¢\82½\81D");
break;
}
- /* fall into... (yes, even for hallucination) */
}
+ /*FALLTHRU*/
case 0:
/*JP
You_hear("the footsteps of a guard on patrol.");
switch (mtmp->data->msound) {
case MS_MEW:
/*JP
- yelp_verb = "yowl";
+ yelp_verb = (!Deaf) ? "yowl" : "arch";
*/
- yelp_verb = "\94ß\82µ\82\96Â\82¢\82½";
+ yelp_verb = (!Deaf) ? "\94ß\82µ\82\96Â\82¢\82½" : "arch";
break;
case MS_BARK:
case MS_GROWL:
/*JP
- yelp_verb = "yelp";
+ yelp_verb = (!Deaf) ? "yelp" : "recoil";
*/
- yelp_verb = "\83L\83\83\83\93\83L\83\83\83\93\96Â\82¢\82½";
+ yelp_verb = (!Deaf) ? "\83L\83\83\83\93\83L\83\83\83\93\96Â\82¢\82½" : "\90K\8d\9e\82Ý\82µ\82½";
break;
case MS_ROAR:
/*JP
- yelp_verb = "snarl";
+ yelp_verb = (!Deaf) ? "snarl" : "bluff";
*/
- yelp_verb = "\82¤\82È\82Á\82½";
+ yelp_verb = (!Deaf) ? "\82¤\82È\82Á\82½" : "\82â\82¹\89ä\96\9d\82µ\82½";
break;
case MS_SQEEK:
/*JP
- yelp_verb = "squeal";
+ yelp_verb = (!Deaf) ? "squeal" : "quiver";
*/
- yelp_verb = "\83L\81[\83L\81[\96Â\82¢\82½";
+ yelp_verb = (!Deaf) ? "\83L\81[\83L\81[\96Â\82¢\82½" : "\90k\82¦\82½";
break;
case MS_SQAWK:
/*JP
- yelp_verb = "screak";
+ yelp_verb = (!Deaf) ? "screak" : "thrash";
*/
- yelp_verb = "\8bà\90Ø\82è\90º\82ð\97§\82Ä\82½";
+ yelp_verb = (!Deaf) ? "\8bà\90Ø\82è\90º\82ð\97§\82Ä\82½" : "\82Ì\82½\82¤\82¿\89ñ\82Á\82½";
break;
case MS_WAIL:
/*JP
- yelp_verb = "wail";
+ yelp_verb = (!Deaf) ? "wail" : "cringe";
*/
- yelp_verb = "\94ß\82µ\82\96Â\82¢\82½";
+ yelp_verb = (!Deaf) ? "\94ß\82µ\82\96Â\82¢\82½" : "\90g\82ð\82·\82\82ß\82½";
break;
}
if (yelp_verb) {
char verbuf[BUFSZ];
register const char *pline_msg = 0, /* Monnam(mtmp) will be prepended */
*verbl_msg = 0, /* verbalize() */
- *verbl_msg_mcan = 0; /* verbalize() if cancelled */
+ *verbl_msg_mcan = 0; /* verbalize() if cancelled */
struct permonst *ptr = mtmp->data;
int msound = ptr->msound;
*/
pline_msg = "\83j\83\83\81[\83j\83\83\81[\96Â\82¢\82½\81D";
break;
- } /* else FALLTHRU */
+ }
+ /*FALLTHRU*/
case MS_GROWL:
/*JP
pline_msg = mtmp->mpeaceful ? "snarls." : "growls!";
}
break;
}
- /* else FALLTHRU */
+ /*FALLTHRU*/
case MS_HUMANOID:
if (!mtmp->mpeaceful) {
if (In_endgame(&u.uz) && is_mplayer(ptr))
break;
case MS_SEDUCE: {
int swval;
+
if (SYSOPT_SEDUCE) {
if (ptr->mlet != S_NYMPH
&& could_seduce(mtmp, &youmonst, (struct attack *) 0) == 1) {
: soldier_foe_msg[rn2(3)];
break;
}
- case MS_RIDER:
- /* 3.6.0 tribute */
- if (ptr == &mons[PM_DEATH]
- && !context.tribute.Deathnotice && u_have_novel()) {
- struct obj *book = u_have_novel();
- const char *tribtitle = (char *)0;
-
- if (book) {
- int novelidx = book->novelidx;
+ case MS_RIDER: {
+ const char *tribtitle;
+ struct obj *book = 0;
+ boolean ms_Death = (ptr == &mons[PM_DEATH]);
- tribtitle = noveltitle(&novelidx);
- }
- if (tribtitle) {
+ /* 3.6 tribute */
+ if (ms_Death && !context.tribute.Deathnotice
+ && (book = u_have_novel()) != 0) {
+ if ((tribtitle = noveltitle(&book->novelidx)) != 0) {
/*JP
Sprintf(verbuf, "Ah, so you have a copy of /%s/.", tribtitle);
*/
Sprintf(verbuf, "\82 \82 \81A/%s/\82ð\8e\9d\82Á\82Ä\82¢\82é\82Ì\82©\81D", tribtitle);
/* no Death featured in these two, so exclude them */
- if (!(strcmpi(tribtitle, "Snuff") == 0
- || strcmpi(tribtitle, "The Wee Free Men") == 0))
+ if (strcmpi(tribtitle, "Snuff")
+ && strcmpi(tribtitle, "The Wee Free Men"))
/*JP
- Strcat(verbuf, " I may have been misquoted there.");
+ Strcat(verbuf, " I may have been misquoted there.");
*/
- Strcat(verbuf, "\82±\82±\82Å\82Í\88ø\97p\82ª\8aÔ\88á\82Á\82Ä\82¢\82é\82©\82à\82µ\82ê\82È\82¢\81D");
+ Strcat(verbuf, " \82±\82±\82Å\82Í\88ø\97p\82ª\8aÔ\88á\82Á\82Ä\82¢\82é\82©\82à\82µ\82ê\82È\82¢\81D");
verbl_msg = verbuf;
- context.tribute.Deathnotice = 1;
}
- } else if (ptr == &mons[PM_DEATH]
- && !rn2(2) && Death_quote(verbuf, BUFSZ)) {
- verbl_msg = verbuf;
- }
+ context.tribute.Deathnotice = 1;
+ } else if (ms_Death && rn2(3) && Death_quote(verbuf, sizeof verbuf)) {
+ verbl_msg = verbuf;
/* end of tribute addition */
- else if (ptr == &mons[PM_DEATH] && !rn2(10))
+
+ } else if (ms_Death && !rn2(10)) {
/*JP
pline_msg = "is busy reading a copy of Sandman #8.";
*/
pline_msg = "\81u\83T\83\93\83h\83}\83\93\81v\82Ì8\8aª\82ð\93Ç\82Þ\82Ì\82É\96Z\82µ\82¢\81D";
- else
+ } else
/*JP
verbl_msg = "Who do you think you are, War?";
*/
verbl_msg = "\83E\83H\81[\82æ\81C\8e©\95ª\82ª\89½\8eÒ\82©\8dl\82¦\82½\82±\82Æ\82ª\82 \82é\82©\81H";
break;
- }
+ } /* case MS_RIDER */
+ } /* switch */
- if (pline_msg)
+ if (pline_msg) {
/*JP
pline("%s %s", Monnam(mtmp), pline_msg);
*/
pline("%s\82Í%s", Monnam(mtmp), pline_msg);
- else if (mtmp->mcan && verbl_msg_mcan)
+ } else if (mtmp->mcan && verbl_msg_mcan) {
verbalize1(verbl_msg_mcan);
- else if (verbl_msg) {
+ } else if (verbl_msg) {
#if 0 /*JP*//*\83f\83X\82ð\93Á\95Ê\88µ\82¢\82µ\82È\82¢*/
+ /* more 3.6 tribute */
if (ptr == &mons[PM_DEATH]) {
/* Death talks in CAPITAL LETTERS
and without quotation marks */
char tmpbuf[BUFSZ];
- Sprintf(tmpbuf, "%s", verbl_msg);
- pline1(ucase(tmpbuf));
+
+ pline1(ucase(strcpy(tmpbuf, verbl_msg)));
} else {
verbalize1(verbl_msg);
}
OSDN Git Service
