pull in the recent unconditionals merge from master

2015-02-27 21:25:00 -05:00
parent 7f0ff8f011
commit b1a7bbbbdb
538 changed files with 1715 additions and 5685 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,5 @@
 *.[ch] filter=NHtext merge=NHsubst
+*.sh filter=NHtext merge=NHsubst
 * text=auto
 *.hqx -text
 *.sln -text
--- a/dat/.gitattributes
+++ b/dat/.gitattributes
@@ -0,0 +1,3 @@
+*.def	filter=NHtext merge=NHsubst
+*.des	filter=NHtext merge=NHsubst
+*.txt	filter=NHtext merge=NHsubst
--- a/dat/Arch.des
+++ b/dat/Arch.des
@@ -1,4 +1,5 @@
-# NetHack 3.5	Arch.des	$Date$  $Revision$
+# NetHack 3.5	Arch.des	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	Arch.des	$Date: 2009/05/06 10:44:15 $  $Revision: 1.6 $
 #	SCCS Id: @(#)Arch.des	3.5	1997/01/31
 #	Copyright (c) 1989 by Jean-Christophe Collet
 #	Copyright (c) 1991 by M. Stephenson
--- a/dat/Barb.des
+++ b/dat/Barb.des
@@ -1,4 +1,5 @@
-# NetHack 3.5	Barb.des	$Date$  $Revision$
+# NetHack 3.5	Barb.des	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	Barb.des	$Date: 2009/05/06 10:44:15 $  $Revision: 1.4 $
 #	SCCS Id: @(#)Barb.des	3.5	1991/12/22
 #	Copyright (c) 1989 by Jean-Christophe Collet
 #	Copyright (c) 1991 by M. Stephenson
--- a/dat/Caveman.des
+++ b/dat/Caveman.des
@@ -1,4 +1,5 @@
-# NetHack 3.5	Caveman.des	$Date$  $Revision$
+# NetHack 3.5	Caveman.des	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	Caveman.des	$Date: 2009/05/06 10:44:15 $  $Revision: 1.4 $
 #	SCCS Id: @(#)Caveman.des	3.5	1995/10/07
 #	Copyright (c) 1989 by Jean-Christophe Collet
 #	Copyright (c) 1991 by M. Stephenson
--- a/dat/Healer.des
+++ b/dat/Healer.des
@@ -1,4 +1,5 @@
-# NetHack 3.5	Healer.des	$Date$  $Revision$
+# NetHack 3.5	Healer.des	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	Healer.des	$Date: 2009/05/06 10:44:16 $  $Revision: 1.5 $
 #	SCCS Id: @(#)Healer.des	3.5	1995/04/16
 #	Copyright (c) 1989 by Jean-Christophe Collet
 #	Copyright (c) 1991, 1993 by M. Stephenson, P. Winner
--- a/dat/Knight.des
+++ b/dat/Knight.des
@@ -1,4 +1,5 @@
-# NetHack 3.5	Knight.des	$Date$  $Revision$
+# NetHack 3.5	Knight.des	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	Knight.des	$Date: 2009/05/06 10:44:16 $  $Revision: 1.4 $
 #	SCCS Id: @(#)Knight.des	3.5	1995/04/16
 #	Copyright (c) 1989 by Jean-Christophe Collet
 #	Copyright (c) 1991,92 by M. Stephenson
--- a/dat/Monk.des
+++ b/dat/Monk.des
@@ -1,4 +1,5 @@
-# NetHack 3.5	Monk.des	$Date$  $Revision$
+# NetHack 3.5	Monk.des	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	Monk.des	$Date: 2009/05/06 10:44:16 $  $Revision: 1.6 $
 #	SCCS Id: @(#)Monk.des	3.5	2002/04/08
 #	Copyright (c) 1989 by Jean-Christophe Collet
 #	Copyright (c) 1991-2 by M. Stephenson
--- a/dat/Priest.des
+++ b/dat/Priest.des
@@ -1,4 +1,5 @@
-# NetHack 3.5	Priest.des	$Date$  $Revision$
+# NetHack 3.5	Priest.des	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	Priest.des	$Date: 2009/05/06 10:44:17 $  $Revision: 1.5 $
 #	SCCS Id: @(#)Priest.des	3.5	2002/04/08
 #	Copyright (c) 1989 by Jean-Christophe Collet
 #	Copyright (c) 1991-2 by M. Stephenson
--- a/dat/Ranger.des
+++ b/dat/Ranger.des
@@ -1,4 +1,5 @@
-# NetHack 3.5	Ranger.des	$Date$  $Revision$
+# NetHack 3.5	Ranger.des	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	Ranger.des	$Date: 2009/05/06 10:44:17 $  $Revision: 1.4 $
 #	SCCS Id: @(#)Ranger.des	3.5	2001/02/01
 #	Copyright (c) 1989 by Jean-Christophe Collet
 #	Copyright (c) 1991 by M. Stephenson
--- a/dat/Rogue.des
+++ b/dat/Rogue.des
@@ -1,4 +1,5 @@
-# NetHack 3.5	Rogue.des	$Date$  $Revision$
+# NetHack 3.5	Rogue.des	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	Rogue.des	$Date: 2009/05/06 10:44:17 $  $Revision: 1.6 $
 #	SCCS Id: @(#)Rogue.des	3.5	2002/02/15
 #	Copyright (c) 1992 by Dean Luick
 # NetHack may be freely redistributed.  See license for details.
--- a/dat/Samurai.des
+++ b/dat/Samurai.des
@@ -1,4 +1,5 @@
-# NetHack 3.5	Samurai.des	$Date$  $Revision$
+# NetHack 3.5	Samurai.des	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	Samurai.des	$Date: 2009/05/06 10:44:17 $  $Revision: 1.6 $
 #	SCCS Id: @(#)Samurai.des	3.5	2002/04/08
 #	Copyright (c) 1989 by Jean-Christophe Collet
 #	Copyright (c) 1991-92 by M. Stephenson, P. Winner
--- a/dat/Tourist.des
+++ b/dat/Tourist.des
@@ -1,4 +1,5 @@
-# NetHack 3.5	Tourist.des	$Date$  $Revision$
+# NetHack 3.5	Tourist.des	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	Tourist.des	$Date: 2009/05/06 10:44:17 $  $Revision: 1.4 $
 #	SCCS Id: @(#)Tourist.des	3.5	1992/09/26
 #	Copyright (c) 1989 by Jean-Christophe Collet
 #	Copyright (c) 1991,92 by M. Stephenson, P. Winner
--- a/dat/Valkyrie.des
+++ b/dat/Valkyrie.des
@@ -1,4 +1,5 @@
-# NetHack 3.5	Valkyrie.des	$Date$  $Revision$
+# NetHack 3.5	Valkyrie.des	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	Valkyrie.des	$Date: 2009/05/06 10:44:17 $  $Revision: 1.6 $
 #	SCCS Id: @(#)Valkyrie.des	3.5	2007/08/01
 #	Copyright (c) 1989 by Jean-Christophe Collet
 #	Copyright (c) 1991-2 by M. Stephenson
--- a/dat/Wizard.des
+++ b/dat/Wizard.des
@@ -1,4 +1,5 @@
-# NetHack 3.5	Wizard.des	$Date$  $Revision$
+# NetHack 3.5	Wizard.des	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	Wizard.des	$Date: 2009/05/06 10:44:17 $  $Revision: 1.5 $
 #	SCCS Id: @(#)Wizard.des	3.5	1992/07/11
 #	Copyright (c) 1992 by David Cohrs
 # NetHack may be freely redistributed.  See license for details.
--- a/dat/bigroom.des
+++ b/dat/bigroom.des
@@ -1,4 +1,5 @@
-# NetHack 3.5	bigroom.des	$Date$  $Revision$
+# NetHack 3.5	bigroom.des	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	bigroom.des	$Date: 2009/05/06 10:44:18 $  $Revision: 1.4 $
 #	SCCS Id: @(#)bigroom.des	3.5	1990/04/15
 #	Copyright (c) 1989 by Jean-Christophe Collet
 #	Copyright (c) 1990 by M. Stephenson
--- a/dat/castle.des
+++ b/dat/castle.des
@@ -1,4 +1,5 @@
-# NetHack 3.5	castle.des	$Date$  $Revision$
+# NetHack 3.5	castle.des	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	castle.des	$Date: 2009/05/06 10:44:18 $  $Revision: 1.5 $
 #	SCCS Id: @(#)castle.des	3.5	2002/05/02
 #	Copyright (c) 1989 by Jean-Christophe Collet
 # NetHack may be freely redistributed.  See license for details.
--- a/dat/data.base
+++ b/dat/data.base
@@ -1,4 +1,5 @@
-# NetHack 3.5	data.base	$Date$  $Revision$
+# NetHack 3.5	data.base	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	data.base	$Date: 2014/10/09 02:04:43 $  $Revision: 1.50 $
 #	Copyright (c) 1994, 1995, 1996 by the NetHack Development Team
 #	Copyright (c) 1994 by Boudewijn Wayers
 #	NetHack may be freely redistributed.  See license for details.
--- a/dat/dungeon.def
+++ b/dat/dungeon.def
@@ -1,4 +1,5 @@
-# NetHack 3.5	dungeon.def	$Date$  $Revision$
+# NetHack 3.5	dungeon.def	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	dungeon.def	$Date: 2009/05/06 10:44:21 $  $Revision: 1.6 $
 #	SCCS Id: @(#)dungeon.def	3.5	2006/03/18
 #	Copyright (c) 1990-95 by M. Stephenson
 # NetHack may be freely redistributed.  See license for details.
@@ -18,8 +19,8 @@
 DUNGEON:	"The Dungeons of Doom" "D" (25, 5)
 ALIGNMENT:	unaligned
 BRANCH:		"The Gnomish Mines" @ (2, 3)
-%REINCARNATION LEVEL:		"rogue" "R" @ (15, 4)
-%REINCARNATION LEVELDESC:	roguelike
+LEVEL:		"rogue" "R" @ (15, 4)
+LEVELDESC:	roguelike
 LEVEL:		"oracle" "O" @ (5, 5)
 LEVALIGN:	neutral
 CHAINBRANCH:	"Sokoban" "oracle" + (1, 0) up
--- a/dat/endgame.des
+++ b/dat/endgame.des
@@ -1,4 +1,5 @@
-# NetHack 3.5	endgame.des	$Date$  $Revision$
+# NetHack 3.5	endgame.des	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	endgame.des	$Date: 2009/05/06 10:44:22 $  $Revision: 1.6 $
 #	SCCS Id: @(#)endgame.des	3.5	2007/03/02
 #	Copyright (c) 1989 by Jean-Christophe Collet
 #	Copyright (c) 1992,1993 by Izchak Miller, David Cohrs,
--- a/dat/gehennom.des
+++ b/dat/gehennom.des
@@ -1,4 +1,5 @@
-# NetHack 3.5	gehennom.des	$Date$  $Revision$
+# NetHack 3.5	gehennom.des	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	gehennom.des	$Date: 2009/05/06 10:44:23 $  $Revision: 1.5 $
 #	SCCS Id: @(#)gehennom.des	3.5	2005/02/02
 #	Copyright (c) 1989 by Jean-Christophe Collet
 #	Copyright (c) 1992 by M. Stephenson and Izchak Miller
