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

Audit rloc()

Browse Source 
Most of the time, rloc() is used for teleporting monsters and it's not a
big deal if they can't find somewhere to go. In a few cases, it is. I
went through all the callsites and made calls to rloc() not cause
impossible()s if they don't need to.

Fixes a bug/suite of bugs reported by ais523.
This commit is contained in:
Sean Hunt
2015-05-24 21:40:33 +09:00
committed by nhmall
parent 80703597c0
commit a67759cbc3
12 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/teleport.c
View File

@@ -1068,7 +1068,7 @@ struct monst *mtmp;
rloc_to(mtmp, c.x, c.y);
return;
}
(void) rloc(mtmp, FALSE);
(void) rloc(mtmp, TRUE);
}
boolean
@@ -1105,7 +1105,7 @@ int in_sight;
if (trap->once)
mvault_tele(mtmp);
else
(void) rloc(mtmp, FALSE);
(void) rloc(mtmp, TRUE);
if (in_sight) {
if (canseemon(mtmp))
@@ -1333,12 +1333,12 @@ boolean give_feedback;
if (give_feedback)
You("are no longer inside %s!", mon_nam(mtmp));
unstuck(mtmp);
(void) rloc(mtmp, FALSE);
(void) rloc(mtmp, TRUE);
} else if (is_rider(mtmp->data) && rn2(13)
&& enexto(&cc, u.ux, u.uy, mtmp->data))
rloc_to(mtmp, cc.x, cc.y);
else
(void) rloc(mtmp, FALSE);
(void) rloc(mtmp, TRUE);
return TRUE;
}