Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

When a pet is resurrected, use its name (not "The [species]") #180

Closed
wants to merge 1 commit into from
Closed

When a pet is resurrected, use its name (not "The [species]") #180

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions src/zap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -998,15 +998,20 @@ revive(struct obj *corpse, boolean by_hero)
if (cansee(x, y)) {
char buf[BUFSZ];

Strcpy(buf, one_of ? "one of " : "");
/* shk_your: "the " or "your " or "<mon>'s " or "<Shk>'s ".
If the result is "Shk's " then it will be ambiguous:
is Shk the mon carrying it, or does Shk's shop own it?
Let's not worry about that... */
(void) shk_your(eos(buf), corpse);
if (one_of)
corpse->quan++; /* force plural */
Strcat(buf, corpse_xname(corpse, (const char *) 0, CXN_NO_PFX));
if (mtmp->mtame) {
Sprintf(buf, "%s corpse", s_suffix(y_monnam(mtmp)));
} else {
Strcpy(buf, one_of ? "one of " : "");
/* shk_your: "the " or "your " or "<mon>'s " or "<Shk>'s ".
If the result is "Shk's " then it will be ambiguous:
is Shk the mon carrying it, or does Shk's shop own it?
Let's not worry about that... */
(void) shk_your(eos(buf), corpse);
if (one_of)
corpse->quan++; /* force plural */
Strcat(buf,
corpse_xname(corpse, (const char *) 0, CXN_NO_PFX));
}
if (one_of) /* could be simplified to ''corpse->quan = 1L;'' */
corpse->quan--;
pline("%s glows iridescently.", upstart(buf));
Expand Down Expand Up @@ -2307,7 +2312,7 @@ bhito(struct obj *obj, struct obj *otmp)
if (cansee(ox, oy)) {
if (canspotmon(mtmp)) {
pline("%s is resurrected!",
upstart(noname_monnam(mtmp, ARTICLE_THE)));
mtmp->mtame ? upstart(y_monnam(mtmp)) : upstart(noname_monnam(mtmp, ARTICLE_THE)));
learn_it = by_u ? TRUE : gz.zap_oseen;
} else {
/* saw corpse but don't see monster: maybe
Expand Down