--- a/dat/knox.des
+++ b/dat/knox.des
@@ -1,4 +1,5 @@
-# NetHack 3.5	knox.des	$Date$  $Revision$
+# NetHack 3.5	knox.des	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	knox.des	$Date: 2009/05/06 10:44:23 $  $Revision: 1.5 $
 #	SCCS Id: @(#)knox.des	3.5	2006/03/20
 #	Copyright (c) 1989 by Jean-Christophe Collet
 #	Copyright (c) 1992 by Izchak Miller
--- a/dat/medusa.des
+++ b/dat/medusa.des
@@ -1,4 +1,5 @@
-# NetHack 3.5	medusa.des	$Date$  $Revision$
+# NetHack 3.5	medusa.des	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	medusa.des	$Date: 2009/05/06 10:44:23 $  $Revision: 1.5 $
 #	SCCS Id: @(#)medusa.des	3.5	1996/05/11
 #	Copyright (c) 1989 by Jean-Christophe Collet
 #	Copyright (c) 1990, 1991 by M. Stephenson
--- a/dat/mines.des
+++ b/dat/mines.des
@@ -1,4 +1,5 @@
-# NetHack 3.5	mines.des	$Date$  $Revision$
+# NetHack 3.5	mines.des	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	mines.des	$Date: 2009/05/06 10:44:23 $  $Revision: 1.17 $
 #	SCCS Id: @(#)mines.des	3.5	2002/05/02
 #	Copyright (c) 1989-95 by Jean-Christophe Collet
 #	Copyright (c) 1991-95 by M. Stephenson
--- a/dat/oracle.des
+++ b/dat/oracle.des
@@ -1,4 +1,5 @@
-# NetHack 3.5	oracle.des	$Date$  $Revision$
+# NetHack 3.5	oracle.des	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	oracle.des	$Date: 2009/05/06 10:44:23 $  $Revision: 1.4 $
 #	SCCS Id: @(#)oracle.des	3.5	1995/10/07
 # NetHack may be freely redistributed.  See license for details.
 #
--- a/dat/oracles.txt
+++ b/dat/oracles.txt
@@ -48,7 +48,7 @@ It is well known that wily shopkeepers raise their prices whene'er they
 espy the garish apparel of the approaching tourist or the countenance of a
 disfavored patron.  They favor the gentle of manner and the fair of face.
 The boor may expect unprofitable transactions.
----- SINKS
+-----
 The cliche of the kitchen sink swallowing any unfortunate rings that contact
 its pernicious surface reflecteth greater truth than many homilies, yet
 even so, few have developed the skill to identify enchanted rings by the
@@ -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
--- a/dat/quest.txt
+++ b/dat/quest.txt
@@ -1,4 +1,5 @@
-# NetHack 3.5	quest.txt	$Date$  $Revision$
+# NetHack 3.5	quest.txt	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	quest.txt	$Date: 2009/05/06 10:44:23 $  $Revision: 1.23 $
 #	SCCS Id: @(#)quest.txt	3.5	2005/12/03
 #	Copyright (c) 1991 by M. Stephenson
 # NetHack may be freely redistributed.  See license for details.
--- a/dat/sokoban.des
+++ b/dat/sokoban.des
@@ -1,4 +1,5 @@
-# NetHack 3.5	sokoban.des	$Date$  $Revision$
+# NetHack 3.5	sokoban.des	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	sokoban.des	$Date: 2009/05/06 10:44:24 $  $Revision: 1.5 $
 #	SCCS Id: @(#)sokoban.des	3.5	1999/03/15
 #	Copyright (c) 1998-1999 by Kevin Hugo
 # NetHack may be freely redistributed.  See license for details.
--- a/dat/symbols
+++ b/dat/symbols
@@ -201,10 +201,6 @@ start: RogueEpyx
 	S_food: \x05			# club (as in cards)			
 	S_potion: \xad			# upside down '!'
 	S_scroll: \x0e			# musical note
-#	S_armor: \x5b
-#	S_ring: \x3d
-#	S_amulet: \x0c
-#	S_tool: \x28
 	S_wand: \xe7			# greek tau
 	S_coin: \x0f			# yes it's the same as gems
 	S_gem: \x0f			# fancy '*'
@@ -397,131 +393,3 @@ start: NHAccess
 	S_explode9: \047
 finish

-start: Unicode_US
-	Description: Unicode symbols similar to code page 437
-	Restrictions: Unicode
-	S_vwall:     U+2502		# box drawings light vertical
-	S_hwall:     U+2500		# box drawings light horizontal
-	S_tlcorn:    U+250C		# box drawings light down and right
-	S_trcorn:    U+2510		# box drawings light down and left
-	S_blcorn:    U+2514		# box drawings light up and right
-	S_brcorn:    U+2518		# box drawings light up and left
-	S_crwall:    U+253C		# box drawings light up and left
-	S_tuwall:    U+2534		# box drawings light up and horizontal
-	S_tdwall:    U+252C		# box drawings light down and horizontal
-	S_tlwall:    U+2524		# box drawings light vertical and left
-	S_trwall:    U+251C		# box drawings light vertical and right
-	S_ndoor:     U+2556		# box drawings down double and left single
-	S_vodoor:    U+25A0		# black square
-	S_hodoor:    U+25A0		# black square
-	S_bars:      U+2261		# identical to
-	S_tree:      U+00B1		# plus-minus sign
-	S_room:      U+00B7		# middle dot
-	S_corr:      U+2591		# light shade
-	S_litcorr:   U+2592		# medium shade
-	S_fountain:  U+2320		# top half integral 
-	S_pool:      U+2248		# almost equal to
-	S_ice:       U+00B7		# middle dot
-	S_lava:      U+2248		# almost equal to
-	S_vodbridge: U+00B7		# middle dot
-	S_hodbridge: U+00B7		# middle dot
-	S_water:     U+2248		# almost equal to
-	S_vbeam:     U+2502		# box drawings light vertical
-	S_hbeam:     U+2500		# box drawings light horizontal
-	S_sw_ml:     U+2502		# box drawings light vertical
-	S_sw_mr:     U+2502		# box drawings light vertical
-	S_explode4:  U+2502		# box drawings light vertical
-	S_explode6:  U+2502		# box drawings light vertical
-finish
-
-start: Unicode_non_US
-	Description: If default OEM CP for non-Unicode programs is not 437 or 850
-	Restrictions: Unicode
-	S_vwall:    U+2502		# box drawings light vertical
-	S_hwall:    U+2500		# box drawings light horizontal
-	S_tlcorn:   U+250C		# box drawings light down and right
-	S_trcorn:   U+2510		# box drawings light down and left
-	S_blcorn:   U+2514		# box drawings light up and right
-	S_brcorn:   U+2518		# box drawings light up and left
-	S_crwall:   U+253C		# box drawings light up and left
-	S_tuwall:   U+2534		# box drawings light up and horizontal
-	S_tdwall:   U+252C		# box drawings light down and horizontal
-	S_tlwall:   U+2524		# box drawings light vertical and left
-	S_trwall:   U+251C		# box drawings light vertical and right
-	S_vodoor:   U+25A0		# black square
-	S_hodoor:   U+25A0		# black square
-	S_corr:     U+2591		# light shade
-	S_litcorr:  U+2592		# medium shade
-	S_vbeam:    U+2502		# box drawings light vertical
-	S_hbeam:    U+2500		# box drawings light horizontal
-	S_sw_ml:    U+2502		# box drawings light vertical
-	S_sw_mr:    U+2502		# box drawings light vertical
-	S_explode4: U+2502		# box drawings light vertical
-	S_explode6: U+2502		# box drawings light vertical
-	S_coin:	    U+20AC		# euro
-finish
-
-start: UnicodeRogueEpyx
-	Description: Unicode Rogue level symbols
-	Restrictions: Unicode
-	Restrictions: Rogue
-	Color: Yes
-	S_weapon: 	U+2191		# up arrow
-	S_armor:  	U+25d9		# Vert rect with o
-	S_ring:	 	U+2642		# circle with arrow
-	S_amulet:	U+2640		# "female" symbol
-	S_food:		U+2663		# club (as in cards)			
-	S_potion:	U+00a1		# upside down '!'
-	S_scroll:	U+266a		# musical note
-	S_wand:		U+03c4		# greek tau
-	S_coin:		U+263c		# yes it's the same as gems
-	S_gem:		U+263c		# fancy '*'
-	S_rock:		U+0060		# grave accent
-	S_ball:		U+0030		# digit 0
-	S_chain:	U+005f		# low line
-	S_venom:	U+002e		# full stop
-	S_book: 	U+002b		# + sign
-	S_vwall:	U+2551		# all walls now use
-	S_hwall:	U+2550		#   double line graphics
-	S_tlcorn:	U+2554		# box drawing double down and right 
-	S_trcorn:	U+2557		# box drawing double down and left 
-	S_blcorn:	U+255a		# box drawing double up and right 
-	S_brcorn:	U+255d		# box drawing double up and left 
-	S_crwall:	U+256c		# box drawing double vertical and horizontal 
-	S_tuwall:	U+2569		# box drawing double up and horizontal 
-	S_tdwall:	U+2566		# box drawing double down and horizontal 
-	S_tlwall:	U+2563		# box drawing double vertical and left 
-	S_trwall:	U+2560		# box drawing double vertical and right 
-	S_ndoor:	U+256c		# box drawing double vertical and horizontal 
-	S_vodoor:	U+256c		# box drawing double vertical and horizontal 
-	S_hodoor: 	U+256c		# box drawing double vertical and horizontal 
-	S_room:		U+00b7		# centered dot 
-	S_corr: 	U+2592		# medium shade
-	S_litcorr:	U+2593		# dark shade
-	S_upstair:	U+001e		# Greek Xi 
-	S_dnstair:	U+001f 
-	S_arrow_trap:	U+2666		# diamond (cards) 
-	S_dart_trap:	U+2666
-	S_falling_rock_trap: U+2666
-	S_squeaky_board: U+2666
-	S_bear_trap: 	U+2666
-	S_land_mine:	U+2666
-	S_rolling_boulder_trap: U+2666
-	S_sleeping_gas_trap: U+2666
-	S_rust_trap:	U+2666
-	S_fire_trap:	U+2666 
-	S_pit:		U+2666
-	S_spiked_pit:	U+2666 
-	S_hole:		U+2666
-	S_trap_door:	U+2666
-	S_teleportation_trap: U+2666 
-	S_level_teleporter: U+2666
-	S_magic_portal: U+2666 
-	S_web: 		U+2666 
-	S_statue_trap:	U+2666 
-	S_magic_trap:	U+2666
-	S_anti_magic_trap: U+2666 
-	S_polymorph_trap: U+2666
-	S_human:	U+263a		# face
-finish
-
--- a/dat/tower.des
+++ b/dat/tower.des
@@ -1,4 +1,5 @@
-# NetHack 3.5	tower.des	$Date$  $Revision$
+# NetHack 3.5	tower.des	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	tower.des	$Date: 2009/05/06 10:44:25 $  $Revision: 1.4 $
 #	SCCS Id: @(#)tower.des	3.5	1990/02/26
 #	Copyright (c) 1989 by Jean-Christophe Collet
 # NetHack may be freely redistributed.  See license for details.
