Make ELBERETH unconditional.

diff --git a/dat/oracles.txt b/dat/oracles.txt
index bee2b4b3000c55280e4217df3814a880a218a726..d307c7a9fb1ca349d1548de59bba10ec70ec61db 100644 (file)
--- a/dat/oracles.txt
+++ b/dat/oracles.txt
@@ -96,7 +96,7 @@ The gods are said to be pleased when offerings are given to the
 priests who attend their temples, and they may grant various favors to
 those who do so.  But beware!  To be young and frugal is better than to
 be old and miserly.
------ ELBERETH
+-----
 The name of Elbereth may strike fear into the hearts of thine enemies, if
 thou dost write it upon the ground at thy feet.  If thou maintainest the
 utmost calm, thy safety will be aided greatly, but beware lest thy clumsy

diff --git a/include/config.h b/include/config.h
index 6db03c2c0cb828c3300c040d490574c502932312..b1e69992c9562672c3d23ebb8e97d510669eceba 100644 (file)
--- a/include/config.h
+++ b/include/config.h
@@ -427,8 +427,6 @@ typedef unsigned char       uchar;
 #define SEDUCE         /* Succubi/incubi seduction, by KAA, suggested by IM */
 #define STEED          /* Riding steeds */
 #define TOURIST                /* Tourist players with cameras and Hawaiian shirts */
-/* difficulty */
-#define ELBERETH       /* Engraving the E-word repels monsters */
 /* I/O */
 #define REDO           /* support for redoing last command - DGK */
 #if !defined(MAC)

diff --git a/include/extern.h b/include/extern.h
index ac5fdb1ecbe8fbf76abafac39030d98ffe20e26e..216b94e6fb511a0a8822fdf0d6777b7ab67ab127 100644 (file)
--- a/include/extern.h
+++ b/include/extern.h
@@ -670,9 +670,7 @@ E void FDECL(cant_reach_floor, (int,int,BOOLEAN_P,BOOLEAN_P));
 E const char *FDECL(surface, (int,int));
 E const char *FDECL(ceiling, (int,int));
 E struct engr *FDECL(engr_at, (XCHAR_P,XCHAR_P));
-#ifdef ELBERETH
 E int FDECL(sengr_at, (const char *,XCHAR_P,XCHAR_P));
-#endif
 E void FDECL(u_wipe_engr, (int));
 E void FDECL(wipe_engr_at, (XCHAR_P,XCHAR_P,XCHAR_P));
 E void FDECL(read_engr_at, (int,int));

diff --git a/include/you.h b/include/you.h
index 50798acdb72017f673a2f05f2354a483ee589c5f..b316abcf75b92e4f4e38a655f1a15920a9312802 100644 (file)
--- a/include/you.h
+++ b/include/you.h
@@ -47,9 +47,7 @@ struct u_event {
 
        Bitfield(invoked,1);            /* invoked Gate to the Sanctum level */
        Bitfield(gehennom_entered,1);   /* entered Gehennom via Valley */
-#ifdef ELBERETH
        Bitfield(uhand_of_elbereth,2);  /* became Hand of Elbereth */
-#endif
        Bitfield(udemigod,1);           /* killed the wiz */
        Bitfield(uvibrated,1);          /* stepped on "vibrating square" */
        Bitfield(ascended,1);           /* has offered the Amulet */

diff --git a/src/cmd.c b/src/cmd.c
index eae24508ce278d189d401dd84b18508d3d97fc78..3c8eff341f7b1833adb88c4cb143199ab36376bb 100644 (file)
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -1785,7 +1785,6 @@ int final;
        putstr(en_win, 0, "");
        putstr(en_win, 0, final ? "Final Attributes:" : "Current Attributes:");
 
-#ifdef ELBERETH
        if (u.uevent.uhand_of_elbereth) {
            static const char * const hofe_titles[3] = {
                                "the Hand of Elbereth",
@@ -1794,7 +1793,6 @@ int final;
            };
            you_are(hofe_titles[u.uevent.uhand_of_elbereth - 1],"");
        }
-#endif
 
        /* note: piousness 20 matches MIN_QUEST_ALIGN (quest.h) */
        if (u.ualign.record >= 20)      you_are("piously aligned","");

diff --git a/src/engrave.c b/src/engrave.c
index c4bdd4496f7d4be624c7b9a8ea77aac3ee2404b2..4af701654a9858a0d21369c7a9f8125391a136b7 100644 (file)
--- a/src/engrave.c
+++ b/src/engrave.c
@@ -244,7 +244,6 @@ xchar x, y;
        return((struct engr *) 0);
 }
 
-#ifdef ELBERETH
 /* Decide whether a particular string is engraved at a specified
  * location; a case-insensitive substring match used.
  * Ignore headstones, in case the player names herself "Elbereth".
@@ -259,7 +258,6 @@ sengr_at(s, x, y)
        return (ep && ep->engr_type != HEADSTONE &&
                ep->engr_time <= moves && strstri(ep->engr_txt, s) != 0);
 }
-#endif /* ELBERETH */
 
 void
 u_wipe_engr(cnt)

diff --git a/src/monmove.c b/src/monmove.c
index 4b6ffc26fe094370a7247a1c95b6505850a3a59f..a7e0da3d2390ce4f240064685553739003122230 100644 (file)
--- a/src/monmove.c
+++ b/src/monmove.c
@@ -122,9 +122,7 @@ struct monst *mtmp;
                return(FALSE);
 
        return (boolean)(sobj_at(SCR_SCARE_MONSTER, x, y) ||
-#ifdef ELBERETH
                         sengr_at("Elbereth", x, y) ||
-#endif
                         (IS_ALTAR(levl[x][y].typ) &&
                            (mtmp->data->mlet == S_VAMPIRE ||
                             is_vampshifter(mtmp))));

