*** dat/opthelp.noherorace	Mon Mar 25 16:37:39 2002
--- dat/opthelp	Mon Mar 25 23:47:08 2002
***************
*** 56,61 ****
--- 56,65 ----
  Boolean option if MFLOPPY was set at compile time:
  checkspace check free disk space before writing files to disk     [TRUE]
  
+ Boolean option if HERO_RACE was set at compile time:
+ hero_race  display the player with the race symbol (otherwise
+            always @)                                              [FALSE]
+ 
  Boolean option if SHOW_BORN was set at compile time:
  showborn   show numbers of created monsters after the number
             vanquished                                             [FALSE]
*** doc/Guidebook.mn.noherorace	Mon Mar 25 18:33:30 2002
--- doc/Guidebook.mn	Tue Mar 26 01:25:46 2002
***************
*** 2093,2098 ****
--- 2093,2102 ----
  NetHack should use this size font for the status window.
  .lp font_size_text	
  NetHack should use this size font for text windows.
+ .lp hero_race
+ Makes the player be shown with the symbol of his/her race
+ (dwarf, elf, gnome, human, orc). Normally the player is
+ always shown as a human regardless of his/her race.
  .lp hilite_pet
  Visually distinguish pets from similar animals (default off).
  The behavior of this option depends on the type of windowing you use.
*** doc/Guidebook.tex.noherorace	Mon Mar 25 18:34:46 2002
--- doc/Guidebook.tex	Tue Mar 26 01:26:49 2002
***************
*** 2577,2582 ****
--- 2577,2587 ----
  \item[\ib{font\_size\_text}]
  NetHack should use this size font for text windows.
  %.lp
+ \item[\ib{hero\_race}]
+ Makes the player be shown with the symbol of his/her race
+ (dwarf, elf, gnome, human, orc). Normally the player is
+ always shown as a human regardless of his/her race.
+ %.lp
  \item[\ib{hilite\_pet}]
  Visually distinguish pets from similar animals (default off).
  The behavior of this option depends on the type of windowing you use.
*** doc/Guidebook.txt.noherorace	Mon Mar 25 18:35:40 2002
--- doc/Guidebook.txt	Tue Mar 26 01:26:57 2002
***************
*** 2790,2795 ****
--- 2790,2800 ----
            font_size_text
                 NetHack should use this size font for text windows.
  
+           hero_race
+                Makes the player be shown with the symbol of his/her race
+                (dwarf, elf, gnome, human, orc). Normally the player is
+                always shown as a human regardless of his/her race.
+ 
            hilite_pet
                 Visually distinguish  pets  from  similar  animals  (default
                 off).   The  behavior  of this option depends on the type of
*** include/display.h.noherorace	Thu Mar 21 01:42:44 2002
--- include/display.h	Mon Mar 25 23:14:13 2002
***************
*** 317,323 ****
--- 317,328 ----
  /* The hero's glyph when seen as a monster.  Could also be...
   * mon_to_glyph(Upolyd || Race_if(PM_HUMAN) ? u.umonnum : urace.malenum)
   */
+ #ifdef HERO_RACE
+ #define hero_glyph monnum_to_glyph(Upolyd || !iflags.hero_race ? \
+ 					u.umonnum : urace.malenum)
+ #else
  #define hero_glyph monnum_to_glyph(u.umonnum)
+ #endif
  
  
  /*
*** include/flag.h.noherorace	Mon Mar 25 16:39:51 2002
--- include/flag.h	Mon Mar 25 23:41:55 2002
***************
*** 211,216 ****
--- 211,219 ----
  #ifdef SHOW_BORN
  	boolean show_born;	/* show numbers of created monsters */
  #endif
+ #ifdef HERO_RACE
+ 	boolean hero_race;	/* show player with the race symbol */
+ #endif
  /*
   * Window capability support.
   */
*** src/options.c.noherorace	Mon Mar 25 17:04:17 2002
--- src/options.c	Tue Mar 26 00:08:01 2002
***************
*** 92,97 ****
--- 92,100 ----
  	{"flush", (boolean *)0, FALSE, SET_IN_FILE},
  #endif
  	{"help", &flags.help, TRUE, SET_IN_GAME},
+ #ifdef HERO_RACE
+ 	{"hero_race", &iflags.hero_race, FALSE, SET_IN_GAME},
+ #endif
  	{"hilite_pet",    &iflags.wc_hilite_pet, FALSE, SET_IN_GAME},	/*WC*/
  #ifdef ASCIIGRAPH
  	{"IBMgraphics", &iflags.IBMgraphics, FALSE, SET_IN_GAME},
***************
*** 2090,2096 ****
  # endif
  			}
  #endif
! 
  			return;
  		}
  	}
--- 2093,2103 ----
  # endif
  			}
  #endif
! #ifdef HERO_RACE
! 			else if (boolopt[i].addr == &iflags.hero_race) {
! 			    need_redraw = TRUE;
! 			}
! #endif
  			return;
  		}
  	}