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

comment thinko

Browse Source 
Some_Monnam() returns "Someone" or "Something", not "Someone" or "It".

Removing the redundant '&& uchain != NULL' test shouldn't produce any
change in behavior.
This commit is contained in:
PatR
2024-08-18 11:29:04 -07:00
parent 9bc6e1bee1
commit 158e3b12dc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/steal.c
+3 -3
View File
@@ -371,7 +371,7 @@ steal(struct monst *mtmp, char *objnambuf)
no longer being visible; it could also be a case of a blinded no longer being visible; it could also be a case of a blinded
hero being able to see via wearing the Eyes of the Overworld and hero being able to see via wearing the Eyes of the Overworld and
having those stolen; remember the name as it is now; if unseen, having those stolen; remember the name as it is now; if unseen,
monkeys will be "It" and nymphs will be "Someone" */ nymphs will be "Someone" and monkeys will be "Something" */
Strcpy(Monnambuf, Some_Monnam(mtmp)); Strcpy(Monnambuf, Some_Monnam(mtmp));
/* food being eaten might already be used up but will not have /* food being eaten might already be used up but will not have
@@ -574,13 +574,13 @@ steal(struct monst *mtmp, char *objnambuf)
otmp->oclass); otmp->oclass);
} }
/* hero's blindfold might have just been stolen; if so, replace /* hero's blindfold might have just been stolen; if so, replace
cached "It" or "Someone" with Monnam */ cached "Someone" or "Something" with Monnam */
if (!seen && canspotmon(mtmp)) if (!seen && canspotmon(mtmp))
Strcpy(Monnambuf, Monnam(mtmp)); Strcpy(Monnambuf, Monnam(mtmp));
} else if (otmp->owornmask) { /* weapon or ball&chain */ } else if (otmp->owornmask) { /* weapon or ball&chain */
struct obj *item = otmp; struct obj *item = otmp;
if (otmp == uball && uchain != NULL) if (otmp == uball) /* non-Null uball implies non-Null uchain */
item = uchain; /* yields a more accurate 'takes off' message */ item = uchain; /* yields a more accurate 'takes off' message */
worn_item_removal(mtmp, item); worn_item_removal(mtmp, item);
/* if we switched from uball to uchain for the preface message, /* if we switched from uball to uchain for the preface message,