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

sleeping shopkeeper

Browse Source 
Pat verified something I had wondered about, that various tests of mcanmove
in shk.c should have also been testing mcanmove.  There may well be other
tests of mcanmove in other files that need fixing.
This commit is contained in:
cohrs
2003-10-30 04:31:05 +00:00
parent 863de70092
commit 64f2d8a37b
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/shk.c
View File

@@ -939,7 +939,7 @@ rouse_shk(shkp, verbosely)
struct monst *shkp;
boolean verbosely;
{
if (!shkp->mcanmove) {
if (!shkp->mcanmove || shkp->msleeping) {
/* greed induced recovery... */
if (verbosely && canspotmon(shkp))
pline("%s %s.", Monnam(shkp),
@@ -1168,7 +1168,7 @@ proceed:
if (ltmp || eshkp->billct || eshkp->debit)
rouse_shk(shkp, TRUE);
if (!shkp->mcanmove) { /* still asleep or paralyzed */
if (!shkp->mcanmove || shkp->msleeping) { /* still asleep/paralyzed */
pline("%s %s.", Monnam(shkp),
rn2(2) ? "seems to be napping" : "doesn't respond");
return 0;
@@ -1617,7 +1617,7 @@ int croaked;
if (cansee(shkp->mx, shkp->my && croaked))
pline("%s %slooks at your corpse%s and %s.",
Monnam(shkp),
!shkp->mcanmove ? "wakes up, " : "",
(!shkp->mcanmove || shkp->msleeping) ? "wakes up, " : "",
!rn2(2) ? (shkp->female ? ", shakes her head," :
", shakes his head,") : "",
!inhishop(shkp) ? "disappears" : "sighs");
@@ -1653,7 +1653,7 @@ int croaked;
umoney = money_cnt(invent);
#endif
takes[0] = '\0';
if (!shkp->mcanmove)
if (!shkp->mcanmove || shkp->msleeping)
Strcat(takes, "wakes up and ");
if (distu(shkp->mx, shkp->my) > 2)
Strcat(takes, "comes and ");