U673 - hooks and grappling hook working thru walls
While wearing the Eyes of the Overworld, one could use a hook or pole thru walls. The bug report thought they should work past a boulder, but I disagree, given a pole or hook's rigid nature, and did not special case that. couldsee() is not affected by the Eyes, so use that after checking cansee().
This commit is contained in:
@@ -28,6 +28,7 @@ it was inappropriate to have a ghost "appear" in desecrated temple when
|
|||||||
accept wish for "grey spell book" not just "grey spellbook"
|
accept wish for "grey spell book" not just "grey spellbook"
|
||||||
do not double credit when putting gold into an unpaid container
|
do not double credit when putting gold into an unpaid container
|
||||||
manes are nonliving
|
manes are nonliving
|
||||||
|
poles and grappling hook worked thru walls when wearing Eyes of the Overworld
|
||||||
|
|
||||||
|
|
||||||
Platform- and/or Interface-Specific Fixes
|
Platform- and/or Interface-Specific Fixes
|
||||||
|
|||||||
@@ -2358,7 +2358,8 @@ struct obj *obj;
|
|||||||
static const char
|
static const char
|
||||||
not_enough_room[] = "There's not enough room here to use that.",
|
not_enough_room[] = "There's not enough room here to use that.",
|
||||||
where_to_hit[] = "Where do you want to hit?",
|
where_to_hit[] = "Where do you want to hit?",
|
||||||
cant_see_spot[] = "won't hit anything if you can't see that spot.";
|
cant_see_spot[] = "won't hit anything if you can't see that spot.",
|
||||||
|
cant_reach[] = "can't reach that spot from here.";
|
||||||
|
|
||||||
/* Distance attacks by pole-weapons */
|
/* Distance attacks by pole-weapons */
|
||||||
STATIC_OVL int
|
STATIC_OVL int
|
||||||
@@ -2404,6 +2405,9 @@ use_pole (obj)
|
|||||||
!canseemon(mtmp))) {
|
!canseemon(mtmp))) {
|
||||||
You(cant_see_spot);
|
You(cant_see_spot);
|
||||||
return (res);
|
return (res);
|
||||||
|
} else if (!couldsee(cc.x, cc.y)) { /* Eyes of the Overworld */
|
||||||
|
You(cant_reach);
|
||||||
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Attack the monster there */
|
/* Attack the monster there */
|
||||||
@@ -2502,6 +2506,9 @@ use_grapple (obj)
|
|||||||
} else if (!cansee(cc.x, cc.y)) {
|
} else if (!cansee(cc.x, cc.y)) {
|
||||||
You(cant_see_spot);
|
You(cant_see_spot);
|
||||||
return (res);
|
return (res);
|
||||||
|
} else if (!couldsee(cc.x, cc.y)) { /* Eyes of the Overworld */
|
||||||
|
You(cant_reach);
|
||||||
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* What do you want to hit? */
|
/* What do you want to hit? */
|
||||||
|
|||||||
Reference in New Issue
Block a user