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

displacing grid bugs (trunk only)

Browse Source 
From a bug report, you could swap places with a pet grid bug when
you're making a diagonal move.  Now you can't.  [Completely ignored:  it
is possible to swap places with pets which are incapable of movement....]

     This imposes the same restriction on the astral Riders when they're
exchanging places with monsters in their way.
This commit is contained in:
nethack.rankin
2007-07-13 23:40:43 +00:00
parent 382bbf7f8e
commit 1a9c99797a
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/mon.c
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)mon.c 3.5 2007/03/30 */
/* SCCS Id: @(#)mon.c 3.5 2007/07/13 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -1259,6 +1259,9 @@ struct monst *magr, /* monster that is currently deciding where to move */
again when defender gets its chance to move */
if ((pa->mflags3 & M3_DISPLACES) != 0 &&
(pd->mflags3 & M3_DISPLACES) == 0 &&
/* no displacing grid bugs diagonally */
!(magr->mx != mdef->mx && magr->my != mdef->my &&
NODIAG(monsndx(pd))) &&
/* no displacing trapped monsters or multi-location longworms */
!mdef->mtrapped && (!mdef->wormno || !count_wsegs(mdef)) &&
/* riders can move anything; others, same size or smaller only */