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

mon vs mon attack message phrasing

Browse Source 
From <Someone>:
  Pet picks up 8 spears.
  Pet wields 8 spears.
  Pet thrusts its spear at Foe.
The routine to handle a monster attacking the hero are already uses "mon
thrusts one of its spears" in this case, so make monster against monster
messages do the same.  Also, it's no longer necessary to save one monster
name before formatting another when using two monster names in the same
message, so switch to the more straightforward usage here.  (The Blind
check is needed in the mhitu case but not in the mhitm one, where it's
redundant because the caller has already verified that both monsters'
locations are visible, but I left it in.)
This commit is contained in:
nethack.rankin
2006-08-08 05:08:23 +00:00
parent 96a0e8e6fe
commit f36c9d19fd
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/fixes34.4
View File

@@ -244,6 +244,8 @@ free storage used to hold region messages in free_region()
honor pushweapon when applying a tool or weapon causes it to become wielded honor pushweapon when applying a tool or weapon causes it to become wielded
in the quest, if the locate level hasn't been reached yet, don't fall or in the quest, if the locate level hasn't been reached yet, don't fall or
randomly teleport past it randomly teleport past it
fix phrasing in monster against monster attack feedback when attacker is
wielding stacked weapons
Platform- and/or Interface-Specific Fixes Platform- and/or Interface-Specific Fixes

16
src/mhitm.c
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)mhitm.c 3.5 2006/05/09 */ /* SCCS Id: @(#)mhitm.c 3.5 2006/08/07 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -1321,15 +1321,15 @@ register struct obj *obj;
STATIC_OVL void STATIC_OVL void
mswingsm(magr, mdef, otemp) mswingsm(magr, mdef, otemp)
register struct monst *magr, *mdef; struct monst *magr, *mdef;
register struct obj *otemp; struct obj *otemp;
{ {
char buf[BUFSZ]; if (flags.verbose && !Blind && mon_visible(magr)) {
if (!flags.verbose || Blind || !mon_visible(magr)) return; pline("%s %s %s%s %s at %s.", Monnam(magr),
Strcpy(buf, mon_nam(mdef));
pline("%s %s %s %s at %s.", Monnam(magr),
(objects[otemp->otyp].oc_dir & PIERCE) ? "thrusts" : "swings", (objects[otemp->otyp].oc_dir & PIERCE) ? "thrusts" : "swings",
mhis(magr), singular(otemp, xname), buf); (otemp->quan > 1L) ? "one of " : "",
mhis(magr), xname(otemp), mon_nam(mdef));
}
} }
/* /*

10
src/mhitu.c
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)mhitu.c 3.5 2006/03/27 */ /* SCCS Id: @(#)mhitu.c 3.5 2006/08/07 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -97,15 +97,15 @@ register struct attack *mattk;
STATIC_OVL void STATIC_OVL void
mswings(mtmp, otemp) /* monster swings obj */ mswings(mtmp, otemp) /* monster swings obj */
register struct monst *mtmp; struct monst *mtmp;
register struct obj *otemp; struct obj *otemp;
{ {
if (!flags.verbose || Blind || !mon_visible(mtmp)) if (flags.verbose && !Blind && mon_visible(mtmp)) {
return;
pline("%s %s %s%s %s.", Monnam(mtmp), pline("%s %s %s%s %s.", Monnam(mtmp),
(objects[otemp->otyp].oc_dir & PIERCE) ? "thrusts" : "swings", (objects[otemp->otyp].oc_dir & PIERCE) ? "thrusts" : "swings",
(otemp->quan > 1L) ? "one of " : "", (otemp->quan > 1L) ? "one of " : "",
mhis(mtmp), xname(otemp)); mhis(mtmp), xname(otemp));
}
} }
/* return how a poison attack was delivered */ /* return how a poison attack was delivered */