--- a/dat/yendor.des
+++ b/dat/yendor.des
@@ -1,4 +1,5 @@
-# NetHack 3.5	yendor.des	$Date$  $Revision$
+# NetHack 3.5	yendor.des	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	yendor.des	$Date: 2009/05/06 10:44:25 $  $Revision: 1.5 $
 #	SCCS Id: @(#)yendor.des	3.5	1996/10/20
 #	Copyright (c) 1989 by Jean-Christophe Collet
 #	Copyright (c) 1992 by M. Stephenson and Izchak Miller
--- a/doc/.gitattributes
+++ b/doc/.gitattributes
@@ -0,0 +1,5 @@
+*.mn	filter=NHtext merge=NHsubst
+*.6	filter=NHtext merge=NHsubst
+fixes.*	filter=NHtext merge=NHsubst
+window.doc filter=NHtext merge=NHsubst
+
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -0,0 +1 @@
+Guidebook
--- a/doc/Guidebook.mn
+++ b/doc/Guidebook.mn
@@ -1,4 +1,5 @@
-.\" $Revision$ $Date$
+.\" $NHDT-Branch$:$NHDT-Revision$ $NHDT-Date$
+.\" $Revision: 1.130 $ $Date: 2012/05/02 00:38:30 $
 .ds h0 "NetHack Guidebook
 .ds h1
 .ds h2 %
--- a/doc/dgn_comp.6
+++ b/doc/dgn_comp.6
@@ -1,5 +1,6 @@
 .TH DGN_COMP 6 "12 Dec 1995"
-.\" NetHack 3.5  dgn_comp.6	$Date$  $Revision$
+.\" NetHack 3.5  dgn_comp.6	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+.\" NetHack 3.5  dgn_comp.6	$Date: 2009/05/06 10:44:28 $  $Revision: 1.2 $
 .UC 4
 .SH NAME
 dgn_comp \- NetHack dungeon compiler
--- a/doc/dlb.6
+++ b/doc/dlb.6
@@ -1,5 +1,6 @@
 .TH DLB 6 "28 Oct 1993"
-.\" NetHack 3.5  dlb.6	$Date$  $Revision$
+.\" NetHack 3.5  dlb.6	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+.\" NetHack 3.5  dlb.6	$Date: 2009/05/06 10:44:28 $  $Revision: 1.3 $
 .UC 4
 .SH NAME
 dlb \- NetHack data librarian
--- a/doc/fixes30.0
+++ b/doc/fixes30.0
@@ -1,4 +1,5 @@
-$RCSfile$ $Revision$ $Date$
+$NHDT-Branch$:$NHDT-Revision$ $NHDT-Date$
+$RCSfile: fixes30.0,v $ $Revision: 1.2 $ $Date: 2003/05/11 15:09:24 $

 [This is a partial list supplied by Ken Arromdee long after the fact]

--- a/doc/fixes34.1
+++ b/doc/fixes34.1
@@ -1,4 +1,5 @@
-$RCSfile$ $Revision$ $Date$
+$NHDT-Branch$:$NHDT-Revision$ $NHDT-Date$
+$RCSfile: fixes34.1,v $ $Revision: 1.331 $ $Date: 2003/02/20 00:19:46 $

 General Fixes and Modified Features
 -----------------------------------
--- a/doc/fixes34.2
+++ b/doc/fixes34.2
@@ -1,4 +1,5 @@
-$RCSfile$ $Revision$ $Date$
+$NHDT-Branch$:$NHDT-Revision$ $NHDT-Date$
+$RCSfile: fixes34.2,v $ $Revision: 1.132 $ $Date: 2003/08/26 15:11:58 $

 General Fixes and Modified Features
 -----------------------------------
--- a/doc/fixes34.3
+++ b/doc/fixes34.3
@@ -1,4 +1,5 @@
-$RCSfile$ $Revision$ $Date$
+$NHDT-Branch$:$NHDT-Revision$ $NHDT-Date$
+$RCSfile: fixes34.3,v $ $Revision: 1.103 $ $Date: 2003/12/06 14:08:46 $

 General Fixes and Modified Features
 -----------------------------------
--- a/doc/fixes35.0
+++ b/doc/fixes35.0
@@ -1,4 +1,5 @@
-$rcsfile: fixes35.0,v $ $Revision$ $Date$
+$NHDT-Branch$:$NHDT-Revision$ $NHDT-Date$
+$rcsfile: fixes35.0,v $ $Revision: 1.445 $ $Date: 2014/11/18 03:10:36 $

 General Fixes and Modified Features
 -----------------------------------
--- a/doc/lev_comp.6
+++ b/doc/lev_comp.6
@@ -1,5 +1,6 @@
 .TH LEV_COMP 6 "16 May 1996"
-.\" NetHack 3.5  lev_comp.6	$Date$  $Revision$
+.\" NetHack 3.5  lev_comp.6	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+.\" NetHack 3.5  lev_comp.6	$Date: 2009/05/06 10:44:28 $  $Revision: 1.2 $
 .UC 4
 .SH NAME
 lev_comp \- NetHack special levels compiler
--- a/doc/makedefs.6
+++ b/doc/makedefs.6
@@ -1,5 +1,6 @@
 .TH MAKEDEFS 6 "29 Apr 2010"
-.\" NetHack 3.5  makedefs.6	$Date$  $Revision$
+.\" NetHack 3.5  makedefs.6	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+.\" NetHack 3.5  makedefs.6	$Date: 2010/05/01 20:57:12 $  $Revision: 1.1 $
 .UC 4
 .SH NAME
 makedefs \- NetHack miscellaneous build-time functions
@@ -117,6 +118,14 @@ and
 .IR vis_tab.h .
 .SH LONG COMMANDS
 .TP
+.BI --debug
+Show debugging output.
+.br
+.TP
+.B --make \fR[\fIcommand\fR]
+Execute a short command.  Command is given without preceding dash.
+.br
+.TP
 .BI --input " file"
 Specify the input
 .I file
--- a/doc/nethack.6
+++ b/doc/nethack.6
@@ -1,5 +1,6 @@
 .TH NETHACK 6 "6 March 2004"
-.\" NetHack 3.5  nethack.6	$Date$  $Revision$
+.\" NetHack 3.5  nethack.6	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+.\" NetHack 3.5  nethack.6	$Date: 2009/05/06 10:44:28 $  $Revision: 1.7 $
 .SH NAME
 nethack \- Exploring The Mazes of Menace
 .SH SYNOPSIS
--- a/doc/recover.6
+++ b/doc/recover.6
@@ -1,5 +1,6 @@
 .TH RECOVER 6 "9 January 1993"
-.\" NetHack 3.5  recover.6	$Date$  $Revision$
+.\" NetHack 3.5  recover.6	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+.\" NetHack 3.5  recover.6	$Date: 2009/05/06 10:44:29 $  $Revision: 1.3 $
 .UC 4
 .SH NAME
 recover \- recover a NetHack game interrupted by disaster
--- a/doc/window.doc
+++ b/doc/window.doc
@@ -1,4 +1,5 @@
-NetHack 3.5  window.doc	$Date$  $Revision$
+NetHack 3.5  window.doc	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+NetHack 3.5  window.doc	$Date: 2012/01/23 10:41:55 $  $Revision: 1.36 $

 Introduction

--- a/include/align.h
+++ b/include/align.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	align.h	$Date$  $Revision$ */
+/* NetHack 3.5	align.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	align.h	$Date: 2009/05/06 10:44:33 $  $Revision: 1.4 $ */
 /*	SCCS Id: @(#)align.h	3.5	1991/12/29	*/
 /* Copyright (c) Mike Stephenson, Izchak Miller  1991.		  */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/amiconf.h
+++ b/include/amiconf.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	amiconf.h	$Date$  $Revision$ */
+/* NetHack 3.5	amiconf.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	amiconf.h	$Date: 2012/01/10 17:47:16 $  $Revision: 1.8 $ */
 /* Copyright (c) Kenneth Lorber, Bethesda, Maryland, 1990, 1991, 1992, 1993. */
 /* NetHack may be freely redistributed.  See license for details. */

--- a/include/artifact.h
+++ b/include/artifact.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	artifact.h	$Date$  $Revision$ */
+/* NetHack 3.5	artifact.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	artifact.h	$Date: 2011/04/07 18:10:44 $  $Revision: 1.6 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

--- a/include/artilist.h
+++ b/include/artilist.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	artilist.h	$Date$  $Revision$ */
+/* NetHack 3.5	artilist.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	artilist.h	$Date: 2011/04/07 18:10:44 $  $Revision: 1.8 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

@@ -214,13 +215,11 @@ A("The Tsurugi of Muramasa",	TSURUGI,
 	PHYS(0,8),	NO_DFNS,	NO_CARY,
 	0,		A_LAWFUL, PM_SAMURAI, NON_PM, 4500L ),

-#ifdef TOURIST
 A("The Platinum Yendorian Express Card", CREDIT_CARD,
 	(SPFX_NOGEN|SPFX_RESTR|SPFX_INTEL|SPFX_DEFN),
 		(SPFX_ESP|SPFX_HSPDAM), 0,
 	NO_ATTK,	NO_DFNS,	CARY(AD_MAGM),
 	CHARGE_OBJ,	A_NEUTRAL, PM_TOURIST, NON_PM, 7000L ),
-#endif

 A("The Orb of Fate",		CRYSTAL_BALL,
 	(SPFX_NOGEN|SPFX_RESTR|SPFX_INTEL|SPFX_LUCK),
--- a/include/attrib.h
+++ b/include/attrib.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	attrib.h	$Date$  $Revision$ */
+/* NetHack 3.5	attrib.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	attrib.h	$Date: 2009/05/06 10:44:34 $  $Revision: 1.4 $ */
 /*	SCCS Id: @(#)attrib.h	3.5	1990/22/02	*/
 /* Copyright 1988, Mike Stephenson				  */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/beconf.h
+++ b/include/beconf.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	beconf.h	$Date$  $Revision$ */
+/* NetHack 3.5	beconf.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	beconf.h	$Date: 2009/05/06 10:44:34 $  $Revision: 1.4 $ */
 /*	SCCS Id: @(#)beconf.h	3.5	1998/07/08	*/
 /* Copyright (c) Dean Luick 1996.	*/
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/botl.h
+++ b/include/botl.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	botl.h	$Date$  $Revision$ */
+/* NetHack 3.5	botl.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	botl.h	$Date: 2012/01/10 17:47:16 $  $Revision: 1.6 $ */
 /* Copyright (c) Michael Allison, 2003				  */
 /* NetHack may be freely redistributed.  See license for details. */

