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

updating 'time' status

Browse Source 
Handling botl updates for 'time' was inconsistent.  Set the flag to
do that when moves is incremented (where the update is suppressed if
running) or when running stops short.

losehp() would cancel running/traveling if called when in normal form
but not if called when polymorphed, so theoretically you could take
damage and keep on running.  I don't have a test case to verify that.
This commit is contained in:
PatR
2020-03-16 17:32:12 -07:00
parent 8ccc9773aa
commit 40d19525c3
5 changed files with 55 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/allmain.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 allmain.c $NHDT-Date: 1580044340 2020/01/26 13:12:20 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.138 $ */
/* NetHack 3.6 allmain.c $NHDT-Date: 1584405115 2020/03/17 00:31:55 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.143 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2012. */
/* NetHack may be freely redistributed. See license for details. */
@@ -178,6 +178,9 @@ boolean resuming;
g.monstermoves++; /* [obsolete (for a long time...)] */
g.moves++;
if (flags.time && !g.context.run)
iflags.time_botl = TRUE; /* 'moves' just changed */
/********************************/
/* once-per-turn things go here */
/********************************/
@@ -189,8 +192,6 @@ boolean resuming;
if (u.ublesscnt)
u.ublesscnt--;
if (flags.time && !g.context.run)
iflags.time_botl = TRUE;
/* One possible result of prayer is healing. Whether or
* not you get healed depends on your current hit points.
@@ -436,8 +437,6 @@ boolean resuming;
if (!g.multi) {
/* lookaround may clear multi */
g.context.move = 0;
if (flags.time)
g.context.botl = TRUE;
continue;
}
if (g.context.mv) {
@@ -457,9 +456,6 @@ boolean resuming;
}
if (u.utotype) /* change dungeon level */
deferred_goto(); /* after rhack() */
/* !g.context.move here: multiple movement command stopped */
else if (flags.time && (!g.context.move || !g.context.mv))
g.context.botl = TRUE;
if (g.vision_full_recalc)
vision_recalc(0); /* vision! */