pull in the recent unconditionals merge from master

sys/share/pcmain.c

@@ -1,4 +1,5 @@
-/* NetHack 3.5	pcmain.c	$Date$  $Revision$ */
+/* NetHack 3.5	pcmain.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	pcmain.c	$Date: 2012/01/20 03:41:31 $  $Revision: 1.48 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -302,19 +303,15 @@ char *argv[];
 	process_options(argc, argv);
 #endif
 
-#ifdef LOADSYMSETS
-# if defined(MSDOS) || defined(WIN32)
+#if defined(MSDOS) || defined(WIN32)
 	/* Player didn't specify any symbol set so use IBM defaults */
 	if (!symset[PRIMARY].name) {
 		load_symset("IBMGraphics_2", PRIMARY);
 	}
-#  ifdef REINCARNATION
 	if (!symset[ROGUESET].name) {
 		load_symset("RogueEpyx", ROGUESET);
 	}
-#  endif
-# endif
-#endif /*LOADSYMSETS*/
+#endif
 
 #ifdef MSDOS
 	init_nhwindows(&argc,argv);
@@ -537,20 +534,16 @@ char *argv[];
 		case 'I':
 		case 'i':
 			if (!strncmpi(argv[0]+1, "IBM", 3)) {
-# ifdef LOADSYMSETS
 				load_symset("IBMGraphics", PRIMARY);
 				load_symset("RogueIBM", ROGUESET);
 				switch_symbols(TRUE);
-# endif
 			}
 			break;
 	    /*	case 'D': */
 		case 'd':
 			if (!strncmpi(argv[0]+1, "DEC", 3)) {
-# ifdef LOADSYMSETS
 				load_symset("DECGraphics", PRIMARY);
 				switch_symbols(TRUE);
-# endif
 			}
 			break;
 #endif
@@ -703,21 +696,11 @@ port_help()
 # endif /* MSDOS || WIN32 */
 #endif /* PORT_HELP */
 
-/* for KR1ED config, WIZARD is 0 or 1 and WIZARD_NAME is a string;
-   for usual config, WIZARD is the string; forcing WIZARD_NAME to match it
-   eliminates conditional testing for which one to use in string ops */
-#ifndef KR1ED
-# undef WIZARD_NAME
-# define WIZARD_NAME WIZARD
-#endif
-
 /* validate wizard mode if player has requested access to it */
 boolean
 authorize_wizard_mode()
 {
-#ifdef WIZARD
 	if (!strcmp(plname, WIZARD_NAME)) return TRUE;
-#endif
 	return FALSE;
 }