fix #H265 - applying wielded towel fails with odd message
From a bug report: attempting to apply a towel which is currently "worn" in the weapon, alternate weapon, or quiver slot fails with "you cannot use it while you're wearing it". The message sounds odd when the towel is wielded, and there's no reason why you shouldn't be able to use it when it's in any of those weapon slots. Compare it with current blindfold rather than checking its owornmask.
This commit is contained in:
@@ -92,7 +92,7 @@ use_towel(obj)
|
||||
if(!freehand()) {
|
||||
You("have no free %s!", body_part(HAND));
|
||||
return 0;
|
||||
} else if (obj->owornmask) {
|
||||
} else if (obj == ublindf) {
|
||||
You("cannot use it while you're wearing it!");
|
||||
return 0;
|
||||
} else if (obj->cursed) {
|
||||
@@ -112,8 +112,11 @@ use_towel(obj)
|
||||
(old ? "has more" : "now has"));
|
||||
make_blinded(Blinded + (long)u.ucreamed - old, TRUE);
|
||||
} else {
|
||||
const char *what = (ublindf->otyp == LENSES) ?
|
||||
"lenses" : "blindfold";
|
||||
const char *what;
|
||||
|
||||
what = (ublindf->otyp == LENSES) ? "lenses" :
|
||||
(obj->otyp == ublindf->otyp) ? "other towel" :
|
||||
"blindfold";
|
||||
if (ublindf->cursed) {
|
||||
You("push your %s %s.", what,
|
||||
rn2(2) ? "cock-eyed" : "crooked");
|
||||
|
||||
Reference in New Issue
Block a user