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/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/include/qtext.h
+++ b/include/qtext.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	qtext.h	$Date$  $Revision$ */
+/* NetHack 3.5	qtext.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	qtext.h	$Date: 2009/05/06 10:45:02 $  $Revision: 1.7 $ */
 /*	SCCS Id: @(#)qtext.h	3.5	1997/02/02	*/
 /* Copyright (c) Mike Stephenson 1991.				  */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/qttableview.h
+++ b/include/qttableview.h
@@ -1,5 +1,6 @@
 /**********************************************************************
-** $Id$
+** $NHDT-Branch$:$NHDT-Revision$ $NHDT-Date$
+** $Id: qttableview.h,v 1.2 2002/03/09 03:13:13 jwalz Exp $
 **
 ** Definition of QtTableView class
 **
--- a/include/quest.h
+++ b/include/quest.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	quest.h	$Date$  $Revision$ */
+/* NetHack 3.5	quest.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	quest.h	$Date: 2009/05/06 10:45:03 $  $Revision: 1.6 $ */
 /*	SCCS Id: @(#)quest.h	3.5	1992/11/15	*/
 /* Copyright (c) Mike Stephenson 1991.				  */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/rect.h
+++ b/include/rect.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	rect.h	$Date$  $Revision$ */
+/* NetHack 3.5	rect.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	rect.h	$Date: 2009/05/06 10:45:03 $  $Revision: 1.4 $ */
 /*	SCCS Id: @(#)rect.h	3.5	1990/02/22	*/
 /* Copyright (c) 1990 by Jean-Christophe Collet			  */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/region.h
+++ b/include/region.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	region.h	$Date$  $Revision$ */
+/* NetHack 3.5	region.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	region.h	$Date: 2009/05/06 10:45:04 $  $Revision: 1.9 $ */
 /*	SCCS Id: @(#)region.h	3.5	2006/06/27	*/
 /* Copyright (c) 1996 by Jean-Christophe Collet			  */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/rm.h
+++ b/include/rm.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	rm.h	$Date$  $Revision$ */
+/* NetHack 3.5	rm.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	rm.h	$Date: 2012/02/16 23:06:00 $  $Revision: 1.23 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

@@ -226,13 +227,6 @@ struct symdef {
 #endif
 };

-/*
- * Graphics sets for display symbols
- */
-#define PRIMARY		0	/* primary graphics         */
-#define ROGUESET	1	/* rogue graphics           */
-#define NUM_GRAPHICS	2
-
 struct symparse {
 	unsigned range;
 #define SYM_CONTROL	1	/* start/finish markers */
@@ -259,30 +253,33 @@ struct symsetentry {
 	Bitfield(nocolor,1);	     /* don't use color if set               */
 	Bitfield(primary,1);	     /* restricted for use as primary set    */
 	Bitfield(rogue,1);	     /* restricted for use as rogue lev set  */
-	Bitfield(unicode,1);	     /* restricted for use as a unicode set  */
 	/* 5 free bits */
 };

+/*
+ * Graphics sets for display symbols
+ */
+#define DEFAULT_GRAPHICS 0	/* regular characters: '-', '+', &c */
+#define PRIMARY		0	/* primary graphics set        */
+#define ROGUESET	1	/* rogue graphics set          */
+#define NUM_GRAPHICS	2
+
 /*
 * special symbol set handling types ( for invoking callbacks, etc.)
 * Must match the order of the known_handlers strings
 * in drawing.c
 */
-#define H_UNK		0
-#define H_IBM		1
-#define H_DEC		2
+#define H_UNK	0
+#define H_IBM	1
+#define H_DEC	2

 extern const struct symdef defsyms[MAXPCHARS];	/* defaults */
 extern const struct symdef def_warnsyms[WARNCOUNT];
 extern int currentgraphics;				  /* from drawing.c */
 extern nhsym showsyms[];

-#ifdef LOADSYMSETS
 extern struct symsetentry symset[NUM_GRAPHICS];		  /* from drawing.c */
 #define SYMHANDLING(ht) (symset[currentgraphics].handling == (ht))
-#else
-#define SYMHANDLING(ht) ((ht) == H_UNK)
-#endif

 /*
 * The 5 possible states of doors
@@ -505,11 +502,9 @@ struct cemetery {
 	char how[100 + 1]; /* [DTHSZ+1] */
 	/* date+time in string of digits rather than binary */
 	char when[4+2+2 + 2+2+2 + 1]; /* "YYYYMMDDhhmmss\0" */
-#ifdef DUNGEON_OVERVIEW
 	/* final resting place spot */
 	schar frpx, frpy;
 	boolean bonesknown;
-#endif
 };

 struct levelflags {
@@ -563,9 +558,7 @@ typedef struct
 }
 dlevel_t;

