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/sys/mac/.gitattributes
+++ b/sys/mac/.gitattributes
@@ -0,0 +1 @@
+NHDeflts filter=NHtext merge=NHsubst
--- a/sys/mac/NHDeflts
+++ b/sys/mac/NHDeflts
@@ -1,4 +1,5 @@
-# NetHack 3.5	NHDeflts	$Date$  $Revision$
+# NetHack 3.5	NHDeflts	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	NHDeflts	$Date: 2009/05/06 10:49:09 $  $Revision: 1.4 $
 # SCCS Id: @(#)NetHack Defaults	3.5	2002/03/15
 # Copyright (c) 2002 by Dean Luick, Mark Modrall, and Kevin Hugo
 # NetHack may be freely redistributed.  See license for details.
--- a/sys/mac/dprintf.c
+++ b/sys/mac/dprintf.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	dprintf.c	$Date$  $Revision$ */
+/* NetHack 3.5	dprintf.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	dprintf.c	$Date: 2009/05/06 10:49:10 $  $Revision: 1.3 $ */
 /*	SCCS Id: @(#)dprintf.c	3.5	1994/01/29		  */
 /* Copyright (c) Jon W{tte, 1993.				  */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/mac/maccurs.c
+++ b/sys/mac/maccurs.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	maccurs.c	$Date$  $Revision$ */
+/* NetHack 3.5	maccurs.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	maccurs.c	$Date: 2009/05/06 10:49:10 $  $Revision: 1.5 $ */
 /*	SCCS Id: @(#)maccurs.c	3.5	1993/01/24		  */
 /* Copyright (c) Jon W{tte, 1992.				  */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/mac/macerrs.c
+++ b/sys/mac/macerrs.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	macerrs.c	$Date$  $Revision$ */
+/* NetHack 3.5	macerrs.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	macerrs.c	$Date: 2009/05/06 10:49:10 $  $Revision: 1.5 $ */
 /*	SCCS Id: @(#)macerrs.c	3.5	1993/01/24		  */
 /* Copyright (c) Michael Hamel, 1991 */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/mac/macfile.c
+++ b/sys/mac/macfile.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	macfile.c	$Date$  $Revision$ */
+/* NetHack 3.5	macfile.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	macfile.c	$Date: 2009/05/06 10:49:10 $  $Revision: 1.7 $ */
 /*	SCCS Id: @(#)macfile.c	3.5	1993/01/24		  */
 /* Copyright (c) Jon W{tte, Hao-Yang Wang, Jonathan Handler 1992. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/mac/macmain.c
+++ b/sys/mac/macmain.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	macmain.c	$Date$  $Revision$ */
+/* NetHack 3.5	macmain.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	macmain.c	$Date: 2009/05/06 10:49:11 $  $Revision: 1.15 $ */
 /*	SCCS Id: @(#)macmain.c	3.5	2008/01/30	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -283,12 +284,8 @@ finder_file_request(void)
 boolean
 authorize_wizard_mode()
 {
-#ifdef WIZARD
 	/* other ports validate user name or character name here */
 	return TRUE;
-#else
-	return FALSE;
-#endif
 }

 /*macmain.c*/
--- a/sys/mac/macmenu.c
+++ b/sys/mac/macmenu.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	macmenu.c	$Date$  $Revision$ */
+/* NetHack 3.5	macmenu.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	macmenu.c	$Date: 2009/05/06 10:49:13 $  $Revision: 1.7 $ */
 /*	SCCS Id: @(#)macmenu.c	3.5	1999/11/24	*/
 /*      Copyright (c) Macintosh NetHack Port Team, 1993.          */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -618,9 +619,7 @@ void mac_askname ()
 	    fatal("\pCannot create mode menu");
 	AppendMenu(askmenu[RSRC_ASK_MODE], "\pNormal");
 	AppendMenu(askmenu[RSRC_ASK_MODE], "\pExplore");
-#ifdef WIZARD
 	AppendMenu(askmenu[RSRC_ASK_MODE], "\pDebug");
-#endif
 	InsertMenu(askmenu[RSRC_ASK_MODE], hierMenu);
 	currmode = 0;

@@ -707,9 +706,7 @@ void mac_askname ()
 	    /* Adjust the mode popup menu */
 	    CheckMenuItem(askmenu[RSRC_ASK_MODE], 1, currmode == 0);
 	    CheckMenuItem(askmenu[RSRC_ASK_MODE], 2, currmode == 1);
-#ifdef WIZARD
 	    CheckMenuItem(askmenu[RSRC_ASK_MODE], 3, currmode == 2);
-#endif

 	    /* Wait for an action on an item */
 	    ModalDialog(filter, &item);
@@ -772,22 +769,17 @@ void mac_askname ()
 	DisposeUserItemUPP(redraw);

 	/* Process the mode */
