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

3
include/config.h
View File

@@ -1,4 +1,4 @@
/* NetHack 3.5 config.h $NHDT-Date: 1425081976 2015/02/28 00:06:16 $ $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.48 $ */ /* NetHack 3.5 config.h $NHDT-Date: 1425083082 2015/02/28 00:24:42 $ $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.51 $ */
/* NetHack 3.5 config.h $Date: 2012/01/27 20:15:26 $ $Revision: 1.37 $ */ /* NetHack 3.5 config.h $Date: 2012/01/27 20:15:26 $ $Revision: 1.37 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -425,7 +425,6 @@ typedef unsigned char uchar;
#define DOAGAIN '\001' /* ^A, the "redo" key used in cmd.c and getline.c */ #define DOAGAIN '\001' /* ^A, the "redo" key used in cmd.c and getline.c */
#define EXP_ON_BOTL /* Show experience on bottom line */
/* #define SCORE_ON_BOTL */ /* added by Gary Erickson (erickson@ucivax) */ /* #define SCORE_ON_BOTL */ /* added by Gary Erickson (erickson@ucivax) */
/* /*

4
src/botl.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.5 botl.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */ /* NetHack 3.5 botl.c $NHDT-Date: 1425083082 2015/02/28 00:24:42 $ $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.38 $ */
/* NetHack 3.5 botl.c $Date: 2012/01/10 17:47:19 $ $Revision: 1.36 $ */ /* NetHack 3.5 botl.c $Date: 2012/01/10 17:47:19 $ $Revision: 1.36 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -268,10 +268,8 @@ bot2()
if (Upolyd) if (Upolyd)
Sprintf(nb = eos(nb), " HD:%d", mons[u.umonnum].mlevel); Sprintf(nb = eos(nb), " HD:%d", mons[u.umonnum].mlevel);
#ifdef EXP_ON_BOTL
else if(flags.showexp) else if(flags.showexp)
Sprintf(nb = eos(nb), " Xp:%u/%-1ld", u.ulevel,u.uexp); Sprintf(nb = eos(nb), " Xp:%u/%-1ld", u.ulevel,u.uexp);
#endif
else else
Sprintf(nb = eos(nb), " Exp:%u", u.ulevel); Sprintf(nb = eos(nb), " Exp:%u", u.ulevel);

8
src/options.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.5 options.c $NHDT-Date: 1425081976 2015/02/28 00:06:16 $ $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.156 $ */ /* NetHack 3.5 options.c $NHDT-Date: 1425083082 2015/02/28 00:24:42 $ $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.158 $ */
/* NetHack 3.5 options.c $Date: 2012/04/09 02:56:30 $ $Revision: 1.153 $ */ /* NetHack 3.5 options.c $Date: 2012/04/09 02:56:30 $ $Revision: 1.153 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -175,11 +175,7 @@ static struct Bool_Opt
{"safe_pet", &flags.safe_dog, TRUE, SET_IN_GAME}, {"safe_pet", &flags.safe_dog, TRUE, SET_IN_GAME},
{"sanity_check", &iflags.sanity_check, FALSE, SET_IN_GAME}, {"sanity_check", &iflags.sanity_check, FALSE, SET_IN_GAME},
{"selectsaved", &iflags.wc2_selectsaved, TRUE, DISP_IN_GAME}, /*WC*/ {"selectsaved", &iflags.wc2_selectsaved, TRUE, DISP_IN_GAME}, /*WC*/
#ifdef EXP_ON_BOTL
{"showexp", &flags.showexp, FALSE, SET_IN_GAME}, {"showexp", &flags.showexp, FALSE, SET_IN_GAME},
#else
{"showexp", (boolean *)0, FALSE, SET_IN_FILE},
#endif
{"showrace", &flags.showrace, FALSE, SET_IN_GAME}, {"showrace", &flags.showrace, FALSE, SET_IN_GAME},
#ifdef SCORE_ON_BOTL #ifdef SCORE_ON_BOTL
{"showscore", &flags.showscore, FALSE, SET_IN_GAME}, {"showscore", &flags.showscore, FALSE, SET_IN_GAME},
@@ -2618,9 +2614,7 @@ goodfruit:
if (initial) return; if (initial) return;
if ((boolopt[i].addr) == &flags.time if ((boolopt[i].addr) == &flags.time
#ifdef EXP_ON_BOTL
|| (boolopt[i].addr) == &flags.showexp || (boolopt[i].addr) == &flags.showexp
#endif
#ifdef SCORE_ON_BOTL #ifdef SCORE_ON_BOTL
|| (boolopt[i].addr) == &flags.showscore || (boolopt[i].addr) == &flags.showscore
#endif #endif

4
sys/wince/mhstatus.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.5 mhstatus.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */ /* NetHack 3.5 mhstatus.c $NHDT-Date: 1425083082 2015/02/28 00:24:42 $ $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.8 $ */
/* NetHack 3.5 mhstatus.c $Date: 2009/05/06 10:52:28 $ $Revision: 1.7 $ */ /* NetHack 3.5 mhstatus.c $Date: 2009/05/06 10:52:28 $ $Revision: 1.7 $ */
/* SCCS Id: @(#)mhstatus.c 3.5 2005/01/23 */ /* SCCS Id: @(#)mhstatus.c 3.5 2005/01/23 */
/* Copyright (C) 2001 by Alex Kompel */ /* Copyright (C) 2001 by Alex Kompel */
@@ -238,10 +238,8 @@ void FormatStatusString(char* text, int format)
if (Upolyd) if (Upolyd)
Sprintf(nb = eos(nb), " HD:%d", mons[u.umonnum].mlevel); Sprintf(nb = eos(nb), " HD:%d", mons[u.umonnum].mlevel);
#ifdef EXP_ON_BOTL
else if(flags.showexp) else if(flags.showexp)
Sprintf(nb = eos(nb), " Xp:%u/%-1ld", u.ulevel,u.uexp); Sprintf(nb = eos(nb), " Xp:%u/%-1ld", u.ulevel,u.uexp);
#endif
else else
Sprintf(nb = eos(nb), " Exp:%u", u.ulevel); Sprintf(nb = eos(nb), " Exp:%u", u.ulevel);
if( format==NHSTAT_LINES_4 ) strcat(text, "\r\n"); if( format==NHSTAT_LINES_4 ) strcat(text, "\r\n");

13
util/makedefs.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.5 makedefs.c $NHDT-Date: 1425081977 2015/02/28 00:06:17 $ $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.61 $ */ /* NetHack 3.5 makedefs.c $NHDT-Date: 1425083082 2015/02/28 00:24:42 $ $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.63 $ */
/* NetHack 3.5 makedefs.c $Date: 2012/01/15 09:27:03 $ $Revision: 1.50 $ */ /* NetHack 3.5 makedefs.c $Date: 2012/01/15 09:27:03 $ $Revision: 1.50 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* Copyright (c) M. Stephenson, 1990, 1991. */ /* Copyright (c) M. Stephenson, 1990, 1991. */
@@ -960,8 +960,7 @@ do_rumors()
* *
*/ */
#define IGNORED_FEATURES ( 0L \ #define IGNORED_FEATURES ( 0L \
| (1L << 19) /* EXP_ON_BOTL */ \ | (1L << 19) /* SCORE_ON_BOTL */ \
| (1L << 20) /* SCORE_ON_BOTL */ \
| (1L << 27) /* ZEROCOMP */ \ | (1L << 27) /* ZEROCOMP */ \
| (1L << 28) /* RLECOMP */ \ | (1L << 28) /* RLECOMP */ \
) )
@@ -999,11 +998,8 @@ make_version()
#ifdef INSURANCE #ifdef INSURANCE
| (1L << 18) | (1L << 18)
#endif #endif
#ifdef EXP_ON_BOTL
| (1L << 19)
#endif
#ifdef SCORE_ON_BOTL #ifdef SCORE_ON_BOTL
| (1L << 20) | (1L << 19)
#endif #endif
/* data format (27..31) /* data format (27..31)
* External compression methods such as COMPRESS and ZLIB_COMP * External compression methods such as COMPRESS and ZLIB_COMP
@@ -1226,9 +1222,6 @@ static const char *build_opts[] = {
#ifdef DLB #ifdef DLB
"data librarian", "data librarian",
#endif #endif
#ifdef EXP_ON_BOTL
"experience points on status line",
#endif
#ifdef MFLOPPY #ifdef MFLOPPY
"floppy drive support", "floppy drive support",
#endif #endif

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 $ */ /* NetHack 3.5 winstat.c $Date: 2009/05/06 10:55:59 $ $Revision: 1.4 $ */
/* SCCS Id: @(#)winstat.c 3.5 1996/04/05 */ /* SCCS Id: @(#)winstat.c 3.5 1996/04/05 */
/* Copyright (c) Dean Luick, 1992 */ /* Copyright (c) Dean Luick, 1992 */
@@ -427,7 +427,6 @@ update_val(attr_rec, new_value)
/* special case: exp can be enabled & disabled */ /* special case: exp can be enabled & disabled */
else if (attr_rec == &shown_stats[F_EXP]) { else if (attr_rec == &shown_stats[F_EXP]) {
static boolean flagexp = TRUE; static boolean flagexp = TRUE;
#ifdef EXP_ON_BOTL
if (flags.showexp && !flagexp) { if (flags.showexp && !flagexp) {
set_name(attr_rec->w, shown_stats[F_EXP].name); set_name(attr_rec->w, shown_stats[F_EXP].name);
@@ -439,14 +438,6 @@ update_val(attr_rec, new_value)
flagexp = flags.showexp; flagexp = flags.showexp;
} }
if (!flagexp) return; 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 */ /* special case: score can be enabled & disabled */
@@ -612,11 +603,7 @@ update_fancy_status(wp)
case F_LEVEL: val = (long) (u.mtimedone ? case F_LEVEL: val = (long) (u.mtimedone ?
mons[u.umonnum].mlevel : mons[u.umonnum].mlevel :
u.ulevel); break; u.ulevel); break;
#ifdef EXP_ON_BOTL
case F_EXP: val = flags.showexp ? u.uexp : 0L; break; 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_ALIGN: val = (long) u.ualign.type; break;
case F_TIME: val = flags.time ? (long) moves : 0L; break; case F_TIME: val = flags.time ? (long) moves : 0L; break;
#ifdef SCORE_ON_BOTL #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 $ */ /* NetHack 3.5 gnstatus.c $Date: 2009/05/06 10:57:54 $ $Revision: 1.5 $ */
/* SCCS Id: @(#)gnstatus.c 3.5 2000/07/16 */ /* SCCS Id: @(#)gnstatus.c 3.5 2000/07/16 */
/* Copyright (C) 1998 by Erik Andersen <andersee@debian.org> */ /* Copyright (C) 1998 by Erik Andersen <andersee@debian.org> */
@@ -655,7 +655,6 @@ void ghack_status_window_update_stats()
lastAC = u.uac; lastAC = u.uac;
gtk_label_set( GTK_LABEL( acLabel), buf); gtk_label_set( GTK_LABEL( acLabel), buf);
#ifdef EXP_ON_BOTL
if (flags.showexp) { if (flags.showexp) {
sprintf(buf,"Exp:%ld", u.uexp); sprintf(buf,"Exp:%ld", u.uexp);
if (lastExp < u.uexp && firstTime==FALSE) { if (lastExp < u.uexp && firstTime==FALSE) {
@@ -669,7 +668,6 @@ void ghack_status_window_update_stats()
lastExp = u.uexp; lastExp = u.uexp;
gtk_label_set( GTK_LABEL( expLabel), buf); gtk_label_set( GTK_LABEL( expLabel), buf);
} else } else
#endif
{ {
gtk_label_set( GTK_LABEL( expLabel), ""); gtk_label_set( GTK_LABEL( expLabel), "");
} }