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

B05003 - tree kicking object grammar

Browse Source 
<Someone> thought the incorrect grammar in the messages was due to scatter()
changing the quan of treefruit, but in fact, it was due to treefruit
referring to the wrong object (there is also a theoretical possibility that
treefruit can refer to a merged object with the wrong count).  Create a temp
object for use in the message to avoid these possibilities.
This commit is contained in:
cohrs
2003-07-30 05:12:27 +00:00
parent ee430c5b3e
commit 3300cfc737
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/dokick.c
View File

@@ -892,16 +892,21 @@ dokick()
if (rn2(15) && !(maploc->looted & TREE_LOOTED) &&
(treefruit = rnd_treefruit_at(x, y))) {
long nfruit = 8L-rnl(7), nfall;
short frtype = treefruit->otyp;
treefruit->quan = nfruit;
if (is_plural(treefruit))
pline("Some %s fall from the tree!", xname(treefruit));
else
pline("%s falls from the tree!", An(xname(treefruit)));
nfall = scatter(x,y,2,MAY_HIT,treefruit);
if ( nfall != nfruit ) {
/* scatter left some in the tree */
if (nfall != nfruit) {
/* scatter left some in the tree, but treefruit
* may not refer to the correct object */
treefruit = mksobj(frtype, TRUE, FALSE);
treefruit->quan = nfruit-nfall;
pline("%ld %s got caught in the branches.",
nfruit-nfall, xname(treefruit));
dealloc_obj(treefruit);
}
exercise(A_DEX, TRUE);
exercise(A_WIS, TRUE); /* discovered a new food source! */