Fix:	SE011

Problem:
	The conditional tile remapping which supports the various options
	in config.h has not been maintained for some time. This has meant
	that attempting to change any of these options caused the tiles
	to get all confused. This produced warning messages during
	compilation and the wrong tiles to be displayed during play.

Compatible with:
	Slash'EM 0.0.5E4

Author: J. Ali Harlow, ali@avrc.city.ac.uk

Date:	2 Sep 1999

*** win/share/tilemap.c.orig	Wed Aug 18 16:14:48 1999
--- win/share/tilemap.c	Thu Sep  2 18:52:08 1999
***************
*** 39,48 ****
  	{ MON_GLYPH, PM_BLINKING_EYE, "beholder" },
  
  #ifndef KOPS
! 	{ MON_GLYPH, PM_JABBERWOCK, "Keystone Kop" },
! 	{ MON_GLYPH, PM_JABBERWOCK, "Kop Sergeant" },
! 	{ MON_GLYPH, PM_JABBERWOCK, "Kop Lieutenant" },
! 	{ MON_GLYPH, PM_JABBERWOCK, "Kop Kaptain" },
  #endif
  
  #ifndef BLACKMARKET
--- 39,48 ----
  	{ MON_GLYPH, PM_BLINKING_EYE, "beholder" },
  
  #ifndef KOPS
! 	{ MON_GLYPH, PM_VORPAL_JABBERWOCK, "Keystone Kop" },
! 	{ MON_GLYPH, PM_VORPAL_JABBERWOCK, "Kop Sergeant" },
! 	{ MON_GLYPH, PM_VORPAL_JABBERWOCK, "Kop Lieutenant" },
! 	{ MON_GLYPH, PM_VORPAL_JABBERWOCK, "Kop Kaptain" },
  #endif
  
  #ifndef BLACKMARKET
***************
*** 67,95 ****
  	{ MON_GLYPH, PM_ROSHI, "guide" },
  #endif
  
  #ifndef KOPS
! 	{ OBJ_GLYPH, CLUB, "rubber hose" },
  #endif
  #ifndef TOURIST
! 	{ OBJ_GLYPH, LEATHER_JACKET, "Hawaiian shirt" },
! 	{ OBJ_GLYPH, LEATHER_JACKET, "T-shirt" },
  	{ OBJ_GLYPH, LOCK_PICK, "credit card" },
! 	{ OBJ_GLYPH, MAGIC_LAMP, "expensive camera" },
  #endif
! # ifndef D_SABER
!         { OBJ_GLYPH, DIMSABER, "dimsaber" },
! # endif /* D_SABER */
! # ifndef WALLET_O_P
!         { OBJ_GLYPH, SILVER_WALLET, "silver wallet" },
! # endif /* WALLET_O_P */
! # ifndef P_SPOON
!         { OBJ_GLYPH, SPOON, "spoon" },
! # endif /* P_SPOON */
  	/* allow slime mold to look like slice of pizza, since we
  	 * don't know what a slime mold should look like when renamed anyway
  	 */
  #ifndef MAIL
! 	{ OBJ_GLYPH, SCR_CHARGING+6, "mail" },
  #endif
  	{ 0, 0, 0}
  };
--- 67,127 ----
  	{ MON_GLYPH, PM_ROSHI, "guide" },
  #endif
  
+ #ifndef YEOMAN
+ 	{ MON_GLYPH, PM_VALKYRIE, "yeoman" },
+ 	{ MON_GLYPH, PM_LOLTH, "Chief Yeoman Warder" },
+ 	{ MON_GLYPH, PM_DARK_ONE, "Colonel Blood" },
+ 	{ MON_GLYPH, PM_APPRENTICE, "Yeoman Warder" },
+ #endif
+ 
+ #ifndef DWARF
+ 	{ MON_GLYPH, PM_MASTER_SHIFTER, "Thorin" },
+ 	{ MON_GLYPH, PM_TRANSMUTER, "Smaug" },
+ 	{ MON_GLYPH, PM_SHIFTER*, "dwarf warrior" },
+ #endif
+ 
+ #ifndef FIREARMS
+ 	{ OBJ_GLYPH, SLING, "pistol" },
+ 	{ OBJ_GLYPH, SLING, "submachine gun" },
+ 	{ OBJ_GLYPH, SLING, "rifle" },
+ 	{ OBJ_GLYPH, SLING, "shotgun" },
+ 	{ OBJ_GLYPH, SLING, "bullet" },
+ 	{ OBJ_GLYPH, SLING, "silver bullet" },
+ 	{ OBJ_GLYPH, SLING, "shotgun shell" },
+ #endif
+ 
  #ifndef KOPS
! 	{ OBJ_GLYPH, BULLWHIP, "rubber hose" },
  #endif
+ 
  #ifndef TOURIST
! #ifdef KOPS
! 	{ OBJ_GLYPH, RUBBER_HOSE, "Hawaiian shirt" },
! 	{ OBJ_GLYPH, RUBBER_HOSE, "T-shirt" },
! #else
! 	{ OBJ_GLYPH, BULLWHIP, "Hawaiian shirt" },
! 	{ OBJ_GLYPH, BULLWHIP, "T-shirt" },
! #endif
  	{ OBJ_GLYPH, LOCK_PICK, "credit card" },
! 	{ OBJ_GLYPH, RED_DOUBLE_LIGHTSABER, "expensive camera" },
  #endif
! 
! #ifndef D_SABER
! 	{ OBJ_GLYPH, GREEN_LIGHTSABER, "blue lightsaber" },
! #endif
! 
! #ifndef YEOMAN
! 	{ OBJ_GLYPH, TOWEL, "saddle" },
! #endif
! 
! #ifndef P_SPOON
! 	{ OBJ_GLYPH, BEARTRAP, "spoon" },
! #endif
  	/* allow slime mold to look like slice of pizza, since we
  	 * don't know what a slime mold should look like when renamed anyway
  	 */
  #ifndef MAIL
! 	{ OBJ_GLYPH, SCR_PUNISHMENT+5, "mail" },
  #endif
  	{ 0, 0, 0}
  };