-#ifdef WIZARD
-	wizard =
-#endif
-	discover = 0;
+	wizard = discover = 0;
 	switch (currmode) {
 	case 0:		/* Normal */
 	    break;
 	case 1:		/* Explore */
 	    discover = 1;
 	    break;
-#ifdef WIZARD
 	case 2:		/* Debug */
 	    wizard = 1;
-	    strcpy(plname, WIZARD);
+	    strcpy(plname, WIZARD_NAME);
 	    break;
-#endif
 	default:	/* Quit */
 	    ExitToShell();
 	}
@@ -934,7 +926,6 @@ AdjustMenus(short dimMenubar)

 	if (newMenubar != mbarRegular)
 		;							/* we've already found its state */
-#ifdef WIZARD
 	else if (wizard)
 	{
 		newMenubar = mbarSpecial;
@@ -946,7 +937,6 @@ AdjustMenus(short dimMenubar)
 			SetMenuItemText(MHND_FILE, menuFilePlayMode, "\pDebug");
 		}
 	}
-#endif

 	else if (discover)
 	{
--- a/sys/mac/macsnd.c
+++ b/sys/mac/macsnd.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	macsnd.c	$Date$  $Revision$ */
+/* NetHack 3.5	macsnd.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	macsnd.c	$Date: 2009/05/06 10:49:14 $  $Revision: 1.6 $ */
 /*	SCCS Id: @(#)macsnd.c	3.5	1992/11/28	*/
 /* 	Copyright (c) 1992 by Jon Watte */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/mac/mactopl.c
+++ b/sys/mac/mactopl.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	mactopl.c	$Date$  $Revision$ */
+/* NetHack 3.5	mactopl.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	mactopl.c	$Date: 2009/05/06 10:49:14 $  $Revision: 1.5 $ */
 /*	SCCS Id: @(#)mactopl.c	3.5	1991/07/23 */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/mac/mactty.c
+++ b/sys/mac/mactty.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	mactty.c	$Date$  $Revision$ */
+/* NetHack 3.5	mactty.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	mactty.c	$Date: 2009/05/06 10:49:14 $  $Revision: 1.5 $ */
 /*	SCCS Id: @(#)mactty.c	3.5	1993/03/01			*/
 /* Copyright (c) Jon W{tte 1993.					*/
 /* NetHack may be freely redistributed.  See license for details.	*/
--- a/sys/mac/macunix.c
+++ b/sys/mac/macunix.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	macunix.c	$Date$  $Revision$ */
+/* NetHack 3.5	macunix.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	macunix.c	$Date: 2009/05/06 10:49:16 $  $Revision: 1.6 $ */
 /*	SCCS Id: @(#)macunix.c	3.5	1994/11/07	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/mac/macwin.c
+++ b/sys/mac/macwin.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	macwin.c	$Date$  $Revision$ */
+/* NetHack 3.5	macwin.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	macwin.c	$Date: 2012/01/10 17:47:23 $  $Revision: 1.22 $ */
 /* Copyright (c) Jon W{tte, Hao-Yang Wang, Jonathan Handler 1992. */
 /* NetHack may be freely redistributed.  See license for details. */

--- a/sys/mac/mgetline.c
+++ b/sys/mac/mgetline.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	mgetline.c	$Date$  $Revision$ */
+/* NetHack 3.5	mgetline.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	mgetline.c	$Date: 2009/05/06 10:49:18 $  $Revision: 1.6 $ */
 /*	SCCS Id: @(#)getline.c	3.5	1990/22/02 */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/mac/mmodal.c
+++ b/sys/mac/mmodal.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	mmodal.c	$Date$  $Revision$ */
+/* NetHack 3.5	mmodal.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	mmodal.c	$Date: 2009/05/06 10:49:18 $  $Revision: 1.7 $ */
 /*	SCCS Id: @(#)mmodal.c	3.5	1993/01/24		  */
 /* Copyright (c) Jon W{tte, Hao-Yang Wang, Jonathan Handler 1992. */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/mac/mrecover.c
+++ b/sys/mac/mrecover.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	mrecover.c	$Date$  $Revision$ */
+/* NetHack 3.5	mrecover.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	mrecover.c	$Date: 2009/05/06 10:49:19 $  $Revision: 1.4 $ */
 /*	SCCS Id: @(#)mrecover.c	3.5		1996/07/24	  */
 /*      Copyright (c) David Hairston, 1993.                       */
 /* NetHack may be freely redistributed.  See license for details. */
--- a/sys/mac/mttymain.c
+++ b/sys/mac/mttymain.c
@@ -1,4 +1,5 @@
-/* NetHack 3.5	mttymain.c	$Date$  $Revision$ */
+/* NetHack 3.5	mttymain.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	mttymain.c	$Date: 2009/05/06 10:49:20 $  $Revision: 1.8 $ */
 /*	SCCS Id: @(#)mttymain.c	3.5	1993/02/26			*/
 /* Copyright (c) Jon W{tte, 1993					*/
 /* NetHack may be freely redistributed.  See license for details.	*/