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

fix #H1662 - temporary vs permanent sleepiness (trunk only)

Browse Source 
From a bug report, wearing
(or removing) an amulet of restful sleep was overriding permanent
sleepiness which had been obtained previously via eating another amulet.
The setting of timeout clobbered the non-timeout bits for that intrinsic.

     This also adds the timeout counter for sleepiness to enlightenment
feedback in wizard mode.  Unrelated:  rephrase enlightenment feedback for
adornment to more accurately describe what that does.
This commit is contained in:
nethack.rankin
2008-05-26 05:46:21 +00:00
parent 91016cff99
commit 9dce52ea98
3 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/do_wear.c
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)do_wear.c 3.5 2008/01/23 */
/* SCCS Id: @(#)do_wear.c 3.5 2008/05/25 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -641,7 +641,14 @@ Amulet_on()
}
break;
case AMULET_OF_RESTFUL_SLEEP:
HSleeping = rnd(100);
{
long newnap = (long)rnd(100), oldnap = (HSleeping & TIMEOUT);
/* avoid clobbering FROMOUTSIDE bit, which might have
gotten set by previously eating one of these amulets */
if (newnap < oldnap || oldnap == 0L)
HSleeping = (HSleeping & ~TIMEOUT) | newnap;
}
break;
case AMULET_OF_YENDOR:
break;
@@ -690,8 +697,9 @@ Amulet_off()
break;
case AMULET_OF_RESTFUL_SLEEP:
setworn((struct obj *)0, W_AMUL);
if (!ESleeping)
HSleeping = 0;
/* HSleeping = 0L; -- avoid clobbering FROMOUTSIDE bit */
if (!ESleeping && !(HSleeping & ~TIMEOUT))
HSleeping &= ~TIMEOUT; /* clear timeout bits */
return;
case AMULET_OF_YENDOR:
break;