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

Merge branch 'NetHack-3.6.2'

Browse Source
This commit is contained in:
nhmall
2019-05-05 23:30:50 -04:00
parent c2e23bac57 cd1d227525
commit db25fe56a8
18 changed files with 218 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/botl.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 botl.c $NHDT-Date: 1554857126 2019/04/10 00:45:26 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.144 $ */
/* NetHack 3.6 botl.c $NHDT-Date: 1557094795 2019/05/05 22:19:55 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.145 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Michael Allison, 2006. */
/* NetHack may be freely redistributed. See license for details. */
@@ -772,7 +772,15 @@ boolean *valsetlist;
}
#endif
if (g.update_all || chg || reset) {
/*
* TODO?
* It's possible for HPmax (or ENEmax) to change while current
* HP (or energy) stays the same. [Perhaps current and maximum
* both go up, then before the next status update takes place
* current goes down again.] If that happens with HPmax, we
* ought to force the windowport to treat current HP as changed
* if hitpointbar is On, in order for that to be re-rendered.
*/
idxmax = curr->idxmax;
pc = (idxmax >= 0) ? percentage(curr, &g.blstats[idx][idxmax]) : 0;
@@ -853,8 +861,8 @@ boolean *valsetlist;
if (g.context.botlx && (windowprocs.wincap2 & WC2_RESET_STATUS) != 0L)
status_update(BL_RESET, (genericptr_t) 0, 0, 0,
NO_COLOR, (unsigned long *) 0);
else if ((updated || g.context.botlx) &&
(windowprocs.wincap2 & WC2_FLUSH_STATUS) != 0L)
else if ((updated || g.context.botlx)
&& (windowprocs.wincap2 & WC2_FLUSH_STATUS) != 0L)
status_update(BL_FLUSH, (genericptr_t) 0, 0, 0,
NO_COLOR, (unsigned long *) 0);
@@ -1335,7 +1343,8 @@ const char *name;
STATIC_OVL boolean
hilite_reset_needed(bl_p, augmented_time)
struct istat_s *bl_p;
long augmented_time;
long augmented_time; /* no longer augmented; it once encoded fractional
* amounts for multiple moves within same turn */
{
/*
* This 'multi' handling may need some tuning...
@@ -1393,7 +1402,7 @@ status_eval_next_unhilite()
}
}
/* called by options handling when 'statushilites' boolean is toggled */
/* called by options handling when 'statushilites' value is changed */
void
reset_status_hilites()
{