diff --git a/src/pray.c b/src/pray.c
index a6bd75ba4f05c9671318ecac9ee5d86208b22d73..602abee598b61a7ad37e02be5273e40064980b6f 100644 (file)
--- a/src/pray.c
+++ b/src/pray.c
@@ -11,9 +11,7 @@ STATIC_DCL int NDECL(in_trouble);
 STATIC_DCL void FDECL(fix_worst_trouble,(int));
 STATIC_DCL void FDECL(angrygods,(ALIGNTYP_P));
 STATIC_DCL void FDECL(at_your_feet, (const char *));
-#ifdef ELBERETH
 STATIC_DCL void NDECL(gcrownu);
-#endif /*ELBERETH*/
 STATIC_DCL void FDECL(pleased,(ALIGNTYP_P));
 STATIC_DCL void FDECL(godvoice,(ALIGNTYP_P,const char*));
 STATIC_DCL void FDECL(god_zaps_you,(ALIGNTYP_P));
@@ -678,7 +676,6 @@ at_your_feet(str)
        }
 }
 
-#ifdef ELBERETH
 STATIC_OVL void
 gcrownu()
 {
@@ -830,7 +827,6 @@ gcrownu()
     add_weapon_skill(1);
     return;
 }
-#endif /*ELBERETH*/
 
 STATIC_OVL void
 pleased(g_align)
@@ -1052,12 +1048,10 @@ pleased(g_align)
        }
        case 7:
        case 8:
-#ifdef ELBERETH
            if (u.ualign.record >= PIOUS && !u.uevent.uhand_of_elbereth) {
                gcrownu();
                break;
            } /* else FALLTHRU */
-#endif /*ELBERETH*/
        case 6: {
            struct obj *otmp;
            int sp_no, trycnt = u.ulevel + 1;
@@ -1090,9 +1084,7 @@ pleased(g_align)
 
        u.ublesscnt = rnz(350);
        kick_on_butt = u.uevent.udemigod ? 1 : 0;
-#ifdef ELBERETH
        if (u.uevent.uhand_of_elbereth) kick_on_butt++;
-#endif
        if (kick_on_butt) u.ublesscnt += kick_on_butt * rnz(1000);
 
        return;

diff --git a/src/u_init.c b/src/u_init.c
index 4e592739759e094d23ba418c4a4bd9d45a3ba6b3..59ba3c23aeffb90c328a062426c918bc4774e2df 100644 (file)
--- a/src/u_init.c
+++ b/src/u_init.c
@@ -540,9 +540,7 @@ u_init()
        u.ublessed = 0;                         /* not worthy yet */
        u.ugangr   = 0;                         /* gods not angry */
        u.ugifts   = 0;                         /* no divine gifts bestowed */
-# ifdef ELBERETH
        u.uevent.uhand_of_elbereth = 0;
-# endif
        u.uevent.uheard_tune = 0;
        u.uevent.uopened_dbridge = 0;
        u.uevent.udemigod = 0;          /* not a demi-god yet... */
@@ -917,9 +915,7 @@ register struct trobj *trop;
                                || otyp == nocreate2
                                || otyp == nocreate3
                                || otyp == nocreate4
-#ifdef ELBERETH
                                || otyp == RIN_LEVITATION
-#endif
                                /* 'useless' items */
                                || otyp == POT_HALLUCINATION
                                || otyp == POT_ACID

diff --git a/util/makedefs.c b/util/makedefs.c
index d84e1c7eafd68fa6bfa3f2b9dd334a968634ff53..dbedfe45bcfbd5672355653188cae1394880e4cb 100644 (file)
--- a/util/makedefs.c
+++ b/util/makedefs.c
@@ -961,8 +961,8 @@ do_rumors()
  */
 #define IGNORED_FEATURES       ( 0L \
                                | (1L << 12)    /* GOLDOBJ */ \
-                               | (1L << 20)    /* EXP_ON_BOTL */ \
-                               | (1L << 21)    /* SCORE_ON_BOTL */ \
+                               | (1L << 19)    /* EXP_ON_BOTL */ \
+                               | (1L << 20)    /* SCORE_ON_BOTL */ \
                                | (1L << 27)    /* ZEROCOMP */ \
                                | (1L << 28)    /* RLECOMP */ \
                                )
@@ -1018,14 +1018,11 @@ make_version()
 #ifdef INSURANCE
                        | (1L << 18)
 #endif
-#ifdef ELBERETH
-                       | (1L << 19)
-#endif
 #ifdef EXP_ON_BOTL
-                       | (1L << 20)
+                       | (1L << 19)
 #endif
 #ifdef SCORE_ON_BOTL
-                       | (1L << 21)
+                       | (1L << 20)
 #endif
                /* data format (27..31)
                 * External compression methods such as COMPRESS and ZLIB_COMP
@@ -1257,9 +1254,6 @@ static const char *build_opts[] = {
 #ifdef DUNGEON_OVERVIEW
                "dungeon map overview patch",
 #endif
-#ifdef ELBERETH
-               "Elbereth",
-#endif
 #ifdef EXP_ON_BOTL
                "experience points on status line",
 #endif
@@ -1684,9 +1678,6 @@ h_filter(line)
        skip = FALSE;
 #ifndef SINKS
        if (!strcmp(tag, "SINKS")) skip = TRUE;
-#endif
-#ifndef ELBERETH
-       if (!strcmp(tag, "ELBERETH")) skip = TRUE;
 #endif
     } else if (skip && !strncmp(line, "-----", 5))
        skip = FALSE;