-#ifdef DUNGEON_OVERVIEW
 extern schar lastseentyp[COLNO][ROWNO];	/* last seen/touched dungeon typ */
-#endif /* DUNGEON_OVERVIEW */

 extern dlevel_t level;	/* structure describing the current level */

@@ -592,10 +585,6 @@ extern dlevel_t level;	/* structure describing the current level */
 			 !(level.monsters[x][y])->mburied)
 #define MON_BURIED_AT(x,y)	(level.monsters[x][y] != (struct monst *)0 && \
 				(level.monsters[x][y])->mburied)
-#ifndef STEED
-#define place_monster(m,x,y)	((m)->mx=(x),(m)->my=(y),\
-				 level.monsters[(m)->mx][(m)->my]=(m))
-#endif
 #define place_worm_seg(m,x,y)	level.monsters[x][y] = m
 #define remove_monster(x,y)	level.monsters[x][y] = (struct monst *)0
 #define m_at(x,y)		(MON_AT(x,y) ? level.monsters[x][y] : \
--- a/include/skills.h
+++ b/include/skills.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	skills.h	$Date$  $Revision$ */
+/* NetHack 3.5	skills.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	skills.h	$Date: 2009/05/06 10:45:05 $  $Revision: 1.5 $ */
 /*	SCCS Id: @(#)skills.h	3.5	2006/12/14	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985-1999. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -67,12 +68,8 @@
 #define P_BARE_HANDED_COMBAT	36  /* actually weaponless; gloves are ok */
 #define P_MARTIAL_ARTS		P_BARE_HANDED_COMBAT	/* Role distinguishes */
 #define P_TWO_WEAPON_COMBAT	37	/* Finally implemented */
-#ifdef STEED
 #define P_RIDING		38	/* How well you control your steed */
 #define P_LAST_H_TO_H		P_RIDING
-#else
-#define P_LAST_H_TO_H		P_TWO_WEAPON_COMBAT
-#endif
 #define P_FIRST_H_TO_H		P_BARE_HANDED_COMBAT

 #define P_NUM_SKILLS		(P_LAST_H_TO_H+1)
--- a/include/sp_lev.h
+++ b/include/sp_lev.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	sp_lev.h	$Date$  $Revision$ */
+/* NetHack 3.5	sp_lev.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	sp_lev.h	$Date: 2009/05/06 10:45:06 $  $Revision: 1.5 $ */
 /*	SCCS Id: @(#)sp_lev.h	3.5	2007/08/01	*/
 /* Copyright (c) 1989 by Jean-Christophe Collet			  */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/spell.h
+++ b/include/spell.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	spell.h	$Date$  $Revision$ */
+/* NetHack 3.5	spell.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	spell.h	$Date: 2009/05/06 10:45:09 $  $Revision: 1.5 $ */
 /*	SCCS Id: @(#)spell.h	3.5	2006/02/11	*/
 /* Copyright 1986, M. Stephenson				  */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/sys.h
+++ b/include/sys.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	sys.h	$Date$  $Revision$ */
+/* NetHack 3.5	sys.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	sys.h	$Date: 2012/01/27 20:15:26 $  $Revision: 1.9 $ */
 /* Copyright (c) Kenneth Lorber, Kensington, Maryland, 2008. */
 /* NetHack may be freely redistributed.  See license for details. */

