Make ELBERETH unconditional.

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","");

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)

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))));

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;

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