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

B01001 fix: corpse grammar

Browse Source 
<Someone> wrote:
> You start bashing monsters with your 2 cockatrice corpses.
> You hit the foo with the cockatrice corpse (note singular).
> The foo is slowing down. The foo turns to stone.
> Also: Your cockatrice corpses rots away.

It appears that vtense() has a problem recognizing "corpses"
as plural.  This doesn't fix that, it just switches to using
otense() in this particular case.
This commit is contained in:
nethack.allison
2003-11-01 22:05:44 +00:00
parent 64f2d8a37b
commit 67dea0ebe1
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/fixes34.3
+1
View File
@@ -85,6 +85,7 @@ try even harder to avoid incorrect map display while changing levels
no "freaked" message by exploding black light, unless you really are no "freaked" message by exploding black light, unless you really are
sleeping monster could respond to attacks by other monsters sleeping monster could respond to attacks by other monsters
sleeping shopkeeper responds to various events without waking sleeping shopkeeper responds to various events without waking
rotting corpses grammar fix
Platform- and/or Interface-Specific Fixes Platform- and/or Interface-Specific Fixes
src/dig.c
+1 -1
View File
@@ -1538,7 +1538,7 @@ long timeout; /* unused */
char *cname = corpse_xname(obj, FALSE); char *cname = corpse_xname(obj, FALSE);
Your("%s%s %s away%c", Your("%s%s %s away%c",
obj == uwep ? "wielded " : nul, cname, obj == uwep ? "wielded " : nul, cname,
vtense(cname, "rot"), obj == uwep ? '!' : '.'); otense(obj, "rot"), obj == uwep ? '!' : '.');
} }
if (obj == uwep) { if (obj == uwep) {
uwepgone(); /* now bare handed */ uwepgone(); /* now bare handed */
src/uhitm.c
+4 -2
View File
@@ -739,11 +739,13 @@ int thrown;
#endif #endif
case CORPSE: /* fixed by polder@cs.vu.nl */ case CORPSE: /* fixed by polder@cs.vu.nl */
if (touch_petrifies(&mons[obj->corpsenm])) { if (touch_petrifies(&mons[obj->corpsenm])) {
static const char withwhat[] = "corpse";
tmp = 1; tmp = 1;
hittxt = TRUE; hittxt = TRUE;
You("hit %s with %s corpse.", mon_nam(mon), You("hit %s with %s %s.", mon_nam(mon),
obj->dknown ? the(mons[obj->corpsenm].mname) : obj->dknown ? the(mons[obj->corpsenm].mname) :
an(mons[obj->corpsenm].mname)); an(mons[obj->corpsenm].mname),
(obj->quan > 1) ? makeplural(withwhat) : withwhat);
if (!munstone(mon, TRUE)) if (!munstone(mon, TRUE))
minstapetrify(mon, TRUE); minstapetrify(mon, TRUE);
if (resists_ston(mon)) break; if (resists_ston(mon)) break;