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

gi.invalid_obj -> hands_obj

Browse Source
This commit is contained in:
nhmall
2023-11-11 19:49:38 -05:00
parent 47bca92e6c
commit 76d328d86a
15 changed files with 40 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/engrave.c
View File

@@ -532,7 +532,7 @@ doengrave(void)
if (!otmp) /* otmp == cg.zeroobj if fingers */
return ECMD_CANCEL;
if (otmp == &gi.invalid_obj) {
if (otmp == &hands_obj) {
Strcat(strcpy(fbuf, "your "), body_part(FINGERTIP));
writer = fbuf;
} else {
@@ -563,7 +563,7 @@ doengrave(void)
return ECMD_OK;
}
if (IS_GRAVE(levl[u.ux][u.uy].typ)) {
if (otmp == &gi.invalid_obj) { /* using only finger */
if (otmp == &hands_obj) { /* using only finger */
You("would only make a small smudge on the %s.",
surface(u.ux, u.uy));
return ECMD_OK;
@@ -1024,7 +1024,7 @@ doengrave(void)
}
/* Tell adventurer what is going on */
if (otmp != &gi.invalid_obj)
if (otmp != &hands_obj)
You("%s the %s with %s.", everb, eloc, doname(otmp));
else
You("%s the %s with your %s.", everb, eloc, body_part(FINGERTIP));
@@ -1131,7 +1131,7 @@ engrave(void)
}
/* Stylus might have been taken out of inventory and destroyed somehow.
* Not safe to dereference stylus until after this. */
if (gc.context.engraving.stylus == &gi.invalid_obj) { /* bare finger */
if (gc.context.engraving.stylus == &hands_obj) { /* bare finger */
stylus = (struct obj *) 0;
} else {
for (stylus = gi.invent; stylus; stylus = stylus->nobj) {