Match object description via single function

making the code more readable.

Instead of doing strcmp(OBJ_DESCR(objects[otyp]), "foo"),
just call objdescr_is(obj, "foo")

(via xNetHack)
This commit is contained in:
Pasi Kallinen
2020-10-20 19:19:54 +03:00
parent 5880da9269
commit 566dde8683
10 changed files with 42 additions and 30 deletions

View File

@@ -114,12 +114,10 @@ struct obj *otmp;
}
if (Confusion || Fumbling || Glib)
chance -= 20;
else if (uarmg && (s = OBJ_DESCR(objects[uarmg->otyp])) != (char *) 0
&& !strncmp(s, "riding ", 7))
else if (uarmg && objdescr_is(uarmg, "riding gloves"))
/* Bonus for wearing "riding" (but not fumbling) gloves */
chance += 10;
else if (uarmf && (s = OBJ_DESCR(objects[uarmf->otyp])) != (char *) 0
&& !strncmp(s, "riding ", 7))
else if (uarmf && objdescr_is(uarmf, "riding boots"))
/* ... or for "riding boots" */
chance += 10;
if (otmp->cursed)