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

Unify mfndpos monster movement flags

Browse Source
This commit is contained in:
Pasi Kallinen
2020-11-28 12:48:09 +02:00
parent 5361958bdc
commit fb188dc1aa
5 changed files with 63 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/dogmove.c
View File

@@ -934,17 +934,7 @@ int after; /* this is extra fast monster movement */
if (appr == -2)
return 0;
allowflags = ALLOW_M | ALLOW_TRAPS | ALLOW_SSM | ALLOW_SANCT;
if (passes_walls(mtmp->data))
allowflags |= (ALLOW_ROCK | ALLOW_WALL);
if (passes_bars(mtmp->data))
allowflags |= ALLOW_BARS;
if (throws_rocks(mtmp->data))
allowflags |= ALLOW_ROCK;
if (is_displacer(mtmp->data))
allowflags |= ALLOW_MDISP;
if (Conflict && !resist(mtmp, RING_CLASS, 0, 0)) {
allowflags |= ALLOW_U;
if (!has_edog) {
/* Guardian angel refuses to be conflicted; rather,
* it disappears, angrily, and sends in some nasties
@@ -960,18 +950,7 @@ int after; /* this is extra fast monster movement */
You("get released!");
}
#endif
if (!nohands(mtmp->data) && !verysmall(mtmp->data)) {
allowflags |= OPENDOOR;
if (monhaskey(mtmp, TRUE))
allowflags |= UNLOCKDOOR;
/* note: the Wizard and Riders can unlock doors without a key;
they won't use that ability if someone manages to tame them */
}
if (is_giant(mtmp->data))
allowflags |= BUSTDOOR;
if (tunnels(mtmp->data)
&& !Is_rogue_level(&u.uz)) /* same restriction as m_move() */
allowflags |= ALLOW_DIG;
allowflags = mon_allowflags(mtmp);
cnt = mfndpos(mtmp, poss, info, allowflags);
/* Normally dogs don't step on cursed items, but if they have no