killer messages
Incorporate various killer message grammar fixes suggested by <Someone>.
Mostly these deal with using the proper killer_format and prefix ("the" or
no "the") for unique and type_is_pname monsters, or death to to eating
their corpses.
One case is handled by a general fix to name_to_mon to allow it to deal
with "Croesus' corpse".
The pre-3.4.1 topten behavior for "starved to death" messages is also restored.
This commit is contained in:
@@ -246,16 +246,11 @@ nh_timeout()
|
||||
if ((m_idx = name_to_mon(killer)) >= LOW_PM) {
|
||||
if (type_is_pname(&mons[m_idx])) {
|
||||
killer_format = KILLED_BY;
|
||||
}
|
||||
#if 0 /* at present, there aren't any monster
|
||||
poisoners with titles rather than names */
|
||||
else if (mons[m_idx].geno & G_UNIQ) {
|
||||
char buf[BUFSZ];
|
||||
Sprintf(buf, "the %s", killer);
|
||||
Strcpy(u.usick_cause, buf);
|
||||
} else if (mons[m_idx].geno & G_UNIQ) {
|
||||
killer = the(killer);
|
||||
Strcpy(u.usick_cause, killer);
|
||||
killer_format = KILLED_BY;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
u.usick_type = 0;
|
||||
done(POISONING);
|
||||
|
||||
Reference in New Issue
Block a user