--- a/include/color.h
+++ b/include/color.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	color.h	$Date$  $Revision$ */
+/* NetHack 3.5	color.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	color.h	$Date: 2009/05/06 10:44:34 $  $Revision: 1.5 $ */
 /*	SCCS Id: @(#)color.h	3.5	1992/02/02	*/
 /* Copyright (c) Steve Linhart, Eric Raymond, 1989. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/config.h
+++ b/include/config.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	config.h	$Date$  $Revision$ */
+/* 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. */

@@ -171,16 +172,12 @@
 *              GDBPATH		(the path to the system gdb(1) program)
 */

-#ifndef WIZARD		/* allow for compile-time or Makefile changes */
-# ifndef KR1ED
-#  define WIZARD  "wizard" /* the person allowed to use the -D option */
+#ifndef WIZARD_NAME		/* allow for compile-time or Makefile changes */
+# define WIZARD_NAME "wizard"
+#endif
+
 /* #define SYSCF */	/* use a global configuration */
 /* #define SYSCF_FILE "sysconf" */ /* global configuration is in a file */
-# else
-#  define WIZARD
-#  define WIZARD_NAME "wizard"
-# endif
-#endif

 #ifndef GDBPATH
 # define GDBPATH "/usr/bin/gdb"
@@ -318,10 +315,6 @@
 */
 #endif /* CHDIR */

-/*
- * Enable some UNICODE support.
- */
-/*#define UNICODE_SUPPORT */		/* master on/off for any unicode support    */


 /*
@@ -415,34 +408,19 @@ typedef unsigned char	uchar;
 */

 /* display features */
-#define LOADSYMSETS	/* loadable symbol sets; only default symbols w/o this  */
 /* dungeon features */
-#define SINKS		/* Kitchen sinks - Janet Walz */
 /* dungeon levels */
 #define WALLIFIED_MAZE	/* Fancy mazes - Jean-Christophe Collet */
-#define REINCARNATION	/* Special Rogue-like levels */
 /* monsters & objects */
-#define KOPS		/* Keystone Kops by Scott R. Turner */
-#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)
 # if !defined(NOCLIPPING)
 # define CLIPPING	/* allow smaller screens -- ERS */
 # endif
 #endif
-#define AUTOPICKUP_EXCEPTIONS	/* exceptions to autopickup */
-#define BARGETHROUGH	/* allow some monsters to move others out of their way */

-#ifdef REDO
-# define DOAGAIN '\001' /* ^A, the "redo" key used in cmd.c and getline.c */
-#endif
+#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) */

 /*
@@ -453,10 +431,8 @@ typedef unsigned char	uchar;
 * bugs left here.
 */

-/*#define GOLDOBJ */	/* Gold is kept on obj chains - Helge Hafting */
 #define STATUS_VIA_WINDOWPORT	/* re-work of the status line updating process */
 #define STATUS_HILITES		/* support hilites of status fields */
-#define DUNGEON_OVERVIEW	/* dungeon overview by Hojita Discordia */
 /* #define WINCHAIN*/		/* stacked window systems */
 /* End of Section 5 */

--- a/include/config1.h
+++ b/include/config1.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	config1.h	$Date$  $Revision$ */
+/* NetHack 3.5	config1.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	config1.h	$Date: 2011/05/23 03:27:07 $  $Revision: 1.13 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

--- a/include/context.h
+++ b/include/context.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	context.h	$Date$  $Revision$ */
+/* NetHack 3.5	context.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	context.h	$Date: 2012/01/10 17:47:16 $  $Revision: 1.15 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

--- a/include/coord.h
+++ b/include/coord.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	coord.h	$Date$  $Revision$ */
+/* NetHack 3.5	coord.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	coord.h	$Date: 2012/01/10 17:47:16 $  $Revision: 1.5 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

--- a/include/decl.h
+++ b/include/decl.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	decl.h	$Date$  $Revision$ */
+/* NetHack 3.5	decl.h	$NHDT-Date: 1425081976 2015/02/28 00:06:16 $  $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.50 $ */
+/* NetHack 3.5	decl.h	$Date: 2011/12/29 20:06:27 $  $Revision: 1.44 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

@@ -38,16 +39,12 @@ E NEARDATA int warn_obj_cnt;		/* count of monsters meeting criteria */
 E int x_maze_max, y_maze_max;
 E int otg_temp;

-#ifdef REDO
 E NEARDATA int in_doagain;
