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

12
src/mon.c
View File

@@ -14,9 +14,7 @@
STATIC_DCL boolean FDECL(restrap,(struct monst *));
STATIC_DCL long FDECL(mm_aggression, (struct monst *,struct monst *));
#ifdef BARGETHROUGH
STATIC_DCL long FDECL(mm_displacement, (struct monst *,struct monst *));
#endif
STATIC_DCL int NDECL(pick_animal);
STATIC_DCL void FDECL(kill_eggs, (struct obj *));
STATIC_DCL void FDECL(dealloc_mextra, (struct mextra *));
@@ -1083,13 +1081,6 @@ nexttry: /* eels prefer the water, but if there is no water nearby,
struct monst *mtmp2 = m_at(nx, ny);
long mmflag = flag | mm_aggression(mon, mtmp2);
#ifndef BARGETHROUGH
if (!(mmflag & ALLOW_M)) continue;
info[cnt] |= ALLOW_M;
if (mtmp2->mtame) {
if (!(mmflag & ALLOW_TM)) continue;
info[cnt] |= ALLOW_TM;
#else /* BARGETHROUGH */
if (mmflag & ALLOW_M) {
info[cnt] |= ALLOW_M;
if (mtmp2->mtame) {
@@ -1100,7 +1091,6 @@ nexttry: /* eels prefer the water, but if there is no water nearby,
mmflag = flag | mm_displacement(mon, mtmp2);
if (!(mmflag & ALLOW_MDISP)) continue;
info[cnt] |= ALLOW_MDISP;
#endif /* BARGETHROUGH */
}
}
/* Note: ALLOW_SANCT only prevents movement, not */
@@ -1206,7 +1196,6 @@ struct monst *magr, /* monster that is currently deciding where to move */
return 0L;
}
#ifdef BARGETHROUGH
/* Monster displacing another monster out of the way */
STATIC_OVL long
mm_displacement(magr, mdef)
@@ -1232,7 +1221,6 @@ struct monst *magr, /* monster that is currently deciding where to move */
return ALLOW_MDISP;
return 0L;
}
#endif /* BARGETHROUGH */
boolean
monnear(mon, x, y)