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

pull in the recent unconditionals merge from master

Browse Source
This commit is contained in:
Derek S. Ray
2015-02-27 21:25:00 -05:00
parent 7f0ff8f011
commit b1a7bbbbdb
538 changed files with 1715 additions and 5685 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
win/X11/winstat.c
View File

@@ -1,4 +1,5 @@
/* NetHack 3.5 winstat.c $Date$ $Revision$ */
/* NetHack 3.5 winstat.c $NHDT-Date: 1425083083 2015/02/28 00:24:43 $ $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.5 $ */
/* NetHack 3.5 winstat.c $Date: 2009/05/06 10:55:59 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)winstat.c 3.5 1996/04/05 */
/* Copyright (c) Dean Luick, 1992 */
/* NetHack may be freely redistributed. See license for details. */
@@ -426,7 +427,6 @@ update_val(attr_rec, new_value)
/* special case: exp can be enabled & disabled */
else if (attr_rec == &shown_stats[F_EXP]) {
static boolean flagexp = TRUE;
#ifdef EXP_ON_BOTL
if (flags.showexp && !flagexp) {
set_name(attr_rec->w, shown_stats[F_EXP].name);
@@ -438,14 +438,6 @@ update_val(attr_rec, new_value)
flagexp = flags.showexp;
}
if (!flagexp) return;
#else
if (flagexp) {
set_name(attr_rec->w, "");
set_value(attr_rec->w, "");
flagexp = FALSE;
}
return; /* don't show it at all */
#endif
}
/* special case: score can be enabled & disabled */
@@ -599,11 +591,7 @@ update_fancy_status(wp)
case F_NAME: val = (long) 0L; break; /* special */
case F_DLEVEL: val = (long) 0L; break; /* special */
#ifndef GOLDOBJ
case F_GOLD: val = (long) u.ugold; break;
#else
case F_GOLD: val = money_cnt(invent); break;
#endif
case F_HP: val = (long) (u.mtimedone ?
(u.mh > 0 ? u.mh : 0):
(u.uhp > 0 ? u.uhp : 0)); break;
@@ -615,11 +603,7 @@ update_fancy_status(wp)
case F_LEVEL: val = (long) (u.mtimedone ?
mons[u.umonnum].mlevel :
u.ulevel); break;
#ifdef EXP_ON_BOTL
case F_EXP: val = flags.showexp ? u.uexp : 0L; break;
#else
case F_EXP: val = 0L; break;
#endif
case F_ALIGN: val = (long) u.ualign.type; break;
case F_TIME: val = flags.time ? (long) moves : 0L; break;
#ifdef SCORE_ON_BOTL