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

Make EXP_ON_BOTL unconditional.

Browse Source
This commit is contained in:
Sean Hunt
2015-02-27 19:24:43 -05:00
committed by Pasi Kallinen
parent f27d319e68
commit fb46fed99d
7 changed files with 9 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
win/X11/winstat.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.5 winstat.c $NHDT-Date$ $NHDT-Branch$:$NHDT-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 */
@@ -427,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);
@@ -439,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 */
@@ -612,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

4
win/gnome/gnstatus.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.5 gnstatus.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 gnstatus.c $NHDT-Date: 1425083083 2015/02/28 00:24:43 $ $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.6 $ */
/* NetHack 3.5 gnstatus.c $Date: 2009/05/06 10:57:54 $ $Revision: 1.5 $ */
/* SCCS Id: @(#)gnstatus.c 3.5 2000/07/16 */
/* Copyright (C) 1998 by Erik Andersen <andersee@debian.org> */
@@ -655,7 +655,6 @@ void ghack_status_window_update_stats()
lastAC = u.uac;
gtk_label_set( GTK_LABEL( acLabel), buf);
#ifdef EXP_ON_BOTL
if (flags.showexp) {
sprintf(buf,"Exp:%ld", u.uexp);
if (lastExp < u.uexp && firstTime==FALSE) {
@@ -669,7 +668,6 @@ void ghack_status_window_update_stats()
lastExp = u.uexp;
gtk_label_set( GTK_LABEL( expLabel), buf);
} else
#endif
{
gtk_label_set( GTK_LABEL( expLabel), "");
}