pit access

Fix the recently reported problem:

" If there is a corpse in a pit, you have to enter the pit in order to pick
" it up, however you are can eat it without being in the pit.

If pit bottoms aren't reachable, then can_reach_floor() needs to know
about it.  I suspect that this change is likely to create some other
bugs though.
This commit is contained in:
nethack.rankin
2004-01-04 08:54:16 +00:00
parent 62e46878b1
commit b8991129a8
4 changed files with 32 additions and 39 deletions
+11 -5
View File
@@ -1,4 +1,4 @@
/* SCCS Id: @(#)engrave.c 3.4 2001/11/04 */
/* SCCS Id: @(#)engrave.c 3.4 2004/01/03 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -132,12 +132,18 @@ unsigned seed; /* for semi-controlled randomization */
boolean
can_reach_floor()
{
return (boolean)(!u.uswallow &&
struct trap *t;
if (u.uswallow) return FALSE;
#ifdef STEED
/* Restricted/unskilled riders can't reach the floor */
!(u.usteed && P_SKILL(P_RIDING) < P_BASIC) &&
/* Restricted/unskilled riders can't reach the floor */
if (u.usteed && P_SKILL(P_RIDING) < P_BASIC) return FALSE;
#endif
(!Levitation ||
if ((t = t_at(u.ux, u.uy)) != 0 && uteetering_at_seen_pit(t) &&
!Flying)
return FALSE;
return (boolean)((!Levitation ||
Is_airlevel(&u.uz) || Is_waterlevel(&u.uz)) &&
(!u.uundetected || !is_hider(youmonst.data) ||
u.umonnum == PM_TRAPPER));