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

refine PR #1139 - m_move() and postmov()

Browse Source 
Remove a stale comment and update one or two others.
Remove several trailing spaces.
Change the data type of a couple of variables from schar to int and a
couple others from int to coordxy.
Redo a nested 'if' sequence to un-nest; results in a bloated diff due
to reducing indentation for a big chunk of code.
Change monster movement to use u_on_newpos() when swallowed hero's
location moves along with engulfer so that a clipped map will be kept
up to date.
This commit is contained in:
PatR
2023-12-01 04:53:20 -08:00
parent f3bcec6c53
commit eb212c1676
1 changed files with 198 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

401
src/monmove.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 monmove.c $NHDT-Date: 1684621592 2023/05/20 22:26:32 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.218 $ */ /* NetHack 3.7 monmove.c $NHDT-Date: 1701435190 2023/12/01 12:53:10 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.229 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Michael Allison, 2006. */ /*-Copyright (c) Michael Allison, 2006. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -16,10 +16,10 @@ static void mind_blast(struct monst *);
static boolean holds_up_web(coordxy, coordxy); static boolean holds_up_web(coordxy, coordxy);
static int count_webbing_walls(coordxy, coordxy); static int count_webbing_walls(coordxy, coordxy);
static boolean soko_allow_web(struct monst *); static boolean soko_allow_web(struct monst *);
static boolean m_search_items(struct monst *, coordxy *, coordxy *, schar *, static boolean m_search_items(struct monst *, coordxy *, coordxy *, int *,
int *); int *);
static int postmov(struct monst *, struct permonst *, int, int, schar, boolean, static int postmov(struct monst *, struct permonst *, coordxy, coordxy, int,
boolean, boolean, boolean); boolean, boolean, boolean, boolean);
static boolean leppie_avoidance(struct monst *); static boolean leppie_avoidance(struct monst *);
static void leppie_stash(struct monst *); static void leppie_stash(struct monst *);
static boolean m_balks_at_approaching(struct monst *); static boolean m_balks_at_approaching(struct monst *);
@@ -1164,7 +1164,7 @@ static boolean
m_search_items( m_search_items(
struct monst *mtmp, struct monst *mtmp,
coordxy *ggx, coordxy *ggy, coordxy *ggx, coordxy *ggy,
schar *mmoved, int *mmoved,
int *appr) int *appr)
{ {
register int minr = SQSRCHRADIUS; /* not too far away */ register int minr = SQSRCHRADIUS; /* not too far away */
@@ -1289,72 +1289,66 @@ static int
postmov( postmov(
struct monst *mtmp, struct monst *mtmp,
struct permonst *ptr, struct permonst *ptr,
int omx, coordxy omx, coordxy omy,
int omy, int mmoved,
schar mmoved,
boolean sawmon, boolean sawmon,
boolean can_tunnel, boolean can_tunnel,
boolean can_unlock, boolean can_unlock,
boolean can_open) boolean can_open)
{ {
coordxy nix, niy; coordxy nix, niy;
int etmp; int etmp, trapret;
boolean canseeit = cansee(mtmp->mx, mtmp->my),
didseeit = canseeit;
if (mmoved == MMOVE_MOVED || mmoved == MMOVE_DONE) { if (mmoved == MMOVE_MOVED) {
boolean canseeit = cansee(mtmp->mx, mtmp->my), nix = mtmp->mx, niy = mtmp->my;
didseeit = canseeit; /* sequencing issue: when monster movement decides that a
monster can move to a door location, it moves the monster
if (mmoved == MMOVE_MOVED) { there before dealing with the door rather than after;
int trapret; so a vampire/bat that is going to shift to fog cloud and
pass under the door is already there but transformation
/* normal monster move will already have <nix,niy>, into fog form--and its message, when in sight--has not
but pet dog_move() with 'goto postmov' won't */ happened yet; we have to move monster back to previous
nix = mtmp->mx, niy = mtmp->my; location before performing the vamp_shift() to make the
/* sequencing issue: when monster movement decides that a message happen at right time, then back to the door again
monster can move to a door location, it moves the monster [if we did the shift sooner, before moving the monster,
there before dealing with the door rather than after; we would need to duplicate it in dog_move()...] */
so a vampire/bat that is going to shift to fog cloud and if (is_vampshifter(mtmp) && !amorphous(mtmp->data)
pass under the door is already there but transformation && IS_DOOR(levl[nix][niy].typ)
into fog form--and its message, when in sight--has not && ((levl[nix][niy].doormask & (D_LOCKED | D_CLOSED)) != 0)
happened yet; we have to move monster back to previous && can_fog(mtmp)) {
location before performing the vamp_shift() to make the if (sawmon) {
message happen at right time, then back to the door again remove_monster(nix, niy);
[if we did the shift above, before moving the monster, place_monster(mtmp, omx, omy);
we would need to duplicate it in dog_move()...] */ newsym(nix, niy), newsym(omx, omy);
if (is_vampshifter(mtmp) && !amorphous(mtmp->data)
&& IS_DOOR(levl[nix][niy].typ)
&& ((levl[nix][niy].doormask & (D_LOCKED | D_CLOSED)) != 0)
&& can_fog(mtmp)) {
if (sawmon) {
remove_monster(nix, niy);
place_monster(mtmp, omx, omy);
newsym(nix, niy), newsym(omx, omy);
}
if (vamp_shift(mtmp, &mons[PM_FOG_CLOUD], sawmon)) {
ptr = mtmp->data; /* update cached value */
}
if (sawmon) {
remove_monster(omx, omy);
place_monster(mtmp, nix, niy);
newsym(omx, omy), newsym(nix, niy);
}
} }
if (vamp_shift(mtmp, &mons[PM_FOG_CLOUD], sawmon)) {
newsym(omx, omy); /* update the old position */ ptr = mtmp->data; /* update cached value */
trapret = mintrap(mtmp, NO_TRAP_FLAGS);
if (trapret == Trap_Killed_Mon || trapret == Trap_Moved_Mon) {
if (mtmp->mx)
newsym(mtmp->mx, mtmp->my);
return MMOVE_DIED; /* it died */
} }
ptr = mtmp->data; /* in case mintrap() caused polymorph */ if (sawmon) {
remove_monster(omx, omy);
place_monster(mtmp, nix, niy);
newsym(omx, omy), newsym(nix, niy);
}
}
newsym(omx, omy); /* update the old position */
trapret = mintrap(mtmp, NO_TRAP_FLAGS);
if (trapret == Trap_Killed_Mon || trapret == Trap_Moved_Mon) {
if (mtmp->mx)
newsym(mtmp->mx, mtmp->my);
return MMOVE_DIED; /* it died */
}
ptr = mtmp->data; /* in case mintrap() caused polymorph */
/* open a door, or crash through it, if 'mtmp' can */
if (IS_DOOR(levl[mtmp->mx][mtmp->my].typ)
&& !passes_walls(ptr) /* doesn't need to open doors */
&& !can_tunnel) { /* taken care of below */
struct rm *here = &levl[mtmp->mx][mtmp->my];
boolean btrapped = (here->doormask & D_TRAPPED) != 0;
/* open a door, or crash through it, if 'mtmp' can */
if (IS_DOOR(levl[mtmp->mx][mtmp->my].typ)
&& !passes_walls(ptr) /* doesn't need to open doors */
&& !can_tunnel) { /* taken care of below */
struct rm *here = &levl[mtmp->mx][mtmp->my];
boolean btrapped = (here->doormask & D_TRAPPED) != 0;
/* used after monster 'who' has been moved to closed door spot 'where' /* used after monster 'who' has been moved to closed door spot 'where'
which will now be changed to door state 'what' with map update */ which will now be changed to door state 'what' with map update */
#define UnblockDoor(where,who,what) \ #define UnblockDoor(where,who,what) \
@@ -1367,126 +1361,130 @@ postmov(
canseeit = didseeit || cansee((who)->mx, (who)->my); \ canseeit = didseeit || cansee((who)->mx, (who)->my); \
} while (0) } while (0)
/* if mon has MKoT, disarm door trap; no message given */ /* if mon has MKoT, disarm door trap; no message given */
if (btrapped && has_magic_key(mtmp)) { if (btrapped && has_magic_key(mtmp)) {
/* BUG: this lets a vampire or blob or a doorbuster /* BUG: this lets a vampire or blob or a doorbuster
holding the Key disarm the trap even though it isn't holding the Key disarm the trap even though it isn't
using that Key when squeezing under or smashing the using that Key when squeezing under or smashing the
door. Not significant enough to worry about; perhaps door. Not significant enough to worry about; perhaps
the Key's magic is more powerful for monsters? */ the Key's magic is more powerful for monsters? */
here->doormask &= ~D_TRAPPED; here->doormask &= ~D_TRAPPED;
btrapped = FALSE; btrapped = FALSE;
}
if ((here->doormask & (D_LOCKED | D_CLOSED)) != 0
&& amorphous(ptr)) {
if (flags.verbose && canseemon(mtmp))
pline("%s %s under the door.", Monnam(mtmp),
(ptr == &mons[PM_FOG_CLOUD]
|| ptr->mlet == S_LIGHT) ? "flows" : "oozes");
} else if (here->doormask & D_LOCKED && can_unlock) {
/* like the vampshift hack above, there are sequencing
issues when the monster is moved to the door's spot
first then door handling plus feedback comes after */
UnblockDoor(here, mtmp, !btrapped ? D_ISOPEN : D_NODOOR);
if (btrapped) {
if (mb_trapped(mtmp, canseeit))
return MMOVE_DIED;
} else {
if (flags.verbose) {
if (canseeit && canspotmon(mtmp)) {
pline("%s unlocks and opens a door.",
Monnam(mtmp));
} else if (canseeit) {
You_see("a door unlock and open.");
} else if (!Deaf) {
Soundeffect(se_door_unlock_and_open, 50);
You_hear("a door unlock and open.");
}
}
}
} else if (here->doormask == D_CLOSED && can_open) {
UnblockDoor(here, mtmp, !btrapped ? D_ISOPEN : D_NODOOR);
if (btrapped) {
if (mb_trapped(mtmp, canseeit))
return MMOVE_DIED;
} else {
if (flags.verbose) {
if (canseeit && canspotmon(mtmp)) {
pline("%s opens a door.", Monnam(mtmp));
} else if (canseeit) {
You_see("a door open.");
} else if (!Deaf) {
Soundeffect(se_door_open, 100);
You_hear("a door open.");
}
}
}
} else if (here->doormask & (D_LOCKED | D_CLOSED)) {
/* mfndpos guarantees this must be a doorbuster */
unsigned mask;
mask = ((btrapped || ((here->doormask & D_LOCKED) != 0
&& !rn2(2))) ? D_NODOOR
: D_BROKEN);
UnblockDoor(here, mtmp, mask);
if (btrapped) {
if (mb_trapped(mtmp, canseeit))
return MMOVE_DIED;
} else {
if (flags.verbose) {
if (canseeit && canspotmon(mtmp)) {
pline("%s smashes down a door.",
Monnam(mtmp));
} else if (canseeit) {
You_see("a door crash open.");
} else if (!Deaf) {
Soundeffect(se_door_crash_open, 50);
You_hear("a door crash open.");
}
}
}
/* if it's a shop door, schedule repair */
if (*in_rooms(mtmp->mx, mtmp->my, SHOPBASE))
add_damage(mtmp->mx, mtmp->my, 0L);
}
} else if (levl[mtmp->mx][mtmp->my].typ == IRONBARS) {
/* 3.6.2: was using may_dig() but that doesn't handle bars;
AD_RUST catches rust monsters but metallivorous() is
needed for xorns and rock moles */
if (!(levl[mtmp->mx][mtmp->my].wall_info & W_NONDIGGABLE)
&& (dmgtype(ptr, AD_RUST) || dmgtype(ptr, AD_CORR)
|| metallivorous(ptr))) {
if (canseemon(mtmp))
pline("%s eats through the iron bars.", Monnam(mtmp));
dissolve_bars(mtmp->mx, mtmp->my);
return MMOVE_DONE;
} else if (flags.verbose && canseemon(mtmp))
Norep("%s %s %s the iron bars.", Monnam(mtmp),
/* pluralization fakes verb conjugation */
makeplural(locomotion(ptr, "pass")),
passes_walls(ptr) ? "through" : "between");
} }
if ((here->doormask & (D_LOCKED | D_CLOSED)) != 0
&& amorphous(ptr)) {
if (flags.verbose && canseemon(mtmp))
pline("%s %s under the door.", Monnam(mtmp),
(ptr == &mons[PM_FOG_CLOUD]
|| ptr->mlet == S_LIGHT) ? "flows" : "oozes");
} else if (here->doormask & D_LOCKED && can_unlock) {
/* like the vampshift hack, there are sequencing
issues when the monster is moved to the door's spot
first then door handling plus feedback comes after */
/* possibly dig */ UnblockDoor(here, mtmp, !btrapped ? D_ISOPEN : D_NODOOR);
if (can_tunnel && may_dig(mtmp->mx, mtmp->my) if (btrapped) {
&& mdig_tunnel(mtmp)) if (mb_trapped(mtmp, canseeit))
return MMOVE_DIED; /* mon died (position already updated) */ return MMOVE_DIED;
} else {
if (!Deaf)
Soundeffect(se_door_unlock_and_open, 50);
if (flags.verbose) {
if (canseeit && canspotmon(mtmp)) {
pline("%s unlocks and opens a door.",
Monnam(mtmp));
} else if (canseeit) {
You_see("a door unlock and open.");
} else if (!Deaf) {
You_hear("a door unlock and open.");
}
}
}
} else if (here->doormask == D_CLOSED && can_open) {
UnblockDoor(here, mtmp, !btrapped ? D_ISOPEN : D_NODOOR);
if (btrapped) {
if (mb_trapped(mtmp, canseeit))
return MMOVE_DIED;
} else {
if (!Deaf)
Soundeffect(se_door_open, 100);
if (flags.verbose) {
if (canseeit && canspotmon(mtmp)) {
pline("%s opens a door.", Monnam(mtmp));
} else if (canseeit) {
You_see("a door open.");
} else if (!Deaf) {
You_hear("a door open.");
}
}
}
} else if (here->doormask & (D_LOCKED | D_CLOSED)) {
/* mfndpos guarantees this must be a doorbuster */
unsigned mask;
/* set also in domove(), hack.c */ mask = ((btrapped
if (engulfing_u(mtmp) || ((here->doormask & D_LOCKED) != 0 && !rn2(2)))
&& (mtmp->mx != omx || mtmp->my != omy)) { ? D_NODOOR
/* If the monster moved, then update */ : D_BROKEN);
u.ux0 = u.ux; UnblockDoor(here, mtmp, mask);
u.uy0 = u.uy; if (btrapped) {
u.ux = mtmp->mx; if (mb_trapped(mtmp, canseeit))
u.uy = mtmp->my; return MMOVE_DIED;
swallowed(0); } else {
} else { if (!Deaf)
newsym(mtmp->mx, mtmp->my); Soundeffect(se_door_crash_open, 50);
if (flags.verbose) {
if (canseeit && canspotmon(mtmp)) {
pline("%s smashes down a door.", Monnam(mtmp));
} else if (canseeit) {
You_see("a door crash open.");
} else if (!Deaf) {
You_hear("a door crash open.");
}
}
}
/* if it's a shop door, schedule repair */
if (*in_rooms(mtmp->mx, mtmp->my, SHOPBASE))
add_damage(mtmp->mx, mtmp->my, 0L);
} }
#undef UnblockDoor #undef UnblockDoor
} else if (levl[mtmp->mx][mtmp->my].typ == IRONBARS) {
/* 3.6.2: was using may_dig() but that doesn't handle bars;
AD_RUST catches rust monsters but metallivorous() is
needed for xorns and rock moles */
if (!(levl[mtmp->mx][mtmp->my].wall_info & W_NONDIGGABLE)
&& (dmgtype(ptr, AD_RUST) || dmgtype(ptr, AD_CORR)
|| metallivorous(ptr))) {
if (canseemon(mtmp))
pline("%s eats through the iron bars.", Monnam(mtmp));
dissolve_bars(mtmp->mx, mtmp->my);
return MMOVE_DONE;
} else if (flags.verbose && canseemon(mtmp))
Norep("%s %s %s the iron bars.", Monnam(mtmp),
/* pluralization fakes verb conjugation */
makeplural(locomotion(ptr, "pass")),
passes_walls(ptr) ? "through" : "between");
} /* doors and bars */
/* possibly dig */
if (can_tunnel && may_dig(mtmp->mx, mtmp->my)
&& mdig_tunnel(mtmp))
return MMOVE_DIED; /* mon died (position already updated) */
/* set also in domove(), hack.c */
if (engulfing_u(mtmp) && (mtmp->mx != omx || mtmp->my != omy)) {
/* If the monster moved, then update */
u.ux0 = u.ux;
u.uy0 = u.uy;
u_on_newpos(mtmp->mx, mtmp->my);
swallowed(0);
} else {
newsym(mtmp->mx, mtmp->my);
} }
} /* mmoved==MMOVE_MOVED */
if (mmoved == MMOVE_MOVED || mmoved == MMOVE_DONE) {
if (OBJ_AT(mtmp->mx, mtmp->my) && mtmp->mcanmove) { if (OBJ_AT(mtmp->mx, mtmp->my) && mtmp->mcanmove) {
/* Maybe a rock mole just ate some metal object */ /* Maybe a rock mole just ate some metal object */
@@ -1521,9 +1519,8 @@ postmov(
if (hides_under(ptr) || ptr->mlet == S_EEL) { if (hides_under(ptr) || ptr->mlet == S_EEL) {
/* Always set--or reset--mundetected if it's already hidden /* Always set--or reset--mundetected if it's already hidden
(just in case the object it was hiding under went away); (just in case the object it was hiding under went away);
usually set mundetected unless monster can't move. */ usually set mundetected unless monster can't move. */
if (mtmp->mundetected if (mtmp->mundetected || (!helpless(mtmp) && rn2(5)))
|| (!helpless(mtmp) && rn2(5)))
(void) hideunder(mtmp); (void) hideunder(mtmp);
newsym(mtmp->mx, mtmp->my); newsym(mtmp->mx, mtmp->my);
} }
@@ -1534,11 +1531,11 @@ postmov(
return mmoved; return mmoved;
} }
/* Handles the movement of a standard monster. */ /* Handles the movement of a standard monster.
/* Return values: * Return values:
* 0: did not move, but can still attack and do other stuff. * 0: did not move, but can still attack and do other stuff;
* 1: moved, possibly can attack. * 1: moved, possibly can attack;
* 2: monster died. * 2: monster died;
* 3: did not move, and can't do anything else either. * 3: did not move, and can't do anything else either.
*/ */
int int
@@ -1547,7 +1544,6 @@ m_move(register struct monst *mtmp, int after)
int appr; int appr;
coordxy ggx, ggy, nix, niy; coordxy ggx, ggy, nix, niy;
xint16 chcnt; xint16 chcnt;
int chi; /* could be schar except for stupid Sun-2 compiler */
boolean can_tunnel = 0; boolean can_tunnel = 0;
boolean can_open = 0, can_unlock = 0 /*, doorbuster = 0 */; boolean can_open = 0, can_unlock = 0 /*, doorbuster = 0 */;
boolean getitems = FALSE; boolean getitems = FALSE;
@@ -1555,10 +1551,10 @@ m_move(register struct monst *mtmp, int after)
boolean better_with_displacing = FALSE; boolean better_with_displacing = FALSE;
boolean sawmon = canspotmon(mtmp); /* before it moved */ boolean sawmon = canspotmon(mtmp); /* before it moved */
struct permonst *ptr; struct permonst *ptr;
schar mmoved = MMOVE_NOTHING; /* not strictly nec.: chi >= 0 will do */ int chi, mmoved = MMOVE_NOTHING; /* not strictly nec.: chi >= 0 will do */
long info[9]; long info[9];
long flag; long flag;
int omx = mtmp->mx, omy = mtmp->my; coordxy omx = mtmp->mx, omy = mtmp->my;
if (mtmp->mtrapped) { if (mtmp->mtrapped) {
int i = mintrap(mtmp, NO_TRAP_FLAGS); int i = mintrap(mtmp, NO_TRAP_FLAGS);
@@ -1596,8 +1592,8 @@ m_move(register struct monst *mtmp, int after)
goto not_special; goto not_special;
/* my dog gets special treatment */ /* my dog gets special treatment */
if (mtmp->mtame) { if (mtmp->mtame) {
return postmov(mtmp, ptr, omx, omy, dog_move(mtmp, after), sawmon, return postmov(mtmp, ptr, omx, omy, dog_move(mtmp, after),
can_tunnel, can_unlock, can_open); sawmon, can_tunnel, can_unlock, can_open);
} }
/* and the acquisitive monsters get special treatment */ /* and the acquisitive monsters get special treatment */
@@ -1625,8 +1621,8 @@ m_move(register struct monst *mtmp, int after)
} else { } else {
mmoved = MMOVE_NOTHING; mmoved = MMOVE_NOTHING;
} }
return postmov(mtmp, ptr, omx, omy, mmoved, sawmon, return postmov(mtmp, ptr, omx, omy, mmoved,
can_tunnel, can_unlock, can_open); sawmon, can_tunnel, can_unlock, can_open);
} }
/* likewise for shopkeeper, guard, or priest */ /* likewise for shopkeeper, guard, or priest */
@@ -1641,15 +1637,14 @@ m_move(register struct monst *mtmp, int after)
case -1: case -1:
mmoved = MMOVE_NOTHING; /* shk follow hero outside shop */ mmoved = MMOVE_NOTHING; /* shk follow hero outside shop */
break; break;
default:
impossible("unknown shk/gd/pri_move return value (%d)", xm);
/*FALLTHRU*/
case 0: case 0:
return postmov(mtmp, ptr, omx, omy, MMOVE_NOTHING, sawmon,
can_tunnel, can_unlock, can_open);
case 1: case 1:
return postmov(mtmp, ptr, omx, omy, MMOVE_MOVED, sawmon, return postmov(mtmp, ptr, omx, omy,
can_tunnel, can_unlock, can_open); (xm != 1) ? MMOVE_NOTHING : MMOVE_MOVED,
default: impossible("unknown shk/gd/pri_move return value (%i)", xm); sawmon, can_tunnel, can_unlock, can_open);
return postmov(mtmp, ptr, omx, omy, MMOVE_NOTHING, sawmon,
can_tunnel, can_unlock, can_open);
} }
} }
@@ -1671,8 +1666,8 @@ m_move(register struct monst *mtmp, int after)
(void) rloc(mtmp, RLOC_MSG); (void) rloc(mtmp, RLOC_MSG);
else else
mnexto(mtmp, RLOC_MSG); mnexto(mtmp, RLOC_MSG);
return postmov(mtmp, ptr, omx, omy, MMOVE_MOVED, sawmon, return postmov(mtmp, ptr, omx, omy, MMOVE_MOVED,
can_tunnel, can_unlock, can_open); sawmon, can_tunnel, can_unlock, can_open);
} }
not_special: not_special:
if (u.uswallow && !mtmp->mflee && u.ustuck != mtmp) if (u.uswallow && !mtmp->mflee && u.ustuck != mtmp)
@@ -1731,8 +1726,8 @@ m_move(register struct monst *mtmp, int after)
} }
if (getitems && m_search_items(mtmp, &ggx, &ggy, &mmoved, &appr)) if (getitems && m_search_items(mtmp, &ggx, &ggy, &mmoved, &appr))
return postmov(mtmp, ptr, omx, omy, mmoved, sawmon, return postmov(mtmp, ptr, omx, omy, mmoved,
can_tunnel, can_unlock, can_open); sawmon, can_tunnel, can_unlock, can_open);
/* don't tunnel if hostile and close enough to prefer a weapon */ /* don't tunnel if hostile and close enough to prefer a weapon */
if (can_tunnel && needspick(ptr) if (can_tunnel && needspick(ptr)
@@ -1887,8 +1882,8 @@ m_move(register struct monst *mtmp, int after)
if (mtmp->wormno) if (mtmp->wormno)
worm_nomove(mtmp); worm_nomove(mtmp);
} }
return postmov(mtmp, ptr, omx, omy, mmoved, sawmon, return postmov(mtmp, ptr, omx, omy, mmoved,
can_tunnel, can_unlock, can_open); sawmon, can_tunnel, can_unlock, can_open);
} }
/* The part of m_move that deals with a monster attacking another monster (and /* The part of m_move that deals with a monster attacking another monster (and