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

floor access

Browse Source 
A post-3.4.3 change dealing with reaching into pits resulted in "you
sit on the air" if you used the #sit command after escaping a pit trap.
Change can_reach_floor() so that caller explicitly controls whether being
on the brink of a pit is a condition that prevents reaching the floor.
This also splits a fairly common message about not being able to reach the
floor into a separate routine.

     There is still oddness here:  if you're polymorphed into a flyer,
#sit yields "you sit down" followed by "you fly over a pit" (latter occurs
when escaping trap activation).  A ceiling hider behaves similarly, but
the second message is "you escape a pit" and doesn't sound quite as silly.
Perhaps #sit should pass TOOKPLUNGE to dotrap(), or maybe there's some
better way to handle this?
This commit is contained in:
nethack.rankin
2005-06-04 05:25:28 +00:00
parent ff54d82b00
commit ff16502d67
13 changed files with 83 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/pickup.c
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)pickup.c 3.5 2005/04/06 */
/* SCCS Id: @(#)pickup.c 3.5 2005/06/02 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -413,7 +413,7 @@ int what; /* should be a long */
}
/* no pickup if levitating & not on air or water level */
if (!can_reach_floor()) {
if (!can_reach_floor(TRUE)) {
if ((multi && !context.run) ||
(autopickup && !flags.pickup) ||
(ttmp && uteetering_at_seen_pit(ttmp)))
@@ -1464,13 +1464,13 @@ boolean looting; /* loot vs tip */
{
const char *verb = looting ? "loot" : "tip";
if (!can_reach_floor()) {
if (!can_reach_floor(TRUE)) {
#ifdef STEED
if (u.usteed && P_SKILL(P_RIDING) < P_BASIC)
rider_cant_reach(); /* not skilled enough to reach */
else
#endif
You("cannot reach the %s.", surface(x, y));
cant_reach_floor(x, y, FALSE, TRUE);
return FALSE;
} else if ((is_pool(x, y) && (looting || !Underwater)) ||
is_lava(x, y)) {
@@ -2591,7 +2591,7 @@ struct obj *box; /* or bag */
if (empty_it) {
struct obj *otmp, *nobj;
boolean verbose = FALSE,
highdrop = !can_reach_floor(),
highdrop = !can_reach_floor(TRUE),
altarizing = IS_ALTAR(levl[u.ux][u.uy].typ),
cursed_mbag = (Is_mbag(box) && box->cursed);
int held = carried(box);