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

Magicbane grammar

Browse Source 
After newsgroup discussion of C343-162, I noticed that it had fixed
the verb usage in the message for confused and/or stunned, but not in the
one for resisting.  (If a monster name ends in 's', or it has been named
"you", 3.4.3 used the wrong verb because vtense() was fooled about plural
or second person.)  No new fixes entry needed....
This commit is contained in:
nethack.rankin
2013-03-17 00:17:18 +00:00
parent fec8981102
commit c9fc8fcc09
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/artifact.c
View File

@@ -888,11 +888,10 @@ boolean vis; /* whether the action can be seen */
char *hittee; /* target's name: "you" or mon_nam(mdef) */
{
struct permonst *old_uasmon;
const char *verb;
const char *verb, *fakename;
boolean youattack = (magr == &youmonst),
youdefend = (mdef == &youmonst),
resisted = FALSE, do_stun, do_confuse, result;
boolean hitteename = (has_mname(mdef) && !strcmpi(hittee, MNAME(mdef)));
int attack_indx, scare_dieroll = MB_MAX_DIEROLL / 2;
result = FALSE; /* no message given yet */
@@ -1028,10 +1027,13 @@ char *hittee; /* target's name: "you" or mon_nam(mdef) */
mdef->mconf = 1;
}
/* now give message(s) describing side-effects;
don't let vtense() be fooled by assigned name ending in 's' */
fakename = youdefend ? "you" : "mon";
if (youattack || youdefend || vis) {
(void) upstart(hittee); /* capitalize */
if (resisted) {
pline("%s %s!", hittee, vtense(hittee, "resist"));
pline("%s %s!", hittee, vtense(fakename, "resist"));
shieldeff(youdefend ? u.ux : mdef->mx,
youdefend ? u.uy : mdef->my);
}
@@ -1042,8 +1044,7 @@ char *hittee; /* target's name: "you" or mon_nam(mdef) */
if (do_stun) Strcat(buf, "stunned");
if (do_stun && do_confuse) Strcat(buf, " and ");
if (do_confuse) Strcat(buf, "confused");
pline("%s %s %s%c", hittee,
hitteename ? "is" : vtense(hittee, "are"),
pline("%s %s %s%c", hittee, vtense(fakename, "are"),
buf, (do_stun && do_confuse) ? '!' : '.');
}
}