-#endif

 E struct dgn_topology {		/* special dungeon levels for speed */
    d_level	d_oracle_level;
    d_level	d_bigroom_level;	/* unused */
-#ifdef REINCARNATION
    d_level	d_rogue_level;
-#endif
    d_level	d_medusa_level;
    d_level	d_stronghold_level;
    d_level	d_valley_level;
@@ -74,9 +71,7 @@ E struct dgn_topology {		/* special dungeon levels for speed */
 /* macros for accesing the dungeon levels by their old names */
 #define oracle_level		(dungeon_topology.d_oracle_level)
 #define bigroom_level		(dungeon_topology.d_bigroom_level)
-#ifdef REINCARNATION
 #define rogue_level		(dungeon_topology.d_rogue_level)
-#endif
 #define medusa_level		(dungeon_topology.d_medusa_level)
 #define stronghold_level	(dungeon_topology.d_stronghold_level)
 #define valley_level		(dungeon_topology.d_valley_level)
@@ -154,9 +149,7 @@ E NEARDATA struct sinfo {
 #ifdef PANICLOG
 	int in_paniclog;
 #endif
-#ifdef WIZARD
 	int wizkit_wishing;
-#endif
 } program_state;

 E boolean restoring;
@@ -185,9 +178,7 @@ E NEARDATA struct kinfo {
    char	name[BUFSZ];		/* actual killer name */
 } killer;

-#ifdef GOLDOBJ
 E long done_money;
-#endif
 E const char *configfile;
 E NEARDATA char plname[PL_NSIZ];
 E NEARDATA char dogname[];
@@ -233,9 +224,7 @@ E uchar monsyms[MAXMCLASSES];		/* current class symbols */
 #include "obj.h"
 E NEARDATA struct obj *invent,
 	*uarm, *uarmc, *uarmh, *uarms, *uarmg, *uarmf,
-#ifdef TOURIST
 	*uarmu,				/* under-wear, so to speak */
-#endif
 	*uskin, *uamul, *uleft, *uright, *ublindf,
 	*uwep, *uswapwep, *uquiver;

@@ -331,7 +320,6 @@ E NEARDATA winid WIN_MESSAGE;
 E NEARDATA winid WIN_STATUS;
 #endif
 E NEARDATA winid WIN_MAP, WIN_INVEN;
-E nhwchar toplines[];

 /* pline (et al) for a single string argument (suppress compiler warning) */
 #define pline1(cstr) pline("%s", cstr)
@@ -342,6 +330,7 @@ E nhwchar toplines[];
 #define Sprintf1(buf, cstr) Sprintf(buf, "%s", cstr)
 #define panic1(cstr) panic("%s", cstr)

+E char toplines[];
 #ifndef TCAP_H
 E struct tc_gbl_data {	/* also declared in tcap.h */
    char *tc_AS, *tc_AE;	/* graphics start and end (tty font swapping) */
@@ -390,13 +379,11 @@ E char *fqn_prefix_names[PREFIX_COUNT];

 E NEARDATA struct savefile_info sfcap, sfrestinfo, sfsaveinfo;

-#ifdef AUTOPICKUP_EXCEPTIONS
 struct autopickup_exception {
 	char *pattern;
 	boolean grab;
 	struct autopickup_exception *next;
 };
-#endif /* AUTOPICKUP_EXCEPTIONS */

 #ifdef PANICTRACE
 E char *ARGV0;
--- a/include/def_os2.h
+++ b/include/def_os2.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	def_os2.h	$Date$  $Revision$ */
+/* NetHack 3.5	def_os2.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	def_os2.h	$Date: 2009/05/06 10:44:37 $  $Revision: 1.4 $ */
 /*	SCCS Id: @(#)def_os2.h	3.5	1993/01/19	*/
 /* Copyright (c) Timo Hakulinen, 1990, 1991, 1992, 1993.	  */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/dgn_file.h
+++ b/include/dgn_file.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	dgn_file.h	$Date$  $Revision$ */
+/* NetHack 3.5	dgn_file.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	dgn_file.h	$Date: 2009/05/06 10:44:38 $  $Revision: 1.4 $ */
 /*	SCCS Id: @(#)dgn_file.h 3.5	1993/01/17	*/
 /* Copyright (c) 1989 by M. Stephenson				  */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/display.h
+++ b/include/display.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	display.h	$Date$  $Revision$ */
+/* NetHack 3.5	display.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	display.h	$Date: 2009/05/06 10:44:38 $  $Revision: 1.14 $ */
 /*	SCCS Id: @(#)display.h	3.5	2005/06/21	*/
 /* Copyright (c) Dean Luick, with acknowledgements to Kevin Darcy */
 /* and Dave Cohrs, 1990.					  */
@@ -15,9 +16,13 @@
 #include "mondata.h"	/* for mindless() */
 #endif

-#ifndef INVISIBLE_OBJECTS
+/*
+ * vobj_at()
+ *
+ * Returns the head of the list of objects that the player can see
+ * at location (x,y).
+ */
 #define vobj_at(x,y) (level.objects[x][y])
-#endif

 /*
 * sensemon()
@@ -197,12 +202,8 @@
 * Display the hero.  It is assumed that all checks necessary to determine
 * _if_ the hero can be seen have already been done.
 */
-#ifdef STEED
 #define maybe_display_usteed	(u.usteed && mon_visible(u.usteed)) ? \
 					ridden_mon_to_glyph(u.usteed) :
-#else
-#define maybe_display_usteed	/* empty */
-#endif

 #define display_self()							\
    show_glyph(u.ux, u.uy,						\
--- a/include/dlb.h
+++ b/include/dlb.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	dlb.h	$Date$  $Revision$ */
+/* NetHack 3.5	dlb.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	dlb.h	$Date: 2009/05/06 10:44:38 $  $Revision: 1.6 $ */
 /*	SCCS Id: @(#)dlb.h	3.5	1997/07/29	*/
 /* Copyright (c) Kenneth Lorber, Bethesda, Maryland, 1993. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/dungeon.h
+++ b/include/dungeon.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	dungeon.h	$Date$  $Revision$ */
+/* NetHack 3.5	dungeon.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	dungeon.h	$Date: 2012/04/14 08:31:03 $  $Revision: 1.11 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

@@ -168,7 +169,6 @@ struct linfo {
 #endif /* MFLOPPY */
 };

-#ifdef DUNGEON_OVERVIEW
 /* types and structures for dungeon map recording
 *
 * It is designed to eliminate the need for an external notes file for some of
@@ -231,9 +231,7 @@ typedef struct mapseen  {
 	    Bitfield(valley, 1);
 	    Bitfield(msanctum, 1);
 	    Bitfield(ludios, 1);
-# ifdef REINCARNATION
 	    Bitfield(roguelevel, 1);
-# endif
 	} flags;
 	/* custom naming */
 	char *custom;
@@ -246,5 +244,4 @@ typedef struct mapseen  {
 	struct cemetery *final_resting_place; /* same as level.bonesinfo */
 } mapseen;

-#endif /* DUNGEON_OVERVIEW */
 #endif /* DUNGEON_H */
--- a/include/engrave.h
+++ b/include/engrave.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	engrave.h	$Date$  $Revision$ */
+/* NetHack 3.5	engrave.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	engrave.h	$Date: 2009/05/06 10:44:39 $  $Revision: 1.4 $ */
 /*	SCCS Id: @(#)engrave.h	3.5	1991/07/31	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/extern.h
+++ b/include/extern.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	extern.h	$Date$  $Revision$ */
+/* NetHack 3.5	extern.h	$NHDT-Date: 1425081976 2015/02/28 00:06:16 $  $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.390 $ */
+/* NetHack 3.5	extern.h	$Date: 2013/11/05 00:57:53 $  $Revision: 1.380 $ */
 /* Copyright (c) Steve Creps, 1988.				  */
 /* NetHack may be freely redistributed.  See license for details. */

@@ -171,7 +172,6 @@ E int NDECL(domonability);
 E int NDECL(doprev_message);
 E int NDECL(timed_occupation);
 E int NDECL(doattributes);
-# ifdef WIZARD
 E int NDECL(wiz_detect);
 E int NDECL(wiz_genesis);
 E int NDECL(wiz_identify);
@@ -179,18 +179,13 @@ E int NDECL(wiz_level_tele);
 E int NDECL(wiz_map);
 E int NDECL(wiz_where);
 E int NDECL(wiz_wish);
-# endif /* WIZARD */
 #endif /* USE_TRAMPOLI */
 E void NDECL(reset_occupations);
 E void FDECL(set_occupation, (int (*)(void),const char *,int));
-#ifdef REDO
 E char NDECL(pgetchar);
 E void FDECL(pushch, (CHAR_P));
 E void FDECL(savech, (CHAR_P));
-#endif
-#ifdef WIZARD
 E void NDECL(add_debug_extended_commands);
-#endif /* WIZARD */
 E void FDECL(reset_commands, (BOOLEAN_P));
 E void FDECL(rhack, (char *));
 E int NDECL(doextlist);
@@ -214,9 +209,7 @@ E void FDECL(hangup, (int));
 E void NDECL(end_of_input);
 #endif
 E char NDECL(readchar);
-#ifdef WIZARD
 E void NDECL(sanity_check);
-#endif
 E char FDECL(yn_function, (const char *, const char *, CHAR_P));
 E boolean FDECL(paranoid_query, (BOOLEAN_P,const char *));

@@ -302,9 +295,6 @@ E void FDECL(bury_obj, (struct obj *));

 /* ### display.c ### */

-#ifdef INVISIBLE_OBJECTS
-E struct obj * FDECL(vobj_at, (XCHAR_P,XCHAR_P));
-#endif /* INVISIBLE_OBJECTS */
 E void FDECL(magic_map_background, (XCHAR_P,XCHAR_P,int));
 E void FDECL(map_background, (XCHAR_P,XCHAR_P,int));
 E void FDECL(map_trap, (struct trap *,int));
@@ -398,9 +388,7 @@ E char *FDECL(distant_monnam, (struct monst *,int,char *));
 E const char *NDECL(rndmonnam);
 E const char *FDECL(hcolor, (const char *));
 E const char *NDECL(rndcolor);
-#ifdef REINCARNATION
 E const char *NDECL(roguename);
-#endif
 E struct obj *FDECL(realloc_obj,
 		(struct obj *, int, genericptr_t, int, const char *));
 E char *FDECL(coyotename, (struct monst *,char *));
@@ -428,9 +416,7 @@ E int NDECL(Gloves_off);
 E int NDECL(Boots_off);
 E int NDECL(Cloak_off);
 E int NDECL(Shield_off);
-#ifdef TOURIST
 E int NDECL(Shirt_off);
-#endif
 E void NDECL(Amulet_off);
 E void FDECL(Ring_on, (struct obj *));
 E void FDECL(Ring_off, (struct obj *));
@@ -520,20 +506,14 @@ E int FDECL(def_char_to_monclass, (CHAR_P));
 #if !defined(MAKEDEFS_C) && !defined(LEV_LEX_C)
 E void FDECL(switch_symbols, (int));
 E void FDECL(assign_graphics, (int));
-#ifdef REINCARNATION
 E void NDECL(init_r_symbols);
-#endif
 E void NDECL(init_symbols);
 E void NDECL(init_showsyms);
 E void NDECL(init_l_symbols);
-#ifdef LOADSYMSETS
 E void FDECL(clear_symsetentry, (int,BOOLEAN_P));
 E void FDECL(update_l_symset, (struct symparse *,int));
 E void FDECL(update_r_symset, (struct symparse *,int));
-#endif
-#ifdef BARGETHROUGH
 E boolean FDECL(cursed_object_at, (int, int));
-#endif

 /* ### dungeon.c ### */

@@ -583,10 +563,7 @@ E int FDECL(induced_align, (int));
 E boolean FDECL(Invocation_lev, (d_level *));
 E xchar NDECL(level_difficulty);
 E schar FDECL(lev_by_name, (const char *));
-#ifdef WIZARD
 E schar FDECL(print_dungeon, (BOOLEAN_P,schar *,xchar *));
-#endif
-#ifdef DUNGEON_OVERVIEW
 E int NDECL(donamelevel);
 E int NDECL(dooverview);
 E void FDECL(show_overview, (int,int));
@@ -597,7 +574,6 @@ E void FDECL(mapseen_temple, (struct monst *));
 E void FDECL(room_discovered, (int));
 E void FDECL(recbranch_mapseen, (d_level *, d_level *));
 E void FDECL(remdun_mapseen, (int));
-#endif /* DUNGEON_OVERVIEW */

 /* ### eat.c ### */

@@ -669,9 +645,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));
@@ -705,11 +679,9 @@ E void FDECL(explode_oil, (struct obj *,int,int));

 /* ### extralev.c ### */

-#ifdef REINCARNATION
 E void NDECL(makeroguerooms);
 E void FDECL(corr, (int,int));
 E void NDECL(makerogueghost);
-#endif

 /* ### files.c ### */

@@ -737,7 +709,7 @@ E void FDECL(set_savefile_name, (BOOLEAN_P));
 #ifdef INSURANCE
 E void FDECL(save_savefile_name, (int));
 #endif
-#if defined(WIZARD) && !defined(MICRO)
+#ifndef MICRO
 E void NDECL(set_error_savefile);
 #endif
 E int NDECL(create_savefile);
@@ -753,14 +725,9 @@ E boolean FDECL(can_read_file, (const char *));
 #endif
 E boolean FDECL(read_config_file, (const char *, int));
 E void FDECL(check_recordfile, (const char *));
-#if defined(WIZARD)
 E void NDECL(read_wizkit);
-#endif
-#ifdef LOADSYMSETS
 E int FDECL(read_sym_file, (int));
 E int FDECL(parse_sym_line, (char *,int));
-E int FDECL(sym_val, (const char *));
-#endif
 E void FDECL(paniclog, (const char *, const char *));
 E int FDECL(validate_prefix_locations, (char *));
 #ifdef SELECTSAVED
@@ -785,10 +752,8 @@ E void FDECL(gush, (int,int,genericptr_t));
 E void FDECL(dryup, (XCHAR_P,XCHAR_P, BOOLEAN_P));
 E void NDECL(drinkfountain);
 E void FDECL(dipfountain, (struct obj *));
-#ifdef SINKS
 E void FDECL(breaksink, (int,int));
 E void NDECL(drinksink);
-#endif

 /* ### hack.c ### */

@@ -826,9 +791,7 @@ E int FDECL(calc_capacity, (int));
 E int NDECL(max_capacity);
 E boolean FDECL(check_capacity, (const char *));
 E int FDECL(inv_cnt, (BOOLEAN_P));
-#ifdef GOLDOBJ
 E long FDECL(money_cnt, (struct obj *));
-#endif

 /* ### hacklib.c ### */

@@ -879,20 +842,6 @@ E int NDECL(phase_of_the_moon);
 E boolean NDECL(friday_13th);
 E int NDECL(night);
 E int NDECL(midnight);
-#ifdef UNICODE_WIDEWINPORT
-E nhwchar *FDECL(nhwstrncpy, (nhwchar *,const char *,size_t));
-E nhwchar *FDECL(nhwncpy, (nhwchar *,const nhwchar *,size_t));
-E nhwchar *FDECL(nhwcpy, (nhwchar *,const nhwchar *));
-E nhwchar *FDECL(nhwstrcpy, (nhwchar *,const char *));
-E char *FDECL(strnhwcpy, (char *,const nhwchar *));
-E nhwchar *FDECL(nhwstrcat, (nhwchar *,const char *));
-E nhwchar *FDECL(nhwcat, (nhwchar *,const nhwchar *));
-E nhwchar *FDECL(nhwindex, (const nhwchar *,int));
-E size_t FDECL(nhwlen, (const nhwchar *));
-E int FDECL(nhwcmp, (const nhwchar *,const nhwchar *));
-E int FDECL(nhwncmp, (const nhwchar *,const nhwchar *,int));
-E int FDECL(nhwstrcmp, (const nhwchar *,const char *));
-#endif

 /* ### invent.c ### */

@@ -923,11 +872,6 @@ E boolean FDECL(obj_here, (struct obj *,int,int));
 E boolean NDECL(wearing_armor);
 E boolean FDECL(is_worn, (struct obj *));
 E struct obj *FDECL(g_at, (int,int));
-#ifndef GOLDOBJ
-E struct obj *FDECL(mkgoldobj, (long));
-E struct obj *FDECL(insert_gold_into_invent, (BOOLEAN_P));
-E void NDECL(remove_gold_from_invent);
-#endif
 E struct obj *FDECL(getobj, (const char *,const char *));
 E int FDECL(ggetobj, (const char *,int (*)(OBJ_P),int,BOOLEAN_P,unsigned *));
 E int FDECL(askchain, (struct obj **,const char *,int,int (*)(OBJ_P),
@@ -1000,9 +944,7 @@ E void FDECL(obj_adjust_light_radius, (struct obj *,int));
 E int FDECL(candle_light_range, (struct obj *));
 E int FDECL(arti_light_radius, (struct obj *));
 E const char *FDECL(arti_light_description, (struct obj *));
-#ifdef WIZARD
 E int NDECL(wiz_light_sources);
-#endif

 /* ### lock.c ### */

@@ -1101,9 +1043,7 @@ E void FDECL(freemcorpsenm, (struct monst *));
 E void FDECL(set_mimic_sym, (struct monst *));
 E int FDECL(mbirth_limit, (int));
 E void FDECL(mimic_hit_msg, (struct monst *, SHORT_P));
-#ifdef GOLDOBJ
 E void FDECL(mkmonmoney, (struct monst *, long));
-#endif
 E int FDECL(bagotricks, (struct obj *,BOOLEAN_P,int *));
 E boolean FDECL(propagate, (int, BOOLEAN_P,BOOLEAN_P));
 E boolean FDECL(usmellmon, (struct permonst *));
@@ -1124,9 +1064,7 @@ E int FDECL(buzzmu, (struct monst *,struct attack *));
 E int FDECL(fightm, (struct monst *));
 E int FDECL(mattackm, (struct monst *,struct monst *));
 E boolean FDECL(engulf_target, (struct monst *,struct monst *));
-#ifdef BARGETHROUGH
 E int FDECL(mdisplacem, (struct monst *,struct monst *,BOOLEAN_P));
-#endif
 E void FDECL(paralyze_monst, (struct monst *,int));
 E int FDECL(sleep_monst, (struct monst *,int,int));
 E void FDECL(slept_monst, (struct monst *));
@@ -1146,9 +1084,7 @@ E boolean NDECL(gulp_blnd_check);
 E int FDECL(gazemu, (struct monst *,struct attack *));
 E void FDECL(mdamageu, (struct monst *,int));
 E int FDECL(could_seduce, (struct monst *,struct monst *,struct attack *));
-#ifdef SEDUCE
 E int FDECL(doseduce, (struct monst *));
-#endif

 /* ### minion.c ### */

@@ -1273,9 +1209,7 @@ E void FDECL(dealloc_obj, (struct obj *));
 E void FDECL(obj_ice_effects, (int, int, BOOLEAN_P));
 E long FDECL(peek_at_iced_corpse_age, (struct obj *));
 E int FDECL(hornoplenty, (struct obj *,BOOLEAN_P));
-#ifdef WIZARD
 E void NDECL(obj_sanity_check);
-#endif

 /* ### mkroom.c ### */

@@ -1412,11 +1346,9 @@ E boolean FDECL(accessible, (int,int));
 E void FDECL(set_apparxy, (struct monst *));
 E boolean FDECL(can_ooze, (struct monst *));
 E boolean FDECL(can_fog, (struct monst *));
-#ifdef BARGETHROUGH
 E boolean FDECL(should_displace, (struct monst *,coord *,long *,int,
 					XCHAR_P,XCHAR_P));
 E boolean FDECL(undesirable_disp, (struct monst *,XCHAR_P,XCHAR_P));
-#endif

 /* ### monst.c ### */

@@ -1631,16 +1563,13 @@ E void FDECL(set_duplicate_opt_detection, (int));
 E void FDECL(set_wc_option_mod_status, (unsigned long, int));
 E void FDECL(set_wc2_option_mod_status, (unsigned long, int));
 E void FDECL(set_option_mod_status, (const char *,int));
-#ifdef AUTOPICKUP_EXCEPTIONS
 E int FDECL(add_autopickup_exception, (const char *));
 E void NDECL(free_autopickup_exceptions);
-#endif /* AUTOPICKUP_EXCEPTIONS */
-#ifdef LOADSYMSETS
 E int FDECL(load_symset, (const char *,int));
 E void FDECL(parsesymbols, (char *));
 E struct symparse *FDECL(match_sym, (char *));
-#endif
 E void NDECL(set_playmode);
+E int FDECL(sym_val, (char *));

 /* ### pager.c ### */

@@ -1706,13 +1635,8 @@ E void NDECL(getlock);

 /* ### pickup.c ### */

-#ifdef GOLDOBJ
 E int FDECL(collect_obj_classes,
 	(char *,struct obj *,BOOLEAN_P,boolean FDECL((*),(OBJ_P)), int *));
-#else
-E int FDECL(collect_obj_classes,
-	(char *,struct obj *,BOOLEAN_P,BOOLEAN_P,boolean FDECL((*),(OBJ_P)), int *));
-#endif
 E boolean FDECL(rider_corpse_revival, (struct obj *,BOOLEAN_P));
 E void FDECL(add_valid_menu_class, (int));
 E boolean FDECL(allow_all, (struct obj *));
@@ -1736,9 +1660,7 @@ E boolean FDECL(container_gone, (int (*)(OBJ_P)));
 E int FDECL(use_container, (struct obj **,int));
 E int FDECL(loot_mon, (struct monst *,int *,boolean *));
 E int NDECL(dotip);
-#ifdef AUTOPICKUP_EXCEPTIONS
 E boolean FDECL(is_autopickup_exception, (struct obj *, BOOLEAN_P));
-#endif /* AUTOPICKUP_EXCEPTIONS */

 /* ### pline.c ### */

@@ -1909,9 +1831,7 @@ E void FDECL(do_genocide, (int));
 E void FDECL(punish, (struct obj *));
 E void NDECL(unpunish);
 E boolean FDECL(cant_revive, (int *,BOOLEAN_P,struct obj *));
-#ifdef WIZARD
 E boolean NDECL(create_particular);
-#endif

 /* ### rect.c ### */

@@ -1955,9 +1875,6 @@ E int FDECL(validate, (int,const char *));
 E void NDECL(reset_restpref);
 E void FDECL(set_restpref, (const char *));
 E void FDECL(set_savepref, (const char *));
-#ifndef GOLDOBJ
-E void FDECL(put_gold_back, (struct monst *));
-#endif

 /* ### rip.c ### */

@@ -2013,9 +1930,7 @@ E void FDECL(outoracle, (BOOLEAN_P, BOOLEAN_P));
 E void FDECL(save_oracles, (int,int));
 E void FDECL(restore_oracles, (int));
 E int FDECL(doconsult, (struct monst *));
-#ifdef WIZARD
 E void NDECL(rumor_check);
-#endif

 /* ### save.c ### */

@@ -2050,10 +1965,8 @@ E void FDECL(store_savefileinfo, (int));

 /* ### shk.c ### */

-#ifdef GOLDOBJ
 E long FDECL(money2mon, (struct monst *, long));
 E void FDECL(money2u, (struct monst *, long));
-#endif
 E void FDECL(shkgone, (struct monst *));
 E void FDECL(set_residency, (struct monst *,BOOLEAN_P));
 E void FDECL(replshk, (struct monst *,struct monst *));
@@ -2186,11 +2099,7 @@ E void FDECL(initialspell, (struct obj *));
 #ifdef USE_TRAMPOLI
 E int NDECL(stealarm);
 #endif
-#ifdef GOLDOBJ
 E long FDECL(somegold, (long));
-#else
-E long NDECL(somegold);
-#endif
 E void FDECL(stealgold, (struct monst *));
 E void FDECL(remove_worn_item, (struct obj *,BOOLEAN_P));
 E int FDECL(steal, (struct monst *, char *));
@@ -2200,13 +2109,10 @@ E void FDECL(maybe_absorb_item, (struct monst *,struct obj *,int,int));
 E void FDECL(mdrop_obj, (struct monst *,struct obj *,BOOLEAN_P));
 E void FDECL(mdrop_special_objs, (struct monst *));
 E void FDECL(relobj, (struct monst *,int,BOOLEAN_P));
-#ifdef GOLDOBJ
 E struct obj *FDECL(findgold, (struct obj *));
-#endif

 /* ### steed.c ### */

-#ifdef STEED
 E void NDECL(rider_cant_reach);
 E boolean FDECL(can_saddle, (struct monst *));
 E int FDECL(use_saddle, (struct obj *));
@@ -2218,7 +2124,6 @@ E void NDECL(kick_steed);
 E void FDECL(dismount_steed, (int));
 E void FDECL(place_monster, (struct monst *,int,int));
 E boolean FDECL(stucksteed, (BOOLEAN_P));
-#endif

 /* ### teleport.c ### */

@@ -2278,10 +2183,8 @@ E boolean FDECL(obj_is_local, (struct obj *));
 E void FDECL(save_timers, (int,int,int));
 E void FDECL(restore_timers, (int,int,BOOLEAN_P,long));
 E void FDECL(relink_timers, (BOOLEAN_P));
-#ifdef WIZARD
 E int NDECL(wiz_timeout_queue);
 E void NDECL(timer_sanity_check);
-#endif

 /* ### topten.c ### */

--- a/include/flag.h
+++ b/include/flag.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	flag.h	$Date$  $Revision$ */
+/* NetHack 3.5	flag.h	$NHDT-Date: 1425081976 2015/02/28 00:06:16 $  $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.60 $ */
+/* NetHack 3.5	flag.h	$Date: 2012/04/09 02:56:32 $  $Revision: 1.59 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

@@ -173,10 +174,8 @@ struct instance_flags {
 	coord	travelcc;	/* coordinates for travel_cache */
 	boolean  window_inited; /* true if init_nhwindows() completed */
 	boolean  vision_inited; /* true if vision is ready */
-#ifdef WIZARD
 	boolean  sanity_check;	/* run sanity checks */
 	boolean  mon_polycontrol;	/* debug: control monster polymorphs */
-#endif
 	/* stuff that is related to options and/or user or platform preferences */
 	unsigned msg_history;	/* hint: # of top lines to save */
 	int	 menu_headings;	/* ATR for menu headings */
@@ -199,8 +198,6 @@ struct instance_flags {
 	boolean  rlecomp;	/* run-length comp of levels when writing savefile */
 	uchar	 num_pad_mode;
 	boolean  echo;		/* 1 to echo characters */
-	boolean  unicodecapable;	/* unicode support is possible on platform */
-	boolean  unicodedisp;	/* unicode support is turned on */
 #if 0
 	boolean  DECgraphics;	/* use DEC VT-xxx extended character set */
 	boolean  IBMgraphics;	/* use IBM extended character set */
@@ -298,11 +295,9 @@ struct instance_flags {
 	boolean  cmdassist;	/* provide detailed assistance for some commands */
 	boolean	 clicklook;	/* allow right-clicking for look */
 	boolean	 obsolete;	/* obsolete options can point at this, it isn't used */
-#ifdef AUTOPICKUP_EXCEPTIONS
 	struct autopickup_exception *autopickup_exceptions[2];
 #define AP_LEAVE 0
 #define AP_GRAB	 1
-#endif
 #ifdef WIN32CON
 #define MAX_ALTKEYHANDLER 25
 	char	 altkeyhandler[MAX_ALTKEYHANDLER];
--- a/include/func_tab.h
+++ b/include/func_tab.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	func_tab.h	$Date$  $Revision$ */
+/* NetHack 3.5	func_tab.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	func_tab.h	$Date: 2009/05/06 10:44:44 $  $Revision: 1.4 $ */
 /*	SCCS Id: @(#)func_tab.h 3.5	1992/04/03	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/global.h
+++ b/include/global.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	global.h	$Date$  $Revision$ */
+/* NetHack 3.5	global.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	global.h	$Date: 2012/01/29 03:00:14 $  $Revision: 1.31 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

@@ -10,6 +11,8 @@

 #define BETA		/* development or beta testing [MRS] */

+#define DEBUG
+
 /*
 * Files expected to exist in the playground directory.
 */
@@ -62,41 +65,10 @@ typedef xchar	boolean;		/* 0 or 1 */
 #endif

 /*
- * UNICODE_SUPPORT
- * Unicode/wide character related support.
+ * type nhsym: loadable symbols go into this type
 */
-#ifdef UNICODE_SUPPORT
-# define UNICODE_DRAWING	/* store drawing symbols in wchar_t data type     */
-# define UNICODE_WIDEWINPORT	/* store and render wide chars in window port     */
-/*# define UNICODE_PLAYERTEXT*/	/* not implemented - player input in wide chars */
-#include <limits.h>
-#include <wchar.h>
-#else
-# undef UNICODE_DRAWING
-# undef UNICODE_WIDEWINPORT
-# undef UNICODE_PLAYERTEXT	
-#endif
-
-#if defined(UNICODE_DRAWING)
-typedef wchar_t nhsym;		/* nhsym is wide char */
-#else
 typedef uchar nhsym;
-#endif

-#if defined(UNICODE_WIDEWINPORT)
-typedef wchar_t nhwchar;	/* nhwchar (window port char) is wide char */
-#else
-typedef char nhwchar;
-#endif
-
-#if 0
-/* Not Implemented presently */
-#if defined(UNICODE_PLAYERTEXT)
-typedef wchar_t nhptext;	/* player input is wide char */
-#else
-typedef char nhptext;
-#endif
-#endif

 #ifndef STRNCMPI
 # ifndef __SASC_60		/* SAS/C already shifts to stricmp */
@@ -131,12 +103,6 @@ typedef char nhptext;
 */
 #define LARGEST_INT	32767

-
-#ifdef REDO
-#define Getchar pgetchar
-#endif
-
-
 #include "coord.h"
 /*
 * Automatic inclusions for the subsidiary files.
--- a/include/hack.h
+++ b/include/hack.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	hack.h	$Date$  $Revision$ */
+/* NetHack 3.5	hack.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	hack.h	$Date: 2009/05/06 10:44:46 $  $Revision: 1.49 $ */
 /*	SCCS Id: @(#)hack.h	3.5	2008/03/19	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -10,9 +11,31 @@
 #include "config.h"
 #endif

-/*	For debugging beta code.	*/
-#ifdef BETA
-#define Dpline	pline
+#ifdef DEBUG
+/* due to strstr(), mon.c matches makemon.c */
+# define showdebug() (sysopt.debugfiles &&			\
+	    ((sysopt.debugfiles[0] == '*') ||			\
+	     (strstr( __FILE__ , sysopt.debugfiles))))
+
+/* GCC understands this syntax */
+# ifdef __GNUC__
+/* ... but whines about it anyway without these pragmas. */
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wvariadic-macros"
+#  define debugpline(args...)                       \
+     do { if (showdebug()) pline( args ); } while(0);
+# pragma GCC diagnostic pop
+# endif
+
+/* and Visual Studio understands this one */
+# ifdef _MSC_VER
+#  define debugpline(...)                           \
+     do { if (showdebug()) pline(__VA_ARGS__); } while(0);
+# endif
+
+#else
+# define showdebug() (0)
+# define debugpline(...)
 #endif

 #define TELL		1
@@ -37,7 +60,6 @@
 #define BY_PAPER	2
 #define BY_OTHER	9

-#ifdef STEED
 /* Macros for why you are no longer riding */
 #define DISMOUNT_GENERIC	0
 #define DISMOUNT_FELL		1
@@ -46,7 +68,6 @@
 #define DISMOUNT_ENGULFED	4
 #define DISMOUNT_BONES		5
 #define DISMOUNT_BYCHOICE	6
-#endif

 /* Special returns from mapglyph() */
 #define MG_CORPSE	0x01
--- a/include/lev.h
+++ b/include/lev.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	lev.h	$Date$  $Revision$ */
+/* NetHack 3.5	lev.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	lev.h	$Date: 2009/05/06 10:44:48 $  $Revision: 1.7 $ */
 /*	SCCS Id: @(#)lev.h	3.5	2006/07/08	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/mac-carbon.h
+++ b/include/mac-carbon.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	mac-carbon.h	$Date$  $Revision$ */
+/* NetHack 3.5	mac-carbon.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	mac-carbon.h	$Date: 2009/05/06 10:44:49 $  $Revision: 1.4 $ */
 /*	SCCS Id: @(#)mac-carbon.h	3.5	2003/06/01	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 2003. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/mac-qt.h
+++ b/include/mac-qt.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	mac-qt.h	$Date$  $Revision$ */
+/* NetHack 3.5	mac-qt.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	mac-qt.h	$Date: 2009/05/06 10:44:50 $  $Revision: 1.4 $ */
 /*	SCCS Id: @(#)mac-qt.h	3.5	2003/06/01	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 2003. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/mac-term.h
+++ b/include/mac-term.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	mac-term.h	$Date$  $Revision$ */
+/* NetHack 3.5	mac-term.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	mac-term.h	$Date: 2009/05/06 10:44:50 $  $Revision: 1.5 $ */
 /*	SCCS Id: @(#)mac-term.h	3.5	2003/06/01	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 2003. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/macconf.h
+++ b/include/macconf.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	macconf.h	$Date$  $Revision$ */
+/* NetHack 3.5	macconf.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	macconf.h	$Date: 2009/05/06 10:44:51 $  $Revision: 1.8 $ */
 /*	SCCS Id: @(#)macconf.h	3.5	1999/10/25	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/macpopup.h
+++ b/include/macpopup.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	macpopup.h	$Date$  $Revision$ */
+/* NetHack 3.5	macpopup.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	macpopup.h	$Date: 2009/05/06 10:44:51 $  $Revision: 1.6 $ */
 /*	SCCS Id: @(#)macpopup.h	3.5	1999/10/25	*/
 /* Copyright (c) Nethack Develpment Team, 1999.		*/
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/mactty.h
+++ b/include/mactty.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	mactty.h	$Date$  $Revision$ */
+/* NetHack 3.5	mactty.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	mactty.h	$Date: 2009/05/06 10:44:51 $  $Revision: 1.6 $ */
 /*	SCCS Id: @(#)mactty.h	3.5	1993/03/01	*/
 /* Copyright (c) Jon W{tte 1993.					*/
 /* NetHack may be freely redistributed.  See license for details.	*/
--- a/include/macwin.h
+++ b/include/macwin.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	macwin.h	$Date$  $Revision$ */
+/* NetHack 3.5	macwin.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	macwin.h	$Date: 2009/05/06 10:44:52 $  $Revision: 1.5 $ */
 /*	SCCS Id: @(#)macwin.h	3.5	1996/01/15	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/mail.h
+++ b/include/mail.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	mail.h	$Date$  $Revision$ */
+/* NetHack 3.5	mail.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	mail.h	$Date: 2009/05/06 10:44:52 $  $Revision: 1.4 $ */
 /*	SCCS Id: @(#)mail.h	3.5	1991/10/11	*/
 /* NetHack may be freely redistributed.  See license for details. */

--- a/include/mextra.h
+++ b/include/mextra.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	mextra.h	$Date$  $Revision$ */
+/* NetHack 3.5	mextra.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	mextra.h	$Date: 2011/04/15 01:55:40 $  $Revision: 1.12 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

--- a/include/mfndpos.h
+++ b/include/mfndpos.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	mfndpos.h	$Date$  $Revision$ */
+/* NetHack 3.5	mfndpos.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	mfndpos.h	$Date: 2009/05/06 10:44:53 $  $Revision: 1.6 $ */
 /*	SCCS Id: @(#)mfndpos.h	3.5	2002/04/06	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -6,9 +7,7 @@
 #ifndef MFNDPOS_H
 #define MFNDPOS_H

-#ifdef BARGETHROUGH
 #define ALLOW_MDISP	0x00001000L	/* can displace a monster out of its way */
-#endif
 #define ALLOW_TRAPS	0x00020000L	/* can enter traps */
 #define ALLOW_U		0x00040000L	/* can attack you */
 #define ALLOW_M		0x00080000L	/* can attack other monsters */
--- a/include/micro.h
+++ b/include/micro.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	micro.h	$Date$  $Revision$ */
+/* NetHack 3.5	micro.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	micro.h	$Date: 2009/05/06 10:44:53 $  $Revision: 1.5 $ */
 /*	SCCS Id: @(#)micro.h	3.5	1990/02/22	*/
 /* micro.h - function declarations for various microcomputers */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/mkroom.h
+++ b/include/mkroom.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	mkroom.h	$Date$  $Revision$ */
+/* NetHack 3.5	mkroom.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	mkroom.h	$Date: 2012/02/15 01:55:31 $  $Revision: 1.8 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

--- a/include/monattk.h
+++ b/include/monattk.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	monattk.h	$Date$  $Revision$ */
+/* NetHack 3.5	monattk.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	monattk.h	$Date: 2009/05/06 10:44:54 $  $Revision: 1.5 $ */
 /*	SCCS Id: @(#)monattk.h	3.5	2002/03/24	*/
 /* NetHack may be freely redistributed.  See license for details. */
 /* Copyright 1988, M. Stephenson */
@@ -71,7 +72,6 @@
 #define AD_DISE		33	/* confers diseases */
 #define AD_DCAY		34	/* decays organics (brown Pudding) */
 #define AD_SSEX		35	/* Succubus seduction (extended) */
-				/* If no SEDUCE then same as AD_SEDU */
 #define AD_HALU		36	/* causes hallucination */
 #define AD_DETH		37	/* for Death only */
 #define AD_PEST		38	/* for Pestilence only */
--- a/include/mondata.h
+++ b/include/mondata.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	mondata.h	$Date$  $Revision$ */
+/* NetHack 3.5	mondata.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	mondata.h	$Date: 2009/05/06 10:44:54 $  $Revision: 1.18 $ */
 /*	SCCS Id: @(#)mondata.h	3.5	2007/04/27	*/
 /* Copyright (c) 1989 Mike Threepoint				  */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -130,9 +131,7 @@
 #define is_covetous(ptr)	((ptr->mflags3 & M3_COVETOUS))
 #define infravision(ptr)	((ptr->mflags3 & M3_INFRAVISION))
 #define infravisible(ptr)	((ptr->mflags3 & M3_INFRAVISIBLE))
-#ifdef BARGETHROUGH
 #define is_displacer(ptr)	(((ptr)->mflags3 & M3_DISPLACES) != 0L) 
-#endif
 #define is_mplayer(ptr)		(((ptr) >= &mons[PM_ARCHEOLOGIST]) && \
 				 ((ptr) <= &mons[PM_WIZARD]))
 #define is_rider(ptr)		((ptr) == &mons[PM_DEATH] || \
--- a/include/monflag.h
+++ b/include/monflag.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	monflag.h	$Date$  $Revision$ */
+/* NetHack 3.5	monflag.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	monflag.h	$Date: 2009/05/06 10:44:54 $  $Revision: 1.6 $ */
 /*	SCCS Id: @(#)monflag.h	3.5	1996/05/04	*/
 /* Copyright (c) 1989 Mike Threepoint				  */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -28,9 +29,7 @@
 #define MS_IMITATE	19	/* imitates others (leocrotta) */
 #define MS_ORC		MS_GRUNT	/* intelligent brutes */
 #define MS_HUMANOID	20	/* generic traveling companion */
-#ifdef KOPS
 #define MS_ARREST	21	/* "Stop in the name of the law!" (Kops) */
-#endif
 #define MS_SOLDIER	22	/* army and watchmen expressions */
 #define MS_GUARD	23	/* "Please drop that gold and follow me." */
 #define MS_DJINNI	24	/* "Thank you for freeing me!" */
@@ -162,7 +161,6 @@
 #define M3_INFRAVISION	0x0100		/* has infravision */
 #define M3_INFRAVISIBLE 0x0200		/* visible by infravision */

-/* define the bit even if BARGETHROUGH is not defined for savefile compat. */
 #define M3_DISPLACES	0x0400		/* moves monsters out of its way */

 #define MZ_TINY		0		/* < 2' */
--- a/include/monst.h
+++ b/include/monst.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	monst.h	$Date$  $Revision$ */
+/* NetHack 3.5	monst.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	monst.h	$Date: 2009/05/06 10:44:55 $  $Revision: 1.14 $ */
 /*	SCCS Id: @(#)monst.h	3.5	2006/09/06	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -134,9 +135,6 @@ struct monst {
 	long mtrapseen;		/* bitmap of traps we've been trapped in */
 	long mlstmv;		/* for catching up with lost time */
 	long mspare1;
-#ifndef GOLDOBJ
-#define mgold mspare1
-#endif
 	struct obj *minvent;

 	struct obj *mw;
--- a/include/monsym.h
+++ b/include/monsym.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	monsym.h	$Date$  $Revision$ */
+/* NetHack 3.5	monsym.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	monsym.h	$Date: 2009/05/06 10:44:55 $  $Revision: 1.5 $ */
 /*	SCCS Id: @(#)monsym.h	3.5	2007/04/07	*/
 /*	Monster symbols and creation information rev 1.0	  */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/mttypriv.h
+++ b/include/mttypriv.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	mttypriv.h	$Date$  $Revision$ */
+/* NetHack 3.5	mttypriv.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	mttypriv.h	$Date: 2009/05/06 10:44:55 $  $Revision: 1.5 $ */
 /*	SCCS Id: @(#)mttypriv.h 3.5	1993/03/01	*/
 /* Copyright (c) Jon W{tte 1993.					*/
 /* NetHack may be freely redistributed.  See license for details.	*/
--- a/include/ntconf.h
+++ b/include/ntconf.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	ntconf.h	$Date$  $Revision$ */
+/* NetHack 3.5	ntconf.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	ntconf.h	$Date: 2012/01/15 19:11:38 $  $Revision: 1.35 $ */
 /*	SCCS Id: @(#)ntconf.h	3.5	2002/03/10	*/
 /* Copyright (c) NetHack PC Development Team 1993, 1994.  */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -192,11 +193,6 @@ extern void NDECL(toggle_mouse_support);
 extern void FDECL(map_subkeyvalue, (char *));
 extern void NDECL(load_keyboard_handler);
 extern void NDECL(raw_clear_screen);
-# ifdef UNICODE_WIDEWINPORT
-extern void FDECL(xputc, (NHWCHAR_P));
-# else
-extern void FDECL(xputc, (int));
-# endif
 #endif

 #include <fcntl.h>
@@ -228,11 +224,6 @@ int  _RTLENTRY _EXPFUNC read  (int __handle, void _FAR *__buf, unsigned __len);
 #define ALLOCA_HACK	/* used in util/panic.c */
 #endif

-#ifndef REDO
-#undef	Getchar
-#define Getchar nhgetch
-#endif
-
 extern int FDECL(set_win32_option, (const char *, const char *));
 #ifdef WIN32CON
 #define LEFTBUTTON  FROM_LEFT_1ST_BUTTON_PRESSED
--- a/include/obj.h
+++ b/include/obj.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	obj.h	$Date$  $Revision$ */
+/* NetHack 3.5	obj.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	obj.h	$Date: 2012/01/10 17:47:16 $  $Revision: 1.31 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

@@ -93,11 +94,7 @@ struct obj {
 	Bitfield(recharged,3);	/* number of times it's been recharged */
 #define on_ice recharged	/* corpse on ice */
 	Bitfield(lamplit,1);	/* a light-source -- can be lit */
-#ifdef INVISIBLE_OBJECTS
-	Bitfield(oinvis,1);	/* invisible */
-#else
-	Bitfield(oreserved1,1);	
-#endif
+	Bitfield(oreserved1,1);	/* was the placeholder for invisible objects, free for use */
 	Bitfield(greased,1);	/* covered with grease */
 	Bitfield(nomerge,1);	/* set temporarily to prevent merging */
 	Bitfield(was_thrown,1);	/* thrown by hero since last picked up */
@@ -311,12 +308,8 @@ struct obj {
 				 (obj)->otyp == TOUCHSTONE)

 /* misc */
-#ifdef KOPS
 #define is_flimsy(otmp)		(objects[(otmp)->otyp].oc_material <= LEATHER || \
 				 (otmp)->otyp == RUBBER_HOSE)
-#else
-#define is_flimsy(otmp)		(objects[(otmp)->otyp].oc_material <= LEATHER)
-#endif

 /* helpers, simple enough to be macros */
 #define is_plural(o)	((o)->quan > 1 || \
--- a/include/objclass.h
+++ b/include/objclass.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	objclass.h	$Date$  $Revision$ */
+/* NetHack 3.5	objclass.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	objclass.h	$Date: 2009/05/06 10:44:58 $  $Revision: 1.9 $ */
 /*	SCCS Id: @(#)objclass.h 3.5	1996/06/16	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/os2conf.h
+++ b/include/os2conf.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	os2conf.h	$Date$  $Revision$ */
+/* NetHack 3.5	os2conf.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	os2conf.h	$Date: 2009/05/06 10:44:58 $  $Revision: 1.6 $ */
 /*	SCCS Id: @(#)os2conf.h	3.5	2007/01/08	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* Copyright (c) Timo Hakulinen, 1990, 1991, 1992, 1993, 1996. */
@@ -99,11 +100,6 @@
 #define sethanguphandler(foo) (void)signal(SIGHUP, (SIG_RET_TYPE)foo)
 #endif

-#ifndef REDO
-# undef	Getchar
-# define Getchar nhgetch
-#endif
-
 void hangup(int i);
 #endif /* OS2CONF_H */
 #endif /* OS2 */
--- a/include/patchlevel.h
+++ b/include/patchlevel.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	patchlevel.h	$Date$  $Revision$ */
+/* NetHack 3.5	patchlevel.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	patchlevel.h	$Date: 2012/04/14 08:31:03 $  $Revision: 1.93 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

--- a/include/pcconf.h
+++ b/include/pcconf.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	pcconf.h	$Date$  $Revision$ */
+/* NetHack 3.5	pcconf.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	pcconf.h	$Date: 2009/05/06 10:45:00 $  $Revision: 1.11 $ */
 /*	SCCS Id: @(#)pcconf.h	3.5	1995/10/11	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -248,11 +249,6 @@

 #include <fcntl.h>

-#ifndef REDO
-# undef Getchar
-# define Getchar nhgetch
-#endif
-
 #ifdef MSDOS
 # define TEXTCOLOR /* */
 # define PORT_HELP "msdoshlp.txt" /* msdos port specific help file */
--- a/include/permonst.h
+++ b/include/permonst.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	permonst.h	$Date$  $Revision$ */
+/* NetHack 3.5	permonst.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	permonst.h	$Date: 2009/05/06 10:45:00 $  $Revision: 1.5 $ */
 /*	SCCS Id: @(#)permonst.h 3.5	2006/01/04	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/prop.h
+++ b/include/prop.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	prop.h	$Date$  $Revision$ */
+/* NetHack 3.5	prop.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	prop.h	$Date: 2011/10/01 00:25:52 $  $Revision: 1.7 $ */
 /* Copyright (c) 1989 Mike Threepoint				  */
 /* NetHack may be freely redistributed.  See license for details. */

@@ -95,12 +96,8 @@ struct prop {
 #	define W_ARMS	    0x00000008L /* Shield */
 #	define W_ARMG	    0x00000010L /* Gloves/gauntlets */
 #	define W_ARMF	    0x00000020L /* Footwear */
-#ifdef TOURIST
 #	define W_ARMU	    0x00000040L /* Undershirt */
 #	define W_ARMOR	     (W_ARM | W_ARMC | W_ARMH | W_ARMS | W_ARMG | W_ARMF | W_ARMU)
-#else
-#	define W_ARMOR	     (W_ARM | W_ARMC | W_ARMH | W_ARMS | W_ARMG | W_ARMF)
-#endif
 	/* Weapons and artifacts */
 #	define W_WEP	    0x00000100L /* Wielded weapon */
 #	define W_QUIVER     0x00000200L /* Quiver for (f)iring ammo */
@@ -113,9 +110,7 @@ struct prop {
 #	define W_RINGR	    0x00040000L /* Right ring */
 #	define W_RING	    (W_RINGL | W_RINGR)
 #	define W_TOOL	    0x00080000L /* Eyewear */
-#ifdef STEED
 #	define W_SADDLE     0x00100000L	/* KMH -- For riding monsters */
-#endif
 #	define W_BALL	    0x00200000L /* Punishment ball */
 #	define W_CHAIN	    0x00400000L /* Punishment chain */

@@ -150,8 +145,6 @@ struct prop {
 #define WORN_BOOTS	W_ARMF
 #define WORN_AMUL	W_AMUL
 #define WORN_BLINDF	W_TOOL
-#ifdef TOURIST
 #define WORN_SHIRT	W_ARMU
-#endif

 #endif /* PROP_H */
--- a/include/qt_clust.h
+++ b/include/qt_clust.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	qt_clust.h	$Date$  $Revision$ */
+/* NetHack 3.5	qt_clust.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	qt_clust.h	$Date: 2009/05/06 10:45:01 $  $Revision: 1.4 $ */
 /*	SCCS Id: @(#)qt_clust.h	3.5	1999/11/19	*/
 /* Copyright (c) Warwick Allison, 1999. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/qt_kde0.h
+++ b/include/qt_kde0.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	qt_kde0.h	$Date$  $Revision$ */
+/* NetHack 3.5	qt_kde0.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	qt_kde0.h	$Date: 2009/05/06 10:45:01 $  $Revision: 1.4 $ */
 /*	SCCS Id: @(#)qt_kde0.h	3.5	1999/11/19	*/
 /* Copyright (c) Warwick Allison, 1999. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/qt_win.h
+++ b/include/qt_win.h
@@ -1,4 +1,5 @@
-// NetHack 3.5	qt_win.h	$Date$  $Revision$
+// NetHack 3.5	qt_win.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+// NetHack 3.5	qt_win.h	$Date: 2012/01/24 04:26:17 $  $Revision: 1.11 $
 // Copyright (c) Warwick Allison, 1999.
 // NetHack may be freely redistributed.  See license for details.
 //
--- a/Show More
+++ b/Show More