@@ -14,6 +15,7 @@ struct sysopt {
 	char *recover;	/* how to run recover - may be overridden by win port */
 	char *wizards;
 	char *shellers;	/* like wizards, for ! command (-DSHELL) */
+	char *debugfiles; /* files to show debugplines in. '*' is all. */
 	int   maxplayers;
 		/* record file */
 	int persmax;
@@ -33,11 +35,7 @@ struct sysopt {
 };
 E struct sysopt sysopt;

-#ifdef SEDUCE
-# define SYSOPT_SEDUCE sysopt.seduce
-#else
-# define SYSOPT_SEDUCE 0
-#endif
+#define SYSOPT_SEDUCE sysopt.seduce

 #endif /* SYS_H */

--- a/include/system.h
+++ b/include/system.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	system.h	$Date$  $Revision$ */
+/* NetHack 3.5	system.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	system.h	$Date: 2009/05/06 10:45:10 $  $Revision: 1.7 $ */
 /*	SCCS Id: @(#)system.h	3.5	2003/11/30	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/tcap.h
+++ b/include/tcap.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	tcap.h	$Date$  $Revision$ */
+/* NetHack 3.5	tcap.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	tcap.h	$Date: 2009/05/06 10:45:11 $  $Revision: 1.6 $ */
 /*	SCCS Id: @(#)tcap.h	3.5	1992/10/21	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1989. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/tile2x11.h
+++ b/include/tile2x11.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	tile2x11.h	$Date$  $Revision$ */
+/* NetHack 3.5	tile2x11.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	tile2x11.h	$Date: 2009/05/06 10:45:11 $  $Revision: 1.5 $ */
 /*	SCCS Id: @(#)tile2x11.h 3.5	1995/01/25	*/
 /* NetHack may be freely redistributed.  See license for details. */

--- a/include/timeout.h
+++ b/include/timeout.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	timeout.h	$Date$  $Revision$ */
+/* NetHack 3.5	timeout.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	timeout.h	$Date: 2009/05/06 10:45:12 $  $Revision: 1.6 $ */
 /*	SCCS Id: @(#)timeout.h	3.5	1999/02/13	*/
 /* Copyright 1994, Dean Luick					  */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/tosconf.h
+++ b/include/tosconf.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	tosconf.h	$Date$  $Revision$ */
+/* NetHack 3.5	tosconf.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	tosconf.h	$Date: 2009/05/06 10:45:12 $  $Revision: 1.3 $ */
 /*	SCCS Id: @(#)tosconf.h	3.5	1990/02/22	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/tradstdc.h
+++ b/include/tradstdc.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	tradstdc.h	$Date$  $Revision$ */
+/* NetHack 3.5	tradstdc.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	tradstdc.h	$Date: 2012/01/11 18:23:26 $  $Revision: 1.15 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

@@ -256,7 +257,6 @@ typedef genericptr genericptr_t;	/* (void *) or (char *) */
 #  define BOOLEAN_P boolean
 # endif
 # define ALIGNTYP_P aligntyp
-# define NHWCHAR_P nhwchar
 #else
 # ifdef WIDENED_PROTOTYPES
 #  define CHAR_P int
@@ -266,14 +266,6 @@ typedef genericptr genericptr_t;	/* (void *) or (char *) */
 #  define SHORT_P int
 #  define BOOLEAN_P int
 #  define ALIGNTYP_P int
-#  if defined(UNICODE_WIDEWINPORT) && defined(WCHAR_MAX)
-#   if WCHAR_MAX >= INT_MAX
-#    define NHWCHAR_P nhwchar
-#   endif
-#  endif
-#  ifndef NHWCHAR_P
-#   define NHWCHAR_P int
-#  endif
 # else
   /* Neither widened nor unwidened prototypes.  Argument list expansion
    * by FDECL/VDECL always empty; all xxx_P vanish so defs aren't needed. */
--- a/include/trampoli.h
+++ b/include/trampoli.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	trampoli.h	$Date$  $Revision$ */
+/* NetHack 3.5	trampoli.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	trampoli.h	$Date: 2009/05/06 10:45:13 $  $Revision: 1.4 $ */
 /*	SCCS Id: @(#)trampoli.h 3.5	1995/06/01	*/
 /* Copyright (c) 1989, by Norm Meluch and Stephen Spackman	  */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -27,7 +28,6 @@
 #define doprev_message() doprev_message_()
 #define timed_occupation() timed_occupation_()
 #define wiz_attributes()   wiz_attributes_()
-#ifdef WIZARD
 #define wiz_detect()	   wiz_detect_()
 #define wiz_genesis()	   wiz_genesis_()
 #define wiz_identify()	   wiz_identify_()
@@ -35,7 +35,6 @@
 #define wiz_map()	   wiz_map_()
 #define wiz_where()	   wiz_where_()
 #define wiz_wish()	   wiz_wish_()
-#endif

 /* ### display.c ### */
 #define doredraw() doredraw_()
--- a/include/trap.h
+++ b/include/trap.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	trap.h	$Date$  $Revision$ */
+/* NetHack 3.5	trap.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	trap.h	$Date: 2009/05/06 10:45:14 $  $Revision: 1.7 $ */
 /*	SCCS Id: @(#)trap.h	3.5	2000/08/30	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/unixconf.h
+++ b/include/unixconf.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	unixconf.h	$Date$  $Revision$ */
+/* NetHack 3.5	unixconf.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	unixconf.h	$Date: 2011/04/19 02:02:06 $  $Revision: 1.15 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

@@ -280,9 +281,6 @@

 #define HLOCK	"perm"	/* an empty file used for locking purposes */

-#ifndef REDO
-#define Getchar nhgetch
-#endif
 #define tgetch getchar

 #ifndef NOSHELL
--- a/include/vision.h
+++ b/include/vision.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	vision.h	$Date$  $Revision$ */
+/* NetHack 3.5	vision.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	vision.h	$Date: 2009/05/06 10:45:15 $  $Revision: 1.5 $ */
 /*	SCCS Id: @(#)vision.h	3.5	2007/05/11	*/
 /* Copyright (c) Dean Luick, with acknowledgements to Dave Cohrs, 1990. */
 /* NetHack may be freely redistributed.  See license for details.	*/
--- a/include/vmsconf.h
+++ b/include/vmsconf.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	vmsconf.h	$Date$  $Revision$ */
+/* NetHack 3.5	vmsconf.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	vmsconf.h	$Date: 2011/09/01 01:46:55 $  $Revision: 1.14 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

@@ -29,20 +30,11 @@
 #ifdef HACKDIR
 # undef HACKDIR
 #endif
-#ifdef WIZARD
-# undef WIZARD
-#endif
 #ifdef WIZARD_NAME
 # undef WIZARD_NAME
 #endif
 #define HACKDIR Local_HACKDIR
-#ifndef KR1ED
-# define WIZARD Local_WIZARD
-# define WIZARD_NAME WIZARD
-#else
-# define WIZARD 1
-# define WIZARD_NAME Local_WIZARD
-#endif
+#define WIZARD_NAME Local_WIZARD
 #ifndef SYSCF
 # define SYSCF
 #endif
@@ -242,9 +234,6 @@ typedef __mode_t mode_t;
 # define O_TRUNC 0x400
 #endif

-#ifndef REDO
-# define Getchar nhgetch
-#endif
 #define tgetch vms_getchar

 #include "system.h"
--- a/include/wceconf.h
+++ b/include/wceconf.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	wceconf.h	$Date$  $Revision$ */
+/* NetHack 3.5	wceconf.h	$NHDT-Date: 1425081976 2015/02/28 00:06:16 $  $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.12 $ */
+/* NetHack 3.5	wceconf.h	$Date: 2009/10/22 02:59:14 $  $Revision: 1.12 $ */
 /* Copyright (C) 2001 by Alex Kompel 	 */
 /* NetHack may be freely redistributed.  See license for details. */

@@ -43,8 +44,6 @@

 #define USER_SOUNDS

-#define AUTOPICKUP_EXCEPTIONS
-
 /*
 * -----------------------------------------------------------------
 *  The remaining code shouldn't need modification.
@@ -186,11 +185,6 @@ extern void NDECL(toggle_mouse_support);
 #define ALLOCA_HACK	/* used in util/panic.c */
 #endif

-#ifndef REDO
-#undef	Getchar
-#define Getchar nhgetch
-#endif
-
 #ifdef _MSC_VER
 #if 0
 #pragma warning(disable:4018)	/* signed/unsigned mismatch */
--- a/include/winGnome.h
+++ b/include/winGnome.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	winGnome.h	$Date$  $Revision$ */
+/* NetHack 3.5	winGnome.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	winGnome.h	$Date: 2009/05/06 10:45:16 $  $Revision: 1.4 $ */
 /*	SCCS Id: @(#)winGnome.h	3.4.	2000/07/16	*/
 /* Copyright (C) 1998 by Erik Andersen <andersee@debian.org> */
 /* Copyright (C) 1998 by Anthony Taylor <tonyt@ptialaska.net> */
--- a/include/winX.h
+++ b/include/winX.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	winX.h	$Date$  $Revision$ */
+/* NetHack 3.5	winX.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	winX.h	$Date: 2012/01/24 04:26:18 $  $Revision: 1.9 $ */
 /* Copyright (c) Dean Luick, 1992				  */
 /* NetHack may be freely redistributed.  See license for details. */

--- a/include/winami.h
+++ b/include/winami.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	winami.h	$Date$  $Revision$ */
+/* NetHack 3.5	winami.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	winami.h	$Date: 2009/05/06 10:45:17 $  $Revision: 1.4 $ */
 /*	SCCS Id: @(#)winami.h	3.5	1993/01/17	*/
 /* Copyright (c) Kenneth Lorber, Bethesda, Maryland, 1991. */
 /* Copyright (c) Gregg Wonderly, Naperville, Illinois, 1992, 1993. */
--- a/include/wingem.h
+++ b/include/wingem.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	wingem.h	$Date$  $Revision$ */
+/* NetHack 3.5	wingem.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	wingem.h	$Date: 2012/01/24 04:26:18 $  $Revision: 1.7 $ */
 /* Copyright (c) Christian Bressler, 1999				  */
 /* NetHack may be freely redistributed.  See license for details. */

--- a/include/winprocs.h
+++ b/include/winprocs.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	winprocs.h	$Date$  $Revision$ */
+/* NetHack 3.5	winprocs.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	winprocs.h	$Date: 2012/01/23 10:45:26 $  $Revision: 1.29 $ */
 /* Copyright (c) David Cohrs, 1992				  */
 /* NetHack may be freely redistributed.  See license for details. */

--- a/include/wintty.h
+++ b/include/wintty.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	wintty.h	$Date$  $Revision$ */
+/* NetHack 3.5	wintty.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	wintty.h	$Date: 2012/01/23 10:45:26 $  $Revision: 1.12 $ */
 /* Copyright (c) David Cohrs, 1991,1992				  */
 /* NetHack may be freely redistributed.  See license for details. */

@@ -34,8 +35,8 @@ struct WinDesc {
 				/* maxcol is also used by WIN_MESSAGE for */
 				/* tracking the ^P command */
    short *datlen;		/* allocation size for *data */
-    nhwchar **data;		/* window data [row][column] */
-    nhwchar *morestr;		/* string to display instead of default */
+    char **data;		/* window data [row][column] */
+    char *morestr;		/* string to display instead of default */
    tty_menu_item *mlist;	/* menu information (MENU) */
    tty_menu_item **plist;	/* menu page pointers (MENU) */
    short plist_size;		/* size of allocated plist (MENU) */
@@ -87,7 +88,7 @@ extern struct WinDesc *wins[MAXWIN];
 extern struct DisplayDesc *ttyDisplay;	/* the tty display descriptor */

 extern char morc;		/* last character typed to xwaitforspace */
-extern nhwchar defmorestr[];	/* default --more-- prompt */
+extern char defmorestr[];	/* default --more-- prompt */

 /* port specific external function references */

@@ -108,9 +109,7 @@ E void NDECL(tty_shutdown);
 * actually would be expanded.	So here, we have to make an exception. */
 E void FDECL(xputc, (int));
 #else
-# ifndef WIN32CON
 E void FDECL(xputc, (CHAR_P));
-# endif
 #endif
 E void FDECL(xputs, (const char *));
 #if defined(SCREEN_VGA) || defined(SCREEN_8514)
@@ -153,10 +152,10 @@ E int FDECL(has_color,(int color));

 /* ### topl.c ### */

-E void FDECL(addtopl, (const nhwchar *));
+E void FDECL(addtopl, (const char *));
 E void NDECL(more);
-E void FDECL(update_topl, (const nhwchar *));
-E void FDECL(putsyms, (const nhwchar *));
+E void FDECL(update_topl, (const char *));
+E void FDECL(putsyms, (const char*));

 /* ### wintty.c ### */
 #ifdef CLIPPING
@@ -166,9 +165,6 @@ E void FDECL(docorner, (int, int));
 E void NDECL(end_glyphout);
 E void FDECL(g_putch, (int));
 E void FDECL(win_tty_init, (int));
-#ifdef UNICODE_WIDEWINPORT
-E void FDECL(u_putch, (nhwchar));
-#endif

 /* external declarations */
 E void FDECL(tty_init_nhwindows, (int *, char **));
--- a/include/wintype.h
+++ b/include/wintype.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	wintype.h	$Date$  $Revision$ */
+/* NetHack 3.5	wintype.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	wintype.h	$Date: 2009/05/06 10:45:19 $  $Revision: 1.10 $ */
 /*	SCCS Id: @(#)wintype.h	3.5	2006/07/08	*/
 /* Copyright (c) David Cohrs, 1991				  */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/xwindow.h
+++ b/include/xwindow.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	xwindow.h	$Date$  $Revision$ */
+/* NetHack 3.5	xwindow.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	xwindow.h	$Date: 2009/05/06 10:45:19 $  $Revision: 1.4 $ */
 /*	SCCS Id: @(#)xwindow.h	3.5	1992/03/07	*/
 /* Copyright (c) Dean Luick, 1992				  */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/xwindowp.h
+++ b/include/xwindowp.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	xwindowp.h	$Date$  $Revision$ */
+/* NetHack 3.5	xwindowp.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	xwindowp.h	$Date: 2009/05/06 10:45:19 $  $Revision: 1.4 $ */
 /*	SCCS Id: @(#)xwindowp.h 3.5	1992/03/07	*/
 /* Copyright (c) Dean Luick, 1992				  */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/include/you.h
+++ b/include/you.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	you.h	$Date$  $Revision$ */
+/* NetHack 3.5	you.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	you.h	$Date: 2012/04/14 08:31:03 $  $Revision: 1.13 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */

@@ -46,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 */
@@ -340,20 +339,14 @@ struct you {
 	int ublessed, ublesscnt;	/* blessing/duration from #pray */
 	long	umoney0;
 	long	uspare1;
-#ifndef GOLDOBJ
-#define ugold uspare1
-#define ugold0 umoney0
-#endif
 	long	uexp, urexp;
 	long	ucleansed;	/* to record moves when player was cleansed */
 	long	usleep;		/* sleeping; monstermove you last started */
 	int uinvault;
 	struct monst *ustuck;
-#ifdef STEED
 	struct monst *usteed;
 	long ugallop;
 	int urideturns;
-#endif
 	int	umortality;		/* how many times you died */
 	int ugrave_arise; /* you die and become something aside from a ghost */
 	int	weapon_slots;		/* unused skill slots */
--- a/include/youprop.h
+++ b/include/youprop.h
@@ -1,4 +1,5 @@
-/* NetHack 3.5	youprop.h	$Date$  $Revision$ */
+/* NetHack 3.5	youprop.h	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	youprop.h	$Date: 2011/10/15 03:00:42 $  $Revision: 1.13 $ */
 /* Copyright (c) 1989 Mike Threepoint				  */
 /* NetHack may be freely redistributed.  See license for details. */

@@ -228,13 +229,9 @@
 #define HFlying			u.uprops[FLYING].intrinsic
 #define EFlying			u.uprops[FLYING].extrinsic
 #define BFlying			u.uprops[FLYING].blocked
-#ifdef STEED
 # define Flying			((HFlying || EFlying || \
 				  (u.usteed && is_flyer(u.usteed->data))) && \
 				 !BFlying)
-#else
-# define Flying			((HFlying || EFlying) && !BFlying)
-#endif
 	/* May touch surface; does not override any others */

 #define Wwalking		(u.uprops[WWALKING].extrinsic && \
@@ -244,12 +241,8 @@

 #define HSwimming		u.uprops[SWIMMING].intrinsic
 #define ESwimming		u.uprops[SWIMMING].extrinsic	/* [Tom] */
-#ifdef STEED
 # define Swimming		(HSwimming || ESwimming || \
 				 (u.usteed && is_swimmer(u.usteed->data)))
-#else
-# define Swimming		(HSwimming || ESwimming)
-#endif
 	/* Get wet, don't go under water unless if amphibious */

 #define HMagical_breathing	u.uprops[MAGICAL_BREATHING].intrinsic