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

12
src/mhitu.c
View File

@@ -1265,7 +1265,7 @@ register struct attack *mattk;
: "makes some remarks about how difficult theft is "
"lately");
if (!tele_restrict(mtmp))
(void) rloc(mtmp, FALSE);
(void) rloc(mtmp, TRUE);
return 3;
} else if (mtmp->mcan) {
if (!Blind) {
@@ -1276,7 +1276,7 @@ register struct attack *mattk;
}
if (rn2(3)) {
if (!tele_restrict(mtmp))
(void) rloc(mtmp, FALSE);
(void) rloc(mtmp, TRUE);
return 3;
}
break;
@@ -1289,7 +1289,7 @@ register struct attack *mattk;
break;
default:
if (!is_animal(mtmp->data) && !tele_restrict(mtmp))
(void) rloc(mtmp, FALSE);
(void) rloc(mtmp, TRUE);
if (is_animal(mtmp->data) && *buf) {
if (canseemon(mtmp))
pline("%s tries to %s away with %s.", Monnam(mtmp),
@@ -1392,7 +1392,7 @@ register struct attack *mattk;
return 2;
} else if (!rn2(33)) {
if (!tele_restrict(mtmp))
(void) rloc(mtmp, FALSE);
(void) rloc(mtmp, TRUE);
monflee(mtmp, d(3, 6), TRUE, FALSE);
return 3;
}
@@ -2381,7 +2381,7 @@ register struct monst *mon;
verbalize("You're such a %s; I wish...",
flags.female ? "sweet lady" : "nice guy");
if (!tele_restrict(mon))
(void) rloc(mon, FALSE);
(void) rloc(mon, TRUE);
return 1;
}
if (u.ualign.type == A_CHAOTIC)
@@ -2503,7 +2503,7 @@ register struct monst *mon;
if (!rn2(25))
mon->mcan = 1; /* monster is worn out */
if (!tele_restrict(mon))
(void) rloc(mon, FALSE);
(void) rloc(mon, TRUE);
return 1;
}