pull in the recent unconditionals merge from master

win/gem/Install.gem

@@ -1,3 +1,6 @@
+$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+$Date: 2005/01/02 17:20:12 $  $Revision: 1.4 $
+
 Hi,
 
 This is nethack3.5.0 for Atari Gem and tty

win/gem/bitmfile.c

@@ -7,6 +7,10 @@
 * Bieber, Dez. 1994					 *
 * -> Programmcode						 *
 \****************************/
+/*
+ * $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+ * $Date: 2002/01/05 21:06:00 $  $Revision: 1.1 $
+ */
 
 #include <errno.h>
 #include <stdlib.h>

win/gem/gr_rect.c

@@ -1,4 +1,5 @@
-/* NetHack 3.5	gr_rect.c	$Date$  $Revision$ */
+/* NetHack 3.5	gr_rect.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	gr_rect.c	$Date: 2009/05/06 10:56:40 $  $Revision: 1.3 $ */
 /*	SCCS Id: @(#)gr_rect.c	3.5	2001/12/10				*/
 /* Copyright (c) Christian Bressler, 2001					*/
 /* NetHack may be freely redistributed.  See license for details. */

win/gem/gr_rect.h

@@ -1,4 +1,8 @@
 /* gr_rect.h */
+/*
+ * $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+ * $Date: 2002/03/20 03:50:49 $  $Revision: 1.1 $
+ */
 #include <e_gem.h>
 /********** structs **********/
 typedef struct {

win/gem/load_img.c

@@ -1,3 +1,7 @@
+/*
+ * $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+ * $Date: 2002/03/20 03:45:03 $  $Revision: 1.2 $
+ */
 #define __TCC_COMPAT__
 #include <stdio.h>
 #include <string.h>

win/gem/tile2img.c

@@ -1,4 +1,5 @@
-/* NetHack 3.5	tile2img.c	$Date$  $Revision$ */
+/* NetHack 3.5	tile2img.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	tile2img.c	$Date: 2009/05/06 10:56:40 $  $Revision: 1.2 $ */
 /*	SCCS Id: @(#)tile2bmp.c	3.2	95/09/06	*/
 /*   Copyright (c) NetHack PC Development Team 1995                 */
 /*   NetHack may be freely redistributed.  See license for details. */

win/gem/wingem.c

@@ -1,4 +1,5 @@
-/* NetHack 3.5	wingem.c	$Date$  $Revision$ */
+/* NetHack 3.5	wingem.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	wingem.c	$Date: 2012/01/24 04:26:29 $  $Revision: 1.16 $ */
 /* Copyright (c) Christian Bressler, 1999					*/
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -910,9 +911,7 @@ int x, y;
 
 void mar_print_gl_char(winid,xchar,xchar,int);
 
-#ifdef REINCARNATION
 extern int mar_set_rogue(int);
-#endif
 
 extern void mar_add_pet_sign(winid,int,int);
 
@@ -925,9 +924,7 @@ Gem_print_glyph(window, x, y, glyph)
     /* Move the cursor. */
     Gem_curs(window, x,y);
 
-# ifdef REINCARNATION
-		mar_set_rogue(Is_rogue_level(&u.uz) ? TRUE : FALSE);
-# endif
+	mar_set_rogue(Is_rogue_level(&u.uz) ? TRUE : FALSE);
 
 	x--;	/* MAR -- because x ranges from 1 to COLNO */
 	if(mar_set_tile_mode(-1)){
@@ -959,9 +956,7 @@ void mar_print_gl_char(window, x, y, glyph)
 
 #ifdef TEXTCOLOR
     /* Turn off color if rogue level. */
-# ifdef REINCARNATION
     if (Is_rogue_level(&u.uz)) color = NO_COLOR;
-# endif
 #endif /* TEXTCOLOR */
 
 	mar_print_char(window,x,y,ch,color);
@@ -1093,11 +1088,7 @@ time_t when;
 	Sprintf(rip_line[NAME_LINE], "%s", plname);
 	/* Put $ on stone */
 	Sprintf(rip_line[GOLD_LINE], "%ld Au",
-#ifndef GOLDOBJ
-		u.ugold);
-#else
 		done_money);
-#endif
 	/* Put together death description */
 	formatkiller(buf, sizeof buf, how);
 

win/gem/wingem1.c

@@ -1,4 +1,5 @@
-/* NetHack 3.5	wingem1.c	$Date$  $Revision$ */
+/* NetHack 3.5	wingem1.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	wingem1.c	$Date: 2009/05/06 10:56:42 $  $Revision: 1.8 $ */
 /*	SCCS Id: @(#)wingem1.c	3.5	1999/12/10	*/
 /* Copyright (c) Christian Bressler 1999 	  */
 /* NetHack may be freely redistributed.  See license for details. */

win/gem/xpm2img.c

@@ -1,4 +1,5 @@
-/* NetHack 3.5	xpm2img.c	$Date$  $Revision$ */
+/* NetHack 3.5	xpm2img.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	xpm2img.c	$Date: 2009/05/06 10:56:48 $  $Revision: 1.3 $ */
 /*	SCCS Id: @(#)xpm2img.c	3.5	2002/03/17	*/
 /*   Copyright (c) Christian Bressler 2002                 */
 /*   NetHack may be freely redistributed.  See license for details. */