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

candelabrum wording

Browse Source 
On Sat, 18 Dec 2004 14:07:14 +1300, <email deleted> wrote:
> Adding one of several candles to a candelabrum which already has six
> gives an ungrammatical message.
This commit is contained in:
nethack.allison
2004-12-20 23:57:02 +00:00
parent e004822da3
commit 38f9ba9a91
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/fixes34.4
View File

@@ -76,6 +76,8 @@ monsters "shrieking in pain" from a potion didn't wake anything up
Master of Thieves as Tourist Nemesis still had STRAT_CLOSE
co-aligned unicorns in bones could be hostile
finding "something" posing as a statue while Blind should map_invisible()
adding more candles than required to total 7 to a candelabrum which
already had between 1 and 6 gave an ungrammatical message
Platform- and/or Interface-Specific Fixes

7
src/apply.c
View File

@@ -1026,9 +1026,12 @@ struct obj **optr;
use_lamp(obj);
return;
} else {
if ((long)otmp->spe + obj->quan > 7L)
if ((long)otmp->spe + obj->quan > 7L) {
obj = splitobj(obj, 7L - (long)otmp->spe);
else *optr = 0;
/* avoid a gramatical error if obj->quan gets
reduced to 1 candle from more than one */
s = (obj->quan != 1) ? "candles" : "candle";
} else *optr = 0;
You("attach %ld%s %s to %s.",
obj->quan, !otmp->spe ? "" : " more",
s, the(xname(otmp)));