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

more F move (trunk only)

Browse Source 
Using F prefix when trying to move into a wall or closed door yielded
"you attack thin air".  Like the recently fixed F-vs-boulder case, give
more appropriate feedback.  Also like F-vs-boulder, initiate digging if
wielding a pick-axe.  (Also handles axes versus trees and closed doors).

     One thing which isn't handled but possibly should be:  F vs closed
door when not wielding a pick or other axe might attempt to force the door.
(Right now it gives "you harmlessly attack the door".)
This commit is contained in:
nethack.rankin
2007-07-19 08:20:20 +00:00
parent 16ad2bd0b8
commit aac603a446
4 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/dig.c
View File

@@ -11,7 +11,6 @@ static NEARDATA boolean did_dig_msg;
STATIC_DCL boolean NDECL(rm_waslit);
STATIC_DCL void FDECL(mkcavepos, (XCHAR_P,XCHAR_P,int,BOOLEAN_P,BOOLEAN_P));
STATIC_DCL void FDECL(mkcavearea, (BOOLEAN_P));
STATIC_DCL int FDECL(dig_typ, (struct obj *,XCHAR_P,XCHAR_P));
STATIC_DCL int NDECL(dig);
STATIC_DCL void FDECL(dig_up_grave, (coord *));
STATIC_DCL int FDECL(adj_pit_checks, (coord *,char *));
@@ -129,12 +128,16 @@ register boolean rockit;
}
/* When digging into location <x,y>, what are you actually digging into? */
STATIC_OVL int
int
dig_typ(otmp, x, y)
struct obj *otmp;
xchar x, y;
{
boolean ispick = is_pick(otmp);
boolean ispick;
if (!otmp) return DIGTYP_UNDIGGABLE;
ispick = is_pick(otmp);
if (!ispick && !is_axe(otmp)) return DIGTYP_UNDIGGABLE;
return (ispick && sobj_at(STATUE, x, y) ? DIGTYP_STATUE :
ispick && sobj_at(BOULDER, x, y) ? DIGTYP_BOULDER :