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

Make BARGETHROUGH unconditional.

Browse Source
This commit is contained in:
Sean Hunt
2015-02-27 19:06:01 -05:00
parent 6e9fa71b05
commit b138d380ea
10 changed files with 0 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/config.h
View File

@@ -425,7 +425,6 @@ typedef unsigned char uchar;
# endif
#endif
#define AUTOPICKUP_EXCEPTIONS /* exceptions to autopickup */
#define BARGETHROUGH /* allow some monsters to move others out of their way */
#ifdef REDO
# define DOAGAIN '\001' /* ^A, the "redo" key used in cmd.c and getline.c */

6
include/extern.h
View File

@@ -520,9 +520,7 @@ E void FDECL(clear_symsetentry, (int,BOOLEAN_P));
E void FDECL(update_l_symset, (struct symparse *,int));
E void FDECL(update_r_symset, (struct symparse *,int));
#endif
#ifdef BARGETHROUGH
E boolean FDECL(cursed_object_at, (int, int));
#endif
/* ### dungeon.c ### */
@@ -1090,9 +1088,7 @@ E int FDECL(buzzmu, (struct monst *,struct attack *));
E int FDECL(fightm, (struct monst *));
E int FDECL(mattackm, (struct monst *,struct monst *));
E boolean FDECL(engulf_target, (struct monst *,struct monst *));
#ifdef BARGETHROUGH
E int FDECL(mdisplacem, (struct monst *,struct monst *,BOOLEAN_P));
#endif
E void FDECL(paralyze_monst, (struct monst *,int));
E int FDECL(sleep_monst, (struct monst *,int,int));
E void FDECL(slept_monst, (struct monst *));
@@ -1374,11 +1370,9 @@ E boolean FDECL(accessible, (int,int));
E void FDECL(set_apparxy, (struct monst *));
E boolean FDECL(can_ooze, (struct monst *));
E boolean FDECL(can_fog, (struct monst *));
#ifdef BARGETHROUGH
E boolean FDECL(should_displace, (struct monst *,coord *,long *,int,
XCHAR_P,XCHAR_P));
E boolean FDECL(undesirable_disp, (struct monst *,XCHAR_P,XCHAR_P));
#endif
/* ### monst.c ### */

2
include/mfndpos.h
View File

@@ -7,9 +7,7 @@
#ifndef MFNDPOS_H
#define MFNDPOS_H
#ifdef BARGETHROUGH
#define ALLOW_MDISP 0x00001000L /* can displace a monster out of its way */
#endif
#define ALLOW_TRAPS 0x00020000L /* can enter traps */
#define ALLOW_U 0x00040000L /* can attack you */
#define ALLOW_M 0x00080000L /* can attack other monsters */

2
include/mondata.h
View File

@@ -131,9 +131,7 @@
#define is_covetous(ptr) ((ptr->mflags3 & M3_COVETOUS))
#define infravision(ptr) ((ptr->mflags3 & M3_INFRAVISION))
#define infravisible(ptr) ((ptr->mflags3 & M3_INFRAVISIBLE))
#ifdef BARGETHROUGH
#define is_displacer(ptr) (((ptr)->mflags3 & M3_DISPLACES) != 0L)
#endif
#define is_mplayer(ptr) (((ptr) >= &mons[PM_ARCHEOLOGIST]) && \
((ptr) <= &mons[PM_WIZARD]))
#define is_rider(ptr) ((ptr) == &mons[PM_DEATH] || \

1
include/monflag.h
View File

@@ -161,7 +161,6 @@
#define M3_INFRAVISION 0x0100 /* has infravision */
#define M3_INFRAVISIBLE 0x0200 /* visible by infravision */
/* define the bit even if BARGETHROUGH is not defined for savefile compat. */
#define M3_DISPLACES 0x0400 /* moves monsters out of its way */
#define MZ_TINY 0 /* < 2' */