Make EXP_ON_BOTL unconditional.

diff --git a/include/config.h b/include/config.h
index 5cf035b5421da56369c30cdfb54234e56a9f03b1..3bddda18ba0a46c4e9b4f345c5f18b7757c79215 100644 (file)
--- a/include/config.h
+++ b/include/config.h
@@ -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 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* 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 EXP_ON_BOTL    /* Show experience on bottom line */
 /* #define SCORE_ON_BOTL */    /* added by Gary Erickson (erickson@ucivax) */
 
 /*

diff --git a/src/botl.c b/src/botl.c
index ab02ae35b8f45f5d8a9e8535565f77da206d2989..76d16a8ff3d8f2004b6a7d9bd6ee62cac2e72812 100644 (file)
--- a/src/botl.c
+++ b/src/botl.c
@@ -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 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -268,10 +268,8 @@ bot2()
 
        if (Upolyd)
                Sprintf(nb = eos(nb), " HD:%d", mons[u.umonnum].mlevel);
-#ifdef EXP_ON_BOTL
        else if(flags.showexp)
                Sprintf(nb = eos(nb), " Xp:%u/%-1ld", u.ulevel,u.uexp);
-#endif
        else
                Sprintf(nb = eos(nb), " Exp:%u", u.ulevel);
 

diff --git a/src/options.c b/src/options.c
index 51bda6c5964e36a0ed201a4be295016defa8ecfd..97378888aae0cbf735329ad0272fec4e3d1b1cb0 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -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 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* 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},
        {"sanity_check", &iflags.sanity_check, FALSE, SET_IN_GAME},
        {"selectsaved", &iflags.wc2_selectsaved, TRUE, DISP_IN_GAME},           /*WC*/
-#ifdef EXP_ON_BOTL
        {"showexp", &flags.showexp, FALSE, SET_IN_GAME},
-#else
-       {"showexp", (boolean *)0, FALSE, SET_IN_FILE},
-#endif
        {"showrace", &flags.showrace, FALSE, SET_IN_GAME},
 #ifdef SCORE_ON_BOTL
        {"showscore", &flags.showscore, FALSE, SET_IN_GAME},
@@ -2618,9 +2614,7 @@ goodfruit:
                        if (initial) return;
 
                        if ((boolopt[i].addr) == &flags.time
-#ifdef EXP_ON_BOTL
                         || (boolopt[i].addr) == &flags.showexp
-#endif
 #ifdef SCORE_ON_BOTL
                         || (boolopt[i].addr) == &flags.showscore
 #endif

diff --git a/sys/wince/mhstatus.c b/sys/wince/mhstatus.c
index dd86e2d6eb3a63fb0af78a7baf03c8ae0ea89154..397f2dcb8692667328942cde8d4fb45b1fa3ca6f 100644 (file)
--- a/sys/wince/mhstatus.c
+++ b/sys/wince/mhstatus.c
@@ -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 $ */
 /*     SCCS Id: @(#)mhstatus.c 3.5     2005/01/23      */
 /* Copyright (C) 2001 by Alex Kompel    */
@@ -238,10 +238,8 @@ void FormatStatusString(char* text, int format)
 
        if (Upolyd)
                Sprintf(nb = eos(nb), " HD:%d", mons[u.umonnum].mlevel);
-#ifdef EXP_ON_BOTL
        else if(flags.showexp)
                Sprintf(nb = eos(nb), " Xp:%u/%-1ld", u.ulevel,u.uexp);
-#endif
        else
                Sprintf(nb = eos(nb), " Exp:%u", u.ulevel);
        if( format==NHSTAT_LINES_4 ) strcat(text, "\r\n");

diff --git a/util/makedefs.c b/util/makedefs.c
index 9ea0d38982e3f3ac62deffe56fa61a0c34228089..ba3ee79f31ffb7cece8bb3df406defb416f224a9 100644 (file)
--- a/util/makedefs.c
+++ b/util/makedefs.c
@@ -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 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* Copyright (c) M. Stephenson, 1990, 1991.                      */
@@ -960,8 +960,7 @@ do_rumors()
  * 
  */
 #define IGNORED_FEATURES       ( 0L \
-                               | (1L << 19)    /* EXP_ON_BOTL */ \
-                               | (1L << 20)    /* SCORE_ON_BOTL */ \
+                               | (1L << 19)    /* SCORE_ON_BOTL */ \
                                | (1L << 27)    /* ZEROCOMP */ \
                                | (1L << 28)    /* RLECOMP */ \
                                )
@@ -999,11 +998,8 @@ make_version()
 #ifdef INSURANCE
                        | (1L << 18)
 #endif
-#ifdef EXP_ON_BOTL
-                       | (1L << 19)
-#endif
 #ifdef SCORE_ON_BOTL
-                       | (1L << 20)
+                       | (1L << 19)
 #endif
                /* data format (27..31)
                 * External compression methods such as COMPRESS and ZLIB_COMP
@@ -1226,9 +1222,6 @@ static const char *build_opts[] = {
 #ifdef DLB
                "data librarian",
 #endif
-#ifdef EXP_ON_BOTL
-               "experience points on status line",
-#endif
 #ifdef MFLOPPY
                "floppy drive support",
 #endif

diff --git a/win/X11/winstat.c b/win/X11/winstat.c
index ab65a168cc183d0c8b14727bcfe10e8bf329130b..ae2a3ce839f3c79a8bd9b7c5e7fc2b3ffb0ee6d8 100644 (file)
--- a/win/X11/winstat.c
+++ b/win/X11/winstat.c
@@ -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

diff --git a/win/gnome/gnstatus.c b/win/gnome/gnstatus.c
index 37e1d7bf6c40392b6f3641639c9cc142ddc09214..5109f5bb7d26308008682a903a5631e5a4181bf9 100644 (file)
--- a/win/gnome/gnstatus.c
+++ b/win/gnome/gnstatus.c
@@ -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), "");
     }