diff --git a/code/Am_map.c b/code/Am_map.c
index 2c4aea2201..7808a527cc 100644
--- a/code/Am_map.c
+++ b/code/Am_map.c
@@ -29,6 +29,7 @@
 #include "doomdef.h"
 #include "st_stuff.h"
 #include "p_local.h"
+#include "p_lnspec.h"
 #include "w_wad.h"
 
 #include "m_cheat.h"
@@ -55,7 +56,8 @@ static int Background, YourColor, WallColor, TSWallColor,
 		   FDWallColor, CDWallColor, ThingColor,
 		   SecretWallColor, GridColor, XHairColor,
 		   NotSeenColor,
-		   Key1Color, Key2Color, Key3Color;
+		   LockedColor,
+		   AlmostBackground;
 
 cvar_t	*am_backcolor,
 		*am_yourcolor,
@@ -67,12 +69,7 @@ cvar_t	*am_backcolor,
 		*am_gridcolor,
 		*am_xhaircolor,
 		*am_notseencolor,
-		*am_key1color,
-		*am_key2color,
-		*am_key3color,
-		*am_key4color,
-		*am_key5color,
-		*am_key6color,
+		*am_lockedcolor,
 		*am_usecustomcolors,
 		*am_ovyourcolor,
 		*am_ovwallcolor,
@@ -499,9 +496,7 @@ void AM_initColors (BOOL overlayed)
 		ThingColor = V_GetColorFromString (palette, am_ovthingcolor->string);
 		FDWallColor =
 			CDWallColor =
-			Key1Color =
-			Key2Color =
-			Key3Color = V_GetColorFromString (palette, am_ovotherwallscolor->string);
+			LockedColor = V_GetColorFromString (palette, am_ovotherwallscolor->string);
 		NotSeenColor =
 			TSWallColor = V_GetColorFromString (palette, am_ovunseencolor->string);
 	} else if (am_usecustomcolors->value) {
@@ -517,24 +512,39 @@ void AM_initColors (BOOL overlayed)
 		GridColor = V_GetColorFromString (palette, am_gridcolor->string);
 		XHairColor = V_GetColorFromString (palette, am_xhaircolor->string);
 		NotSeenColor = V_GetColorFromString (palette, am_notseencolor->string);
-		Key1Color = V_GetColorFromString (palette, am_key1color->string);
-		Key2Color = V_GetColorFromString (palette, am_key2color->string);
-		Key3Color = V_GetColorFromString (palette, am_key3color->string);
+		LockedColor = V_GetColorFromString (palette, am_lockedcolor->string);
+		{
+			unsigned int ba = V_GetColorFromString (NULL, am_backcolor->string);
+			int r = RPART(ba) - 16;
+			int g = GPART(ba) - 16;
+			int b = BPART(ba) - 16;
+			if (r < 0)
+				r += 32;
+			if (g < 0)
+				g += 32;
+			if (b < 0)
+				b += 32;
+
+			if (screens[0].is8bit)
+				AlmostBackground = BestColor (DefaultPalette->basecolors, r, g , b, DefaultPalette->numcolors);
+			else
+				AlmostBackground = MAKERGB(r,g,b);
+		}
+
 	} else {
 		/* Use colors corresponding to the original Doom's */
-		Background = V_GetColorFromString (palette, "0000 0000 0000");
+		Background = V_GetColorFromString (palette, "00 00 00");
+		AlmostBackground = V_GetColorFromString (palette, "10 10 10");
 		SecretWallColor =
-			WallColor = V_GetColorFromString (palette, "fcfc 0000 0000");
-		TSWallColor = V_GetColorFromString (palette, "8080 8080 8080");
-		FDWallColor = V_GetColorFromString (palette, "bcbc 7878 4848");
-		Key1Color =
-			Key2Color =
-			Key3Color =
-			CDWallColor = V_GetColorFromString (palette, "fcfc fcfc 0000");
-		ThingColor = V_GetColorFromString (palette, "7474 fcfc 6c6c");
-		GridColor = V_GetColorFromString (palette, "4c4c 4c4c 4c4c");
-		XHairColor = V_GetColorFromString (palette, "8080 8080 8080");
-		NotSeenColor = V_GetColorFromString (palette, "6c6c 6c6c 6c6c");
+			WallColor = V_GetColorFromString (palette, "fc 00 00");
+		TSWallColor = V_GetColorFromString (palette, "80 80 80");
+		FDWallColor = V_GetColorFromString (palette, "bc 78 48");
+		LockedColor =
+			CDWallColor = V_GetColorFromString (palette, "fc fc 00");
+		ThingColor = V_GetColorFromString (palette, "74 fc 6c");
+		GridColor = V_GetColorFromString (palette, "4c 4c 4c");
+		XHairColor = V_GetColorFromString (palette, "80 80 80");
+		NotSeenColor = V_GetColorFromString (palette, "6c 6c 6c");
 	}
 }
 
@@ -546,9 +556,9 @@ void AM_loadPics(void)
 	int i;
 	char namebuf[9];
   
-	for (i=0;i<10;i++) {
+	for (i = 0; i < 10; i++) {
 		sprintf(namebuf, "AMMNUM%d", i);
-		marknums[i] = W_CacheLumpName(namebuf, PU_STATIC);
+		marknums[i] = W_CacheLumpName (namebuf, PU_STATIC);
 	}
 }
 
@@ -556,8 +566,8 @@ void AM_unloadPics(void)
 {
 	int i;
   
-	for (i=0;i<10;i++)
-		Z_ChangeTag(marknums[i], PU_CACHE);
+	for (i = 0; i < 10; i++)
+		Z_ChangeTag (marknums[i], PU_CACHE);
 }
 
 void AM_clearMarks(void)
@@ -596,7 +606,7 @@ void AM_Stop (void)
 {
 	static event_t st_notify = { 0, ev_keyup, AM_MSGEXITED };
 
-	AM_unloadPics();
+	AM_unloadPics ();
 	automapactive = false;
 	ST_Responder(&st_notify);
 	stopped = true;
@@ -663,7 +673,7 @@ void Cmd_Togglemap (void *plyr, int argc, char **argv)
 //
 // Handle events (user inputs) in automap mode
 //
-BOOL AM_Responder( event_t*	ev )
+BOOL AM_Responder (event_t *ev)
 {
 	int rc;
 	static int cheatstate=0;
@@ -736,7 +746,7 @@ BOOL AM_Responder( event_t*	ev )
 				}
 		}
 		if (!deathmatch->value && cht_CheckCheat(&cheat_amap, (char)ev->data2)) {
-			rc = false;
+			rc = true;	// [RH] Eat last keypress of cheat sequence
 			cheating = (cheating+1) % 3;
 		}
 	}
@@ -773,7 +783,7 @@ BOOL AM_Responder( event_t*	ev )
 //
 // Zooming
 //
-void AM_changeWindowScale(void)
+void AM_changeWindowScale (void)
 {
 	// Change the scaling multipliers
 	scale_mtof = FixedMul(scale_mtof, mtof_zoommul);
@@ -999,7 +1009,7 @@ AM_drawFline
     static fuck = 0;
 
     // For debugging only
-    if (      fl->a.x < 0 || fl->a.x >= f_w
+    if (  fl->a.x < 0 || fl->a.x >= f_w
 	   || fl->a.y < 0 || fl->a.y >= f_h
 	   || fl->b.x < 0 || fl->b.x >= f_w
 	   || fl->b.y < 0 || fl->b.y >= f_h)
@@ -1087,17 +1097,14 @@ AM_drawFline
 
 
 //
-// Clip lines, draw visible part sof lines.
+// Clip lines, draw visible parts of lines.
 //
-void
-AM_drawMline
-( mline_t*	ml,
-  int		color )
+void AM_drawMline (mline_t *ml, int color)
 {
 	static fline_t fl;
 
-	if (AM_clipMline(ml, &fl))
-		AM_drawFline(&fl, color); // draws it on frame buffer using fb coords
+	if (AM_clipMline (ml, &fl))
+		AM_drawFline (&fl, color); // draws it on frame buffer using fb coords
 }
 
 
@@ -1185,21 +1192,9 @@ void AM_drawWalls(void)
 						AM_drawMline(&l, SecretWallColor);
 				    else
 						AM_drawMline(&l, WallColor);
-				} else if (lines[i].special == 26 ||
-						   lines[i].special == 32 ||
-						   lines[i].special == 133 ||
-						   lines[i].special == 99) {
-					AM_drawMline (&l, Key1Color);  // blue key doors
-				} else if (lines[i].special == 28 ||
-						   lines[i].special == 33 ||
-						   lines[i].special == 135 ||
-						   lines[i].special == 13) {
-					AM_drawMline (&l, Key2Color);  // red key doors
-				} else if (lines[i].special == 27 ||
-						   lines[i].special == 34 ||
-						   lines[i].special == 137 ||
-						   lines[i].special == 136) {
-				   AM_drawMline (&l, Key3Color); // yellow key doors
+				} else if (lines[i].special == Door_LockedRaise ||
+						   lines[i].special == ACS_LockedExecute) {
+					AM_drawMline (&l, LockedColor);  // [RH] locked special
 				} else if (lines[i].backsector->floorheight
 					!= lines[i].frontsector->floorheight) {
 					AM_drawMline(&l, FDWallColor); // floor level change
@@ -1329,15 +1324,15 @@ void AM_drawPlayers(void)
 			continue;
 
 		if (p->powers[pw_invisibility])
-			color = 246; // *close* to black
+			color = AlmostBackground;
 		else if (screens[0].is8bit)
 			color = BestColor (DefaultPalette->basecolors,
-							   RPART(p->userinfo->color),
-							   GPART(p->userinfo->color),
-							   BPART(p->userinfo->color),
+							   RPART(p->userinfo.color),
+							   GPART(p->userinfo.color),
+							   BPART(p->userinfo.color),
 							   DefaultPalette->numcolors);
 		else
-			color = p->userinfo->color;
+			color = p->userinfo.color;
 				
 		pt.x = p->mo->x;
 		pt.y = p->mo->y;
diff --git a/code/AM_MAP.H b/code/Am_map.h
similarity index 98%
rename from code/AM_MAP.H
rename to code/Am_map.h
index 4352acb3ff..8cce9d16c5 100644
--- a/code/AM_MAP.H
+++ b/code/Am_map.h
@@ -22,6 +22,8 @@
 #ifndef __AMMAP_H__
 #define __AMMAP_H__
 
+#include "d_event.h"
+
 // Used by ST StatusBar stuff.
 #define AM_MSGHEADER (('a'<<24)+('m'<<16))
 #define AM_MSGENTERED (AM_MSGHEADER | ('e'<<8))
diff --git a/code/c_cmds.c b/code/C_cmds.c
similarity index 83%
rename from code/c_cmds.c
rename to code/C_cmds.c
index 733fe4dd3f..40b979b394 100644
--- a/code/c_cmds.c
+++ b/code/C_cmds.c
@@ -3,6 +3,7 @@
 #include <stdio.h>
 #include <time.h>
 
+#include "version.h"
 #include "c_consol.h"
 #include "c_cmds.h"
 #include "c_dispch.h"
@@ -11,23 +12,32 @@
 
 #include "doomstat.h"
 #include "d_englsh.h"
-#include "sounds.h"
 #include "s_sound.h"
 #include "g_game.h"
 #include "d_items.h"
 #include "p_inter.h"
 #include "z_zone.h"
 #include "w_wad.h"
+#include "g_level.h"
 
 extern FILE *Logfile;
 
 cvar_t *sv_cheats;
 
 struct CmdDispatcher CmdList[] = {
+	{ "error",					Cmd_Error },
+	{ "endgame",				Cmd_Endgame },
+	{ "mem",					Cmd_Mem },
+	{ "pings",					Cmd_Pings },
+	{ "skins",					Cmd_Skins },
+	{ "turn180",				Cmd_Turn180 },
+	{ "puke",					Cmd_Puke },
 	{ "spynext",				Cmd_SpyNext },
 	{ "spyprev",				Cmd_SpyPrev },
 	{ "messagemode",			Cmd_MessageMode },
 	{ "say",					Cmd_Say },
+	{ "messagemode2",			Cmd_MessageMode2 },
+	{ "say_team",				Cmd_Say_Team },
 	{ "limits",					Cmd_Limits },
 	{ "screenshot",				Cmd_Screenshot },
 	{ "vid_setmode",			Cmd_Vid_SetMode },
@@ -42,10 +52,14 @@ struct CmdDispatcher CmdList[] = {
 	{ "sizedown",				Cmd_Sizedown },
 	{ "sizeup",					Cmd_Sizeup },
 	{ "impulse",				Cmd_Impulse },
+	{ "weapnext",				Cmd_WeapNext },
+	{ "weapprev",				Cmd_WeapPrev },
 	{ "alias",					Cmd_Alias },
 	{ "cmdlist",				Cmd_Cmdlist },
 	{ "unbind",					Cmd_Unbind },
 	{ "unbindall",				Cmd_Unbindall },
+	{ "undoublebind",			Cmd_UnDoubleBind },
+	{ "doublebind",				Cmd_DoubleBind },
 	{ "bind",					Cmd_Bind },
 	{ "binddefaults",			Cmd_BindDefaults },
 	{ "dumpheap",				Cmd_DumpHeap },
@@ -69,7 +83,7 @@ struct CmdDispatcher CmdList[] = {
 	{ "logfile",				Cmd_Logfile },
 	{ "noclip",					Cmd_Noclip },
 	{ "notarget",				Cmd_Notarget },
-	{ "quit",					I_Quit },
+	{ "quit",					Cmd_Quit },
 	{ "set",					Cmd_Set },
 	{ "menu_main",				Cmd_Menu_Main },
 	{ "menu_load",				Cmd_Menu_Load },
@@ -89,6 +103,8 @@ struct CmdDispatcher CmdList[] = {
 	{ "bumpgamma",				Cmd_Bumpgamma },
 	{ "togglemessages",			Cmd_ToggleMessages },
 	{ "stop",					Cmd_Stop },
+	{ "soundlist",				Cmd_Soundlist },
+	{ "soundlinks",				Cmd_Soundlinks },
 	{ NULL }
 };
 
@@ -107,6 +123,11 @@ BOOL CheckCheatmode (void)
 	}
 }
 
+void Cmd_Quit (player_t *plyr, int argc, char **argv)
+{
+	exit (0);
+}
+
 void Cmd_ChangeMus (player_t *plyr, int argc, char **argv)
 {
 	if (argc > 1) {
@@ -341,23 +362,50 @@ void Cmd_Logfile (player_t *plyr, int argc, char **argv)
 void Cmd_Limits (player_t *plyr, int argc, char **argv)
 {
 	extern int MaxDeathmatchStarts;
-	extern int MaxPlats;
-	extern int MaxCeilings;
 	extern int MaxSpecialCross;
 	extern int MaxDrawSegs;
 	extern int MaxSegs;
-	extern int MaxVisPlanes;
 	extern int MaxVisSprites;
 	extern int maxopenings;
 
 	Printf_Bold ("Note that the following values are\n"
 				 "dynamic and will increase as needed.\n\n");
-	Printf ("MaxCeilings: %u\n", MaxCeilings);
 	Printf ("MaxDeathmatchStarts: %u\n", MaxDeathmatchStarts);
 	Printf ("MaxDrawSegs: %u\n", MaxDrawSegs);
-	Printf ("MaxPlats: %u\n", MaxPlats);
 	Printf ("MaxSegs: %u\n", MaxSegs);
 	Printf ("MaxSpecialCross: %u\n", MaxSpecialCross);
-	Printf ("MaxVisPlanes: %u\n", MaxVisPlanes);
 	Printf ("MaxVisSprites: %u\n", MaxVisSprites);
-}
\ No newline at end of file
+	Printf ("MaxOpeninings: %u\n", maxopenings);
+}
+
+BOOL P_StartScript (void *who, void *where, int script, char *map, int lineSide,
+					int arg0, int arg1, int arg2, int always);
+void Cmd_Puke (player_t *plyr, int argc, char **argv)
+{
+	if (argc < 2 || argc > 5) {
+		Printf (" puke <script> [arg1] [arg2] [arg3]\n");
+	} else {
+		int script = atoi (argv[1]);
+		int arg0=0, arg1=0, arg2=0;
+
+		if (argc > 2) {
+			arg0 = atoi (argv[2]);
+			if (argc > 3) {
+				arg1 = atoi (argv[3]);
+				if (argc > 4) {
+					arg2 = atoi (argv[4]);
+				}
+			}
+		}
+		P_StartScript (plyr->mo, NULL, script, level.mapname, 0, arg0, arg1, arg2, false);
+	}
+}
+
+void Cmd_Error (player_t *plyr, int argc, char **argv)
+{
+	char *text = BuildString (argc - 1, argv + 1);
+	char *textcopy = Z_Malloc (strlen (text) + 1, PU_LEVEL, 0);
+	strcpy (textcopy, text);
+	free (text);
+	I_Error (textcopy);
+}
diff --git a/code/C_cvars.c b/code/C_cvars.c
index 9b9ff7bc7d..b7740815f5 100644
--- a/code/C_cvars.c
+++ b/code/C_cvars.c
@@ -55,12 +55,10 @@ void UnlatchCVars (void)
 
 void SetCVar (cvar_t *var, char *value)
 {
-	// TODO: Find a better way to not send serverinfo updates
-	//		 when not inside a game.
-	if (var->flags & CVAR_LATCH) {
+	if (var->flags & CVAR_LATCH && gamestate != GS_FULLCONSOLE && gamestate != GS_STARTUP) {
 		var->modified = true;
 		var->u.latched_string = copystring (value);
-	} else if (var->flags & CVAR_SERVERINFO && gamestate > -1) {
+	} else if (var->flags & CVAR_SERVERINFO && gamestate != GS_STARTUP) {
 		if (netgame && consoleplayer != 0) {
 			Printf ("Only player 1 can change %s\n", var->name);
 			return;
@@ -85,6 +83,8 @@ void SetCVarFloat (cvar_t *var, float value)
 	SetCVar (var, string);
 }
 
+int cvar_defflags;
+
 cvar_t *cvar (char *var_name, char *value, int flags)
 {
 	cvar_t *var, *dummy;
@@ -104,7 +104,7 @@ cvar_t *cvar (char *var_name, char *value, int flags)
 		CVars = var;
 		C_AddTabCommand (var_name);
 	}
-	var->flags = flags;
+	var->flags = flags | cvar_defflags;;
 	return var;
 }
 
diff --git a/code/Cmdlib.c b/code/Cmdlib.c
index 0f97de6002..e34d2b3863 100644
--- a/code/Cmdlib.c
+++ b/code/Cmdlib.c
@@ -29,18 +29,7 @@ gamedir will hold progdir + the game directory (id1, id2, etc)
 
   */
 
-char		progdir[1024];
-
-void SetProgDir (void)
-{
-#ifdef _WIN32
-    GetModuleFileName (NULL, progdir, 1024);
-    *(strrchr (progdir, '\\') + 1) = 0;
-	FixPathSeperator (progdir);
-#else
-	Printf ("SetProgDir: Rewrite this\n");
-#endif
-}
+char progdir[1024];
 
 void FixPathSeperator (char *path)
 {
@@ -215,9 +204,27 @@ void DefaultExtension (char *path, char *extension)
 Extract file parts
 ====================
 */
+// FIXME: should include the slash, otherwise
+// backing to an empty path will be wrong when appending a slash
+void ExtractFilePath (char *path, char *dest)
+{
+	char *src;
+
+	src = path + strlen(path) - 1;
+
+//
+// back up until a \ or the start
+//
+	while (src != path && *(src-1) != '\\' && *(src-1) != '/')
+		src--;
+
+	memcpy (dest, path, src-path);
+	dest[src-path] = 0;
+}
+
 void ExtractFileBase (char *path, char *dest)
 {
-	char    *src;
+	char *src;
 
 	src = path + strlen(path) - 1;
 
@@ -242,8 +249,8 @@ ParseNum / ParseHex
 */
 int ParseHex (char *hex)
 {
-	char    *str;
-	int    num;
+	char *str;
+	int num;
 
 	num = 0;
 	str = hex;
@@ -285,7 +292,7 @@ BOOL IsNum (char *str)
 	BOOL result = true;
 
 	while (*str) {
-		if ((*str < '0') || (*str > '9')) {
+		if (((*str < '0') || (*str > '9')) && (*str != '-')) {
 			result = false;
 			break;
 		}
diff --git a/code/Cmdlib.h b/code/Cmdlib.h
index 7425b8c27f..6aa91b648e 100644
--- a/code/Cmdlib.h
+++ b/code/Cmdlib.h
@@ -31,10 +31,10 @@ BOOL FileExists (char *filename);
 extern	char	progdir[1024];
 
 void	FixPathSeperator (char *path);
-void	SetProgDir (void);
 
 void 	DefaultExtension (char *path, char *extension);
 
+void	ExtractFilePath (char *path, char *dest);
 void 	ExtractFileBase (char *path, char *dest);
 
 int		ParseHex (char *str);
diff --git a/code/D_dehack.c b/code/D_dehack.c
index c7f0adc92e..1e08d27003 100644
--- a/code/D_dehack.c
+++ b/code/D_dehack.c
@@ -2,37 +2,42 @@
 #include <stdlib.h>
 #include <malloc.h>
 #include <string.h>
+#include <stddef.h>
 
 #include "doomtype.h"
 #include "doomstat.h"
 #include "info.h"
-#include "sounds.h"
+#include "d_dehack.h"
+#include "s_sound.h"
 #include "d_items.h"
 #include "g_level.h"
 #include "m_cheat.h"
 #include "cmdlib.h"
 #include "dstrings.h"
+#include "m_alloc.h"
 #include "m_misc.h"
 #include "w_wad.h"
 
 
 // Miscellaneous info that used to be constant
-int deh_StartHealth = 100;
-int deh_StartBullets = 50;
-int deh_MaxHealth = 100;
-int deh_MaxArmor = 200;
-int deh_GreenAC = 1;
-int deh_BlueAC = 2;
-int deh_MaxSoulsphere = 200;
-int deh_SoulsphereHealth = 100;
-int deh_MegasphereHealth = 200;
-int deh_GodHealth = 100;
-int deh_FAArmor = 200;
-int deh_FAAC = 2;
-int deh_KFAArmor = 200;
-int deh_KFAAC = 2;
-int deh_BFGCells = 40;
-int deh_Infight = 0;
+struct DehInfo deh = {
+	100,	// .StartHealth
+	 50,	// .StartBullets
+	100,	// .MaxHealth
+	200,	// .MaxArmor
+	  1,	// .GreenAC
+	  2,	// .BlueAC
+	200,	// .MaxSoulsphere
+	100,	// .SoulsphereHealth
+	200,	// .MegasphereHealth
+	100,	// .GodHealth
+	200,	// .FAArmor
+	  2,	// .FAAC
+	200,	// .KFAArmor
+	  2,	// .KFAAC
+	 40,	// .BFGCells
+	  0,	// .Infight
+};
 
 // These are the original heights of every Doom 2 thing. They are used if a patch
 // specifies that a thing should be hanging from the ceiling but doesn't specify
@@ -57,21 +62,19 @@ static byte OrgHeights[] = {
 
 #define LINESIZE 2048
 
-#define CHECKMODE(a,b)		if (!stricmp (Line1, (a))) cont = (b)(num);
-
 #define CHECKKEY(a,b)		if (!stricmp (Line1, (a))) (b) = atoi(Line2);
-#define CHECKCHEAT(a,b,c)	if (!stricmp (Line1, (a))) ChangeCheat (Line2, (b), (c));
 
 static char *PatchFile, *PatchPt;
 static char *Line1, *Line2;
 static int	 dversion, pversion;
+static BOOL  including, includenotext;
 
 static const char *unknown_str = "Unknown key %s encountered in %s %d.\n";
 
 // This is an offset to be used for computing the text stuff.
 // Straight from the DeHackEd source which was
 // Written by Greg Lewis, gregl@umich.edu.
-static int toff[] = {129044L, 129044L, 129044L, 129284L, 129380L};
+static int toff[] = {129044, 129044, 129044, 129284, 129380};
 
 // A conversion array to convert from the 448 code pointers to the 966
 // Frames that exist.
@@ -124,10 +127,288 @@ static short codepconv[448] = {  1,    2,   3,   4,    6,   9,  10,   11,  12,
 
 BOOL BackedUpData = false;
 // This is the original data before it gets replaced by a patch.
-char *OrgSfxNames[NUMSFX];
+//char *OrgSfxNames[NUMSFX];
 char *OrgSprNames[NUMSPRITES];
 actionf_t OrgActionPtrs[NUMSTATES];
 
+// Sound equivalences. When a patch tries to change a sound,
+// use these sound names.
+char *SoundMap[] = {
+	NULL,
+	"weapons/pistol",
+	"weapons/shotgf",
+	"weapons/shotgr",
+	"weapons/sshotf",
+	"weapons/sshoto",
+	"weapons/sshotc",
+	"weapons/sshotl",
+	"weapons/plasmaf",
+	"weapons/bfgf",
+	"weapons/sawup",
+	"weapons/sawidle",
+	"weapons/sawfull",
+	"weapons/sawhit",
+	"weapons/rocklf",
+	"weapons/bfgx",
+	"imp/attack",
+	"imp/shotx",
+	"plats/pt1_strt",
+	"plats/pt1_stop",
+	"doors/dr1_open",
+	"doors/dr1_clos",
+	"plats/pt1_mid",
+	"switches/normbutn",
+	"switches/exitbutn",
+	"*pain100_1",
+	"demon/pain",
+	"grunt/pain",
+	"vile/pain",
+	"fatso/pain",
+	"pain/pain",
+	"misc/gibbed",
+	"misc/i_pkup",
+	"misc/w_pkup",
+	"*land1",
+	"misc/teleport",
+	"grunt/sight1",
+	"grunt/sight2",
+	"grunt/sight3",
+	"imp/sight1",
+	"imp/sight2",
+	"demon/sight",
+	"caco/sight",
+	"baron/sight",
+	"cyber/sight",
+	"spider/sight",
+	"baby/sight",
+	"knight/sight",
+	"vile/sight",
+	"fatso/sight",
+	"pain/sight",
+	"skull/melee",
+	"demon/melee",
+	"skeleton/melee",
+	"vile/start",
+	"imp/melee",
+	"skeleton/swing",
+	"*death1",
+	"*xdeath1",
+	"grunt/death1",
+	"grunt/death2",
+	"grunt/death3",
+	"imp/death1",
+	"imp/death2",
+	"demon/death",
+	"caco/death",
+	"misc/unused",
+	"baron/death",
+	"cyber/death",
+	"spider/death",
+	"baby/death",
+	"vile/death",
+	"knight/death",
+	"pain/death",
+	"skeleton/death",
+	"grunt/active",
+	"imp/active",
+	"demon/active",
+	"baby/active",
+	"baby/walk",
+	"vile/active",
+	"*grunt1",
+	"world/barrelx",
+	"*fist",
+	"cyber/hoof",
+	"spider/walk",
+	"weapons/chngun",
+	"misc/chat2",
+	"doors/dr2_open",
+	"doors/dr2_clos",
+	"misc/spawn",
+	"vile/firecrkl",
+	"vile/firestrt",
+	"misc/p_pkup",
+	"brain/spit",
+	"brain/cube",
+	"brain/sight",
+	"brain/pain",
+	"brain/death",
+	"fatso/attack",
+	"gatso/death",
+	"wolfss/sight",
+	"wolfss/death",
+	"keen/pain",
+	"keen/death",
+	"skeleton/active",
+	"skeleton/sight",
+	"skeleton/attack",
+	"misc/chat"
+};
+
+// Functions used in a .bex [CODEPTR] chunk
+void A_Light0();
+void A_WeaponReady();
+void A_Lower();
+void A_Raise();
+void A_Punch();
+void A_ReFire();
+void A_FirePistol();
+void A_Light1();
+void A_FireShotgun();
+void A_Light2();
+void A_FireShotgun2();
+void A_CheckReload();
+void A_OpenShotgun2();
+void A_LoadShotgun2();
+void A_CloseShotgun2();
+void A_FireCGun();
+void A_GunFlash();
+void A_FireMissile();
+void A_Saw();
+void A_FirePlasma();
+void A_BFGsound();
+void A_FireBFG();
+void A_BFGSpray();
+void A_Explode();
+void A_Pain();
+void A_PlayerScream();
+void A_Fall();
+void A_XScream();
+void A_Look();
+void A_Chase();
+void A_FaceTarget();
+void A_PosAttack();
+void A_Scream();
+void A_SPosAttack();
+void A_VileChase();
+void A_VileStart();
+void A_VileTarget();
+void A_VileAttack();
+void A_StartFire();
+void A_Fire();
+void A_FireCrackle();
+void A_Tracer();
+void A_SkelWhoosh();
+void A_SkelFist();
+void A_SkelMissile();
+void A_FatRaise();
+void A_FatAttack1();
+void A_FatAttack2();
+void A_FatAttack3();
+void A_BossDeath();
+void A_CPosAttack();
+void A_CPosRefire();
+void A_TroopAttack();
+void A_SargAttack();
+void A_HeadAttack();
+void A_BruisAttack();
+void A_SkullAttack();
+void A_Metal();
+void A_SpidRefire();
+void A_BabyMetal();
+void A_BspiAttack();
+void A_Hoof();
+void A_CyberAttack();
+void A_PainAttack();
+void A_PainDie();
+void A_KeenDie();
+void A_BrainPain();
+void A_BrainScream();
+void A_BrainDie();
+void A_BrainAwake();
+void A_BrainSpit();
+void A_SpawnSound();
+void A_SpawnFly();
+void A_BrainExplode();
+
+struct CodePtr {
+	char *name;
+	actionf_t func;
+};
+
+static const struct CodePtr CodePtrs[] = {
+	{ "NULL",			{(actionf_p1)NULL}, },
+	{ "Light0",			{(actionf_p1)A_Light0}, },
+	{ "WeaponReady",	{(actionf_p1)A_WeaponReady}, },
+	{ "Lower",			{(actionf_p1)A_Lower}, },
+	{ "Raise",			{(actionf_p1)A_Raise}, },
+	{ "Punch",			{(actionf_p1)A_Punch}, },
+	{ "ReFire",			{(actionf_p1)A_ReFire}, },
+	{ "FirePistol",		{(actionf_p1)A_FirePistol}, },
+	{ "Light1",			{(actionf_p1)A_Light1}, },
+	{ "FireShotgun",	{(actionf_p1)A_FireShotgun}, },
+	{ "Light2",			{(actionf_p1)A_Light2}, },
+	{ "FireShotgun2",	{(actionf_p1)A_FireShotgun2}, },
+	{ "CheckReload",	{(actionf_p1)A_CheckReload}, },
+	{ "OpenShotgun2",	{(actionf_p1)A_OpenShotgun2}, },
+	{ "LoadShotgun2",	{(actionf_p1)A_LoadShotgun2}, },
+	{ "CloseShotgun2",	{(actionf_p1)A_CloseShotgun2}, },
+	{ "FireCGun",		{(actionf_p1)A_FireCGun}, },
+	{ "A_GunFlash",		{(actionf_p1)A_GunFlash}, },
+	{ "FireMissile",	{(actionf_p1)A_FireMissile}, },
+	{ "Saw",			{(actionf_p1)A_Saw}, },
+	{ "FirePlasma",		{(actionf_p1)A_FirePlasma}, },
+	{ "BFGsound",		{(actionf_p1)A_BFGsound}, },
+	{ "FireBFG",		{(actionf_p1)A_FireBFG}, },
+	{ "BFGSpray",		{(actionf_p1)A_BFGSpray}, },
+	{ "Explode",		{(actionf_p1)A_Explode}, },
+	{ "Pain",			{(actionf_p1)A_Pain}, },
+	{ "PlayerScream",	{(actionf_p1)A_PlayerScream}, },
+	{ "Fall",			{(actionf_p1)A_Fall}, },
+	{ "XScream",		{(actionf_p1)A_XScream}, },
+	{ "Look",			{(actionf_p1)A_Look}, },
+	{ "Chase",			{(actionf_p1)A_Chase}, },
+	{ "FaceTarget",		{(actionf_p1)A_FaceTarget}, },
+	{ "PosAttack",		{(actionf_p1)A_PosAttack}, },
+	{ "Scream",			{(actionf_p1)A_Scream}, },
+	{ "SPosAttack",		{(actionf_p1)A_SPosAttack}, },
+	{ "VileChase",		{(actionf_p1)A_VileChase}, },
+	{ "VileStart",		{(actionf_p1)A_VileStart}, },
+	{ "VileTarget",		{(actionf_p1)A_VileTarget}, },
+	{ "VileAttack",		{(actionf_p1)A_VileAttack}, },
+	{ "StartFire",		{(actionf_p1)A_StartFire}, },
+	{ "Fire",			{(actionf_p1)A_Fire}, },
+	{ "FireCrackle",	{(actionf_p1)A_FireCrackle}, },
+	{ "Tracer",			{(actionf_p1)A_Tracer}, },
+	{ "SkelWhoosh",		{(actionf_p1)A_SkelWhoosh}, },
+	{ "SkelFist",		{(actionf_p1)A_SkelFist}, },
+	{ "SkelMissile",	{(actionf_p1)A_SkelMissile}, },
+	{ "FatRaise",		{(actionf_p1)A_FatRaise}, },
+	{ "FatAttack1",		{(actionf_p1)A_FatAttack1}, },
+	{ "FatAttack2",		{(actionf_p1)A_FatAttack2}, },
+	{ "FatAttack3",		{(actionf_p1)A_FatAttack3}, },
+	{ "BossDeath",		{(actionf_p1)A_BossDeath}, },
+	{ "CPosAttack",		{(actionf_p1)A_CPosAttack}, },
+	{ "CPosRefire",		{(actionf_p1)A_CPosRefire}, },
+	{ "TroopAttack",	{(actionf_p1)A_TroopAttack}, },
+	{ "SargAttack",		{(actionf_p1)A_SargAttack}, },
+	{ "HeadAttack",		{(actionf_p1)A_HeadAttack}, },
+	{ "BruisAttack",	{(actionf_p1)A_BruisAttack}, },
+	{ "SkullAttack",	{(actionf_p1)A_SkullAttack}, },
+	{ "Metal",			{(actionf_p1)A_Metal}, },
+	{ "SpidRefire",		{(actionf_p1)A_SpidRefire}, },
+	{ "BabyMetal",		{(actionf_p1)A_BabyMetal}, },
+	{ "BspiAttack",		{(actionf_p1)A_BspiAttack}, },
+	{ "Hoof",			{(actionf_p1)A_Hoof}, },
+	{ "CyberAttack",	{(actionf_p1)A_CyberAttack}, },
+	{ "PainAttack",		{(actionf_p1)A_PainAttack}, },
+	{ "PainDie",		{(actionf_p1)A_PainDie}, },
+	{ "KeenDie",		{(actionf_p1)A_KeenDie}, },
+	{ "BrainPain",		{(actionf_p1)A_BrainPain}, },
+	{ "BrainScream",	{(actionf_p1)A_BrainScream}, },
+	{ "BrainDie",		{(actionf_p1)A_BrainDie}, },
+	{ "BrainAwake",		{(actionf_p1)A_BrainAwake}, },
+	{ "BrainSpit",		{(actionf_p1)A_BrainSpit}, },
+	{ "SpawnSound",		{(actionf_p1)A_SpawnSound}, },
+	{ "SpawnFly",		{(actionf_p1)A_SpawnFly}, },
+	{ "BrainExplode",	{(actionf_p1)A_BrainExplode}, },
+	{ NULL, }
+};
+
+struct Key {
+	char *name;
+	ptrdiff_t offset;
+};
 
 extern byte cheat_mus_seq[9];
 extern byte cheat_choppers_seq[11];
@@ -141,16 +422,94 @@ extern byte cheat_clev_seq[10];
 extern byte cheat_mypos_seq[8];
 extern byte cheat_amap_seq[5];
 
+static int PatchThing (int);
+static int PatchSound (int);
+static int PatchFrame (int);
+static int PatchSprite (int);
+static int PatchAmmo (int);
+static int PatchWeapon (int);
+static int PatchPointer (int);
+static int PatchCheats (int);
+static int PatchMisc (int);
+static int PatchText (int);
+static int PatchStrings (int);
+static int PatchPars (int);
+static int PatchCodePtrs (int);
+static int DoInclude (int);
 
-void BackUpData (void)
+static const struct {
+	char *name;
+	int (*func)(int);
+} Modes[] = {
+	// These appear in .deh and .bex files
+	{ "Thing",		PatchThing },
+	{ "Sound",		PatchSound },
+	{ "Frame",		PatchFrame },
+	{ "Sprite",		PatchSprite },
+	{ "Ammo",		PatchAmmo },
+	{ "Weapon",		PatchWeapon },
+	{ "Pointer",	PatchPointer },
+	{ "Cheat",		PatchCheats },
+	{ "Misc",		PatchMisc },
+	{ "Text",		PatchText },
+	// These appear in .bex files
+	{ "include",	DoInclude },
+	{ "[STRINGS]",	PatchStrings },
+	{ "[PARS]",		PatchPars },
+	{ "[CODEPTR]",	PatchCodePtrs },
+	{ NULL, },
+};
+
+static int HandleMode (const char *mode, int num);
+static BOOL HandleKey (const struct Key *keys, void *structure, const char *key, int value);
+static void BackupData (void);
+static void ChangeCheat (byte *newcheat, byte *cheatseq, BOOL needsval);
+static BOOL ReadChars (char **stuff, int size);
+static char *igets (void);
+static int GetLine (void);
+
+
+static int HandleMode (const char *mode, int num)
+{
+	int i = 0;
+
+	while (Modes[i].name && stricmp (Modes[i].name, mode))
+		i++;
+
+	if (Modes[i].name)
+		return Modes[i].func (num);
+
+	// Handle unknown or unimplemented data
+	Printf ("Unknown chunk %s encountered. Skipping.\n", mode);
+	do
+		i = GetLine ();
+	while (i == 1);
+
+	return i;
+}
+
+static BOOL HandleKey (const struct Key *keys, void *structure, const char *key, int value)
+{
+	while (keys->name && stricmp (keys->name, key))
+		keys++;
+
+	if (keys->name) {
+		*((int *)(((byte *)structure) + keys->offset)) = value;
+		return false;
+	}
+
+	return true;
+}
+
+static void BackUpData (void)
 {
 	int i;
 
 	if (BackedUpData)
 		return;
 
-	for (i = 0; i < NUMSFX; i++)
-		OrgSfxNames[i] = S_sfx[i].name;
+//	for (i = 0; i < NUMSFX; i++)
+//		OrgSfxNames[i] = S_sfx[i].name;
 
 	for (i = 0; i < NUMSPRITES; i++)
 		OrgSprNames[i] = sprnames[i];
@@ -159,7 +518,7 @@ void BackUpData (void)
 		OrgActionPtrs[i] = states[i].action;
 }
 
-void ChangeCheat (byte *newcheat, byte *cheatseq, BOOL needsval)
+static void ChangeCheat (byte *newcheat, byte *cheatseq, BOOL needsval)
 {
 	while (*cheatseq != 0xff && *cheatseq != 1 && *newcheat) {
 		*cheatseq++ = SCRAMBLE(*newcheat);
@@ -198,6 +557,93 @@ static BOOL ReadChars (char **stuff, int size)
 	return true;
 }
 
+static void ReplaceSpecialChars (char *str)
+{
+	char *p = str, c;
+	int i;
+
+	while (c = *p++) {
+		if (c != '\\') {
+			*str++ = c;
+		} else {
+			switch (*p) {
+				case 'n':
+				case 'N':
+					*str++ = '\n';
+					break;
+				case 't':
+				case 'T':
+					*str++ = '\t';
+					break;
+				case 'r':
+				case 'R':
+					*str++ = '\r';
+					break;
+				case 'x':
+				case 'X':
+					c = 0;
+					p++;
+					for (i = 0; i < 2; i++) {
+						c <<= 4;
+						if (*p >= '0' && *p <= '9')
+							c += *p-'0';
+						else if (*p >= 'a' && *p <= 'f')
+							c += 10 + *p-'a';
+						else if (*p >= 'A' && *p <= 'F')
+							c += 10 + *p-'A';
+						else
+							break;
+						p++;
+					}
+					*str++ = c;
+					break;
+				case '0':
+				case '1':
+				case '2':
+				case '3':
+				case '4':
+				case '5':
+				case '6':
+				case '7':
+					c = 0;
+					for (i = 0; i < 3; i++) {
+						c <<= 3;
+						if (*p >= '0' && *p <= '7')
+							c += *p-'0';
+						else
+							break;
+						p++;
+					}
+					*str++ = c;
+					break;
+				default:
+					*str++ = *p;
+					break;
+			}
+			p++;
+		}
+	}
+	*str = 0;
+}
+
+static char *skipwhite (char *str)
+{
+	if (str)
+		while (*str && isspace(*str))
+			*str++;
+	return str;
+}
+
+static void stripwhite (char *str)
+{
+	char *end = str + strlen(str) - 1;
+
+	while (end >= str && isspace(*end))
+		end--;
+
+	end[1] = '\0';
+}
+
 static char *igets (void)
 {
 	char *line;
@@ -216,7 +662,7 @@ static char *igets (void)
 	return line;
 }
 
-int GetLine (void)
+static int GetLine (void)
 {
 	char *line, *line2;
 
@@ -228,10 +674,8 @@ int GetLine (void)
 		if (!line)
 			return 0;
 
-		Line1 = line;
-		while (*Line1 && *Line1 < ' ')
-			Line1++;
-	} while (*Line1 == 0);			// Loop until we get a line with
+		Line1 = skipwhite (line);
+	} while (Line1 && *Line1 == 0);	// Loop until we get a line with
 									// more than just whitespace.
 	line = strchr (Line1, '=');
 
@@ -265,8 +709,9 @@ int GetLine (void)
 		while (*line && *line <= ' ')
 			line++;				// Skip white space
 
-		if (*line == 0)
-			return 0;			// No second word
+		//.bex files don't have this restriction
+		//if (*line == 0)
+		//	return 0;			// No second word
 
 		Line2 = line;
 
@@ -274,8 +719,64 @@ int GetLine (void)
 	}
 }
 
-int PatchThing (int thingNum)
+static int PatchThing (int thingNum)
 {
+	static const struct Key keys[] = {
+		{ "ID #",				myoffsetof(mobjinfo_t,doomednum) },
+		{ "Initial frame",		myoffsetof(mobjinfo_t,spawnstate) },
+		{ "Hit points",			myoffsetof(mobjinfo_t,spawnhealth) },
+		{ "First moving frame",	myoffsetof(mobjinfo_t,seestate) },
+		{ "Reaction time",		myoffsetof(mobjinfo_t,reactiontime) },
+		{ "Injury frame",		myoffsetof(mobjinfo_t,painstate) },
+		{ "Pain chance",		myoffsetof(mobjinfo_t,painchance) },
+		{ "Close attack frame",	myoffsetof(mobjinfo_t,meleestate) },
+		{ "Far attack frame",	myoffsetof(mobjinfo_t,missilestate) },
+		{ "Death frame",		myoffsetof(mobjinfo_t,deathstate) },
+		{ "Exploding frame",	myoffsetof(mobjinfo_t,xdeathstate) },
+		{ "Speed",				myoffsetof(mobjinfo_t,speed) },
+		{ "Width",				myoffsetof(mobjinfo_t,radius) },
+		{ "Height",				myoffsetof(mobjinfo_t,height) },
+		{ "Mass",				myoffsetof(mobjinfo_t,mass) },
+		{ "Missile damage",		myoffsetof(mobjinfo_t,damage) },
+		{ "Bits",				myoffsetof(mobjinfo_t,flags) },
+		{ "Respawn frame",		myoffsetof(mobjinfo_t,raisestate) },
+		{ NULL, }
+	};
+	// a .bex extension:
+	static const char *bitnames[32] = {
+		"SPECIAL",
+		"SOLID",
+		"SHOOTABLE",
+		"NOSECTOR",
+		"NOBLOCKMAP",
+		"AMBUSH",
+		"JUSTHIT",
+		"JUSTATTACKED",
+		"SPAWNCEILING",
+		"NOGRAVITY",
+		"DROPOFF",
+		"PICKUP",
+		"NOCLIP",
+		"SLIDE",
+		"FLOAT",
+		"TELEPORT",
+		"MISSILE",
+		"DROPPED",
+		"SHADOW",
+		"NOBLOOD",
+		"CORPSE",
+		"INFLOAT",
+		"COUNTKILL",
+		"COUNTITEM",
+		"SKULLFLY",
+		"NOTDMATCH",
+		"TRANSLATION1",
+		"TRANSLATION2",
+		"STEALTH",
+		"TRANSLUC25",
+		"TRANSLUCENT",		// (aka TRANSLUC50) BOOM actually has this as the last bit
+		"UNUSED1"
+	};
 	int result;
 	mobjinfo_t *info, dummy;
 	BOOL hadHeight = false;
@@ -295,34 +796,45 @@ int PatchThing (int thingNum)
 	//info->flags &= ~MF_TRANSLUCBITS;
 
 	while ((result = GetLine ()) == 1) {
-			 CHECKKEY ("ID #",					info->doomednum)
-		else CHECKKEY ("Initial frame",			info->spawnstate)
-		else CHECKKEY ("Hit points",			info->spawnhealth)
-		else CHECKKEY ("First moving frame",	info->seestate)
-		else CHECKKEY ("Alert sound",			info->seesound)
-		else CHECKKEY ("Reaction time",			info->reactiontime)
-		else CHECKKEY ("Attack sound",			info->attacksound)
-		else CHECKKEY ("Injury frame",			info->painstate)
-		else CHECKKEY ("Pain chance",			info->painchance)
-		else CHECKKEY ("Pain sound",			info->painsound)
-		else CHECKKEY ("Close attack frame",	info->meleestate)
-		else CHECKKEY ("Far attack frame",		info->missilestate)
-		else CHECKKEY ("Death frame",			info->deathstate)
-		else CHECKKEY ("Exploding frame",		info->xdeathstate)
-		else CHECKKEY ("Death sound",			info->deathsound)
-		else CHECKKEY ("Speed",					info->speed)
-		else CHECKKEY ("Width",					info->radius)
-		else if (!stricmp (Line1, "Height")) {
-			info->height = atoi (Line2);
+		int sndmap = atoi (Line2);
+
+		if (sndmap >= sizeof(SoundMap))
+			sndmap = 0;
+
+		if (HandleKey (keys, info, Line1, atoi (Line2))) {
+			if (!stricmp (Line1, "Alert sound"))
+				info->seesound = SoundMap[sndmap];
+			else if (!stricmp (Line1, "Attack sound"))
+				info->attacksound = SoundMap[sndmap];
+			else if (!stricmp (Line1, "Pain sound"))
+				info->painsound = SoundMap[sndmap];
+			else if (!stricmp (Line1, "Death sound"))
+				info->deathsound = SoundMap[sndmap];
+			else if (!stricmp (Line1, "Action sound"))
+				info->activesound = SoundMap[sndmap];
+			else Printf (unknown_str, Line1, "Thing", thingNum);
+		} else if (!stricmp (Line1, "Height")) {
 			hadHeight = true;
+		} else if (!stricmp (Line1, "Bits")) {
+			if (!IsNum (Line2)) {
+				char *data = COM_Parse (Line2);
+
+				while (data) {
+					int i = 0;
+
+					for (i = 0; i < 32; i++)
+						if (!stricmp (bitnames[i], com_token))
+							break;
+
+					if (i == 32)
+						Printf ("Unknown bit %s\n", com_token);
+					else
+						info->flags += 1 << i;
+					data = COM_Parse (data);
+				}
+				DPrintf ("Flags: %d\n", info->flags);
+			}
 		}
-		else CHECKKEY ("Height",				info->height)
-		else CHECKKEY ("Mass",					info->mass)
-		else CHECKKEY ("Missile damage",		info->damage)
-		else CHECKKEY ("Action sound",			info->activesound)
-		else CHECKKEY ("Bits",					info->flags)
-		else CHECKKEY ("Respawn frame",			info->raisestate)
-		else Printf (unknown_str, Line1, "Thing", thingNum);
 	}
 
 	if (info->flags & MF_SPAWNCEILING && !hadHeight && thingNum < sizeof(OrgHeights))
@@ -331,36 +843,37 @@ int PatchThing (int thingNum)
 	return result;
 }
 
-int PatchSound (int soundNum)
+static int PatchSound (int soundNum)
 {
 	int result;
+
+	DPrintf ("Sound %d (no longer supported)\n", soundNum);
+/*
 	sfxinfo_t *info, dummy;
 	int offset = 0;
-
 	if (soundNum >= 1 && soundNum <= NUMSFX) {
 		info = &S_sfx[soundNum];
-		DPrintf ("Sound %d\n", soundNum);
 	} else {
 		info = &dummy;
 		Printf ("Sound %d out of range.\n");
 	}
-
+*/
 	while ((result = GetLine ()) == 1) {
+		/*
 		if (!stricmp  ("Offset", Line1))
 			offset = atoi (Line2);
 		else CHECKKEY ("Zero/One",			info->singularity)
 		else CHECKKEY ("Value",				info->priority)
-		/*
 		else CHECKKEY ("Zero 1",			info->link)
 		else CHECKKEY ("Neg. One 1",		info->pitch)
 		else CHECKKEY ("Neg. One 2",		info->volume)
 		else CHECKKEY ("Zero 2",			info->data)
 		else CHECKKEY ("Zero 3",			info->usefulness)
 		else CHECKKEY ("Zero 4",			info->lumpnum)
-		*/
 		else Printf (unknown_str, Line1, "Sound", soundNum);
+		*/
 	}
-
+/*
 	if (offset) {
 		// Calculate offset from start of sound names
 		offset -= toff[dversion] + 21076;
@@ -378,12 +891,21 @@ int PatchSound (int soundNum)
 			Printf ("Sound name %d out of range.\n", offset + 1);
 		}
 	}
-
+*/
 	return result;
 }
 
-int PatchFrame (int frameNum)
+static int PatchFrame (int frameNum)
 {
+	static const struct Key keys[] = {
+		{ "Sprite number",		myoffsetof(state_t,sprite) },
+		{ "Sprite subnumber",	myoffsetof(state_t,frame) },
+		{ "Duration",			myoffsetof(state_t,tics) },
+		{ "Next frame",			myoffsetof(state_t,nextstate) },
+		{ "Unknown 1",			myoffsetof(state_t,misc1) },
+		{ "Unknown 2",			myoffsetof(state_t,misc2) },
+		{ NULL, }
+	};
 	int result;
 	state_t *info, dummy;
 
@@ -395,19 +917,14 @@ int PatchFrame (int frameNum)
 		Printf ("Frame %d out of range\n", frameNum);
 	}
 
-	while ((result = GetLine ()) == 1) {
-			 CHECKKEY ("Sprite number",		info->sprite)
-		else CHECKKEY ("Sprite subnumber",	info->frame)
-		else CHECKKEY ("Duration",			info->tics)
-		else CHECKKEY ("Next frame",		info->nextstate)
-		else CHECKKEY ("Unknown 1",			info->misc1)
-		else CHECKKEY ("Unknown 2",			info->misc2)
-		else Printf (unknown_str, Line1, "Frame", frameNum);
-	}
+	while ((result = GetLine ()) == 1)
+		if (HandleKey (keys, info, Line1, atoi (Line2)))
+			Printf (unknown_str, Line1, "Frame", frameNum);
+
 	return result;
 }
 
-int PatchSprite (int sprNum)
+static int PatchSprite (int sprNum)
 {
 	int result;
 	int offset = 0;
@@ -439,7 +956,7 @@ int PatchSprite (int sprNum)
 	return result;
 }
 
-int PatchAmmo (int ammoNum)
+static int PatchAmmo (int ammoNum)
 {
 	extern int clipammo[NUMAMMO];
 
@@ -466,8 +983,17 @@ int PatchAmmo (int ammoNum)
 	return result;
 }
 
-int PatchWeapon (int weapNum)
+static int PatchWeapon (int weapNum)
 {
+	static const struct Key keys[] = {
+		{ "Ammo type",			myoffsetof(weaponinfo_t,ammo) },
+		{ "Deselect frame",		myoffsetof(weaponinfo_t,upstate) },
+		{ "Select frame",		myoffsetof(weaponinfo_t,downstate) },
+		{ "Bobbing frame",		myoffsetof(weaponinfo_t,readystate) },
+		{ "Shooting frame",		myoffsetof(weaponinfo_t,atkstate) },
+		{ "Firing frame",		myoffsetof(weaponinfo_t,flashstate) },
+		{ NULL, }
+	};
 	int result;
 	weaponinfo_t *info, dummy;
 
@@ -479,19 +1005,14 @@ int PatchWeapon (int weapNum)
 		Printf ("Weapon %d out of range.\n", weapNum);
 	}
 
-	while ((result = GetLine ()) == 1) {
-			 CHECKKEY ("Ammo type",			info->ammo)
-		else CHECKKEY ("Deselect frame",	info->upstate)
-		else CHECKKEY ("Select frame",		info->downstate)
-		else CHECKKEY ("Bobbing frame",		info->readystate)
-		else CHECKKEY ("Shooting frame",	info->atkstate)
-		else CHECKKEY ("Firing frame",		info->flashstate)
-		else Printf (unknown_str, Line1, "Weapon", weapNum);
-	}
+	while ((result = GetLine ()) == 1)
+		if (HandleKey (keys, info, Line1, atoi (Line2)))
+			Printf (unknown_str, Line1, "Weapon", weapNum);
+
 	return result;
 }
 
-int PatchPointer (int ptrNum)
+static int PatchPointer (int ptrNum)
 {
 	int result;
 
@@ -510,77 +1031,183 @@ int PatchPointer (int ptrNum)
 	return result;
 }
 
-int PatchCheats (int dummy)
+static int PatchCheats (int dummy)
 {
+	static const struct {
+		char *name;
+		byte *cheatseq;
+		BOOL needsval;
+	} keys[] = {
+		{ "Change music",		cheat_mus_seq,				 true },
+		{ "Chainsaw",			cheat_choppers_seq,			 false },
+		{ "God mode",			cheat_god_seq,				 false },
+		{ "Ammo & Keys",		cheat_ammo_seq,				 false },
+		{ "Ammo",				cheat_ammonokey_seq,		 false },
+		{ "No Clipping 1",		cheat_noclip_seq,			 false },
+		{ "No Clipping 2",		cheat_commercial_noclip_seq, false },
+		{ "Invincibility",		cheat_powerup_seq[0],		 false },
+		{ "Berserk",			cheat_powerup_seq[1],		 false },
+		{ "Invisibility",		cheat_powerup_seq[2],		 false },
+		{ "Radiation Suit",		cheat_powerup_seq[3],		 false },
+		{ "Auto-map",			cheat_powerup_seq[4],		 false },
+		{ "Lite-Amp Goggles",	cheat_powerup_seq[5],		 false },
+		{ "BEHOLD menu",		cheat_powerup_seq[6],		 false },
+		{ "Level Warp",			cheat_clev_seq,				 true },
+		{ "Player Position",	cheat_mypos_seq,			 false },
+		{ "Map cheat",			cheat_amap_seq,				 false },
+		{ NULL, }
+	};
 	int result;
 
 	DPrintf ("Cheats\n");
 
 	while ((result = GetLine ()) == 1) {
-			 CHECKCHEAT ("Change music",		cheat_mus_seq,				 true)
-		else CHECKCHEAT ("Chainsaw",			cheat_choppers_seq,			 false)
-		else CHECKCHEAT ("God mode",			cheat_god_seq,				 false)
-		else CHECKCHEAT ("Ammo & Keys",			cheat_ammo_seq,				 false)
-		else CHECKCHEAT ("Ammo",				cheat_ammonokey_seq,		 false)
-		else CHECKCHEAT ("No Clipping 1",		cheat_noclip_seq,			 false)
-		else CHECKCHEAT ("No Clipping 2",		cheat_commercial_noclip_seq, false)
-		else CHECKCHEAT ("Invincibility",		cheat_powerup_seq[0],		 false)
-		else CHECKCHEAT ("Berserk",				cheat_powerup_seq[1],		 false)
-		else CHECKCHEAT ("Invisibility",		cheat_powerup_seq[2],		 false)
-		else CHECKCHEAT ("Radiation Suit",		cheat_powerup_seq[3],		 false)
-		else CHECKCHEAT ("Auto-map",			cheat_powerup_seq[4],		 false)
-		else CHECKCHEAT ("Lite-Amp Goggles",	cheat_powerup_seq[5],		 false)
-		else CHECKCHEAT ("BEHOLD menu",			cheat_powerup_seq[6],		 false)
-		else CHECKCHEAT ("Level Warp",			cheat_clev_seq,				 true)
-		else CHECKCHEAT ("Player Position",		cheat_mypos_seq,			 false)
-		else CHECKCHEAT ("Map cheat",			cheat_amap_seq,				 false)
-		else Printf ("Unknown cheat %s.\n", Line2);
+		int i = 0;
+		while (keys[i].name && stricmp (keys[i].name, Line1))
+			i++;
+
+		if (!keys[i].name)
+			Printf ("Unknown cheat %s.\n", Line2);
+		else
+			ChangeCheat (Line2, keys[i].cheatseq, keys[i].needsval);
 	}
 	return result;
 }
 
-int PatchMisc (int dummy)
+static int PatchMisc (int dummy)
 {
+	static const struct Key keys[] = {
+		{ "Initial Health",			myoffsetof(struct DehInfo,StartHealth) },
+		{ "Initial Bullets",		myoffsetof(struct DehInfo,StartBullets) },
+		{ "Max Health",				myoffsetof(struct DehInfo,MaxHealth) },
+		{ "Max Armor",				myoffsetof(struct DehInfo,MaxArmor) },
+		{ "Green Armor Class",		myoffsetof(struct DehInfo,GreenAC) },
+		{ "Blue Armor Class",		myoffsetof(struct DehInfo,BlueAC) },
+		{ "Max Soulsphere",			myoffsetof(struct DehInfo,BlueAC) },
+		{ "Soulsphere Health",		myoffsetof(struct DehInfo,SoulsphereHealth) },
+		{ "Megasphere Health",		myoffsetof(struct DehInfo,MegasphereHealth) },
+		{ "God Mode Health",		myoffsetof(struct DehInfo,GodHealth) },
+		{ "IDFA Armor",				myoffsetof(struct DehInfo,FAArmor) },
+		{ "IDFA Armor Class",		myoffsetof(struct DehInfo,FAAC) },
+		{ "IDKFA Armor",			myoffsetof(struct DehInfo,KFAArmor) },
+		{ "IDKFA Armor Class",		myoffsetof(struct DehInfo,KFAAC) },
+		{ "BFG Cells/Shot",			myoffsetof(struct DehInfo,BFGCells) },
+		{ "Monsters Infight",		myoffsetof(struct DehInfo,Infight) },
+		{ NULL, }
+	};
 	int result;
 	gitem_t *item;
 
-	DPrintf ("Misc");
+	DPrintf ("Misc\n");
 
-	while ((result = GetLine()) == 1) {
-			 CHECKKEY ("Initial Health",		deh_StartHealth)
-		else CHECKKEY ("Initial Bullets",		deh_StartBullets)
-		else CHECKKEY ("Max Health",			deh_MaxHealth)
-		else CHECKKEY ("Max Armor",				deh_MaxArmor)
-		else CHECKKEY ("Green Armor Class",		deh_GreenAC)
-		else CHECKKEY ("Blue Armor Class",		deh_BlueAC)
-		else CHECKKEY ("Max Soulsphere",		deh_MaxSoulsphere)
-		else CHECKKEY ("Soulsphere Health",		deh_SoulsphereHealth)
-		else CHECKKEY ("Megasphere Health",		deh_MegasphereHealth)
-		else CHECKKEY ("God Mode Health",		deh_GodHealth)
-		else CHECKKEY ("IDFA Armor",			deh_FAArmor)
-		else CHECKKEY ("IDFA Armor Class",		deh_FAAC)
-		else CHECKKEY ("IDKFA Armor",			deh_KFAArmor)
-		else CHECKKEY ("IDKFA Armor Class",		deh_KFAAC)
-		else CHECKKEY ("BFG Cells/Shot",		deh_BFGCells)
-		else CHECKKEY ("Monsters Infight",		deh_Infight)
-		else Printf ("Unknown miscellaneous info %s.\n", Line2);
-	}
+	while ((result = GetLine()) == 1)
+		if (HandleKey (keys, &deh, Line1, atoi (Line2)))
+			Printf ("Unknown miscellaneous info %s.\n", Line2);
 
 	if ( (item = FindItem ("Basic Armor")) )
-		item->offset = deh_GreenAC;
+		item->offset = deh.GreenAC;
 
 	if ( (item = FindItem ("Mega Armor")) )
-		item->offset = deh_BlueAC;
+		item->offset = deh.BlueAC;
 
-	if (deh_Infight == 0xDD)
-		deh_Infight = 1;		// Enable infighting
-	else
-		deh_Infight = 0;
+	// 0xDD == enable infighting
+	deh.Infight = deh.Infight == 0xDD ? 1 : 0;
 
 	return result;
 }
 
-int PatchText (int oldSize)
+static int PatchPars (int dummy)
+{
+	char *space, mapname[8], *moredata;
+	level_info_t *info;
+	int result, par;
+
+	DPrintf ("[Pars]\n");
+
+	while ( (result = GetLine()) ) {
+		// Argh! .bex doesn't follow the same rules as .deh
+		if (result == 1) {
+			Printf ("Unknown key in [PARS] section: %s\n", Line1);
+			continue;
+		}
+		if (stricmp ("par", Line1))
+			return result;
+
+		space = strchr (Line2, ' ');
+
+		if (!space) {
+			Printf ("Need data after par.\n");
+			continue;
+		}
+
+		*space++ = '\0';
+
+		while (*space && isspace(*space))
+			space++;
+
+		moredata = strchr (space, ' ');
+
+		if (moredata) {
+			// At least 3 items on this line, must be E?M? format
+			sprintf (mapname, "E%cM%c", *Line2, *space);
+			par = atoi (moredata + 1);
+		} else {
+			// Only 2 items, must be MAP?? format
+			sprintf (mapname, "MAP%02d", atoi(Line2) % 100);
+			par = atoi (space);
+		}
+
+		if (!(info = FindLevelInfo (mapname)) ) {
+			Printf ("No map %s\n", mapname);
+			continue;
+		}
+
+		info->partime = par;
+		DPrintf ("Par for %s changed to %d\n", mapname, par);
+	}
+	return result;
+}
+
+static int PatchCodePtrs (int dummy)
+{
+	int result;
+
+	DPrintf ("[CodePtr]\n");
+
+	while ((result = GetLine()) == 1) {
+		if (!strnicmp ("Frame", Line1, 5) && isspace(Line1[5])) {
+			int frame = atoi (Line1 + 5);
+
+			if (frame < 0 || frame >= NUMSTATES) {
+				Printf ("Frame %d out of range\n", frame);
+			} else {
+				int i = 0;
+				char *data;
+
+				COM_Parse (Line2);
+
+				if ((com_token[0] == 'A' || com_token[0] == 'a') && com_token[1] == '_')
+					data = com_token + 2;
+				else
+					data = com_token;
+
+				while (CodePtrs[i].name && stricmp (CodePtrs[i].name, Line2))
+					i++;
+
+				if (CodePtrs[i].name) {
+					states[frame].action.acp1 = CodePtrs[i].func.acp1;
+					DPrintf ("Frame %d set to %s\n", frame, CodePtrs[i].name);
+				} else {
+					states[frame].action.acp1 = NULL;
+					DPrintf ("Unknown code pointer: %s\n", Line2);
+				}
+			}
+		}
+	}
+	return result;
+}
+
+static int PatchText (int oldSize)
 {
 	int newSize;
 	char *oldStr;
@@ -615,11 +1242,17 @@ int PatchText (int oldSize)
 		return 0;
 	}
 
+	if (includenotext) {
+		Printf ("Skipping text chunk in included patch.\n");
+		goto donewithtext;
+	}
+
 	DPrintf ("Searching for text:\n%s\n", oldStr);
 	good = false;
 
 
 	// Search through sfx names
+#if 0
 	for (i = 0; i < NUMSFX; i++) {
 		if (S_sfx[i].name) {
 			if (!strcmp (S_sfx[i].name, oldStr)) {
@@ -631,9 +1264,9 @@ int PatchText (int oldSize)
 			}
 		}
 	}
-
 	if (good)
 		goto donewithtext;
+#endif
 
 
 	// Search through sprite names
@@ -698,7 +1331,96 @@ donewithtext:
 
 	return result;
 }
-	
+
+static int PatchStrings (int dummy)
+{
+	static int maxstrlen = 128;
+	static char *holdstring;
+	int result;
+
+	DPrintf ("[Strings]\n");
+
+	if (!holdstring)
+		holdstring = Malloc (maxstrlen);
+
+	while ((result = GetLine()) == 1) {
+		int i;
+
+		*holdstring = '\0';
+		do {
+			while (maxstrlen < strlen (holdstring) + strlen (Line2)) {
+				maxstrlen += 128;
+				holdstring = Realloc (holdstring, maxstrlen);
+			}
+			strcat (holdstring, skipwhite (Line2));
+			stripwhite (holdstring);
+			if (holdstring[strlen(holdstring)-1] == '\\') {
+				holdstring[strlen(holdstring)-1] = '\0';
+				Line2 = igets ();
+			} else
+				Line2 = NULL;
+		} while (Line2 && *Line2);
+
+		for (i = 0; i < NUMSTRINGS; i++)
+			if (!stricmp (Strings[i].name, Line1))
+				break;
+
+		if (i == NUMSTRINGS) {
+			Printf ("Unknown string: %s\n", Line1);
+		} else {
+			ReplaceSpecialChars (holdstring);
+			ReplaceString (&Strings[i].string, copystring (holdstring));
+			Strings[i].type = str_patched;
+			Printf ("%s set to:\n%s\n", Line1, holdstring);
+		}
+	}
+
+	return result;
+}
+
+static int DoInclude (int dummy)
+{
+	char *data;
+	int savedversion, savepversion;
+	char *savepatchfile, *savepatchpt;
+
+	if (including) {
+		Printf ("Sorry, can't nest includes\n");
+		goto endinclude;
+	}
+
+	data = COM_Parse (Line2);
+	if (!stricmp (com_token, "notext")) {
+		includenotext = true;
+		data = COM_Parse (data);
+	}
+
+	if (!com_token[0]) {
+		includenotext = false;
+		Printf ("Include directive is missing filename\n");
+		goto endinclude;
+	}
+
+	DPrintf ("Including %s\n", com_token);
+	savepatchfile = PatchFile;
+	savepatchpt = PatchPt;
+	savedversion = dversion;
+	savepversion = pversion;
+	including = true;
+
+	DoDehPatch (com_token, false);
+
+	DPrintf ("Done with include\n");
+	PatchFile = savepatchfile;
+	PatchPt = savepatchpt;
+	dversion = savedversion;
+	pversion = savepversion;
+
+endinclude:
+	including = false;
+	includenotext = false;
+	return GetLine();
+}
 
 void DoDehPatch (char *patchfile, BOOL autoloading)
 {
@@ -718,17 +1440,25 @@ void DoDehPatch (char *patchfile, BOOL autoloading)
 		if ( (PatchFile = malloc (filelen + 1)) ) {
 			W_ReadLump (lump, PatchFile);
 		} else {
-			Printf ("Not enough memory to apply internal DeHackEd patch\n");
+			Printf ("Not enough memory to apply patch\n");
 			return;
 		}
 	} else if (patchfile) {
-		// Try to execute patchfile as a patch.
+		// Try to use patchfile as a patch.
 		FILE *deh;
 
 		strcpy (file, patchfile);
+		FixPathSeperator (file);
 		DefaultExtension (file, ".deh");
 
-		if ( (deh = fopen (file, "rb")) ) {
+		if ( !(deh = fopen (file, "rb")) ) {
+			strcpy (file, patchfile);
+			FixPathSeperator (file);
+			DefaultExtension (file, ".bex");
+			deh = fopen (file, "rb");
+		}
+
+		if (deh) {
 			filelen = Q_filelength (deh);
 			if ( (PatchFile = malloc (filelen + 1)) ) {
 				fread (PatchFile, 1, filelen, deh);
@@ -736,6 +1466,24 @@ void DoDehPatch (char *patchfile, BOOL autoloading)
 			}
 		}
 
+		if (!PatchFile) {
+			// Couldn't find it on disk, try reading it from a lump
+			strcpy (file, patchfile);
+			FixPathSeperator (file);
+			ExtractFileBase (file, file);
+			file[8] = 0;
+			lump = W_CheckNumForName (file);
+			if (lump >= 0) {
+				filelen = W_LumpLength (lump);
+				if ( (PatchFile = malloc (filelen + 1)) ) {
+					W_ReadLump (lump, PatchFile);
+				} else {
+					Printf ("Not enough memory to apply patch\n");
+					return;
+				}
+			}
+		}
+
 		if (!PatchFile) {
 			Printf ("Could not open DeHackEd patch \"%s\"\n", file);
 			return;
@@ -745,24 +1493,30 @@ void DoDehPatch (char *patchfile, BOOL autoloading)
 		return;
 	}
 
-	// End lump with a NULL for our parser
+	// End file with a NULL for our parser
 	PatchFile[filelen] = 0;
 
 	dversion = pversion = -1;
 
 	cont = 0;
-	if (!strnicmp (PatchFile, "Patch File for DeHackEd v", 25)) {
+	if (!strncmp (PatchFile, "Patch File for DeHackEd v", 25)) {
 		PatchPt = strchr (PatchFile, '\n');
 		while ((cont = GetLine()) == 1) {
 				 CHECKKEY ("Doom version", dversion)
 			else CHECKKEY ("Patch format", pversion)
 		}
-	}
-
-	if (!cont || dversion == -1 || pversion == -1) {
-		free (PatchFile);
-		Printf ("\"%s\" is not a DeHackEd patch file\n");
-		return;
+		if (!cont || dversion == -1 || pversion == -1) {
+			free (PatchFile);
+			Printf ("\"%s\" is not a DeHackEd patch file\n");
+			return;
+		}
+	} else {
+		DPrintf ("Patch does not have DeHackEd signature. Assuming .bex\n");
+		dversion = 19;
+		pversion = 6;
+		PatchPt = PatchFile;
+		while ((cont = GetLine()) == 1)
+			;
 	}
 
 	if (pversion != 6) {
@@ -787,28 +1541,9 @@ void DoDehPatch (char *patchfile, BOOL autoloading)
 	do {
 		if (cont == 1) {
 			Printf ("Key %s encountered out of context\n", Line1);
-			break;
-		} else if (cont == 2) {
-			int num = atoi (Line2);
-
-				 CHECKMODE ("Thing",	PatchThing)
-			else CHECKMODE ("Sound",	PatchSound)
-			else CHECKMODE ("Frame",	PatchFrame)
-			else CHECKMODE ("Sprite",	PatchSprite)
-			else CHECKMODE ("Ammo",		PatchAmmo)
-			else CHECKMODE ("Weapon",	PatchWeapon)
-			else CHECKMODE ("Pointer",	PatchPointer)
-			else CHECKMODE ("Cheat",	PatchCheats)
-			else CHECKMODE ("Misc",		PatchMisc)
-			else CHECKMODE ("Text",		PatchText)
-			else {
-				// Handle unknown or unimplemented data
-				Printf ("Unknown chunk %s %s encountered. Skipping.\n", Line1, Line2);
-				do {
-					cont = GetLine ();
-				} while (cont == 1);
-			}
-		}
+			cont = 0;
+		} else if (cont == 2)
+			cont = HandleMode (Line1, atoi (Line2));
 	} while (cont);
 
 	free (PatchFile);
diff --git a/code/D_DEHACK.H b/code/D_dehack.h
similarity index 100%
rename from code/D_DEHACK.H
rename to code/D_dehack.h
diff --git a/code/D_englsh.h b/code/D_englsh.h
deleted file mode 100644
index 169a5b0c7d..0000000000
--- a/code/D_englsh.h
+++ /dev/null
@@ -1,701 +0,0 @@
-// Emacs style mode select	 -*- C++ -*- 
-//-----------------------------------------------------------------------------
-//
-// $Id:$
-//
-// Copyright (C) 1993-1996 by id Software, Inc.
-//
-// This source is available for distribution and/or modification
-// only under the terms of the DOOM Source Code License as
-// published by id Software. All rights reserved.
-//
-// The source is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// FITNESS FOR A PARTICULAR PURPOSE. See the DOOM Source Code License
-// for more details.
-//
-// DESCRIPTION:
-//		Printed strings for translation.
-//		English language support (default).
-//
-//-----------------------------------------------------------------------------
-
-#ifndef __D_ENGLSH__
-#define __D_ENGLSH__
-
-//
-//		Printed strings for translation
-//
-
-//
-// D_Main.C
-//
-#define D_DEVSTR		"Development mode ON.\n"
-#define D_CDROM			"CD-ROM Version: default.cfg from c:\\doomdata\n"
-
-//
-//		M_Menu.C
-//
-#define PRESSKEY		"press a key."
-#define PRESSYN 		"press y or n."
-#define QUITMSG			"are you sure you want to\nquit this great game?"
-#define LOADNET 		"you can't do load while in a net game!\n\n"PRESSKEY
-#define QLOADNET		"you can't quickload during a netgame!\n\n"PRESSKEY
-#define QSAVESPOT		"you haven't picked a quicksave slot yet!\n\n"PRESSKEY
-#define SAVEDEAD		"you can't save if you aren't playing!\n\n"PRESSKEY
-#define QSPROMPT		"quicksave over your game named\n\n'%s'?\n\n"PRESSYN
-#define QLPROMPT		"do you want to quickload the game named\n\n'%s'?\n\n"PRESSYN
-
-#define NEWGAME \
-"you can't start a new game\n"\
-"while in a network game.\n\n"PRESSKEY
-
-#define NIGHTMARE		\
-"are you sure? this skill level\n"\
-"isn't even remotely fair.\n\n"PRESSYN
-
-#define SWSTRING		\
-"this is the shareware version of doom.\n\n"\
-"you need to order the entire trilogy.\n\n"PRESSKEY
-
-#define MSGOFF			"Messages OFF"
-#define MSGON			"Messages ON"
-#define NETEND			"you can't end a netgame!\n\n"PRESSKEY
-#define ENDGAME			"are you sure you want to end the game?\n\n"PRESSYN
-
-#define DOSY			"(press y to quit)"
-
-#define DETAILHI		"High detail"
-#define DETAILLO		"Low detail"
-#define GAMMALVL0		"Gamma correction OFF"
-#define GAMMALVL1		"Gamma correction level 1"
-#define GAMMALVL2		"Gamma correction level 2"
-#define GAMMALVL3		"Gamma correction level 3"
-#define GAMMALVL4		"Gamma correction level 4"
-#define EMPTYSTRING 	"empty slot"
-
-//
-//		P_inter.C
-//
-#define GOTARMOR		"Picked up the armor."
-#define GOTMEGA			"Picked up the MegaArmor!"
-#define GOTHTHBONUS 	"Picked up a health bonus."
-#define GOTARMBONUS 	"Picked up an armor bonus."
-#define GOTSTIM			"Picked up a stimpack."
-#define GOTMEDINEED 	"Picked up a medikit that you REALLY need!"
-#define GOTMEDIKIT		"Picked up a medikit."
-#define GOTSUPER		"Supercharge!"
-
-#define GOTBLUECARD 	"Picked up a blue keycard."
-#define GOTYELWCARD 	"Picked up a yellow keycard."
-#define GOTREDCARD		"Picked up a red keycard."
-#define GOTBLUESKUL 	"Picked up a blue skull key."
-#define GOTYELWSKUL 	"Picked up a yellow skull key."
-#define GOTREDSKULL 	"Picked up a red skull key."
-
-#define GOTINVUL		"Invulnerability!"
-#define GOTBERSERK		"Berserk!"
-#define GOTINVIS		"Partial Invisibility"
-#define GOTSUIT			"Radiation Shielding Suit"
-#define GOTMAP			"Computer Area Map"
-#define GOTVISOR		"Light Amplification Visor"
-#define GOTMSPHERE		"MegaSphere!"
-
-#define GOTCLIP			"Picked up a clip."
-#define GOTCLIPBOX		"Picked up a box of bullets."
-#define GOTROCKET		"Picked up a rocket."
-#define GOTROCKBOX		"Picked up a box of rockets."
-#define GOTCELL			"Picked up an energy cell."
-#define GOTCELLBOX		"Picked up an energy cell pack."
-#define GOTSHELLS		"Picked up 4 shotgun shells."
-#define GOTSHELLBOX 	"Picked up a box of shotgun shells."
-#define GOTBACKPACK 	"Picked up a backpack full of ammo!"
-
-#define GOTBFG9000		"You got the BFG9000!  Oh, yes."
-#define GOTCHAINGUN 	"You got the chaingun!"
-#define GOTCHAINSAW 	"A chainsaw!  Find some meat!"
-#define GOTLAUNCHER 	"You got the rocket launcher!"
-#define GOTPLASMA		"You got the plasma gun!"
-#define GOTSHOTGUN		"You got the shotgun!"
-#define GOTSHOTGUN2 	"You got the super shotgun!"
-
-//
-// P_Doors.C
-//
-#define PD_BLUEO		"You need a blue key\nto activate this object"
-#define PD_REDO			"You need a red key\nto activate this object"
-#define PD_YELLOWO		"You need a yellow key\nto activate this object"
-#define PD_BLUEK		"You need a blue key\nto open this door"
-#define PD_REDK			"You need a red key\nto open this door"
-#define PD_YELLOWK		"You need a yellow key\nto open this door"
-
-//
-//		G_game.C
-//
-#define GGSAVED "game saved."
-
-//
-//		HU_stuff.C
-//
-#define HUSTR_MSGU		"[Message unsent]"
-
-#define HUSTR_E1M1		"E1M1: Hangar"
-#define HUSTR_E1M2		"E1M2: Nuclear Plant"
-#define HUSTR_E1M3		"E1M3: Toxin Refinery"
-#define HUSTR_E1M4		"E1M4: Command Control"
-#define HUSTR_E1M5		"E1M5: Phobos Lab"
-#define HUSTR_E1M6		"E1M6: Central Processing"
-#define HUSTR_E1M7		"E1M7: Computer Station"
-#define HUSTR_E1M8		"E1M8: Phobos Anomaly"
-#define HUSTR_E1M9		"E1M9: Military Base"
-
-#define HUSTR_E2M1		"E2M1: Deimos Anomaly"
-#define HUSTR_E2M2		"E2M2: Containment Area"
-#define HUSTR_E2M3		"E2M3: Refinery"
-#define HUSTR_E2M4		"E2M4: Deimos Lab"
-#define HUSTR_E2M5		"E2M5: Command Center"
-#define HUSTR_E2M6		"E2M6: Halls of the Damned"
-#define HUSTR_E2M7		"E2M7: Spawning Vats"
-#define HUSTR_E2M8		"E2M8: Tower of Babel"
-#define HUSTR_E2M9		"E2M9: Fortress of Mystery"
-
-#define HUSTR_E3M1		"E3M1: Hell Keep"
-#define HUSTR_E3M2		"E3M2: Slough of Despair"
-#define HUSTR_E3M3		"E3M3: Pandemonium"
-#define HUSTR_E3M4		"E3M4: House of Pain"
-#define HUSTR_E3M5		"E3M5: Unholy Cathedral"
-#define HUSTR_E3M6		"E3M6: Mt. Erebus"
-#define HUSTR_E3M7		"E3M7: Limbo"
-#define HUSTR_E3M8		"E3M8: Dis"
-#define HUSTR_E3M9		"E3M9: Warrens"
-
-#define HUSTR_E4M1		"E4M1: Hell Beneath"
-#define HUSTR_E4M2		"E4M2: Perfect Hatred"
-#define HUSTR_E4M3		"E4M3: Sever The Wicked"
-#define HUSTR_E4M4		"E4M4: Unruly Evil"
-#define HUSTR_E4M5		"E4M5: They Will Repent"
-#define HUSTR_E4M6		"E4M6: Against Thee Wickedly"
-#define HUSTR_E4M7		"E4M7: And Hell Followed"
-#define HUSTR_E4M8		"E4M8: Unto The Cruel"
-#define HUSTR_E4M9		"E4M9: Fear"
-
-#define HUSTR_1			"level 1: entryway"
-#define HUSTR_2			"level 2: underhalls"
-#define HUSTR_3			"level 3: the gantlet"
-#define HUSTR_4			"level 4: the focus"
-#define HUSTR_5			"level 5: the waste tunnels"
-#define HUSTR_6			"level 6: the crusher"
-#define HUSTR_7			"level 7: dead simple"
-#define HUSTR_8			"level 8: tricks and traps"
-#define HUSTR_9			"level 9: the pit"
-#define HUSTR_10		"level 10: refueling base"
-#define HUSTR_11		"level 11: 'o' of destruction!"
-
-#define HUSTR_12		"level 12: the factory"
-#define HUSTR_13		"level 13: downtown"
-#define HUSTR_14		"level 14: the inmost dens"
-#define HUSTR_15		"level 15: industrial zone"
-#define HUSTR_16		"level 16: suburbs"
-#define HUSTR_17		"level 17: tenements"
-#define HUSTR_18		"level 18: the courtyard"
-#define HUSTR_19		"level 19: the citadel"
-#define HUSTR_20		"level 20: gotcha!"
-
-#define HUSTR_21		"level 21: nirvana"
-#define HUSTR_22		"level 22: the catacombs"
-#define HUSTR_23		"level 23: barrels o' fun"
-#define HUSTR_24		"level 24: the chasm"
-#define HUSTR_25		"level 25: bloodfalls"
-#define HUSTR_26		"level 26: the abandoned mines"
-#define HUSTR_27		"level 27: monster condo"
-#define HUSTR_28		"level 28: the spirit world"
-#define HUSTR_29		"level 29: the living end"
-#define HUSTR_30		"level 30: icon of sin"
-
-#define HUSTR_31		"level 31: wolfenstein"
-#define HUSTR_32		"level 32: grosse"
-
-#define PHUSTR_1		"level 1: congo"
-#define PHUSTR_2		"level 2: well of souls"
-#define PHUSTR_3		"level 3: aztec"
-#define PHUSTR_4		"level 4: caged"
-#define PHUSTR_5		"level 5: ghost town"
-#define PHUSTR_6		"level 6: baron's lair"
-#define PHUSTR_7		"level 7: caughtyard"
-#define PHUSTR_8		"level 8: realm"
-#define PHUSTR_9		"level 9: abattoire"
-#define PHUSTR_10		"level 10: onslaught"
-#define PHUSTR_11		"level 11: hunted"
-
-#define PHUSTR_12		"level 12: speed"
-#define PHUSTR_13		"level 13: the crypt"
-#define PHUSTR_14		"level 14: genesis"
-#define PHUSTR_15		"level 15: the twilight"
-#define PHUSTR_16		"level 16: the omen"
-#define PHUSTR_17		"level 17: compound"
-#define PHUSTR_18		"level 18: neurosphere"
-#define PHUSTR_19		"level 19: nme"
-#define PHUSTR_20		"level 20: the death domain"
-
-#define PHUSTR_21		"level 21: slayer"
-#define PHUSTR_22		"level 22: impossible mission"
-#define PHUSTR_23		"level 23: tombstone"
-#define PHUSTR_24		"level 24: the final frontier"
-#define PHUSTR_25		"level 25: the temple of darkness"
-#define PHUSTR_26		"level 26: bunker"
-#define PHUSTR_27		"level 27: anti-christ"
-#define PHUSTR_28		"level 28: the sewers"
-#define PHUSTR_29		"level 29: odyssey of noises"
-#define PHUSTR_30		"level 30: the gateway of hell"
-
-#define PHUSTR_31		"level 31: cyberden"
-#define PHUSTR_32		"level 32: go 2 it"
-
-#define THUSTR_1		"level 1: system control"
-#define THUSTR_2		"level 2: human bbq"
-#define THUSTR_3		"level 3: power control"
-#define THUSTR_4		"level 4: wormhole"
-#define THUSTR_5		"level 5: hanger"
-#define THUSTR_6		"level 6: open season"
-#define THUSTR_7		"level 7: prison"
-#define THUSTR_8		"level 8: metal"
-#define THUSTR_9		"level 9: stronghold"
-#define THUSTR_10		"level 10: redemption"
-#define THUSTR_11		"level 11: storage facility"
-
-#define THUSTR_12		"level 12: crater"
-#define THUSTR_13		"level 13: nukage processing"
-#define THUSTR_14		"level 14: steel works"
-#define THUSTR_15		"level 15: dead zone"
-#define THUSTR_16		"level 16: deepest reaches"
-#define THUSTR_17		"level 17: processing area"
-#define THUSTR_18		"level 18: mill"
-#define THUSTR_19		"level 19: shipping/respawning"
-#define THUSTR_20		"level 20: central processing"
-
-#define THUSTR_21		"level 21: administration center"
-#define THUSTR_22		"level 22: habitat"
-#define THUSTR_23		"level 23: lunar mining project"
-#define THUSTR_24		"level 24: quarry"
-#define THUSTR_25		"level 25: baron's den"
-#define THUSTR_26		"level 26: ballistyx"
-#define THUSTR_27		"level 27: mount pain"
-#define THUSTR_28		"level 28: heck"
-#define THUSTR_29		"level 29: river styx"
-#define THUSTR_30		"level 30: last call"
-
-#define THUSTR_31		"level 31: pharaoh"
-#define THUSTR_32		"level 32: caribbean"
-
-#define HUSTR_CHATMACRO1		"I'm ready to kick butt!"
-#define HUSTR_CHATMACRO2		"I'm OK."
-#define HUSTR_CHATMACRO3		"I'm not looking too good!"
-#define HUSTR_CHATMACRO4		"Help!"
-#define HUSTR_CHATMACRO5		"You suck!"
-#define HUSTR_CHATMACRO6		"Next time, scumbag..."
-#define HUSTR_CHATMACRO7		"Come here!"
-#define HUSTR_CHATMACRO8		"I'll take care of it."
-#define HUSTR_CHATMACRO9		"Yes"
-#define HUSTR_CHATMACRO0		"No"
-
-#define HUSTR_TALKTOSELF1		"You mumble to yourself"
-#define HUSTR_TALKTOSELF2		"Who's there?"
-#define HUSTR_TALKTOSELF3		"You scare yourself"
-#define HUSTR_TALKTOSELF4		"You start to rave"
-#define HUSTR_TALKTOSELF5		"You've lost it..."
-
-#define HUSTR_MESSAGESENT		"[Message Sent]"
-
-// The following should NOT be changed unless it seems
-// just AWFULLY necessary
-
-#define HUSTR_PLRGREEN	"Green: "
-#define HUSTR_PLRINDIGO "Indigo: "
-#define HUSTR_PLRBROWN	"Brown: "
-#define HUSTR_PLRRED	"Red: "
-
-#define HUSTR_KEYGREEN	'g'
-#define HUSTR_KEYINDIGO 'i'
-#define HUSTR_KEYBROWN	'b'
-#define HUSTR_KEYRED	'r'
-
-//
-//		AM_map.C
-//
-
-#define AMSTR_FOLLOWON			"Follow Mode ON"
-#define AMSTR_FOLLOWOFF			"Follow Mode OFF"
-
-#define AMSTR_GRIDON			"Grid ON"
-#define AMSTR_GRIDOFF			"Grid OFF"
-
-#define AMSTR_MARKEDSPOT		"Marked Spot"
-#define AMSTR_MARKSCLEARED		"All Marks Cleared"
-
-//
-//		ST_stuff.C
-//
-
-#define STSTR_MUS				"Music Change"
-#define STSTR_NOMUS 			"IMPOSSIBLE SELECTION"
-#define STSTR_DQDON 			"Degreelessness Mode ON"
-#define STSTR_DQDOFF			"Degreelessness Mode OFF"
-
-#define STSTR_KFAADDED			"Very Happy Ammo Added"
-#define STSTR_FAADDED			"Ammo (no keys) Added"
-
-#define STSTR_NCON				"No Clipping Mode ON"
-#define STSTR_NCOFF 			"No Clipping Mode OFF"
-
-#define STSTR_BEHOLD			"inVuln, Str, Inviso, Rad, Allmap, or Lite-amp"
-#define STSTR_BEHOLDX			"Power-up Toggled"
-
-#define STSTR_CHOPPERS			"... doesn't suck - GM"
-#define STSTR_CLEV				"Changing Level..."
-
-//
-//		F_Finale.C
-//
-#define E1TEXT \
-"Once you beat the big badasses and\n"\
-"clean out the moon base you're supposed\n"\
-"to win, aren't you? Aren't you? Where's\n"\
-"your fat reward and ticket home? What\n"\
-"the hell is this? It's not supposed to\n"\
-"end this way!\n"\
-"\n" \
-"It stinks like rotten meat, but looks\n"\
-"like the lost Deimos base.  Looks like\n"\
-"you're stuck on The Shores of Hell.\n"\
-"The only way out is through.\n"\
-"\n"\
-"To continue the DOOM experience, play\n"\
-"The Shores of Hell and its amazing\n"\
-"sequel, Inferno!\n"
-
-
-#define E2TEXT \
-"You've done it! The hideous cyber-\n"\
-"demon lord that ruled the lost Deimos\n"\
-"moon base has been slain and you\n"\
-"are triumphant! But ... where are\n"\
-"you? You clamber to the edge of the\n"\
-"moon and look down to see the awful\n"\
-"truth.\n" \
-"\n"\
-"Deimos floats above Hell itself!\n"\
-"You've never heard of anyone escaping\n"\
-"from Hell, but you'll make the bastards\n"\
-"sorry they ever heard of you! Quickly,\n"\
-"you rappel down to  the surface of\n"\
-"Hell.\n"\
-"\n" \
-"Now, it's on to the final chapter of\n"\
-"DOOM! -- Inferno."
-
-
-#define E3TEXT \
-"The loathsome spiderdemon that\n"\
-"masterminded the invasion of the moon\n"\
-"bases and caused so much death has had\n"\
-"its ass kicked for all time.\n"\
-"\n"\
-"A hidden doorway opens and you enter.\n"\
-"You've proven too tough for Hell to\n"\
-"contain, and now Hell at last plays\n"\
-"fair -- for you emerge from the door\n"\
-"to see the green fields of Earth!\n"\
-"Home at last.\n" \
-"\n"\
-"You wonder what's been happening on\n"\
-"Earth while you were battling evil\n"\
-"unleashed. It's good that no Hell-\n"\
-"spawn could have come through that\n"\
-"door with you ..."
-
-
-#define E4TEXT \
-"the spider mastermind must have sent forth\n"\
-"its legions of hellspawn before your\n"\
-"final confrontation with that terrible\n"\
-"beast from hell.  but you stepped forward\n"\
-"and brought forth eternal damnation and\n"\
-"suffering upon the horde as a true hero\n"\
-"would in the face of something so evil.\n"\
-"\n"\
-"besides, someone was gonna pay for what\n"\
-"happened to daisy, your pet rabbit.\n"\
-"\n"\
-"but now, you see spread before you more\n"\
-"potential pain and gibbitude as a nation\n"\
-"of demons run amok among our cities.\n"\
-"\n"\
-"next stop, hell on earth!"
-
-
-// after level 6, put this:
-
-#define C1TEXT \
-"YOU HAVE ENTERED DEEPLY INTO THE INFESTED\n" \
-"STARPORT. BUT SOMETHING IS WRONG. THE\n" \
-"MONSTERS HAVE BROUGHT THEIR OWN REALITY\n" \
-"WITH THEM, AND THE STARPORT'S TECHNOLOGY\n" \
-"IS BEING SUBVERTED BY THEIR PRESENCE.\n" \
-"\n"\
-"AHEAD, YOU SEE AN OUTPOST OF HELL, A\n" \
-"FORTIFIED ZONE. IF YOU CAN GET PAST IT,\n" \
-"YOU CAN PENETRATE INTO THE HAUNTED HEART\n" \
-"OF THE STARBASE AND FIND THE CONTROLLING\n" \
-"SWITCH WHICH HOLDS EARTH'S POPULATION\n" \
-"HOSTAGE."
-
-// After level 11, put this:
-
-#define C2TEXT \
-"YOU HAVE WON! YOUR VICTORY HAS ENABLED\n" \
-"HUMANKIND TO EVACUATE EARTH AND ESCAPE\n"\
-"THE NIGHTMARE.  NOW YOU ARE THE ONLY\n"\
-"HUMAN LEFT ON THE FACE OF THE PLANET.\n"\
-"CANNIBAL MUTATIONS, CARNIVOROUS ALIENS,\n"\
-"AND EVIL SPIRITS ARE YOUR ONLY NEIGHBORS.\n"\
-"YOU SIT BACK AND WAIT FOR DEATH, CONTENT\n"\
-"THAT YOU HAVE SAVED YOUR SPECIES.\n"\
-"\n"\
-"BUT THEN, EARTH CONTROL BEAMS DOWN A\n"\
-"MESSAGE FROM SPACE: \"SENSORS HAVE LOCATED\n"\
-"THE SOURCE OF THE ALIEN INVASION. IF YOU\n"\
-"GO THERE, YOU MAY BE ABLE TO BLOCK THEIR\n"\
-"ENTRY.  THE ALIEN BASE IS IN THE HEART OF\n"\
-"YOUR OWN HOME CITY, NOT FAR FROM THE\n"\
-"STARPORT.\" SLOWLY AND PAINFULLY YOU GET\n"\
-"UP AND RETURN TO THE FRAY."
-
-
-// After level 20, put this:
-
-#define C3TEXT \
-"YOU ARE AT THE CORRUPT HEART OF THE CITY,\n"\
-"SURROUNDED BY THE CORPSES OF YOUR ENEMIES.\n"\
-"YOU SEE NO WAY TO DESTROY THE CREATURES'\n"\
-"ENTRYWAY ON THIS SIDE, SO YOU CLENCH YOUR\n"\
-"TEETH AND PLUNGE THROUGH IT.\n"\
-"\n"\
-"THERE MUST BE A WAY TO CLOSE IT ON THE\n"\
-"OTHER SIDE. WHAT DO YOU CARE IF YOU'VE\n"\
-"GOT TO GO THROUGH HELL TO GET TO IT?"
-
-
-// After level 29, put this:
-
-#define C4TEXT \
-"THE HORRENDOUS VISAGE OF THE BIGGEST\n"\
-"DEMON YOU'VE EVER SEEN CRUMBLES BEFORE\n"\
-"YOU, AFTER YOU PUMP YOUR ROCKETS INTO\n"\
-"HIS EXPOSED BRAIN. THE MONSTER SHRIVELS\n"\
-"UP AND DIES, ITS THRASHING LIMBS\n"\
-"DEVASTATING UNTOLD MILES OF HELL'S\n"\
-"SURFACE.\n"\
-"\n"\
-"YOU'VE DONE IT. THE INVASION IS OVER.\n"\
-"EARTH IS SAVED. HELL IS A WRECK. YOU\n"\
-"WONDER WHERE BAD FOLKS WILL GO WHEN THEY\n"\
-"DIE, NOW. WIPING THE SWEAT FROM YOUR\n"\
-"FOREHEAD YOU BEGIN THE LONG TREK BACK\n"\
-"HOME. REBUILDING EARTH OUGHT TO BE A\n"\
-"LOT MORE FUN THAN RUINING IT WAS.\n"
-
-
-
-// Before level 31, put this:
-
-#define C5TEXT \
-"CONGRATULATIONS, YOU'VE FOUND THE SECRET\n"\
-"LEVEL! LOOKS LIKE IT'S BEEN BUILT BY\n"\
-"HUMANS, RATHER THAN DEMONS. YOU WONDER\n"\
-"WHO THE INMATES OF THIS CORNER OF HELL\n"\
-"WILL BE."
-
-
-// Before level 32, put this:
-
-#define C6TEXT \
-"CONGRATULATIONS, YOU'VE FOUND THE\n"\
-"SUPER SECRET LEVEL!  YOU'D BETTER\n"\
-"BLAZE THROUGH THIS ONE!\n"
-
-
-// after map 06 
-
-#define P1TEXT	\
-"You gloat over the steaming carcass of the\n"\
-"Guardian.  With its death, you've wrested\n"\
-"the Accelerator from the stinking claws\n"\
-"of Hell.  You relax and glance around the\n"\
-"room.  Damn!  There was supposed to be at\n"\
-"least one working prototype, but you can't\n"\
-"see it. The demons must have taken it.\n"\
-"\n"\
-"You must find the prototype, or all your\n"\
-"struggles will have been wasted. Keep\n"\
-"moving, keep fighting, keep killing.\n"\
-"Oh yes, keep living, too."
-
-
-// after map 11
-
-#define P2TEXT \
-"Even the deadly Arch-Vile labyrinth could\n"\
-"not stop you, and you've gotten to the\n"\
-"prototype Accelerator which is soon\n"\
-"efficiently and permanently deactivated.\n"\
-"\n"\
-"You're good at that kind of thing."
-
-
-// after map 20
-
-#define P3TEXT \
-"You've bashed and battered your way into\n"\
-"the heart of the devil-hive.  Time for a\n"\
-"Search-and-Destroy mission, aimed at the\n"\
-"Gatekeeper, whose foul offspring is\n"\
-"cascading to Earth.  Yeah, he's bad. But\n"\
-"you know who's worse!\n"\
-"\n"\
-"Grinning evilly, you check your gear, and\n"\
-"get ready to give the bastard a little Hell\n"\
-"of your own making!"
-
-// after map 30
-
-#define P4TEXT \
-"The Gatekeeper's evil face is splattered\n"\
-"all over the place.  As its tattered corpse\n"\
-"collapses, an inverted Gate forms and\n"\
-"sucks down the shards of the last\n"\
-"prototype Accelerator, not to mention the\n"\
-"few remaining demons.  You're done. Hell\n"\
-"has gone back to pounding bad dead folks \n"\
-"instead of good live ones.  Remember to\n"\
-"tell your grandkids to put a rocket\n"\
-"launcher in your coffin. If you go to Hell\n"\
-"when you die, you'll need it for some\n"\
-"final cleaning-up ..."
-
-// before map 31
-
-#define P5TEXT \
-"You've found the second-hardest level we\n"\
-"got. Hope you have a saved game a level or\n"\
-"two previous.  If not, be prepared to die\n"\
-"aplenty. For master marines only."
-
-// before map 32
-
-#define P6TEXT \
-"Betcha wondered just what WAS the hardest\n"\
-"level we had ready for ya?  Now you know.\n"\
-"No one gets out alive."
-
-
-#define T1TEXT \
-"You've fought your way out of the infested\n"\
-"experimental labs.   It seems that UAC has\n"\
-"once again gulped it down.  With their\n"\
-"high turnover, it must be hard for poor\n"\
-"old UAC to buy corporate health insurance\n"\
-"nowadays..\n"\
-"\n"\
-"Ahead lies the military complex, now\n"\
-"swarming with diseased horrors hot to get\n"\
-"their teeth into you. With luck, the\n"\
-"complex still has some warlike ordnance\n"\
-"laying around."
-
-
-#define T2TEXT \
-"You hear the grinding of heavy machinery\n"\
-"ahead.  You sure hope they're not stamping\n"\
-"out new hellspawn, but you're ready to\n"\
-"ream out a whole herd if you have to.\n"\
-"They might be planning a blood feast, but\n"\
-"you feel about as mean as two thousand\n"\
-"maniacs packed into one mad killer.\n"\
-"\n"\
-"You don't plan to go down easy."
-
-
-#define T3TEXT \
-"The vista opening ahead looks real damn\n"\
-"familiar. Smells familiar, too -- like\n"\
-"fried excrement. You didn't like this\n"\
-"place before, and you sure as hell ain't\n"\
-"planning to like it now. The more you\n"\
-"brood on it, the madder you get.\n"\
-"Hefting your gun, an evil grin trickles\n"\
-"onto your face. Time to take some names."
-
-#define T4TEXT \
-"Suddenly, all is silent, from one horizon\n"\
-"to the other. The agonizing echo of Hell\n"\
-"fades away, the nightmare sky turns to\n"\
-"blue, the heaps of monster corpses start \n"\
-"to evaporate along with the evil stench \n"\
-"that filled the air. Jeeze, maybe you've\n"\
-"done it. Have you really won?\n"\
-"\n"\
-"Something rumbles in the distance.\n"\
-"A blue light begins to glow inside the\n"\
-"ruined skull of the demon-spitter."
-
-
-#define T5TEXT \
-"What now? Looks totally different. Kind\n"\
-"of like King Tut's condo. Well,\n"\
-"whatever's here can't be any worse\n"\
-"than usual. Can it?  Or maybe it's best\n"\
-"to let sleeping gods lie.."
-
-
-#define T6TEXT \
-"Time for a vacation. You've burst the\n"\
-"bowels of hell and by golly you're ready\n"\
-"for a break. You mutter to yourself,\n"\
-"Maybe someone else can kick Hell's ass\n"\
-"next time around. Ahead lies a quiet town,\n"\
-"with peaceful flowing water, quaint\n"\
-"buildings, and presumably no Hellspawn.\n"\
-"\n"\
-"As you step off the transport, you hear\n"\
-"the stomp of a cyberdemon's iron shoe."
-
-
-
-//
-// Character cast strings F_FINALE.C
-//
-#define CC_ZOMBIE		"ZOMBIEMAN"
-#define CC_SHOTGUN		"SHOTGUN GUY"
-#define CC_HEAVY		"HEAVY WEAPON DUDE"
-#define CC_IMP			"IMP"
-#define CC_DEMON		"DEMON"
-#define CC_LOST			"LOST SOUL"
-#define CC_CACO			"CACODEMON"
-#define CC_HELL			"HELL KNIGHT"
-#define CC_BARON		"BARON OF HELL"
-#define CC_ARACH		"ARACHNOTRON"
-#define CC_PAIN			"PAIN ELEMENTAL"
-#define CC_REVEN		"REVENANT"
-#define CC_MANCU		"MANCUBUS"
-#define CC_ARCH			"ARCH-VILE"
-#define CC_SPIDER		"THE SPIDER MASTERMIND"
-#define CC_CYBER		"THE CYBERDEMON"
-#define CC_HERO			"OUR HERO"
-
-
-#endif
-//-----------------------------------------------------------------------------
-//
-// $Log:$
-//
-//-----------------------------------------------------------------------------
diff --git a/code/D_items.h b/code/D_items.h
index 497ac2121b..82c1de3f6e 100644
--- a/code/D_items.h
+++ b/code/D_items.h
@@ -52,7 +52,7 @@ extern	weaponinfo_t	weaponinfo[NUMWEAPONS];
 #define IT_ARMOR				4
 #define IT_KEY					8
 #define IT_ARTIFACT 			16				// Don't auto-activate item (unused)
-#define IT_POWER				32				// Auto-activate item
+#define IT_POWERUP				32				// Auto-activate item
 
 struct gitem_s
 {
@@ -67,16 +67,18 @@ struct gitem_s
 };
 typedef struct gitem_s gitem_t;
 
-extern gitem_t ItemList[];
+extern int num_items;
+
+extern gitem_t itemlist[];
 
 void InitItems (void);
 
 // FindItem
 gitem_t	*GetItemByIndex (int index);
-gitem_t	*FindItemByClassname (char *classname);
-gitem_t *FindItem (char *pickup_name);
+gitem_t	*FindItemByClassname (const char *classname);
+gitem_t *FindItem (const char *pickup_name);
 
-#define ITEM_INDEX(i)	((i)-ItemList)
+#define ITEM_INDEX(i)	((i)-itemlist)
 
 
 #endif
diff --git a/code/D_main.c b/code/D_main.c
index 5bfbe32cd0..6be5f4b3b5 100644
--- a/code/D_main.c
+++ b/code/D_main.c
@@ -25,18 +25,21 @@
 //-----------------------------------------------------------------------------
 
 
-#define BGCOLOR 		7
-#define FGCOLOR 		8
+#ifdef _WIN32
+#include <direct.h>
+#define mkdir(a,b) mkdir (a)
+#else
+#include <sys/stat.h>
+#endif
 
 
 #include "m_alloc.h"
+#include "minilzo.h"
 
 #include "doomdef.h"
 #include "doomstat.h"
 
 #include "dstrings.h"
-#include "sounds.h"
-
 
 #include "z_zone.h"
 #include "w_wad.h"
@@ -75,6 +78,10 @@
 
 #include "cmdlib.h"
 
+#include "s_sound.h"
+
+#include "m_swap.h"
+
 cvar_t	*fraglimit;
 cvar_t	*timelimit;
 
@@ -94,31 +101,30 @@ extern void TurboCallback (cvar_t *);
 void D_DoomLoop (void);
 
 
-char*			wadfiles[MAXWADFILES];
+wadlist_t		*wadfiles;		// [RH] remove limit on # of loaded wads
+wadlist_t		**wadtail = &wadfiles;
 
-
-BOOL 			devparm;		// started game with -devparm
+BOOL			devparm;		// started game with -devparm
 
 BOOL			DrawNewHUD;		// [RH] Draw the new HUD?
+int				NoWipe;			// [RH] Allow wipe? (Needs to be set each time)
 
 BOOL			drone;
 
-BOOL 			singletics = false; // debug flag to cancel adaptiveness
+BOOL			singletics = false; // debug flag to cancel adaptiveness
 
 
+char *D_DrawIcon;	// [RH] Patch name of icon to draw on next refresh
 
-//extern int soundVolume;
-//extern  int	sfxVolume;
-//extern  int	musicVolume;
 
-extern	BOOL	 inhelpscreens;
+extern BOOL		inhelpscreens;
 
-char 			startmap[8];
-BOOL	 		autostart;
+char			startmap[8];
+BOOL			autostart;
 
 FILE*			debugfile;
 
-BOOL	 		advancedemo;
+BOOL			advancedemo;
 
 
 
@@ -165,13 +171,8 @@ extern void M_RestoreMode (void);
 
 void D_ProcessEvents (void)
 {
-	event_t*	ev;
+	event_t *ev;
 		
-	// IF STORE DEMO, DO NOT ACCEPT INPUT
-	if ( ( gamemode == commercial )
-		 && (W_CheckNumForName("map01")<0) )
-	  return;
-
 	// [RH] If testing mode, do not accept input until test is over
 	if (testingmode) {
 		if (testingmode <= I_GetTime()) {
@@ -217,7 +218,7 @@ void DMFlagsCallback (cvar_t *var)
 // wipegamestate can be set to -1 to force a wipe on the next draw
 gamestate_t 	wipegamestate = GS_DEMOSCREEN;
 extern	BOOL	setsizeneeded, setmodeneeded;
-extern	int		NewWidth, NewHeight, NewBpp;
+extern	int		NewWidth, NewHeight, NewID, DisplayID;
 extern	cvar_t	*st_scale;
 void R_ExecuteSetViewSize (void);
 
@@ -239,7 +240,7 @@ void D_Display (void)
 	BOOL 						redrawsbar;
 
 	if (nodrawers)
-		return; 				   // for comparative timing / profiling
+		return; 				// for comparative timing / profiling
 
 	redrawsbar = false;
 	if (!menuwasactive && menuactive)
@@ -249,23 +250,21 @@ void D_Display (void)
 	if (setmodeneeded) {
 		int oldwidth = screens[0].width;
 		int oldheight = screens[0].height;
-		int oldbpp = screens[0].Bpp << 3;
+		int oldid = DisplayID;
 
 		// Change screen mode.
-		if (!V_SetResolution (NewWidth, NewHeight, NewBpp))
-			if (!V_SetResolution (oldwidth, oldheight, oldbpp))
+		if (!V_SetResolution (NewWidth, NewHeight, NewID))
+			if (!V_SetResolution (oldwidth, oldheight, oldid))
 				I_FatalError ("Could not change screen mode");
 
 		// Recalculate various view parameters.
 		setsizeneeded = true;
-		// Trick status bar into rethinking its position :-)
+		// Trick status bar into rethinking its position
 		SetCVarFloat (st_scale, st_scale->value);
 		// Redraw status bar.
 		redrawsbar = true;
 		// Refresh the console.
 		C_NewModeAdjust ();
-		// Fill the back screen.
-		//R_FillBackScreen ();
 	}
 
 	// change the view size if needed
@@ -282,9 +281,15 @@ void D_Display (void)
 
 	I_BeginUpdate ();
 
-	// save the current screen if about to wipe
-	if (gamestate != wipegamestate)
+	// [RH] Allow temporarily disabling wipes
+	if (NoWipe) {
+		NoWipe--;
+		wipegamestate = gamestate;
+		wipe = false;
+	}
+	else if (gamestate != wipegamestate && gamestate != GS_FULLCONSOLE)
 	{
+		// save the current screen if about to wipe
 		wipe = true;
 		wipe_StartScreen(0, 0, screens[0].width, screens[0].height);
 	}
@@ -308,7 +313,7 @@ void D_Display (void)
 		}
 		if (inhelpscreensstate && !inhelpscreens)
 			redrawsbar = true;				// just put away the help screen
-		ST_Drawer (realviewheight == screens[0].height, redrawsbar );
+		ST_Drawer (realviewheight == screens[0].height, redrawsbar);
 		fullscreen = realviewheight == screens[0].height;
 
 		break;
@@ -331,7 +336,7 @@ void D_Display (void)
 
 	// draw the view directly
 	if (gamestate == GS_LEVEL && (!automapactive || viewactive) && gametic) {
-		R_RenderPlayerView (&players[displayplayer]);
+		R_RenderPlayerView (&players[consoleplayer]);	// [RH] Use camera of the consoleplayer
 	}
 
 	if (gamestate == GS_LEVEL && DrawNewHUD && viewactive) {
@@ -380,9 +385,13 @@ void D_Display (void)
 	
 	// [RH] Refresh the border here if the menu is active
 	// since it might be dimming the background.
-	if (menuactive && viewactive)
+	if (gamestate != GS_FULLCONSOLE &&
+		((menuactive && viewactive) || (noisedebug->value && gamestate == GS_LEVEL)))
 		R_DrawViewBorder ();
 
+	if (noisedebug->value)
+		S_NoiseDebug ();
+
 	// draw pause pic
 	if (paused)
 	{
@@ -395,46 +404,83 @@ void D_Display (void)
 		V_DrawPatchCleanNoMove((screens[0].width-(pause->width)*CleanXfac)/2,y,&screens[0],pause);
 	}
 
-	C_DrawConsole ();	  // draw console
+	// [RH] Draw icon, if any
+	if (D_DrawIcon) {
+		int lump = W_CheckNumForName (D_DrawIcon);
 
-	// menus go directly to the screen
-	M_Drawer ();		  // menu is drawn even on top of everything
-	NetUpdate ();		  // send out any new accumulation
+		D_DrawIcon = NULL;
+		if (lump >= 0) {
+			patch_t *p = W_CacheLumpNum (lump, PU_CACHE);
 
-	// normal update
-	if (!wipe)
-	{
-		I_FinishUpdate ();				// page flip or blit buffer
-		return;
+			V_DrawPatchIndirect (160-SHORT(p->width)/2, 100-SHORT(p->height)/2,
+								 &screens[0], p);
+		}
 	}
-	
-	// wipe update
-	wipe_EndScreen(0, 0, screens[0].width, screens[0].height);
 
-	wipestart = I_GetTime () - 1;
+	NetUpdate ();			// send out any new accumulation
+
+	if (!wipe) {
+		// normal update
+		C_DrawConsole ();	// draw console
+		M_Drawer ();		// menu is drawn even on top of everything
+		I_FinishUpdate ();	// page flip or blit buffer
+	} else {
+		// wipe update
+		wipe_EndScreen(0, 0, screens[0].width, screens[0].height);
+		I_FinishUpdateNoBlit ();
+
+		wipestart = I_GetTime () - 1;
 
-	I_FinishUpdate ();
-	do
-	{
 		do
 		{
-			nowtime = I_GetTime ();
-			tics = nowtime - wipestart;
-		} while (!tics);
-		wipestart = nowtime;
-		I_BeginUpdate ();
-		done = wipe_ScreenWipe(wipe_Melt
-							   , 0, 0, screens[0].width, screens[0].height, tics);
-		I_UpdateNoBlit ();
-		C_DrawConsole ();
-		M_Drawer ();							// menu is drawn even on top of wipes
+			do
+			{
+				nowtime = I_GetTime ();
+				tics = nowtime - wipestart;
+			} while (!tics);
+			wipestart = nowtime;
+			I_BeginUpdate ();
+			done = wipe_ScreenWipe(wipe_Melt,
+								   0, 0, screens[0].width, screens[0].height, tics);
+			I_UpdateNoBlit ();
+			C_DrawConsole ();
+			M_Drawer ();							// menu is drawn even on top of wipes
 
-		I_FinishUpdate ();						// page flip or blit buffer
-	} while (!done);
+			I_FinishUpdate ();						// page flip or blit buffer
+		} while (!done);
+	}
 }
 
 
 
+//
+// [RH] D_ErrorLoop
+//
+char errortext[2048];
+jmp_buf errorjmp;
+BOOL errorjmpable;
+
+void D_ErrorLoop (void)
+{
+	while (1) {
+		errorjmpable = true;
+		if (setjmp (errorjmp)) {
+			if (errortext[0]) {
+				gameaction = ga_fullconsole;
+				Printf ("%s\n", errortext);
+				errortext[0] = 0;
+
+				D_QuitNetGame ();
+				if (demorecording)
+					G_CheckDemoStatus ();
+				netgame = false;
+			}
+		}
+		D_DoomLoop ();	// never returns
+	}
+}
+
+
 //
 //	D_DoomLoop
 //
@@ -442,35 +488,11 @@ extern BOOL demorecording;
 
 void D_DoomLoop (void)
 {
-	if (demorecording)
-		G_BeginRecording ();
-				
-	if (M_CheckParm ("-debugfile"))
-	{
-		char	filename[20];
-		sprintf (filename,"debug%i.txt",consoleplayer);
-		Printf ("debug output to: %s\n",filename);
-		debugfile = fopen (filename,"w");
-	}
-	I_InitGraphics ();
-	C_InitConsole (screens[0].width, screens[0].height, true);
-
-	InitItems ();
-
-	// [RH] Lock any cvars that should be locked now that we're
-	// about to begin the game.
-	C_EnableNoSet ();
-
-	// [RH] Now that all game subsystems have been initialized,
-	// do all commands on the command line other than +set
-	C_ExecCmdLineParams (false);
-
 	while (1)
 	{
 		// frame syncronous IO operations
 		I_StartFrame ();
 		
-
 		// process one or more tics
 		if (singletics)
 		{
@@ -491,8 +513,8 @@ void D_DoomLoop (void)
 			TryRunTics (); // will run at least one tic
 		}
 
-		// [RH] Use displayplayer rather than console player
-		S_UpdateSounds (players[displayplayer].mo);// move positional sounds
+		// [RH] Use the consoleplayer's camera to update sounds
+		S_UpdateSounds (players[consoleplayer].camera);	// move positional sounds
 
 		// Update display, next frame, with current state.
 		D_Display ();
@@ -549,7 +571,7 @@ void D_AdvanceDemo (void)
 //
 // [RH] If M_DemoNoPlay is true, then any
 //		demos are skipped.
-extern M_DemoNoPlay;
+extern BOOL M_DemoNoPlay;
 
 void D_DoAdvanceDemo (void)
 {
@@ -625,6 +647,8 @@ void D_DoAdvanceDemo (void)
 		  G_DeferedPlayDemo ("demo4");
 		break;
 	}
+	if (gamestate == GS_DEMOSCREEN)
+		C_HideConsole ();
 }
 
 
@@ -639,25 +663,31 @@ void D_StartTitle (void)
 	D_AdvanceDemo ();
 }
 
+//
+// [RH] Quit the current game and go to fullscreen console
+//
+void Cmd_Endgame (player_t *plyr, int argc, char **argv)
+{
+	if (!netgame) {
+		gameaction = ga_fullconsole;
+		demosequence = -1;
+	}
+}
 
 
 
-//		print title for every printed line
-char			title[128];
-
-
 
 //
 // D_AddFile
 //
 void D_AddFile (char *file)
 {
-	int numwadfiles;
-		
-	for (numwadfiles = 0 ; wadfiles[numwadfiles] ; numwadfiles++)
-		;
+	wadlist_t *wad = Z_Malloc (sizeof(*wad) + strlen(file), PU_STATIC, 0);
 
-	wadfiles[numwadfiles] = copystring (file);
+	*wadtail = wad;
+	wad->next = NULL;
+	strcpy (wad->name, file);
+	wadtail = &wad->next;
 }
 
 //
@@ -665,115 +695,126 @@ void D_AddFile (char *file)
 // Checks availability of IWAD files by name,
 // to determine whether registered/commercial features
 // should be executed (notably loading PWAD's).
+// [RH] Rewritten to recognize the IWAD by its contents, not its name.
 //
-void IdentifyVersion (void)
+static const char *IdentifyVersion (void)
 {
+	const char *titlestring;
+	static const char doomwadnames[][13] = {
+		"doom2f.wad",
+		"doom2.wad",
+		"plutonia.wad",
+		"tnt.wad",
+		"doomu.wad", // Hack from original Linux version. Not necessary, but I threw it in anyway.
+		"doom.wad",
+		"doom1.wad",
+		""
+	};
+	int i;
 
-	char*		doom1wad;
-	char*		doomwad;
-	char*		doom2wad;
-
-	char*		doom2fwad;
-	char*		plutoniawad;
-	char*		tntwad;
-
-	char*		custwad;
-
-	char*		doomwaddir;
-	char*		home;
+	char *doomwaddir;
 	
-	char		iwad[64];
-	char*		iwadfull = NULL;
-	int 		iwadindex;
+	char iwad[256];
+	int  iwadindex;
 
-	doomwaddir = home = progdir;
+	doomwaddir = progdir;
 
-	// Commercial.
-	doom2wad = Malloc(strlen(doomwaddir)+9+1);
-	sprintf(doom2wad, "%sdoom2.wad", doomwaddir);
-
-	// Registered.
-	doomwad = Malloc(strlen(doomwaddir)+8+1);
-	sprintf(doomwad, "%sdoom.wad", doomwaddir);
-	
-	// Shareware.
-	doom1wad = Malloc(strlen(doomwaddir)+9+1);
-	sprintf(doom1wad, "%sdoom1.wad", doomwaddir);
-
-	 // Bug, dear Shawn.
-	// Insufficient malloc, caused spurious realloc errors.
-	plutoniawad = Malloc(strlen(doomwaddir)+/*9*/12+1);
-	sprintf(plutoniawad, "%splutonia.wad", doomwaddir);
-
-	tntwad = Malloc(strlen(doomwaddir)+9+1);
-	sprintf(tntwad, "%stnt.wad", doomwaddir);
-
-	// French stuff.
-	doom2fwad = Malloc(strlen(doomwaddir)+10+1);
-	sprintf(doom2fwad, "%sdoom2f.wad", doomwaddir);
-
-	if (FileExists (doom2fwad)) {
-		iwadfull = doom2fwad;
-	} else if (FileExists (doom2wad)) {
-		iwadfull = doom2wad;
-	} else if (FileExists (plutoniawad)) {
-		iwadfull = plutoniawad;
-	} else if (FileExists (tntwad)) {
-		iwadfull = tntwad;
-	} else if (FileExists (doomwad)) {
-		iwadfull = doomwad;
-	} else if (FileExists (doom1wad)) {
-		iwadfull = doom1wad;
+	// Search for a pre-defined IWAD from the list above
+	for (i = 0; doomwadnames[i][0]; i++) {
+		sprintf (iwad, "%s%s", doomwaddir, doomwadnames[i]);
+		if (FileExists (iwad))
+			break;
 	}
+	if (!doomwadnames[i][0])
+		iwad[0] = 0;
 
+	// See if the user wants to use a different iwad instead
 	iwadindex = M_CheckParm ("-iwad");
 
 	if (iwadindex && iwadindex < myargc - 1) {
-		iwadindex++;
-		custwad = Malloc(strlen(myargv[iwadindex]) + 5);
+		char *custwad = Z_Malloc(strlen(myargv[++iwadindex]) + 5, PU_STATIC, 0);
 		strcpy (custwad, myargv[iwadindex]);
+		FixPathSeperator (custwad);
 		DefaultExtension (custwad, ".wad");
-		if (FileExists (custwad)) {
-			iwadfull = custwad;
-		}
+		if (FileExists (custwad))
+			strcpy (iwad, custwad);
+		Z_Free (custwad);
 	}
 	
-	if (iwadfull)
-		ExtractFileBase (iwadfull, iwad);
-	else
-		iwad[0] = 0;
+	// Now scan the contents of the IWAD to determine which one it is
+	if (iwad[0]) {
+		static const char checklumps[8][8] = {
+			"E1M1", "E2M1", "E4M1", "MAP01",
+			"ANIMDEFS", "FINAL2", "REDTNT2", "CAMO1"
+		};
+		int lumpsfound[8];
+		wadinfo_t header;
+		FILE *f;
 
-	if (stricmp (iwad, "doom2f") == 0) {
-		gamemode = commercial;
-		gamemission = doom2;
-		// C'est ridicule!
-		// Let's handle languages in config files, okay?
-		language = french;
-		Printf("French version\n");
-	} else if (stricmp (iwad, "doom2") == 0) {
-		gamemode = commercial;
-		gamemission = doom2;
-	} else if (stricmp (iwad, "plutonia") == 0) {
-		gamemode = commercial;
-		gamemission = pack_plut;
-	} else if (stricmp (iwad, "tnt") == 0) {
-		gamemode = commercial;
-		gamemission = pack_tnt;
-	} else if (stricmp (iwad, "doom") == 0) {
-		// Retail checking is handled later
-		gamemode = registered;
-		gamemission = doom;
-	} else if (stricmp (iwad, "doom1") == 0) {
-		gamemode = shareware;
-		gamemission = doom;
-	} else {
-		Printf("Game mode indeterminate.\n");
-		gamemode = indetermined;
+		memset (lumpsfound, 0, sizeof(lumpsfound));
+		if (f = fopen (iwad, "rb")) {
+			fread (&header, sizeof(header), 1, f);
+			if (header.identification == IWAD_ID) {
+				header.numlumps = LONG(header.numlumps);
+				if (0 == fseek (f, LONG(header.infotableofs), SEEK_SET)) {
+					for (i = 0; i < header.numlumps; i++) {
+						filelump_t lump;
+						int j;
+
+						if (0 == fread (&lump, sizeof(lump), 1, f))
+							break;
+						for (j = 0; j < 8; j++)
+							if (!strnicmp (lump.name, checklumps[j], 8))
+								lumpsfound[j]++;
+					}
+				}
+			}
+			fclose (f);
+		}
+
+		gamemode = undetermined;
+		titlestring = "Public DOOM - ";
+
+		if (lumpsfound[0]) {
+			gamemission = doom;
+			if (lumpsfound[1]) {
+				if (lumpsfound[2]) {
+					gamemode = retail;
+					titlestring = "The Ultimate DOOM Startup";
+				} else {
+					gamemode = registered;
+					titlestring = "DOOM Registered Startup";
+				}
+			} else {
+				gamemode = shareware;
+				titlestring = "DOOM Shareware Startup";
+			}
+			if (lumpsfound[5])
+				titlestring = "Heretic (But It Won't Work)";
+		} else if (lumpsfound[3]) {
+			gamemode = commercial;
+			if (lumpsfound[6]) {
+				gamemission = pack_tnt;
+				titlestring = "DOOM 2: TNT - Evilution";
+			} else if (lumpsfound[7]) {
+				gamemission = pack_plut;
+				titlestring = "DOOM 2: Plutonia Experiment";
+			} else {
+				gamemission = doom2;
+				if (lumpsfound[4])
+					titlestring = "Hexen (But It Won't Work)";
+				else
+					titlestring = "DOOM 2: Hell on Earth";
+			}
+		}
 	}
 
-	if (gamemode != indetermined) {
-		D_AddFile (iwadfull);
-	}
+	if (gamemode == undetermined)
+		Printf ("Game mode indeterminate.\n");
+	if (iwad[0])
+		D_AddFile (iwad);
+
+	return titlestring;
 }
 
 //
@@ -781,17 +822,17 @@ void IdentifyVersion (void)
 //
 void FindResponseFile (void)
 {
-	int 			i;
 #define MAXARGVS		100
+	int i;
 		
-	for (i = 1;i < myargc;i++)
+	for (i = 1; i < myargc; i++)
 		if (myargv[i][0] == '@')
 		{
-			FILE *			handle;
-			int 			size;
-			int 			k;
-			int 			index;
-			int 			indexinfile;
+			FILE *	handle;
+			int 	size;
+			int 	k;
+			int 	index;
+			int 	indexinfile;
 			char	*infile;
 			char	*file;
 			char	*moreargs[20];
@@ -800,11 +841,9 @@ void FindResponseFile (void)
 			// READ THE RESPONSE FILE INTO MEMORY
 			handle = fopen (&myargv[i][1],"rb");
 			if (!handle)
-			{
-				Printf ("\nNo such response file!");
-				exit(1);
-			}
-			Printf("Found response file %s!\n",&myargv[i][1]);
+				I_FatalError ("\nNo such response file!");
+
+			Printf ("Found response file %s!\n", &myargv[i][1]);
 			fseek (handle,0,SEEK_END);
 			size = ftell(handle);
 			fseek (handle,0,SEEK_SET);
@@ -849,10 +888,138 @@ void FindResponseFile (void)
 		}
 }
 
+// [RH] Copied this from BOOM 2.02:
+//
+// DoLooseFiles
+//
+// Take any file names on the command line before the first switch parm
+// and insert the appropriate -file, -deh or -playdemo switch in front
+// of them.
+//
+// Note that more than one -file, etc. entry on the command line won't
+// work, so we have to go get all the valid ones if any that show up
+// after the loose ones.  This means that boom fred.wad -file wilma
+// will still load fred.wad and wilma.wad, in that order.
+// The response file code kludges up its own version of myargv[] and 
+// unfortunately we have to do the same here because that kludge only
+// happens if there _is_ a response file.  Truth is, it's more likely
+// that there will be a need to do one or the other so it probably 
+// isn't important.  We'll point off to the original argv[], or the 
+// area allocated in FindResponseFile, or our own areas from copystrings.
+//
+
+static void DoLooseFiles (void)
+{
+	char *wads[MAXARGVS];	// store the respective loose filenames
+	char *lmps[MAXARGVS];
+	char *dehs[MAXARGVS];
+	int wadcount = 0;		// count the loose filenames
+	int lmpcount = 0;
+	int dehcount = 0;
+	int i,j,p;
+	char **tmyargv;			// use these to recreate the argv array
+	int tmyargc;
+
+	for (i=1; i < myargc; i++)
+	{
+		if (*myargv[i] == '-' || *myargv[i] == '+') break;	// quit at first switch
+
+		// so now we must have a loose file.  Find out what kind and store it.
+		j = strlen(myargv[i]);
+		if (!stricmp(&myargv[i][j-4], ".wad")) 
+			wads[wadcount++] = copystring (myargv[i]);
+		if (!stricmp(&myargv[i][j-4], ".lmp")) 
+			lmps[lmpcount++] = copystring (myargv[i]);
+		if (!stricmp(&myargv[i][j-4], ".deh")) 
+			dehs[dehcount++] = copystring (myargv[i]);
+		if (!stricmp(&myargv[i][j-4], ".bex")) 
+			dehs[dehcount++] = copystring (myargv[i]);
+		if (myargv[i][j-4] != '.')		// assume wad if no extension
+			wads[wadcount++] = copystring (myargv[i]);
+		*myargv[i] = '\0'; // nuke that entry so it won't repeat later
+	}
+
+	// Now, if we didn't find any loose files, we can just leave.
+	if (wadcount + lmpcount + dehcount == 0) return;	// ******* early return ****
+
+	if ((p = M_CheckParm ("-file")))
+	{
+		*myargv[p] = '\0';    // nuke the entry
+		while (++p != myargc && *myargv[p] != '-' && *myargv[p] != '+')
+		{
+			wads[wadcount++] = copystring (myargv[p]);
+			*myargv[p] = '\0';	// null any we find and save
+		}
+	}
+
+	if ((p = M_CheckParm ("-deh")))
+	{
+		*myargv[p] = '\0';		// nuke the entry
+		while (++p != myargc && *myargv[p] != '-' && *myargv[p] != '+')
+		{
+			dehs[dehcount++] = copystring (myargv[p]);
+			*myargv[p] = '\0';	// null any we find and save
+		}
+	}
+
+	if ((p = M_CheckParm ("-playdemo")))
+	{
+		*myargv[p] = '\0';		// nuke the entry
+		while (++p != myargc && *myargv[p] != '-' && *myargv[p] != '+')
+		{
+			lmps[lmpcount++] = copystring (myargv[p]);
+			*myargv[p] = '\0';	// null any we find and save
+		}
+	}
+
+	// Now go back and redo the whole myargv array with our stuff in it.
+	// First, create a new myargv array to copy into
+	tmyargv = calloc(sizeof(char *), MAXARGVS);
+	tmyargv[0] = myargv[0]; // invocation 
+	tmyargc = 1;
+
+	// put our stuff into it
+	if (wadcount > 0)
+	{
+		tmyargv[tmyargc++] = copystring ("-file"); // put the switch in
+		for (i=0;i<wadcount;)
+			tmyargv[tmyargc++] = wads[i++];		// allocated by copystring above
+	}
+
+	// for -deh
+	if (dehcount > 0)
+	{
+		tmyargv[tmyargc++] = copystring ("-deh");
+		for (i=0;i<dehcount;)
+			tmyargv[tmyargc++] = dehs[i++];
+	}
+
+	// for -playdemo
+	if (lmpcount > 0)
+	{
+		tmyargv[tmyargc++] = copystring ("-playdemo");
+		for (i=0;i<lmpcount;)
+			tmyargv[tmyargc++] = lmps[i++];
+	}
+
+	// then copy everything that's there now
+	for (i=1;i<myargc;i++)
+	{
+		if (*myargv[i])		// skip any null entries
+			tmyargv[tmyargc++] = myargv[i];		// pointers are still valid
+	}
+	// now make the global variables point to our array
+	myargv = tmyargv;
+	myargc = tmyargc;
+}
 
 extern thinker_t thinkercap;
 void P_MobjThinker (mobj_t *mobj);
 
+// [RH] This function is called whenever the lost soul translucency level
+//		changes. It searches through the entir world for any lost souls
+//		and sets their translucency levels as appropriate. New skulls are
+//		also set to spawn with the desired translucency.
 void TransSoulsCallback (cvar_t *var)
 {
 	thinker_t *currentthinker;
@@ -892,10 +1059,19 @@ void D_DoomMain (void)
 	int		p, flags;
 	char	file[256];
 
-	SetProgDir ();
+	gamestate = GS_STARTUP;
+
+	// [RH] Initialize the minilzo package.
+	if (lzo_init () != LZO_E_OK)
+		I_FatalError ("Could not initialize LZO routines");
 
 	C_InstallCommands ();
 
+	M_LoadDefaults ();		// load before initing other systems
+
+	// [RH] do all +set commands on the command line
+	C_ExecCmdLineParams (true);
+
 	// [RH] Set default cvar values. These will
 	//		be overridden by the configfile.
 	C_SetCVars ();
@@ -906,106 +1082,20 @@ void D_DoomMain (void)
 	}
 
 	FindResponseFile ();
+	DoLooseFiles();  // Ty 08/29/98 - handle "loose" files on command line
 
 	{
 		// [RH] Make sure zdoom.wad is always loaded, since
 		// it contains stuff we need.
-		char *zdoomwad;
-
-		zdoomwad = Malloc (strlen (progdir) + 10);
+		char *zdoomwad = Z_Malloc (strlen (progdir) + 10, PU_STATIC, 0);
 		sprintf (zdoomwad, "%szdoom.wad", progdir);
 		D_AddFile (zdoomwad);
 	}
 
-	IdentifyVersion ();
+	I_SetTitleString (IdentifyVersion ());
 
 	modifiedgame = false;
 
-	flags = (int)dmflagsvar->value;
-	dmflagsvar->u.callback = DMFlagsCallback;
-		
-	if (M_CheckParm ("-nomonsters"))
-		flags |= DF_NO_MONSTERS;
-
-	if (M_CheckParm ("-respawn"))
-		flags |= DF_MONSTERS_RESPAWN;
-
-	if (M_CheckParm ("-fast"))
-		flags |= DF_FAST_MONSTERS;
-
-	devparm = M_CheckParm ("-devparm");
-	if (M_CheckParm ("-altdeath")) {
-		SetCVarFloat (deathmatch, 1.0f);
-		flags |= DF_ITEMS_RESPAWN;
-	} else if (M_CheckParm ("-deathmatch")) {
-		SetCVarFloat (deathmatch, 1.0f);
-		flags |= DF_WEAPONS_STAY;
-	}
-
-	SetCVarFloat (dmflagsvar, (float)flags);
-
-	switch (gamemode) {
-		case shareware:
-			I_SetTitleString ("DOOM Shareware Startup");
-			break;
-
-		case registered:
-			I_SetTitleString ("DOOM Registered Startup");
-			break;
-
-		case commercial:
-			switch (gamemission) {
-				case doom2:
-					I_SetTitleString ("DOOM 2: Hell on Earth");
-					break;
-
-				case pack_plut:
-					I_SetTitleString ("DOOM 2: Plutonia Experiment");
-					break;
-
-				case pack_tnt:
-					I_SetTitleString ("DOOM 2: TNT - Evilution");
-					break;
-
-				case doom:
-				case none:
-					break;
-			}
-			break;
-
-		default:
-			I_SetTitleString ("Public DOOM -");
-			break;
-	}
-
-	if (devparm)
-		Printf(D_DEVSTR);
-	
-	if (M_CheckParm("-cdrom"))
-	{
-		Printf(D_CDROM);
-	}	
-	
-	// turbo option
-	// [RH] (Also exists as a cvar now.)
-	{
-		cvar_t *turbo = cvar ("turbo", "0", CVAR_CALLBACK);
-		float tval;
-
-		turbo->u.callback = TurboCallback;
-		if ( (p=M_CheckParm ("-turbo")) ) {
-			if (p < myargc - 1)
-				tval = (float)atof (myargv[p+1]);
-			else
-				tval = 200.0f;
-			Printf ("turbo scale: %g%%\n", tval);
-		} else {
-			tval = 100.0f;
-		}
-
-		SetCVarFloat (turbo, tval);
-	}
-
 	p = M_CheckParm ("-file");
 	if (p)
 	{
@@ -1025,18 +1115,79 @@ void D_DoomMain (void)
 	if (p && p < myargc-1)
 	{
 		strcpy (file, myargv[p+1]);
+		FixPathSeperator (file);
 		DefaultExtension (file, ".lmp");
 		D_AddFile (file);
-		Printf("Playing demo %s.\n", file);
+		Printf ("Playing demo %s.\n", file);
 	}
 	
-	// get skill / episode / map from parms
-	if (gamemode == commercial)
-		strcpy (startmap, "MAP01");
-	else
-		strcpy (startmap, "E1M1");
-	autostart = false;
+	W_InitMultipleFiles (&wadfiles);
 
+	// [RH] Moved these up here so that we can do most of our
+	//		startup output in a fullscreen console.
+
+	HU_Init ();
+	I_Init ();
+	I_InitGraphics ();
+	V_Init ();
+
+	// [RH] Initialize configurable strings.
+	D_InitStrings ();
+
+	// [RH] Apply any DeHackEd patch
+	{
+		int hack;
+		cvar_t *autopatch;
+
+		hack = M_CheckParm ("-deh");
+		if (hack && hack < myargc - 1)
+			// Use patch from command line
+			DoDehPatch (myargv[hack + 1], false);
+		else {
+			autopatch = cvar ("def_patch", "", CVAR_ARCHIVE);
+			if (FileExists (autopatch->string))
+				// Use patch specified by def_patch.
+				// (Any patches in a PWAD take precedence.)
+				DoDehPatch (autopatch->string, true);
+			else
+				DoDehPatch (NULL, true);	// See if there's a patch in a PWAD
+		}
+	}
+
+	// [RH] User-configurable startup strings. Because BOOM does.
+	if (STARTUP1[0])	Printf ("%s\n", STARTUP1);
+	if (STARTUP2[0])	Printf ("%s\n", STARTUP2);
+	if (STARTUP3[0])	Printf ("%s\n", STARTUP3);
+	if (STARTUP4[0])	Printf ("%s\n", STARTUP4);
+	if (STARTUP5[0])	Printf ("%s\n", STARTUP5);
+
+	flags = (int)dmflagsvar->value;
+	dmflagsvar->u.callback = DMFlagsCallback;
+		
+	if (M_CheckParm ("-nomonsters"))
+		flags |= DF_NO_MONSTERS;
+
+	if (M_CheckParm ("-respawn"))
+		flags |= DF_MONSTERS_RESPAWN;
+
+	if (M_CheckParm ("-fast"))
+		flags |= DF_FAST_MONSTERS;
+
+	devparm = M_CheckParm ("-devparm");
+
+	if (M_CheckParm ("-altdeath")) {
+		SetCVarFloat (deathmatch, 1.0f);
+		flags |= DF_ITEMS_RESPAWN;
+	} else if (M_CheckParm ("-deathmatch")) {
+		SetCVarFloat (deathmatch, 1.0f);
+		flags |= DF_WEAPONS_STAY;
+	}
+
+	SetCVarFloat (dmflagsvar, (float)flags);
+
+	// get skill / episode / map from parms
+	strcpy (startmap, gamemode == commercial ? "MAP01" : "E1M1");
+	autostart = false;
 				
 	p = M_CheckParm ("-skill");
 	if (p && p < myargc-1)
@@ -1045,25 +1196,6 @@ void D_DoomMain (void)
 		autostart = true;
 	}
 
-	p = M_CheckParm ("-timer");
-	if (p && p < myargc-1)
-	{
-		int time = atoi(myargv[p+1]);
-
-		Printf("Levels will end after %d minute",time);
-		if (time > 1)
-			Printf("s");
-		Printf(".\n");
-
-		SetCVarFloat (timelimit, (float)time);
-	}
-
-	p = M_CheckParm ("-avg");
-	if (p && p < myargc-1) {
-		Printf("Austin Virtual Gaming: Levels will end after 20 minutes\n");
-		SetCVarFloat (timelimit, 20);
-	}
-
 	p = M_CheckParm ("-warp");
 	if (p && p < myargc-1)
 	{
@@ -1088,41 +1220,47 @@ void D_DoomMain (void)
 		myargv[p][0] = '-';
 		autostart = true;
 	}
+	if (devparm)
+		Printf (Strings[0].builtin);	// D_DEVSTR
 	
-	// init subsystems
-	Printf ("M_LoadDefaults: Load system defaults.\n");
-	M_LoadDefaults ();				// load before initing other systems
-
-	// [RH] do all +set commands on the command line
-	C_ExecCmdLineParams (true);
-
-	Printf ("Z_Init: Init zone memory allocation daemon. \n");
-	Z_Init ();
-
-	Printf ("W_Init: Init WADfiles.\n");
-	W_InitMultipleFiles (wadfiles);
-
-	// [RH] Load foreign language strings
-	D_InitStrings ();
-
-	// [RH] Apply any DeHackEd patch
+	if (M_CheckParm("-cdrom"))
 	{
-		int hack;
-		cvar_t *autopatch;
+		Printf (Strings[1].builtin);	// D_CDROM
+		mkdir ("c:\\zdoomdat", 0);
+	}	
+	
+	// turbo option
+	// [RH] (Also exists as a cvar now.)
+	{
+		cvar_t *turbo = cvar ("turbo", "0", CVAR_CALLBACK);
+		float tval;
 
-		hack = M_CheckParm ("-deh");
-		if (hack && hack < myargc - 1)
-			// Use patch from command line
-			DoDehPatch (myargv[hack + 1], false);
-		else {
-			autopatch = cvar ("def_patch", "", CVAR_ARCHIVE);
-			if (FileExists (autopatch->string))
-				// Use patch specified by def_patch.
-				// (Any patches in a PWAD take precedence.)
-				DoDehPatch (autopatch->string, true);
+		turbo->u.callback = TurboCallback;
+		if ( (p=M_CheckParm ("-turbo")) ) {
+			if (p < myargc - 1)
+				tval = (float)atof (myargv[p+1]);
 			else
-				DoDehPatch (NULL, true);	// See if there's a patch in a PWAD
+				tval = 200.0f;
+			Printf ("turbo scale: %g%%\n", tval);
+		} else {
+			tval = 100.0f;
 		}
+
+		SetCVarFloat (turbo, tval);
+	}
+
+	p = M_CheckParm ("-timer");
+	if (p && p < myargc-1)
+	{
+		double time = atof (myargv[p+1]);
+		Printf ("Levels will end after %g minute%s.\n", time, time > 1 ? "s" : "");
+		SetCVarFloat (timelimit, (float)time);
+	}
+
+	p = M_CheckParm ("-avg");
+	if (p && p < myargc-1) {
+		Printf ("Austin Virtual Gaming: Levels will end after 20 minutes\n");
+		SetCVarFloat (timelimit, 20);
 	}
 
 	// [RH] Now that all text strings are set up,
@@ -1132,40 +1270,15 @@ void D_DoomMain (void)
 	// [RH] Parse through all loaded mapinfo lumps
 	G_ParseMapInfo ();
 
-	// [RH] Check for retail game
-	if (gamemode == registered) {
-		if (W_CheckNumForName ("e4m1") != -1) {
-			gamemode = retail;
-			I_SetTitleString ("The Ultimate DOOM Startup");
-		}
-	}
+	// [RH] Parse any SNDINFO lumps
+	S_ParseSndInfo();
 
 	// Check for -file in shareware
-	if (modifiedgame)
-	{
-		// These are the lumps that will be checked in IWAD,
-		// if any one is not present, execution will be aborted.
-		char name[23][8]=
-		{
-			"e2m1","e2m2","e2m3","e2m4","e2m5","e2m6","e2m7","e2m8","e2m9",
-			"e3m1","e3m3","e3m3","e3m4","e3m5","e3m6","e3m7","e3m8","e3m9",
-			"dphoof","bfgga0","heada1","cybra1","spida1d1"
-		};
-		int i;
-		
-		if (gamemode == shareware)
-			I_Error("\nYou cannot -file with the shareware "
-					"version. Register!");
-
-		// Check for fake IWAD with right name,
-		// but w/o all the lumps of the registered version. 
-		if (gamemode == registered || gamemode == retail)
-			for (i = 0;i < 23; i++)
-				if (W_CheckNumForName(name[i])<0 &&
-					(W_CheckNumForName)(name[i],ns_sprites)<0)
-					I_Error("\nThis is not the registered version.");
-	}
+	// [RH] Don't check for a bunch of lumps not found in shareware.
+	if (modifiedgame && gamemode == shareware)
+		I_Error("\nYou cannot -file with the shareware version. Register!");
 	
+#if 0
 	// Iff additonal PWAD files are used, print modified banner
 	if (modifiedgame)
 	{
@@ -1183,7 +1296,7 @@ void D_DoomMain (void)
 	switch ( gamemode )
 	{
 	  case shareware:
-	  case indetermined:
+	  case undetermined:
 		Printf (
 			"===========================================================================\n"
 			"                                Shareware!\n"
@@ -1205,48 +1318,26 @@ void D_DoomMain (void)
 		// Ouch.
 		break;
 	}
-
-	Printf ("\nI_StartGraphics: Determine display hardware.\n");
-	I_StartGraphics ();
-
-	Printf ("V_Init: allocate screens.\n");
-	V_Init ();
+#endif
 
 	Printf ("M_Init: Init miscellaneous info.\n");
 	M_Init ();
 
-	Printf ("R_Init: Init DOOM refresh daemon - ");
+	Printf ("R_Init: Init DOOM refresh daemon");
 	R_Init ();
 
-	Printf ("\nP_Init: Init Playloop state.\n");
+	Printf ("\nP_Init: Init Playloop state.");
 	P_Init ();
 
-	Printf ("I_Init: Setting up machine state.\n");
-	I_Init ();
+	Printf ("\nS_Init: Setting up sound.\n");
+	S_Init ((int)snd_SfxVolume->value /* *8 */, snd_MusicVolume->value /* *8*/ );
 
 	Printf ("D_CheckNetGame: Checking network game status.\n");
 	D_CheckNetGame ();
 
-	Printf ("S_Init: Setting up sound.\n");
-	S_Init ((int)snd_SfxVolume->value /* *8 */, snd_MusicVolume->value /* *8*/ );
-
-	Printf ("HU_Init: Setting up heads up display.\n");
-	HU_Init ();
-
 	Printf ("ST_Init: Init status bar.\n");
 	ST_Init ();
 
-	// check for a driver that wants intermission stats
-	p = M_CheckParm ("-statcopy");
-	if (p && p<myargc-1)
-	{
-		// for statistics driver
-		extern	void*	statcopy;
-
-		statcopy = (void*)atoi(myargv[p+1]);
-		Printf ("External statistics registered.\n");
-	}
-	
 	// start the apropriate game based on parms
 	p = M_CheckParm ("-record");
 
@@ -1291,15 +1382,22 @@ void D_DoomMain (void)
 	p = M_CheckParm ("-loadgame");
 	if (p && p < myargc-1)
 	{
-		if (M_CheckParm("-cdrom"))
-			sprintf(file, "c:\\doomdata\\"SAVEGAMENAME"%c.dsg",myargv[p+1][0]);
-		else
-			sprintf(file, SAVEGAMENAME"%c.dsg",myargv[p+1][0]);
+		G_BuildSaveName (file, myargv[p+1][0]);
 		G_LoadGame (file);
 	}
-		
 
-	if ( gameaction != ga_loadgame )
+	// [RH] Initialize items. Still only used for the give command. :-(
+	InitItems ();
+
+	// [RH] Lock any cvars that should be locked now that we're
+	// about to begin the game.
+	C_EnableNoSet ();
+
+	// [RH] Now that all game subsystems have been initialized,
+	// do all commands on the command line other than +set
+	C_ExecCmdLineParams (false);
+
+	if (gameaction != ga_loadgame)
 	{
 		if (autostart || netgame) {
 			G_InitNew (startmap);
@@ -1308,5 +1406,18 @@ void D_DoomMain (void)
 		}
 	}
 
-	D_DoomLoop ();	// never returns
+	if (demorecording)
+		G_BeginRecording ();
+				
+	if (M_CheckParm ("-debugfile"))
+	{
+		char	filename[20];
+		sprintf (filename,"debug%i.txt",consoleplayer);
+		Printf ("debug output to: %s\n",filename);
+		debugfile = fopen (filename,"w");
+	}
+
+	atexit (D_QuitNetGame);		// killough
+
+	D_ErrorLoop ();		// [RH] Wrap D_DoomLoop inside another function
 }
diff --git a/code/D_net.c b/code/D_net.c
index 8561f3ce7f..1ada54384f 100644
--- a/code/D_net.c
+++ b/code/D_net.c
@@ -22,7 +22,7 @@
 //
 //-----------------------------------------------------------------------------
 
-
+#include "version.h"
 #include "m_alloc.h"
 #include "m_menu.h"
 #include "i_system.h"
@@ -34,7 +34,6 @@
 #include "c_consol.h"
 #include "d_netinf.h"
 #include "cmdlib.h"
-#include "sounds.h"
 #include "s_sound.h"
 #include "m_cheat.h"
 
@@ -71,6 +70,9 @@ BOOL	 		remoteresend[MAXNETNODES];				// set when local needs tics
 int 			resendto[MAXNETNODES];					// set when remote needs tics
 int 			resendcount[MAXNETNODES];
 
+unsigned int	lastrecvtime[MAXPLAYERS];				// [RH] Used for pings
+unsigned int	currrecvtime[MAXPLAYERS];
+
 int 			nodeforplayer[MAXPLAYERS];
 
 int 			maketic;
@@ -288,6 +290,10 @@ void GetPackets (void)
 						
 		netconsole = netbuffer->player & ~PL_DRONE;
 		netnode = doomcom->remotenode;
+
+		// [RH] Get "ping" times
+		lastrecvtime[netconsole] = currrecvtime[netconsole];
+		currrecvtime[netconsole] = I_MSTime ();
 		
 		// to save bytes, only the low byte of tic numbers are sent
 		// Figure out what the rest of the bytes are
@@ -305,10 +311,10 @@ void GetPackets (void)
 
 			if (deathmatch->value) {
 				Printf ("%s left the game with %d frags\n",
-						 players[netconsole].userinfo->netname,
+						 players[netconsole].userinfo.netname,
 						 players[netconsole].fragcount);
 			} else {
-				Printf ("%s left the game\n", players[netconsole].userinfo->netname);
+				Printf ("%s left the game\n", players[netconsole].userinfo.netname);
 			}
 
 			if (demorecording) {
@@ -492,11 +498,12 @@ void CheckAbort (void)
 {
 	event_t *ev;
 	int 		stoptic;
-		
+
+	Printf ("");	// [RH] Give the console a chance to redraw itself
 	stoptic = I_GetTime () + 2; 
 	while (I_GetTime() < stoptic) 
 		I_StartTic (); 
-		
+
 	I_StartTic ();
 	for ( ; eventtail != eventhead 
 			  ; eventtail = (++eventtail)&(MAXEVENTS-1) ) 
@@ -531,7 +538,7 @@ void D_ArbitrateNetStart (void)
 	nodesdetected[0] = 1;	// Detect ourselves
 
 	// [RH] Rewrote this loop based on Doom Legacy 1.11's code.
-	Printf ("Waiting for %d more players...\n", doomcom->numnodes - 1);
+	Printf ("Waiting for %d more player%s...\n", doomcom->numnodes - 1, (doomcom->numnodes == 2) ? "" : "s");
 	do {
 		CheckAbort ();
 
@@ -569,7 +576,7 @@ void D_ArbitrateNetStart (void)
 								D_ReadUserInfoStrings (netbuffer->player, &stream, false);
 
 								Printf ("%s joined the game (node %d, player %d)\n",
-										players[netbuffer->player].userinfo->netname,
+										players[netbuffer->player].userinfo.netname,
 										doomcom->remotenode,
 										netbuffer->player);
 							}
@@ -644,7 +651,7 @@ void D_CheckNetGame (void)
 	// I_InitNetwork sets doomcom and netgame
 	I_InitNetwork ();
 	if (doomcom->id != DOOMCOM_ID)
-		I_Error ("Doomcom buffer invalid!");
+		I_FatalError ("Doomcom buffer invalid!");
 	
 	netbuffer = &doomcom->data;
 	consoleplayer = displayplayer = doomcom->consoleplayer;
@@ -652,36 +659,22 @@ void D_CheckNetGame (void)
 	// [RH] Setup user info
 	D_SetupUserInfo ();
 
-	UnlatchCVars ();
-
 	if (netgame)
 		D_ArbitrateNetStart ();
 
-	UnlatchCVars ();
-
-	{
-		char map[9];
-		strncpy (map, startmap, 8);
-		map[8] = 0;
-
-		Printf ("skill: %g  deathmatch: %g  map: %s  dmflags: %i\n",
-				gameskill->value, deathmatch->value, map, dmflags);
-	}
-		
 	// read values out of doomcom
 	ticdup = doomcom->ticdup;
 	maxsend = BACKUPTICS/(2*ticdup)-1;
 	if (maxsend<1)
 		maxsend = 1;
 						
-	for (i=0 ; i<doomcom->numplayers ; i++)
+	for (i = 0; i < doomcom->numplayers; i++)
 		playeringame[i] = true;
-	for (i=0 ; i<doomcom->numnodes ; i++)
+	for (i = 0; i < doomcom->numnodes; i++)
 		nodeingame[i] = true;
 		
 	Printf ("player %i of %i (%i nodes)\n",
 			consoleplayer+1, doomcom->numplayers, doomcom->numnodes);
-
 }
 
 
@@ -692,7 +685,7 @@ void D_CheckNetGame (void)
 //
 void D_QuitNetGame (void)
 {
-	int 			i, j;
+	int i, j;
 		
 	if (debugfile)
 		fclose (debugfile);
@@ -703,9 +696,9 @@ void D_QuitNetGame (void)
 	// send a bunch of packets for security
 	netbuffer->player = consoleplayer;
 	netbuffer->numtics = 0;
-	for (i=0 ; i<4 ; i++)
+	for (i = 0; i < 4; i++)
 	{
-		for (j=1 ; j<doomcom->numnodes ; j++)
+		for (j = 1; j < doomcom->numnodes; j++)
 			if (nodeingame[j])
 				HSendPacket (j, NCMD_EXIT, myoffsetof(doomdata_t,cmds));
 		I_WaitVBL (1);
@@ -938,16 +931,28 @@ void Net_DoCommand (int type, byte **stream, int player)
 	switch (type) {
 		case DEM_SAY:
 			{
-				int who = ReadByte (stream);
+				byte who = ReadByte (stream);
 
 				s = ReadString (stream);
-				if (!who || (who - 1) == consoleplayer) {
-					Printf_Bold ("%s: %s\n", players[player].userinfo->netname, s);
+				if ((who == 0) || players[player].userinfo.team[0] == 0) {
+					// Said to everyone
+					Printf_Bold ("%s: %s\n", players[player].userinfo.netname, s);
 					
-					if (gamemode == commercial)
-						S_StartSound(ORIGIN_AMBIENT3, sfx_radio);
-					else
-						S_StartSound(ORIGIN_AMBIENT3, sfx_tink);
+					if (gamemode == commercial) {
+						S_StartSound (ORIGIN_AMBIENT3, "misc/chat", 60);
+					} else {
+						S_StartSound (ORIGIN_AMBIENT3, "misc/chat2", 60);
+					}
+				} else if (!stricmp (players[player].userinfo.team,
+									 players[consoleplayer].userinfo.team)) {
+					// Said only to members of the player's team
+					Printf_Bold ("(%s): %s\n", players[player].userinfo.netname, s);
+					
+					if (gamemode == commercial) {
+						S_StartSound (ORIGIN_AMBIENT3, "misc/chat", 60);
+					} else {
+						S_StartSound (ORIGIN_AMBIENT3, "misc/chat2", 60);
+					}
 				}
 			}
 			break;
@@ -989,7 +994,7 @@ void Net_DoCommand (int type, byte **stream, int player)
 			strncpy (level.nextmap, s, 8);
 			// Using LEVEL_NOINTERMISSION tends to throw the game out of sync.
 			level.flags |= LEVEL_CHANGEMAPCHEAT;
-			G_ExitLevel ();
+			G_ExitLevel (0);
 			break;
 
 		case DEM_SUICIDE:
@@ -1003,4 +1008,15 @@ void Net_DoCommand (int type, byte **stream, int player)
 
 	if (s)
 		free (s);
-}
\ No newline at end of file
+}
+
+// [RH] List ping times
+void Cmd_Pings (void *plyr, int argc, char **argv)
+{
+	int i;
+
+	for (i = 0; i < MAXPLAYERS; i++)
+		if (playeringame[i])
+			Printf ("% 4u %s\n", currrecvtime[i] - lastrecvtime[i],
+					players[i].userinfo.netname);
+}
diff --git a/code/D_player.h b/code/D_player.h
index d21c68f677..2cb796f18f 100644
--- a/code/D_player.h
+++ b/code/D_player.h
@@ -157,19 +157,23 @@ typedef struct player_s
 	//	can be set to REDCOLORMAP for pain, etc.
 	int 				fixedcolormap;
 
-	// Player skin colorshift,
-	//	0-3 for which color to draw player.
-	int 				colormap;		
+	// [RH] Amount to shift view horizontally (for earthquakes)
+	int 				xviewshift;		
 
 	// Overlay view sprites (gun, etc).
 	pspdef_t			psprites[NUMPSPRITES];
 
-	// [RH] Pointer to a userinfo struct
-	userinfo_t			*userinfo;
+	// [RH] A userinfo struct
+	userinfo_t			userinfo;
 
 	// [RH] Tic when respawning is allowed
 	int					respawn_time;
 
+	// [RH] Used for calculating falling damage
+	fixed_t				oldvelocity[3];
+
+	// [RH] Camera to use to draw view from. Normally same as mo
+	mobj_t				*camera;
 } player_t;
 
 
diff --git a/code/D_PROTO.C b/code/D_proto.c
similarity index 99%
rename from code/D_PROTO.C
rename to code/D_proto.c
index 6a3832f725..4d52f45aa2 100644
--- a/code/D_PROTO.C
+++ b/code/D_proto.c
@@ -280,7 +280,7 @@ void ReadTicCmd (ticcmd_t *tcmd, byte **stream, int player)
 }
 
 
-static byte *lenspot;
+byte *lenspot;
 
 // Write the header of an IFF chunk and leave space
 // for the length field.
diff --git a/code/Doomdef.h b/code/Doomdef.h
index 0a438d0211..c22f515149 100644
--- a/code/Doomdef.h
+++ b/code/Doomdef.h
@@ -30,11 +30,6 @@
 //
 // Global parameters/defines.
 //
-// DOOM version
-enum { VERSION =  114 };
-#define VERSIONSTR "114"
-#define GAMEVER (0x010e)
-
 
 // Game mode handling - identify IWAD version
 //	to handle IWAD dependend animations etc.
@@ -45,7 +40,7 @@ typedef enum
   commercial,	// DOOM 2 retail, E1 M34
   // DOOM 2 german edition not handled
   retail,		// DOOM 1 retail, E4, M36
-  indetermined	// Well, no IWAD found.
+  undetermined	// Well, no IWAD found.
   
 } GameMode_t;
 
@@ -69,7 +64,6 @@ typedef enum
   french,
   german,
   unknown
-
 } Language_t;
 
 
@@ -77,36 +71,6 @@ typedef enum
 // most parameter validation debugging code will not be compiled
 #define RANGECHECK
 
-// Do or do not use external soundserver.
-// The sndserver binary to be run separately
-//	has been introduced by Dave Taylor.
-// The integrated sound support is experimental,
-//	and unfinished. Default is synchronous.
-// Experimental asynchronous timer based is
-//	handled by SNDINTR. 
-#define SNDSERV  1
-//#define SNDINTR  1
-
-
-// This one switches between MIT SHM (no proper mouse)
-// and XFree86 DGA (mickey sampling). The original
-// linuxdoom used SHM, which is default.
-//#define X11_DGA				1
-
-
-//
-// For resize of screen, at start of game.
-// It will not work dynamically, see visplanes.
-//
-#define BASE_WIDTH				320
-
-// It is educational but futile to change this
-//	scaling e.g. to 2. Drawing of status bar,
-//	menues etc. is tied to the scale implied
-//	by the graphics.
-#define SCREEN_MUL				1
-#define INV_ASPECT_RATIO		0.625 // 0.75, ideally
-
 // The maximum number of players, multiplayer/networking.
 #define MAXPLAYERS				8
 
@@ -121,7 +85,10 @@ typedef enum
 	GS_LEVEL,
 	GS_INTERMISSION,
 	GS_FINALE,
-	GS_DEMOSCREEN
+	GS_DEMOSCREEN,
+	GS_FULLCONSOLE,		// [RH]	Fullscreen console
+	GS_HIDECONSOLE,		// [RH] The menu just did something that should hide fs console
+	GS_STARTUP			// [RH] Console is fullscreen, and game is just starting
 } gamestate_t;
 
 //
@@ -138,11 +105,11 @@ typedef enum
 
 typedef float skill_t;
 
-#define sk_baby 				0.0
-#define sk_easy 				1.0
-#define sk_medium				2.0
-#define sk_hard 				3.0
-#define sk_nightmare			4.0
+#define sk_baby 				0.0f
+#define sk_easy 				1.0f
+#define sk_medium				2.0f
+#define sk_hard 				3.0f
+#define sk_nightmare			4.0f
 
 
 
@@ -288,6 +255,8 @@ typedef enum
 #define KEY_MOUSE2				0x101
 #define KEY_MOUSE3				0x102
 #define KEY_MOUSE4				0x103
+#define KEY_MWHEELUP			0x104
+#define KEY_MWHEELDOWN			0x105
 
 #define KEY_JOY1				0x108
 #define KEY_JOY2				0x109
@@ -322,13 +291,14 @@ typedef enum
 #define KEY_JOY31				0x126
 #define KEY_JOY32				0x127
 
+#define NUM_KEYS				0x128
 
 // [RH] dmflags->value flags (based on Q2's)
 #define	DF_NO_HEALTH		1		// Do not spawn health items (DM)
 #define	DF_NO_ITEMS			2		// Do not spawn powerups (DM)
 #define	DF_WEAPONS_STAY		4		// Leave weapons around after pickup (DM)
 #define	DF_YES_FALLING		8		// Falling too far hurts
-#define DF_YES_FALLING_LOTS	16		// Falling too far hurts a lot
+#define DF_NO_FRIENDLY_FIRE	16		// Can't hurt teammates
 //#define	DF_INVENTORY_ITEMS	32		// Wait for player to use powerups when picked up
 #define	DF_SAME_LEVEL		64		// Stay on the same map when someone exits (DM)
 #define	DF_SPAWN_FARTHEST	128		// Spawn players as far as possible from other players (DM)
@@ -343,4 +313,14 @@ typedef enum
 #define DF_NO_JUMP			65536	// Don't allow jumping
 #define DF_NO_FREELOOK		131072	// Don't allow freelook
 
+// phares 3/20/98:
+//
+// Player friction is variable, based on controlling
+// linedefs. More friction can create mud, sludge,
+// magnetized floors, etc. Less friction can create ice.
+
+#define MORE_FRICTION_MOMENTUM 15000	// mud factor based on momentum
+#define ORIG_FRICTION          0xE800	// original value
+#define ORIG_FRICTION_FACTOR   2048		// original value
+
 #endif			// __DOOMDEF__
diff --git a/code/Doomstat.c b/code/Doomstat.c
index f54124079c..84dbff4407 100644
--- a/code/Doomstat.c
+++ b/code/Doomstat.c
@@ -28,7 +28,7 @@
 
 
 // Game Mode - identify IWAD as shareware, retail etc.
-GameMode_t		gamemode = indetermined;
+GameMode_t		gamemode = undetermined;
 GameMission_t	gamemission = doom;
 
 // Language.
@@ -43,6 +43,9 @@ cvar_t			*developer;
 // True if an old demo is being played back.
 BOOL			olddemo;
 
+// [RH] Feature control cvars
+cvar_t *boom_friction, *boom_pushers;
+
 // [RH] Deathmatch flags
 cvar_t			*dmflagsvar;
 int				dmflags;		// Copy of dmflagsvar->value, but as an integer.
diff --git a/code/Doomstat.h b/code/Doomstat.h
index 56e3c827d9..183c7f6127 100644
--- a/code/Doomstat.h
+++ b/code/Doomstat.h
@@ -83,7 +83,10 @@ extern	BOOL 			respawnmonsters;
 extern	BOOL			netgame;
 
 // Flag: true only if started as net deathmatch.
-extern	cvar_t			*deathmatch; 	
+extern	cvar_t			*deathmatch;
+
+// [RH] Teamplay mode
+extern	cvar_t			*teamplay;
 		
 // -------------------------
 // Internal parameters for sound rendering.
@@ -278,26 +281,30 @@ void EndMMX (void);
 
 #endif
 
+extern cvar_t *boom_friction;
+extern cvar_t *boom_pushers;
+
 
 // [RH] Miscellaneous info for DeHackEd support
-
-extern int deh_StartHealth;
-extern int deh_StartBullets;
-extern int deh_MaxHealth;
-extern int deh_MaxArmor;
-extern int deh_GreenAC;
-extern int deh_BlueAC;
-extern int deh_MaxSoulsphere;
-extern int deh_SoulsphereHealth;
-extern int deh_MegasphereHealth;
-extern int deh_GodHealth;
-extern int deh_FAArmor;
-extern int deh_FAAC;
-extern int deh_KFAArmor;
-extern int deh_KFAAC;
-extern int deh_BFGCells;
-extern int deh_Infight;
-
+struct DehInfo {
+	int StartHealth;
+	int StartBullets;
+	int MaxHealth;
+	int MaxArmor;
+	int GreenAC;
+	int BlueAC;
+	int MaxSoulsphere;
+	int SoulsphereHealth;
+	int MegasphereHealth;
+	int GodHealth;
+	int FAArmor;
+	int FAAC;
+	int KFAArmor;
+	int KFAAC;
+	int BFGCells;
+	int Infight;
+};
+extern struct DehInfo deh;
 
 // [RH] Deathmatch flags
 
diff --git a/code/Doomtype.h b/code/Doomtype.h
index 8f4e0f04bd..4f7475a388 100644
--- a/code/Doomtype.h
+++ b/code/Doomtype.h
@@ -48,6 +48,7 @@ typedef unsigned char byte;
 // Predefined with some OS.
 #ifdef __GNUC__
 #include <values.h>
+typedef long long __int64;
 #else
 /* [Petteri] Don't redefine if we already have these */
 #ifndef MAXCHAR
@@ -68,8 +69,10 @@ typedef unsigned char byte;
 
 
 #ifndef NOASM
+#ifndef USEASM
 #define USEASM
 #endif
+#endif
 
 
 
diff --git a/code/Dstrings.c b/code/Dstrings.c
index 78ee2dd18d..5ef24048e4 100644
--- a/code/Dstrings.c
+++ b/code/Dstrings.c
@@ -34,8 +34,6 @@
 #include "cmdlib.h"
 #include "g_level.h"
 
-cvar_t *var_language;
-
 char* endmsg[NUM_QUITMESSAGES+1]=
 {
   // DOOM1
@@ -60,228 +58,228 @@ char* endmsg[NUM_QUITMESSAGES+1]=
 
 
 gamestring_t Strings[NUMSTRINGS] = {
-	{ 0, "Development mode ON.\n", NULL },
-	{ 0, "CD-ROM Version: default.cfg from c:\\doomdata\n", NULL },
-	{ 0, "press a key.", NULL },
-	{ 0, "press y or n.", NULL },
-	{ 0, "are you sure you want to\nquit this great game?", NULL },
-	{ 0, "you can't do load while in a net game!\n\npress a key.", NULL },
-	{ 0, "you can't quickload during a netgame!\n\npress a key.", NULL },
-	{ 0, "you haven't picked a quicksave slot yet!\n\npress a key.", NULL },
-	{ 0, "you can't save if you aren't playing!\n\npress a key.", NULL },
-	{ 0, "quicksave over your game named\n\n'%s'?\n\npress y or n.", NULL },
-	{ 0, "do you want to quickload the game named\n\n'%s'?\n\npress y or n.", NULL },
-	{ 0, "you can't start a new game\nwhile in a network game.\n\npress a key.", NULL },
-	{ 0, "are you sure? this skill level\nisn't even remotely fair.\n\npress y or n.", NULL },
-	{ 0, "this is the shareware version of doom.\n\nyou need to order the entire trilogy.\n\npress a key.", NULL },
-	{ 0, "Messages OFF", NULL },
-	{ 0, "Messages ON", NULL },
-	{ 0, "you can't end a netgame!\n\npress a key.", NULL },
-	{ 0, "are you sure you want to end the game?\n\npress y or n.", NULL },
-	{ 0, "(press y to quit)", NULL },
-	{ 0, "empty slot", NULL },
-	{ 0, "Picked up the armor.", NULL },
-	{ 0, "Picked up the MegaArmor!", NULL },
-	{ 0, "Picked up a health bonus.", NULL },
-	{ 0, "Picked up an armor bonus.", NULL },
-	{ 0, "Picked up a stimpack.", NULL },
-	{ 0, "Picked up a medikit that you REALLY need!", NULL },
-	{ 0, "Picked up a medikit.", NULL },
-	{ 0, "Supercharge!", NULL },
-	{ 0, "Picked up a blue keycard.", NULL },
-	{ 0, "Picked up a yellow keycard.", NULL },
-	{ 0, "Picked up a red keycard.", NULL },
-	{ 0, "Picked up a blue skull key.", NULL },
-	{ 0, "Picked up a yellow skull key.", NULL },
-	{ 0, "Picked up a red skull key.", NULL },
-	{ 0, "Invulnerability!", NULL },
-	{ 0, "Berserk!", NULL },
-	{ 0, "Partial Invisibility", NULL },
-	{ 0, "Radiation Shielding Suit", NULL },
-	{ 0, "Computer Area Map", NULL },
-	{ 0, "Light Amplification Visor", NULL },
-	{ 0, "MegaSphere!", NULL },
-	{ 0, "Picked up a clip.", NULL },
-	{ 0, "Picked up a box of bullets.", NULL },
-	{ 0, "Picked up a rocket.", NULL },
-	{ 0, "Picked up a box of rockets.", NULL },
-	{ 0, "Picked up an energy cell.", NULL },
-	{ 0, "Picked up an energy cell pack.", NULL },
-	{ 0, "Picked up 4 shotgun shells.", NULL },
-	{ 0, "Picked up a box of shotgun shells.", NULL },
-	{ 0, "Picked up a backpack full of ammo!", NULL },
-	{ 0, "You got the BFG9000!  Oh, yes.", NULL },
-	{ 0, "You got the chaingun!", NULL },
-	{ 0, "A chainsaw!  Find some meat!", NULL },
-	{ 0, "You got the rocket launcher!", NULL },
-	{ 0, "You got the plasma gun!", NULL },
-	{ 0, "You got the shotgun!", NULL },
-	{ 0, "You got the super shotgun!", NULL },
-	{ 0, "You need a blue key to activate this object", NULL },
-	{ 0, "You need a red key to activate this object", NULL },
-	{ 0, "You need a yellow key to activate this object", NULL },
-	{ 0, "You need a blue key to open this door", NULL },
-	{ 0, "You need a red key to open this door", NULL },
-	{ 0, "You need a yellow key to open this door", NULL },
-	{ 0, "game saved.", NULL },
-	{ 0, "[Message unsent]", NULL },
-	{ 0, "E1M1: Hangar", NULL },
-	{ 0, "E1M2: Nuclear Plant", NULL },
-	{ 0, "E1M3: Toxin Refinery", NULL },
-	{ 0, "E1M4: Command Control", NULL },
-	{ 0, "E1M5: Phobos Lab", NULL },
-	{ 0, "E1M6: Central Processing", NULL },
-	{ 0, "E1M7: Computer Station", NULL },
-	{ 0, "E1M8: Phobos Anomaly", NULL },
-	{ 0, "E1M9: Military Base", NULL },
-	{ 0, "E2M1: Deimos Anomaly", NULL },
-	{ 0, "E2M2: Containment Area", NULL },
-	{ 0, "E2M3: Refinery", NULL },
-	{ 0, "E2M4: Deimos Lab", NULL },
-	{ 0, "E2M5: Command Center", NULL },
-	{ 0, "E2M6: Halls of the Damned", NULL },
-	{ 0, "E2M7: Spawning Vats", NULL },
-	{ 0, "E2M8: Tower of Babel", NULL },
-	{ 0, "E2M9: Fortress of Mystery", NULL },
-	{ 0, "E3M1: Hell Keep", NULL },
-	{ 0, "E3M2: Slough of Despair", NULL },
-	{ 0, "E3M3: Pandemonium", NULL },
-	{ 0, "E3M4: House of Pain", NULL },
-	{ 0, "E3M5: Unholy Cathedral", NULL },
-	{ 0, "E3M6: Mt. Erebus", NULL },
-	{ 0, "E3M7: Limbo", NULL },
-	{ 0, "E3M8: Dis", NULL },
-	{ 0, "E3M9: Warrens", NULL },
-	{ 0, "E4M1: Hell Beneath", NULL },
-	{ 0, "E4M2: Perfect Hatred", NULL },
-	{ 0, "E4M3: Sever The Wicked", NULL },
-	{ 0, "E4M4: Unruly Evil", NULL },
-	{ 0, "E4M5: They Will Repent", NULL },
-	{ 0, "E4M6: Against Thee Wickedly", NULL },
-	{ 0, "E4M7: And Hell Followed", NULL },
-	{ 0, "E4M8: Unto The Cruel", NULL },
-	{ 0, "E4M9: Fear", NULL },
-	{ 0, "level 1: entryway", NULL },
-	{ 0, "level 2: underhalls", NULL },
-	{ 0, "level 3: the gantlet", NULL },
-	{ 0, "level 4: the focus", NULL },
-	{ 0, "level 5: the waste tunnels", NULL },
-	{ 0, "level 6: the crusher", NULL },
-	{ 0, "level 7: dead simple", NULL },
-	{ 0, "level 8: tricks and traps", NULL },
-	{ 0, "level 9: the pit", NULL },
-	{ 0, "level 10: refueling base", NULL },
-	{ 0, "level 11: 'o' of destruction!", NULL },
-	{ 0, "level 12: the factory", NULL },
-	{ 0, "level 13: downtown", NULL },
-	{ 0, "level 14: the inmost dens", NULL },
-	{ 0, "level 15: industrial zone", NULL },
-	{ 0, "level 16: suburbs", NULL },
-	{ 0, "level 17: tenements", NULL },
-	{ 0, "level 18: the courtyard", NULL },
-	{ 0, "level 19: the citadel", NULL },
-	{ 0, "level 20: gotcha!", NULL },
-	{ 0, "level 21: nirvana", NULL },
-	{ 0, "level 22: the catacombs", NULL },
-	{ 0, "level 23: barrels o' fun", NULL },
-	{ 0, "level 24: the chasm", NULL },
-	{ 0, "level 25: bloodfalls", NULL },
-	{ 0, "level 26: the abandoned mines", NULL },
-	{ 0, "level 27: monster condo", NULL },
-	{ 0, "level 28: the spirit world", NULL },
-	{ 0, "level 29: the living end", NULL },
-	{ 0, "level 30: icon of sin", NULL },
-	{ 0, "level 31: wolfenstein", NULL },
-	{ 0, "level 32: grosse", NULL },
-	{ 0, "level 1: congo", NULL },
-	{ 0, "level 2: well of souls", NULL },
-	{ 0, "level 3: aztec", NULL },
-	{ 0, "level 4: caged", NULL },
-	{ 0, "level 5: ghost town", NULL },
-	{ 0, "level 6: baron's lair", NULL },
-	{ 0, "level 7: caughtyard", NULL },
-	{ 0, "level 8: realm", NULL },
-	{ 0, "level 9: abattoire", NULL },
-	{ 0, "level 10: onslaught", NULL },
-	{ 0, "level 11: hunted", NULL },
-	{ 0, "level 12: speed", NULL },
-	{ 0, "level 13: the crypt", NULL },
-	{ 0, "level 14: genesis", NULL },
-	{ 0, "level 15: the twilight", NULL },
-	{ 0, "level 16: the omen", NULL },
-	{ 0, "level 17: compound", NULL },
-	{ 0, "level 18: neurosphere", NULL },
-	{ 0, "level 19: nme", NULL },
-	{ 0, "level 20: the death domain", NULL },
-	{ 0, "level 21: slayer", NULL },
-	{ 0, "level 22: impossible mission", NULL },
-	{ 0, "level 23: tombstone", NULL },
-	{ 0, "level 24: the final frontier", NULL },
-	{ 0, "level 25: the temple of darkness", NULL },
-	{ 0, "level 26: bunker", NULL },
-	{ 0, "level 27: anti-christ", NULL },
-	{ 0, "level 28: the sewers", NULL },
-	{ 0, "level 29: odyssey of noises", NULL },
-	{ 0, "level 30: the gateway of hell", NULL },
-	{ 0, "level 31: cyberden", NULL },
-	{ 0, "level 32: go 2 it", NULL },
-	{ 0, "level 1: system control", NULL },
-	{ 0, "level 2: human bbq", NULL },
-	{ 0, "level 3: power control", NULL },
-	{ 0, "level 4: wormhole", NULL },
-	{ 0, "level 5: hanger", NULL },
-	{ 0, "level 6: open season", NULL },
-	{ 0, "level 7: prison", NULL },
-	{ 0, "level 8: metal", NULL },
-	{ 0, "level 9: stronghold", NULL },
-	{ 0, "level 10: redemption", NULL },
-	{ 0, "level 11: storage facility", NULL },
-	{ 0, "level 12: crater", NULL },
-	{ 0, "level 13: nukage processing", NULL },
-	{ 0, "level 14: steel works", NULL },
-	{ 0, "level 15: dead zone", NULL },
-	{ 0, "level 16: deepest reaches", NULL },
-	{ 0, "level 17: processing area", NULL },
-	{ 0, "level 18: mill", NULL },
-	{ 0, "level 19: shipping/respawning", NULL },
-	{ 0, "level 20: central processing", NULL },
-	{ 0, "level 21: administration center", NULL },
-	{ 0, "level 22: habitat", NULL },
-	{ 0, "level 23: lunar mining project", NULL },
-	{ 0, "level 24: quarry", NULL },
-	{ 0, "level 25: baron's den", NULL },
-	{ 0, "level 26: ballistyx", NULL },
-	{ 0, "level 27: mount pain", NULL },
-	{ 0, "level 28: heck", NULL },
-	{ 0, "level 29: river styx", NULL },
-	{ 0, "level 30: last call", NULL },
-	{ 0, "level 31: pharaoh", NULL },
-	{ 0, "level 32: caribbean", NULL },
-	{ 0, "You mumble to yourself", NULL },
-	{ 0, "Who's there?", NULL },
-	{ 0, "You scare yourself", NULL },
-	{ 0, "You start to rave", NULL },
-	{ 0, "You've lost it...", NULL },
-	{ 0, "[Message Sent]", NULL },
-	{ 0, "Follow Mode ON", NULL },
-	{ 0, "Follow Mode OFF", NULL },
-	{ 0, "Grid ON", NULL },
-	{ 0, "Grid OFF", NULL },
-	{ 0, "Marked Spot", NULL },
-	{ 0, "All Marks Cleared", NULL },
-	{ 0, "Music Change", NULL },
-	{ 0, "IMPOSSIBLE SELECTION", NULL },
-	{ 0, "Degreelessness Mode ON", NULL },
-	{ 0, "Degreelessness Mode OFF", NULL },
-	{ 0, "Very Happy Ammo Added", NULL },
-	{ 0, "Ammo (no keys) Added", NULL },
-	{ 0, "No Clipping Mode ON", NULL },
-	{ 0, "No Clipping Mode OFF", NULL },
-	{ 0, "inVuln, Str, Inviso, Rad, Allmap, or Lite-amp", NULL },
-	{ 0, "Power-up Toggled", NULL },
-	{ 0, "... doesn't suck - GM", NULL },
-	{ 0, "Changing Level...\n", NULL },
-	{ 0, "Once you beat the big badasses and\n"\
+	{ 0, "D_DEVSTR", "Useless mode ON.\n", NULL },
+	{ 0, "D_CDROM", "CD-ROM Version: zdoom.cfg from c:\\zdoomdat\n", NULL },
+	{ 0, "PRESSKEY", "press a key.", NULL },
+	{ 0, "PRESSYN", "press y or n.", NULL },
+	{ 0, "QUITMSG", "are you sure you want to\nquit this great game?", NULL },
+	{ 0, "LOADNET", "you can't do load while in a net game!\n\npress a key.", NULL },
+	{ 0, "QLOADNET", "you can't quickload during a netgame!\n\npress a key.", NULL },
+	{ 0, "QSAVESPOT", "you haven't picked a quicksave slot yet!\n\npress a key.", NULL },
+	{ 0, "SAVEDEAD", "you can't save if you aren't playing!\n\npress a key.", NULL },
+	{ 0, "QSPROMPT", "quicksave over your game named\n\n'%s'?\n\npress y or n.", NULL },
+	{ 0, "QLPROMPT", "do you want to quickload the game named\n\n'%s'?\n\npress y or n.", NULL },
+	{ 0, "NEWGAME", "you can't start a new game\nwhile in a network game.\n\npress a key.", NULL },
+	{ 0, "NIGHTMARE", "are you sure? this skill level\nisn't even remotely fair.\n\npress y or n.", NULL },
+	{ 0, "SWSTRING", "this is the shareware version of doom.\n\nyou need to order the entire trilogy.\n\npress a key.", NULL },
+	{ 0, "MSGOFF", "Messages OFF", NULL },
+	{ 0, "MSGON", "Messages ON", NULL },
+	{ 0, "NETEND", "you can't end a netgame!\n\npress a key.", NULL },
+	{ 0, "ENDGAME", "are you sure you want to end the game?\n\npress y or n.", NULL },
+	{ 0, "DOSY", "(press y to quit)", NULL },
+	{ 0, "EMPTYSTRING", "empty slot", NULL },
+	{ 0, "GOTARMOR", "Picked up the armor.", NULL },
+	{ 0, "GOTMEGA", "Picked up the MegaArmor!", NULL },
+	{ 0, "GOTHTHBONUS", "Picked up a health bonus.", NULL },
+	{ 0, "GOTARMBONUS", "Picked up an armor bonus.", NULL },
+	{ 0, "GOTSTIM", "Picked up a stimpack.", NULL },
+	{ 0, "GOTMEDINEED", "Picked up a medikit that you REALLY need!", NULL },
+	{ 0, "GOTMEDIKIT", "Picked up a medikit.", NULL },
+	{ 0, "GOTSUPER", "Supercharge!", NULL },
+	{ 0, "GOTBLUECARD", "Picked up a blue keycard.", NULL },
+	{ 0, "GOTYELWCARD", "Picked up a yellow keycard.", NULL },
+	{ 0, "GOTREDCARD", "Picked up a red keycard.", NULL },
+	{ 0, "GOTBLUESKUL", "Picked up a blue skull key.", NULL },
+	{ 0, "GOTYELWSKUL", "Picked up a yellow skull key.", NULL },
+	{ 0, "GOTREDSKUL", "Picked up a red skull key.", NULL },
+	{ 0, "GOTINVUL", "Invulnerability!", NULL },
+	{ 0, "GOTBERSERK", "Berserk!", NULL },
+	{ 0, "GOTINVIS", "Partial Invisibility", NULL },
+	{ 0, "GOTSUIT", "Radiation Shielding Suit", NULL },
+	{ 0, "GOTMAP", "Computer Area Map", NULL },
+	{ 0, "GOTVISOR", "Light Amplification Visor", NULL },
+	{ 0, "GOTMSPHERE", "MegaSphere!", NULL },
+	{ 0, "GOTCLIP", "Picked up a clip.", NULL },
+	{ 0, "GOTCLIPBOX", "Picked up a box of bullets.", NULL },
+	{ 0, "GOTROCKET", "Picked up a rocket.", NULL },
+	{ 0, "GOTROCKBOX", "Picked up a box of rockets.", NULL },
+	{ 0, "GOTCELL", "Picked up an energy cell.", NULL },
+	{ 0, "GOTCELLBOX", "Picked up an energy cell pack.", NULL },
+	{ 0, "GOTSHELLS", "Picked up 4 shotgun shells.", NULL },
+	{ 0, "GOTSHELLBOX", "Picked up a box of shotgun shells.", NULL },
+	{ 0, "GOTBACKPACK", "Picked up a backpack full of ammo!", NULL },
+	{ 0, "GOTBFG9000", "You got the BFG9000!  Oh, yes.", NULL },
+	{ 0, "GOTCHAINGUN", "You got the chaingun!", NULL },
+	{ 0, "GOTCHAINSAW", "A chainsaw!  Find some meat!", NULL },
+	{ 0, "GOTLAUNCHER", "You got the rocket launcher!", NULL },
+	{ 0, "GOTPLASMA", "You got the plasma gun!", NULL },
+	{ 0, "GOTSHOTGUN", "You got the shotgun!", NULL },
+	{ 0, "GOTSHOTGUN2", "You got the super shotgun!", NULL },
+	{ 0, "PD_BLUEO", "You need a blue key to activate this object", NULL },
+	{ 0, "PD_REDO", "You need a red key to activate this object", NULL },
+	{ 0, "PD_YELLOWO", "You need a yellow key to activate this object", NULL },
+	{ 0, "PD_BLUEK", "You need a blue key to open this door", NULL },
+	{ 0, "PD_REDK", "You need a red key to open this door", NULL },
+	{ 0, "PD_YELLOWK", "You need a yellow key to open this door", NULL },
+	{ 0, "GGSAVED", "game saved.", NULL },
+	{ 0, "HUSTR_MSGU", "[Message unsent]", NULL },
+	{ 0, "HUSTR_E1M1", "E1M1: Hangar", NULL },
+	{ 0, "HUSTR_E1M2", "E1M2: Nuclear Plant", NULL },
+	{ 0, "HUSTR_E1M3", "E1M3: Toxin Refinery", NULL },
+	{ 0, "HUSTR_E1M4", "E1M4: Command Control", NULL },
+	{ 0, "HUSTR_E1M5", "E1M5: Phobos Lab", NULL },
+	{ 0, "HUSTR_E1M6", "E1M6: Central Processing", NULL },
+	{ 0, "HUSTR_E1M7", "E1M7: Computer Station", NULL },
+	{ 0, "HUSTR_E1M8", "E1M8: Phobos Anomaly", NULL },
+	{ 0, "HUSTR_E1M9", "E1M9: Military Base", NULL },
+	{ 0, "HUSTR_E2M1", "E2M1: Deimos Anomaly", NULL },
+	{ 0, "HUSTR_E2M2", "E2M2: Containment Area", NULL },
+	{ 0, "HUSTR_E2M3", "E2M3: Refinery", NULL },
+	{ 0, "HUSTR_E2M4", "E2M4: Deimos Lab", NULL },
+	{ 0, "HUSTR_E2M5", "E2M5: Command Center", NULL },
+	{ 0, "HUSTR_E2M6", "E2M6: Halls of the Damned", NULL },
+	{ 0, "HUSTR_E2M7", "E2M7: Spawning Vats", NULL },
+	{ 0, "HUSTR_E2M8", "E2M8: Tower of Babel", NULL },
+	{ 0, "HUSTR_E2M9", "E2M9: Fortress of Mystery", NULL },
+	{ 0, "HUSTR_E3M1", "E3M1: Hell Keep", NULL },
+	{ 0, "HUSTR_E3M2", "E3M2: Slough of Despair", NULL },
+	{ 0, "HUSTR_E3M3", "E3M3: Pandemonium", NULL },
+	{ 0, "HUSTR_E3M4", "E3M4: House of Pain", NULL },
+	{ 0, "HUSTR_E3M5", "E3M5: Unholy Cathedral", NULL },
+	{ 0, "HUSTR_E3M6", "E3M6: Mt. Erebus", NULL },
+	{ 0, "HUSTR_E3M7", "E3M7: Limbo", NULL },
+	{ 0, "HUSTR_E3M8", "E3M8: Dis", NULL },
+	{ 0, "HUSTR_E3M9", "E3M9: Warrens", NULL },
+	{ 0, "HUSTR_E4M1", "E4M1: Hell Beneath", NULL },
+	{ 0, "HUSTR_E4M2", "E4M2: Perfect Hatred", NULL },
+	{ 0, "HUSTR_E4M3", "E4M3: Sever The Wicked", NULL },
+	{ 0, "HUSTR_E4M4", "E4M4: Unruly Evil", NULL },
+	{ 0, "HUSTR_E4M5", "E4M5: They Will Repent", NULL },
+	{ 0, "HUSTR_E4M6", "E4M6: Against Thee Wickedly", NULL },
+	{ 0, "HUSTR_E4M7", "E4M7: And Hell Followed", NULL },
+	{ 0, "HUSTR_E4M8", "E4M8: Unto The Cruel", NULL },
+	{ 0, "HUSTR_E4M9", "E4M9: Fear", NULL },
+	{ 0, "HUSTR_1", "level 1: entryway", NULL },
+	{ 0, "HUSTR_2", "level 2: underhalls", NULL },
+	{ 0, "HUSTR_3", "level 3: the gantlet", NULL },
+	{ 0, "HUSTR_4", "level 4: the focus", NULL },
+	{ 0, "HUSTR_5", "level 5: the waste tunnels", NULL },
+	{ 0, "HUSTR_6", "level 6: the crusher", NULL },
+	{ 0, "HUSTR_7", "level 7: dead simple", NULL },
+	{ 0, "HUSTR_8", "level 8: tricks and traps", NULL },
+	{ 0, "HUSTR_9", "level 9: the pit", NULL },
+	{ 0, "HUSTR_10", "level 10: refueling base", NULL },
+	{ 0, "HUSTR_11", "level 11: 'o' of destruction!", NULL },
+	{ 0, "HUSTR_12", "level 12: the factory", NULL },
+	{ 0, "HUSTR_13", "level 13: downtown", NULL },
+	{ 0, "HUSTR_14", "level 14: the inmost dens", NULL },
+	{ 0, "HUSTR_15", "level 15: industrial zone", NULL },
+	{ 0, "HUSTR_16", "level 16: suburbs", NULL },
+	{ 0, "HUSTR_17", "level 17: tenements", NULL },
+	{ 0, "HUSTR_18", "level 18: the courtyard", NULL },
+	{ 0, "HUSTR_19", "level 19: the citadel", NULL },
+	{ 0, "HUSTR_20", "level 20: gotcha!", NULL },
+	{ 0, "HUSTR_21", "level 21: nirvana", NULL },
+	{ 0, "HUSTR_22", "level 22: the catacombs", NULL },
+	{ 0, "HUSTR_23", "level 23: barrels o' fun", NULL },
+	{ 0, "HUSTR_24", "level 24: the chasm", NULL },
+	{ 0, "HUSTR_25", "level 25: bloodfalls", NULL },
+	{ 0, "HUSTR_26", "level 26: the abandoned mines", NULL },
+	{ 0, "HUSTR_27", "level 27: monster condo", NULL },
+	{ 0, "HUSTR_28", "level 28: the spirit world", NULL },
+	{ 0, "HUSTR_29", "level 29: the living end", NULL },
+	{ 0, "HUSTR_30", "level 30: icon of sin", NULL },
+	{ 0, "HUSTR_31", "level 31: wolfenstein", NULL },
+	{ 0, "HUSTR_32", "level 32: grosse", NULL },
+	{ 0, "PHUSTR_1", "level 1: congo", NULL },
+	{ 0, "PHUSTR_2", "level 2: well of souls", NULL },
+	{ 0, "PHUSTR_3", "level 3: aztec", NULL },
+	{ 0, "PHUSTR_4", "level 4: caged", NULL },
+	{ 0, "PHUSTR_5", "level 5: ghost town", NULL },
+	{ 0, "PHUSTR_6", "level 6: baron's lair", NULL },
+	{ 0, "PHUSTR_7", "level 7: caughtyard", NULL },
+	{ 0, "PHUSTR_8", "level 8: realm", NULL },
+	{ 0, "PHUSTR_9", "level 9: abattoire", NULL },
+	{ 0, "PHUSTR_10", "level 10: onslaught", NULL },
+	{ 0, "PHUSTR_11", "level 11: hunted", NULL },
+	{ 0, "PHUSTR_12", "level 12: speed", NULL },
+	{ 0, "PHUSTR_13", "level 13: the crypt", NULL },
+	{ 0, "PHUSTR_14", "level 14: genesis", NULL },
+	{ 0, "PHUSTR_15", "level 15: the twilight", NULL },
+	{ 0, "PHUSTR_16", "level 16: the omen", NULL },
+	{ 0, "PHUSTR_17", "level 17: compound", NULL },
+	{ 0, "PHUSTR_18", "level 18: neurosphere", NULL },
+	{ 0, "PHUSTR_19", "level 19: nme", NULL },
+	{ 0, "PHUSTR_20", "level 20: the death domain", NULL },
+	{ 0, "PHUSTR_21", "level 21: slayer", NULL },
+	{ 0, "PHUSTR_22", "level 22: impossible mission", NULL },
+	{ 0, "PHUSTR_23", "level 23: tombstone", NULL },
+	{ 0, "PHUSTR_24", "level 24: the final frontier", NULL },
+	{ 0, "PHUSTR_25", "level 25: the temple of darkness", NULL },
+	{ 0, "PHUSTR_26", "level 26: bunker", NULL },
+	{ 0, "PHUSTR_27", "level 27: anti-christ", NULL },
+	{ 0, "PHUSTR_28", "level 28: the sewers", NULL },
+	{ 0, "PHUSTR_29", "level 29: odyssey of noises", NULL },
+	{ 0, "PHUSTR_30", "level 30: the gateway of hell", NULL },
+	{ 0, "PHUSTR_31", "level 31: cyberden", NULL },
+	{ 0, "PHUSTR_32", "level 32: go 2 it", NULL },
+	{ 0, "THUSTR_1", "level 1: system control", NULL },
+	{ 0, "THUSTR_2", "level 2: human bbq", NULL },
+	{ 0, "THUSTR_3", "level 3: power control", NULL },
+	{ 0, "THUSTR_4", "level 4: wormhole", NULL },
+	{ 0, "THUSTR_5", "level 5: hanger", NULL },
+	{ 0, "THUSTR_6", "level 6: open season", NULL },
+	{ 0, "THUSTR_7", "level 7: prison", NULL },
+	{ 0, "THUSTR_8", "level 8: metal", NULL },
+	{ 0, "THUSTR_9", "level 9: stronghold", NULL },
+	{ 0, "THUSTR_10", "level 10: redemption", NULL },
+	{ 0, "THUSTR_11", "level 11: storage facility", NULL },
+	{ 0, "THUSTR_12", "level 12: crater", NULL },
+	{ 0, "THUSTR_13", "level 13: nukage processing", NULL },
+	{ 0, "THUSTR_14", "level 14: steel works", NULL },
+	{ 0, "THUSTR_15", "level 15: dead zone", NULL },
+	{ 0, "THUSTR_16", "level 16: deepest reaches", NULL },
+	{ 0, "THUSTR_17", "level 17: processing area", NULL },
+	{ 0, "THUSTR_18", "level 18: mill", NULL },
+	{ 0, "THUSTR_19", "level 19: shipping/respawning", NULL },
+	{ 0, "THUSTR_20", "level 20: central processing", NULL },
+	{ 0, "THUSTR_21", "level 21: administration center", NULL },
+	{ 0, "THUSTR_22", "level 22: habitat", NULL },
+	{ 0, "THUSTR_23", "level 23: lunar mining project", NULL },
+	{ 0, "THUSTR_24", "level 24: quarry", NULL },
+	{ 0, "THUSTR_25", "level 25: baron's den", NULL },
+	{ 0, "THUSTR_26", "level 26: ballistyx", NULL },
+	{ 0, "THUSTR_27", "level 27: mount pain", NULL },
+	{ 0, "THUSTR_28", "level 28: heck", NULL },
+	{ 0, "THUSTR_29", "level 29: river styx", NULL },
+	{ 0, "THUSTR_30", "level 30: last call", NULL },
+	{ 0, "THUSTR_31", "level 31: pharaoh", NULL },
+	{ 0, "THUSTR_32", "level 32: caribbean", NULL },
+	{ 0, "HUSTR_TALKTOSELF1", "You mumble to yourself", NULL },
+	{ 0, "HUSTR_TALKTOSELF2", "Who's there?", NULL },
+	{ 0, "HUSTR_TALKTOSELF3", "You scare yourself", NULL },
+	{ 0, "HUSTR_TALKTOSELF4", "You start to rave", NULL },
+	{ 0, "HUSTR_TALKTOSELF5", "You've lost it...", NULL },
+	{ 0, "HUSTR_MESSAGESENT", "[Message Sent]", NULL },
+	{ 0, "AMSTR_FOLLOWON", "Follow Mode ON", NULL },
+	{ 0, "AMSTR_FOLLOWOFF", "Follow Mode OFF", NULL },
+	{ 0, "AMSTR_GRIDON", "Grid ON", NULL },
+	{ 0, "AMSTR_GRIDOFF", "Grid OFF", NULL },
+	{ 0, "AMSTR_MARKEDSPOT", "Marked Spot", NULL },
+	{ 0, "AMSTR_MARKSCLEARED", "All Marks Cleared", NULL },
+	{ 0, "STSTR_MUS", "Music Change", NULL },
+	{ 0, "STSTR_NOMUS", "IMPOSSIBLE SELECTION", NULL },
+	{ 0, "STSTR_DQDON", "Degreelessness Mode ON", NULL },
+	{ 0, "STSTR_DQDOFF", "Degreelessness Mode OFF", NULL },
+	{ 0, "STSTR_KFAADDED", "Very Happy Ammo Added", NULL },
+	{ 0, "STSTR_FAADDED", "Ammo (no keys) Added", NULL },
+	{ 0, "STSTR_NCON", "No Clipping Mode ON", NULL },
+	{ 0, "STSTR_NCOFF", "No Clipping Mode OFF", NULL },
+	{ 0, "STSTR_BEHOLD", "inVuln, Str, Inviso, Rad, Allmap, or Lite-amp", NULL },
+	{ 0, "STSTR_BEHOLDX", "Power-up Toggled", NULL },
+	{ 0, "STSTR_CHOPPERS", "... doesn't suck - GM", NULL },
+	{ 0, "STSTR_CLEV", "Changing Level...\n", NULL },
+	{ 0, "E1TEXT", "Once you beat the big badasses and\n"\
 		"clean out the moon base you're supposed\n"\
 		"to win, aren't you? Aren't you? Where's\n"\
 		"your fat reward and ticket home? What\n"\
@@ -297,7 +295,7 @@ gamestring_t Strings[NUMSTRINGS] = {
 		"The Shores of Hell and its amazing\n"\
 		"sequel, Inferno!\n"
 		, NULL },
-	{ 0, "You've done it! The hideous cyber-\n"\
+	{ 0, "E2TEXT", "You've done it! The hideous cyber-\n"\
 		"demon lord that ruled the lost Deimos\n"\
 		"moon base has been slain and you\n"\
 		"are triumphant! But ... where are\n"\
@@ -315,7 +313,7 @@ gamestring_t Strings[NUMSTRINGS] = {
 		"Now, it's on to the final chapter of\n"\
 		"DOOM! -- Inferno."
 		, NULL },
-	{ 0, "The loathsome spiderdemon that\n"\
+	{ 0, "E3TEXT", "The loathsome spiderdemon that\n"\
 		"masterminded the invasion of the moon\n"\
 		"bases and caused so much death has had\n"\
 		"its ass kicked for all time.\n"\
@@ -333,7 +331,7 @@ gamestring_t Strings[NUMSTRINGS] = {
 		"spawn could have come through that\n"\
 		"door with you ..."
 		, NULL },
-	{ 0, "the spider mastermind must have sent forth\n"\
+	{ 0, "E4TEXT", "the spider mastermind must have sent forth\n"\
 		"its legions of hellspawn before your\n"\
 		"final confrontation with that terrible\n"\
 		"beast from hell.  but you stepped forward\n"\
@@ -350,7 +348,7 @@ gamestring_t Strings[NUMSTRINGS] = {
 		"\n"\
 		"next stop, hell on earth!"
 		, NULL },
-	{ 0, "YOU HAVE ENTERED DEEPLY INTO THE INFESTED\n" \
+	{ 0, "C1TEXT", "YOU HAVE ENTERED DEEPLY INTO THE INFESTED\n" \
 		"STARPORT. BUT SOMETHING IS WRONG. THE\n" \
 		"MONSTERS HAVE BROUGHT THEIR OWN REALITY\n" \
 		"WITH THEM, AND THE STARPORT'S TECHNOLOGY\n" \
@@ -363,7 +361,7 @@ gamestring_t Strings[NUMSTRINGS] = {
 		"SWITCH WHICH HOLDS EARTH'S POPULATION\n" \
 		"HOSTAGE."
 		, NULL },
-	{ 0, "YOU HAVE WON! YOUR VICTORY HAS ENABLED\n" \
+	{ 0, "C2TEXT", "YOU HAVE WON! YOUR VICTORY HAS ENABLED\n" \
 		"HUMANKIND TO EVACUATE EARTH AND ESCAPE\n"\
 		"THE NIGHTMARE.  NOW YOU ARE THE ONLY\n"\
 		"HUMAN LEFT ON THE FACE OF THE PLANET.\n"\
@@ -381,7 +379,7 @@ gamestring_t Strings[NUMSTRINGS] = {
 		"STARPORT.\" SLOWLY AND PAINFULLY YOU GET\n"\
 		"UP AND RETURN TO THE FRAY."
 		, NULL },
-	{ 0, "YOU ARE AT THE CORRUPT HEART OF THE CITY,\n"\
+	{ 0, "C3TEXT", "YOU ARE AT THE CORRUPT HEART OF THE CITY,\n"\
 		"SURROUNDED BY THE CORPSES OF YOUR ENEMIES.\n"\
 		"YOU SEE NO WAY TO DESTROY THE CREATURES'\n"\
 		"ENTRYWAY ON THIS SIDE, SO YOU CLENCH YOUR\n"\
@@ -391,7 +389,7 @@ gamestring_t Strings[NUMSTRINGS] = {
 		"OTHER SIDE. WHAT DO YOU CARE IF YOU'VE\n"\
 		"GOT TO GO THROUGH HELL TO GET TO IT?"
 		, NULL },
-	{ 0, "THE HORRENDOUS VISAGE OF THE BIGGEST\n"\
+	{ 0, "C4TEXT", "THE HORRENDOUS VISAGE OF THE BIGGEST\n"\
 		"DEMON YOU'VE EVER SEEN CRUMBLES BEFORE\n"\
 		"YOU, AFTER YOU PUMP YOUR ROCKETS INTO\n"\
 		"HIS EXPOSED BRAIN. THE MONSTER SHRIVELS\n"\
@@ -407,17 +405,17 @@ gamestring_t Strings[NUMSTRINGS] = {
 		"HOME. REBUILDING EARTH OUGHT TO BE A\n"\
 		"LOT MORE FUN THAN RUINING IT WAS.\n"
 		, NULL },
-	{ 0, "CONGRATULATIONS, YOU'VE FOUND THE SECRET\n"\
+	{ 0, "C5TEXT", "CONGRATULATIONS, YOU'VE FOUND THE SECRET\n"\
 		"LEVEL! LOOKS LIKE IT'S BEEN BUILT BY\n"\
 		"HUMANS, RATHER THAN DEMONS. YOU WONDER\n"\
 		"WHO THE INMATES OF THIS CORNER OF HELL\n"\
 		"WILL BE."
 		, NULL },
-	{ 0, "CONGRATULATIONS, YOU'VE FOUND THE\n"\
+	{ 0, "C6TEXT", "CONGRATULATIONS, YOU'VE FOUND THE\n"\
 		"SUPER SECRET LEVEL!  YOU'D BETTER\n"\
 		"BLAZE THROUGH THIS ONE!\n"
 		, NULL },
-	{ 0, "You gloat over the steaming carcass of the\n"\
+	{ 0, "P1TEXT", "You gloat over the steaming carcass of the\n"\
 		"Guardian.  With its death, you've wrested\n"\
 		"the Accelerator from the stinking claws\n"\
 		"of Hell.  You relax and glance around the\n"\
@@ -430,14 +428,14 @@ gamestring_t Strings[NUMSTRINGS] = {
 		"moving, keep fighting, keep killing.\n"\
 		"Oh yes, keep living, too."
 		, NULL },
-	{ 0, "Even the deadly Arch-Vile labyrinth could\n"\
+	{ 0, "P2TEXT", "Even the deadly Arch-Vile labyrinth could\n"\
 		"not stop you, and you've gotten to the\n"\
 		"prototype Accelerator which is soon\n"\
 		"efficiently and permanently deactivated.\n"\
 		"\n"\
 		"You're good at that kind of thing."
 		, NULL },
-	{ 0, "You've bashed and battered your way into\n"\
+	{ 0, "P3TEXT", "You've bashed and battered your way into\n"\
 		"the heart of the devil-hive.  Time for a\n"\
 		"Search-and-Destroy mission, aimed at the\n"\
 		"Gatekeeper, whose foul offspring is\n"\
@@ -448,7 +446,7 @@ gamestring_t Strings[NUMSTRINGS] = {
 		"get ready to give the bastard a little Hell\n"\
 		"of your own making!"
 		, NULL },
-	{ 0, "The Gatekeeper's evil face is splattered\n"\
+	{ 0, "P4TEXT", "The Gatekeeper's evil face is splattered\n"\
 		"all over the place.  As its tattered corpse\n"\
 		"collapses, an inverted Gate forms and\n"\
 		"sucks down the shards of the last\n"\
@@ -461,16 +459,16 @@ gamestring_t Strings[NUMSTRINGS] = {
 		"when you die, you'll need it for some\n"\
 		"final cleaning-up ..."
 		, NULL },
-	{ 0, "You've found the second-hardest level we\n"\
+	{ 0, "P5TEXT", "You've found the second-hardest level we\n"\
 		"got. Hope you have a saved game a level or\n"\
 		"two previous.  If not, be prepared to die\n"\
 		"aplenty. For master marines only."
 		, NULL },
-	{ 0, "Betcha wondered just what WAS the hardest\n"\
+	{ 0, "P6TEXT", "Betcha wondered just what WAS the hardest\n"\
 		"level we had ready for ya?  Now you know.\n"\
 		"No one gets out alive."
 		, NULL },
-	{ 0, "You've fought your way out of the infested\n"\
+	{ 0, "T1TEXT", "You've fought your way out of the infested\n"\
 		"experimental labs.   It seems that UAC has\n"\
 		"once again gulped it down.  With their\n"\
 		"high turnover, it must be hard for poor\n"\
@@ -483,7 +481,7 @@ gamestring_t Strings[NUMSTRINGS] = {
 		"complex still has some warlike ordnance\n"\
 		"laying around."
 		, NULL },
-	{ 0, "You hear the grinding of heavy machinery\n"\
+	{ 0, "T2TEXT", "You hear the grinding of heavy machinery\n"\
 		"ahead.  You sure hope they're not stamping\n"\
 		"out new hellspawn, but you're ready to\n"\
 		"ream out a whole herd if you have to.\n"\
@@ -493,7 +491,7 @@ gamestring_t Strings[NUMSTRINGS] = {
 		"\n"\
 		"You don't plan to go down easy."
 		, NULL },
-	{ 0, "The vista opening ahead looks real damn\n"\
+	{ 0, "T3TEXT", "The vista opening ahead looks real damn\n"\
 		"familiar. Smells familiar, too -- like\n"\
 		"fried excrement. You didn't like this\n"\
 		"place before, and you sure as hell ain't\n"\
@@ -502,7 +500,7 @@ gamestring_t Strings[NUMSTRINGS] = {
 		"Hefting your gun, an evil grin trickles\n"\
 		"onto your face. Time to take some names."
 		, NULL },
-	{ 0, "Suddenly, all is silent, from one horizon\n"\
+	{ 0, "T4TEXT", "Suddenly, all is silent, from one horizon\n"\
 		"to the other. The agonizing echo of Hell\n"\
 		"fades away, the nightmare sky turns to\n"\
 		"blue, the heaps of monster corpses start \n"\
@@ -514,13 +512,13 @@ gamestring_t Strings[NUMSTRINGS] = {
 		"A blue light begins to glow inside the\n"\
 		"ruined skull of the demon-spitter."
 		, NULL },
-	{ 0, "What now? Looks totally different. Kind\n"\
+	{ 0, "T5TEXT", "What now? Looks totally different. Kind\n"\
 		"of like King Tut's condo. Well,\n"\
 		"whatever's here can't be any worse\n"\
 		"than usual. Can it?  Or maybe it's best\n"\
 		"to let sleeping gods lie.."
 		, NULL },
-	{ 0, "Time for a vacation. You've burst the\n"\
+	{ 0, "T6TEXT", "Time for a vacation. You've burst the\n"\
 		"bowels of hell and by golly you're ready\n"\
 		"for a break. You mutter to yourself,\n"\
 		"Maybe someone else can kick Hell's ass\n"\
@@ -531,93 +529,114 @@ gamestring_t Strings[NUMSTRINGS] = {
 		"As you step off the transport, you hear\n"\
 		"the stomp of a cyberdemon's iron shoe."
 		, NULL },
-	{ 0, "ZOMBIEMAN", NULL },
-	{ 0, "SHOTGUN GUY", NULL },
-	{ 0, "HEAVY WEAPON DUDE", NULL },
-	{ 0, "IMP", NULL },
-	{ 0, "DEMON", NULL },
-	{ 0, "LOST SOUL", NULL },
-	{ 0, "CACODEMON", NULL },
-	{ 0, "HELL KNIGHT", NULL },
-	{ 0, "BARON OF HELL", NULL },
-	{ 0, "ARACHNOTRON", NULL },
-	{ 0, "PAIN ELEMENTAL", NULL },
-	{ 0, "REVENANT", NULL },
-	{ 0, "MANCUBUS", NULL },
-	{ 0, "ARCH-VILE", NULL },
-	{ 0, "THE SPIDER MASTERMIND", NULL },
-	{ 0, "THE CYBERDEMON", NULL },
-	{ 0, "OUR HERO", NULL }
-};
+	{ 0, "CC_ZOMBIE", "ZOMBIEMAN", NULL },
+	{ 0, "CC_SHOTGUN", "SHOTGUN GUY", NULL },
+	{ 0, "CC_HEAVY", "HEAVY WEAPON DUDE", NULL },
+	{ 0, "CC_IMP", "IMP", NULL },
+	{ 0, "CC_DEMON", "DEMON", NULL },
+	{ 0, "CC_LOST", "LOST SOUL", NULL },
+	{ 0, "CC_CACO", "CACODEMON", NULL },
+	{ 0, "CC_HELL", "HELL KNIGHT", NULL },
+	{ 0, "CC_BARON", "BARON OF HELL", NULL },
+	{ 0, "CC_ARACH", "ARACHNOTRON", NULL },
+	{ 0, "CC_PAIN", "PAIN ELEMENTAL", NULL },
+	{ 0, "CC_REVEN", "REVENANT", NULL },
+	{ 0, "CC_MANCU", "MANCUBUS", NULL },
+	{ 0, "CC_ARCH", "ARCH-VILE", NULL },
+	{ 0, "CC_SPIDER", "THE SPIDER MASTERMIND", NULL },
+	{ 0, "CC_CYBER", "THE CYBERDEMON", NULL },
+	{ 0, "CC_HERO", "OUR HERO", NULL },
 
-void newlanguage (cvar_t *var)
-{
-	D_InitStrings ();
-	G_SetLevelStrings ();
-}
+	// [RH] New strings from BOOM
+	{ 0, "PD_BLUEC", "You need a blue card to open this door", NULL },
+	{ 0, "PD_REDC", "You need a red card to open this door", NULL },
+	{ 0, "PD_YELLOWC", "You need a yellow card to open this door", NULL },
+	{ 0, "PD_BLUES", "You need a blue skull to open this door", NULL },
+	{ 0, "PD_REDS", "You need a red skull to open this door", NULL },
+	{ 0, "PD_YELLOWS", "You need a yellow skull to open this door", NULL },
+	{ 0, "PD_ANY", "Any key will open this door", NULL },
+	{ 0, "PD_ALL3", "You need all three keys to open this door", NULL },
+	{ 0, "PD_ALL6", "You need all six keys to open this door", NULL },
+
+	// [RH] Obituary strings
+	{ 0, "OB_SUICIDE", "suicides", NULL },
+	{ 0, "OB_FALLING", "fell too far", NULL },
+	{ 0, "OB_CRUSH", "was squished", NULL },
+	{ 0, "OB_EXIT", "tried to leave", NULL },
+	{ 0, "OB_WATER", "can't swim", NULL },
+	{ 0, "OB_SLIME", "mutated", NULL },
+	{ 0, "OB_LAVA", "melted", NULL },
+	{ 0, "OB_BARREL", "went boom", NULL },
+	{ 0, "OB_SPLASH", "stood in the wrong spot", NULL },
+	{ 0, "OB_R_SPLASH", "should have stood back", NULL },
+	{ 0, "OB_ROCKET", "should have stood back", NULL },
+	{ 0, "OB_KILLEDSELF", "killed %hself", NULL },
+	{ 0, "OB_STEALTHBABY", "thought %g saw an arachnotron", NULL },
+	{ 0, "OB_STEALTHVILE", "thought %g saw an archvile", NULL },
+	{ 0, "OB_STEALTHBARON", "thought %g saw a Baron of Hell", NULL },
+	{ 0, "OB_STEALTHCACO", "thought %g saw a cacodemon", NULL },
+	{ 0, "OB_STEALTHCHAINGUY", "thought %g saw a chaingunner", NULL },
+	{ 0, "OB_STEALTHDEMON", "thought %g saw a demon", NULL },
+	{ 0, "OB_STEALTHKNIGHT", "thought %g saw a Hell Knight", NULL },
+	{ 0, "OB_STEALTHIMP", "thought %g saw an imp", NULL },
+	{ 0, "OB_STEALTHFATSO", "thought %g saw a mancubus", NULL },
+	{ 0, "OB_STEALTHUNDEAD", "thought %g saw a revenant", NULL },
+	{ 0, "OB_STEALTHSHOTGUY", "thought %g saw a sargeant", NULL },
+	{ 0, "OB_STEALTHZOMBIE", "thought %g saw a zombieman", NULL },
+	{ 0, "OB_UNDEADHIT", "was punched by a revenant", NULL },
+	{ 0, "OB_IMPHIT", "was slashed by an imp", NULL },
+	{ 0, "OB_CACOHIT", "got too close to a cacodemon", NULL },
+	{ 0, "OB_DEMONHIT", "was bit by a demon", NULL },
+	{ 0, "OB_SPECTREHIT", "was eaten by a spectre", NULL },
+	{ 0, "OB_BARONHIT", "was ripped open by a Baron of Hell", NULL },
+	{ 0, "OB_KNIGHTHIT", "was gutted by a Hell Knight", NULL },
+	{ 0, "OB_ZOMBIE", "was killed by a zombieman", NULL },
+	{ 0, "OB_SHOTGUY", "was shot by a sargeant", NULL },
+	{ 0, "OB_VILE", "was incinerated by an archvile", NULL },
+	{ 0, "OB_UNDEAD", "couldn't evade a revevant's fireball", NULL },
+	{ 0, "OB_FATSO", "was squashed by a mancubus", NULL },
+	{ 0, "OB_CHAINGUY", "was perforated by a chaingunner", NULL },
+	{ 0, "OB_SKULL", "was spooked by a lost soul", NULL },
+	{ 0, "OB_IMP", "was burned by an imp", NULL },
+	{ 0, "OB_CACO", "was smitten by a cacodemon", NULL },
+	{ 0, "OB_BARON", "was bruised by a Baron of Hell", NULL },
+	{ 0, "OB_KNIGHT", "was splayed by a Hell Knight", NULL },
+	{ 0, "OB_SPIDER", "stood in awe of the spider demon", NULL },
+	{ 0, "OB_BABY", "let an arachnotron get %h", NULL },
+	{ 0, "OB_CYBORG", "was splattered by a cyberdemon", NULL },
+	{ 0, "OB_WOLFSS", "was no match for the past", NULL },
+	{ 0, "OB_MPFIST", "chewed on %s's fist", NULL },
+	{ 0, "OB_MPCHAINSAW", "was mowed over by %s's chainsaw", NULL },
+	{ 0, "OB_MPPISTOL", "was tickled by %s", NULL },
+	{ 0, "OB_MPSHOTGUN", "chewed on %s's boomstick", NULL },
+	{ 0, "OB_MPSSHOTGUN", "was splattered by %s's super shotgun", NULL },
+	{ 0, "OB_MPCHAINGUN", "was mowed down by %s", NULL },
+	{ 0, "OB_MPROCKET", "rode %s's rocket", NULL },
+	{ 0, "OB_MPR_SPLASH", "almost dodged %s's rocket", NULL },
+	{ 0, "OB_MPPLASMARIFLE", "was melted by %s", NULL },
+	{ 0, "OB_MPBFG_BOOM", "was splintered by %s's BFG", NULL },
+	{ 0, "OB_MPBFG_SPLASH", "couldn't hide from %s's BFG", NULL },
+	{ 0, "OB_MPTELEFRAG", "was telefragged by %s", NULL },
+	{ 0, "OB_DEFAULT", "died", NULL },
+	{ 0, "OB_FRIENDLY1", "mows down a teammate", NULL },
+	{ 0, "OB_FRIENDLY2", "checks %p glasses", NULL },
+	{ 0, "OB_FRIENDLY3", "gets a frag for the other team", NULL },
+	{ 0, "OB_FRIENDLY4", "loses another friend", NULL },
+	{ 0, "SAVEGAMENAME", "zdoomsv", NULL },
+	{ 0, "STARTUP1", "", NULL },
+	{ 0, "STARTUP2", "", NULL },
+	{ 0, "STARTUP3", "", NULL },
+	{ 0, "STARTUP4", "", NULL },
+	{ 0, "STARTUP5", "", NULL },
+};
 
 void D_InitStrings (void)
 {
-	byte *strings;
-	char *str;
-	char *languagename;
 	int i;
-	int chunksize;
 
-	var_language->u.callback = newlanguage;
-	languagename = var_language->string;
-
-	if (languagename) {
-		i = W_CheckNumForName ("LANGDATA");
-		str = "";
-		if (i != -1) {
-			strings = W_CacheLumpNum (i, PU_CACHE);
-
-			while (1) {
-				str = ReadString (&strings);
-				if (*str == 0)
-					break;			// No more languages
-
-				chunksize = ReadLong (&strings);
-				if (!stricmp (str, languagename))
-					break;
-
-				strings += chunksize;
-			}
-
-			if (*str) {
-				language = english + 1;
-				for (i = 0; i < NUMSTRINGS; i++) {
-					str = ReadString (&strings);
-					chunksize -= strlen (str) + 1;
-					if (chunksize < 0) {
-						Printf ("Language \"%s\" is missing %d strings\n", languagename, NUMSTRINGS - i);
-						languagename = NULL;
-						break;
-					}
-					if (Strings[i].type == str_notchanged || Strings[i].type == str_foreign) {
-						ReplaceString (&Strings[i].string, str);
-						Strings[i].type = str_foreign;
-					}
-				}
-			}
-
-		}
-		if (languagename && !stricmp (languagename, "English")) {
-			languagename = NULL;
-		} else if (*str == 0) {
-			Printf ("Unknown language \"%s\"\n", languagename);
-			languagename = NULL;
-		}
-	}
-
-	if (!languagename) {
-		for (i = 0; i < NUMSTRINGS; i++) {
-			if (Strings[i].type == str_notchanged || Strings[i].type == str_foreign) {
-				ReplaceString (&Strings[i].string, Strings[i].builtin);
-				Strings[i].type = str_notchanged;
-			}
-		}
+	for (i = 0; i < NUMSTRINGS; i++) {
+		if (Strings[i].type == str_notchanged)
+			ReplaceString (&Strings[i].string, Strings[i].builtin);
 	}
 
 	endmsg[0] = QUITMSG;
diff --git a/code/Dstrings.h b/code/Dstrings.h
index e27f41ac57..11da01a628 100644
--- a/code/Dstrings.h
+++ b/code/Dstrings.h
@@ -31,9 +31,6 @@ void D_InitStrings (void);
 void ReplaceString (char **ptr, char *str);
 
 
-// Misc. other strings.
-#define SAVEGAMENAME	"zdoomsv"
-
 // QuitDOOM messages
 #define NUM_QUITMESSAGES   14
 
@@ -42,13 +39,13 @@ extern char* endmsg[];
 // [RH] String handling has changed significantly and is no longer static per build.
 typedef enum {
 	str_notchanged,
-	str_foreign,
 	str_patched,
 	str_custom
 } strtype_t;
 
 typedef struct gamestring_s {
 	strtype_t	 type;
+	char		*name;
 	char		*builtin;
 	char		*string;
 } gamestring_t;
@@ -370,7 +367,89 @@ typedef struct gamestring_s {
 #define CC_CYBER			(Strings[258].string)
 #define CC_HERO				(Strings[259].string)
 
-#define NUMSTRINGS			260
+#define PD_BLUEC			(Strings[260].string)
+#define PD_REDC				(Strings[261].string)
+#define PD_YELLOWC			(Strings[262].string)
+#define PD_BLUES			(Strings[263].string)
+#define PD_REDS				(Strings[264].string)
+#define PD_YELLOWS			(Strings[265].string)
+#define PD_ANY				(Strings[266].string)
+#define PD_ALL3				(Strings[267].string)
+#define PD_ALL6				(Strings[268].string)
+
+#define OB_SUICIDE			(Strings[269].string)
+#define OB_FALLING			(Strings[270].string)
+#define OB_CRUSH			(Strings[271].string)
+#define OB_EXIT				(Strings[272].string)
+#define OB_WATER			(Strings[273].string)
+#define OB_SLIME			(Strings[274].string)
+#define OB_LAVA				(Strings[275].string)
+#define OB_BARREL			(Strings[276].string)
+#define OB_SPLASH			(Strings[277].string)
+#define OB_R_SPLASH			(Strings[278].string)
+#define OB_ROCKET			(Strings[279].string)
+#define OB_KILLEDSELF		(Strings[280].string)
+#define OB_STEALTHBABY		(Strings[281].string)
+#define OB_STEALTHVILE		(Strings[282].string)
+#define OB_STEALTHBARON		(Strings[283].string)
+#define OB_STEALTHCACO		(Strings[284].string)
+#define OB_STEALTHCHAINGUY	(Strings[285].string)
+#define OB_STEALTHDEMON		(Strings[286].string)
+#define OB_STEALTHKNIGHT	(Strings[287].string)
+#define OB_STEALTHIMP		(Strings[288].string)
+#define OB_STEALTHFATSO		(Strings[289].string)
+#define OB_STEALTHUNDEAD	(Strings[290].string)
+#define OB_STEALTHSHOTGUY	(Strings[291].string)
+#define OB_STEALTHZOMBIE	(Strings[292].string)
+#define OB_UNDEADHIT		(Strings[293].string)
+#define OB_IMPHIT			(Strings[294].string)
+#define OB_CACOHIT			(Strings[295].string)
+#define OB_DEMONHIT			(Strings[296].string)
+#define OB_SPECTREHIT		(Strings[297].string)
+#define OB_BARONHIT			(Strings[298].string)
+#define OB_KNIGHTHIT		(Strings[299].string)
+#define OB_ZOMBIE			(Strings[300].string)
+#define OB_SHOTGUY			(Strings[301].string)
+#define OB_VILE				(Strings[302].string)
+#define OB_UNDEAD			(Strings[303].string)
+#define OB_FATSO			(Strings[304].string)
+#define OB_CHAINGUY			(Strings[305].string)
+#define OB_SKULL			(Strings[306].string)
+#define OB_IMP				(Strings[307].string)
+#define OB_CACO				(Strings[308].string)
+#define OB_BARON			(Strings[309].string)
+#define OB_KNIGHT			(Strings[310].string)
+#define OB_SPIDER			(Strings[311].string)
+#define OB_BABY				(Strings[312].string)
+#define OB_CYBORG			(Strings[313].string)
+#define OB_WOLFSS			(Strings[314].string)
+#define OB_MPFIST			(Strings[315].string)
+#define OB_MPCHAINSAW		(Strings[316].string)
+#define OB_MPPISTOL			(Strings[317].string)
+#define OB_MPSHOTGUN		(Strings[318].string)
+#define OB_MPSSHOTGUN		(Strings[319].string)
+#define OB_MPCHAINGUN		(Strings[320].string)
+#define OB_MPROCKET			(Strings[321].string)
+#define OB_MPR_SPLASH		(Strings[322].string)
+#define OB_MPPLASMARIFLE	(Strings[323].string)
+#define OB_MPBFG_BOOM		(Strings[324].string)
+#define OB_MPBFG_SPLASH		(Strings[325].string)
+#define OB_MPTELEFRAG		(Strings[326].string)
+#define OB_DEFAULT			(Strings[327].string)
+#define OB_FRIENDLY1		(Strings[328].string)
+#define OB_FRIENDLY2		(Strings[329].string)
+#define OB_FRIENDLY3		(Strings[330].string)
+#define OB_FRIENDLY4		(Strings[331].string)
+
+#define SAVEGAMENAME		(Strings[332].string)
+
+#define STARTUP1			(Strings[333].string)
+#define STARTUP2			(Strings[334].string)
+#define STARTUP3			(Strings[335].string)
+#define STARTUP4			(Strings[336].string)
+#define STARTUP5			(Strings[337].string)
+
+#define NUMSTRINGS			338
 
 extern gamestring_t Strings[];
 
diff --git a/code/F_finale.c b/code/F_finale.c
index 8db06b7505..be2593903b 100644
--- a/code/F_finale.c
+++ b/code/F_finale.c
@@ -31,16 +31,18 @@
 #include "m_swap.h"
 #include "z_zone.h"
 #include "v_video.h"
+#include "v_text.h"
 #include "w_wad.h"
 #include "s_sound.h"
 
 // Data.
 #include "dstrings.h"
-#include "sounds.h"
 
 #include "doomstat.h"
 #include "r_state.h"
 
+#include "hu_stuff.h"
+
 // ?
 //#include "doomstat.h"
 //#include "r_local.h"
@@ -129,7 +131,7 @@ BOOL F_Responder (event_t *event)
 //
 void F_Ticker (void)
 {
-	int 		i;
+	int i;
 	
 	// check for skipping
 	// [RH] Non-commercial can be skipped now, too
@@ -176,9 +178,7 @@ void F_Ticker (void)
 //
 // F_TextWrite
 //
-
-#include "hu_stuff.h"
-extern	patch_t *hu_font[HU_FONTSIZE];
+extern patch_t *hu_font[HU_FONTSIZE];
 
 
 void F_TextWrite (void)
@@ -270,6 +270,7 @@ castinfo_t		castorder[] = {
 
 int 			castnum;
 int 			casttics;
+int				castsprite;	// [RH] For overriding the player sprite with a skin
 state_t*		caststate;
 BOOL	 		castdeath;
 int 			castframes;
@@ -307,6 +308,10 @@ void F_StartCast (void)
 	wipegamestate = -1; 		// force a screen wipe
 	castnum = 0;
 	caststate = &states[mobjinfo[castorder[castnum].type].seestate];
+	if (castorder[castnum].type == MT_PLAYER)
+		castsprite = skins[players[consoleplayer].userinfo.skin].sprite;
+	else
+		castsprite = caststate->sprite;
 	casttics = caststate->tics;
 	castdeath = false;
 	finalestage = 2;	
@@ -322,9 +327,8 @@ void F_StartCast (void)
 //
 void F_CastTicker (void)
 {
-	int 		st;
-	int 		sfx;
-	void		*origin;
+	int st;
+	void *origin;
 
 	if (--casttics > 0)
 		return; 				// not time to change state yet
@@ -346,13 +350,19 @@ void F_CastTicker (void)
 					origin = ORIGIN_AMBIENT;
 					break;
 			}
-			S_StartSound (origin, mobjinfo[castorder[castnum].type].seesound);
+			S_StartSound (origin, mobjinfo[castorder[castnum].type].seesound, 90);
 		}
 		caststate = &states[mobjinfo[castorder[castnum].type].seestate];
+		if (castorder[castnum].type == MT_PLAYER)
+			castsprite = skins[players[consoleplayer].userinfo.skin].sprite;
+		else
+			castsprite = caststate->sprite;
 		castframes = 0;
 	}
 	else
 	{
+		char *sfx;
+
 		// just advance to next state in animation
 		if (caststate == &states[S_PLAY_ATK1])
 			goto stopattack;	// Oh, gross hack!
@@ -363,37 +373,37 @@ void F_CastTicker (void)
 		// sound hacks....
 		switch (st)
 		{
-		  case S_PLAY_ATK1: 	sfx = sfx_dshtgn; break;
-		  case S_POSS_ATK2: 	sfx = sfx_pistol; break;
-		  case S_SPOS_ATK2: 	sfx = sfx_shotgn; break;
-		  case S_VILE_ATK2: 	sfx = sfx_vilatk; break;
-		  case S_SKEL_FIST2:	sfx = sfx_skeswg; break;
-		  case S_SKEL_FIST4:	sfx = sfx_skepch; break;
-		  case S_SKEL_MISS2:	sfx = sfx_skeatk; break;
+		  case S_PLAY_ATK1: 	sfx = "weapons/sshotf"; break;
+		  case S_POSS_ATK2: 	sfx = "grunt/attack"; break;
+		  case S_SPOS_ATK2: 	sfx = "shotguy/attack"; break;
+		  case S_VILE_ATK2: 	sfx = "vile/start"; break;
+		  case S_SKEL_FIST2:	sfx = "skeleton/swing"; break;
+		  case S_SKEL_FIST4:	sfx = "skeleton/melee"; break;
+		  case S_SKEL_MISS2:	sfx = "skeleton/attack"; break;
 		  case S_FATT_ATK8:
 		  case S_FATT_ATK5:
-		  case S_FATT_ATK2: 	sfx = sfx_firsht; break;
+		  case S_FATT_ATK2: 	sfx = "fatso/attack"; break;
 		  case S_CPOS_ATK2:
 		  case S_CPOS_ATK3:
-		  case S_CPOS_ATK4: 	sfx = sfx_shotgn; break;
-		  case S_TROO_ATK3: 	sfx = sfx_claw; break;
-		  case S_SARG_ATK2: 	sfx = sfx_sgtatk; break;
+		  case S_CPOS_ATK4: 	sfx = "chainguy/attack"; break;
+		  case S_TROO_ATK3: 	sfx = "imp/attack"; break;
+		  case S_SARG_ATK2: 	sfx = "demon/melee"; break;
 		  case S_BOSS_ATK2:
 		  case S_BOS2_ATK2:
-		  case S_HEAD_ATK2: 	sfx = sfx_firsht; break;
-		  case S_SKULL_ATK2:	sfx = sfx_sklatk; break;
+		  case S_HEAD_ATK2: 	sfx = "caco/attack"; break;
+		  case S_SKULL_ATK2:	sfx = "skull/melee"; break;
 		  case S_SPID_ATK2:
-		  case S_SPID_ATK3: 	sfx = sfx_shotgn; break;
-		  case S_BSPI_ATK2: 	sfx = sfx_plasma; break;
+		  case S_SPID_ATK3: 	sfx = "spider/attack"; break;
+		  case S_BSPI_ATK2: 	sfx = "baby/attack"; break;
 		  case S_CYBER_ATK2:
 		  case S_CYBER_ATK4:
-		  case S_CYBER_ATK6:	sfx = sfx_rlaunc; break;
-		  case S_PAIN_ATK3: 	sfx = sfx_sklatk; break;
+		  case S_CYBER_ATK6:	sfx = "weapons/rocklf"; break;
+		  case S_PAIN_ATK3: 	sfx = "skull/melee"; break;
 		  default: sfx = 0; break;
 		}
 				
 		if (sfx)
-			S_StartSound (ORIGIN_AMBIENT, sfx);
+			S_StartSound (ORIGIN_AMBIENT, sfx, 90);
 	}
 		
 	if (castframes == 12)
@@ -464,61 +474,38 @@ BOOL F_CastResponder (event_t* ev)
 				origin = ORIGIN_AMBIENT;
 				break;
 		}
-		S_StartSound (origin, mobjinfo[castorder[castnum].type].deathsound);
+		if (castorder[castnum].type == MT_PLAYER) {
+			static const char sndtemplate[] = "player/%s/death1";
+			static const char *genders[] = { "male", "female", "neuter" };
+			char nametest[128];
+			int sndnum;
+
+			sprintf (nametest, sndtemplate, skins[players[consoleplayer].userinfo.skin].name);
+			sndnum = S_FindSound (nametest);
+			if (sndnum == -1) {
+				sprintf (nametest, sndtemplate, genders);
+				sndnum = S_FindSound (nametest);
+				if (sndnum == -1)
+					sndnum = S_FindSound ("player/male/death1");
+			}
+			S_StartSfx (origin, sndnum, 90);
+		} else
+			S_StartSound (origin, mobjinfo[castorder[castnum].type].deathsound, 90);
 	}
 		
 	return true;
 }
 
 
-void F_CastPrint (char* text)
+void F_CastPrint (char *text)
 {
-	char*		ch;
-	int 		c;
-	int 		cx;
-	int 		w;
-	int 		width;
-	
-	// find width
-	ch = text;
-	width = 0;
-		
-	while (ch)
-	{
-		c = *ch++;
-		if (!c)
-			break;
-		c = toupper(c) - HU_FONTSTART;
-		if (c < 0 || c> HU_FONTSIZE)
-		{
-			width += 4;
-			continue;
-		}
-				
-		w = SHORT (hu_font[c]->width);
-		width += w;
-	}
-	
-	// draw it
-	cx = (CleanWidth-width)/2;
-	ch = text;
-	while (ch)
-	{
-		c = *ch++;
-		if (!c)
-			break;
-		c = toupper(c) - HU_FONTSTART;
-		if (c < 0 || c> HU_FONTSIZE)
-		{
-			cx += 4;
-			continue;
-		}
-				
-		w = SHORT (hu_font[c]->width);
-		V_DrawPatchCleanNoMove (cx, (screens[0].height * 180) / 200, &screens[0], hu_font[c]);
-		cx+=w;
-	}
-		
+	char text2[80], *t2 = text2;
+
+	while (*text)
+		*t2++ = *text++ ^ 0x80;
+	*t2 = 0;
+	V_DrawTextClean ((screens[0].width - V_StringWidth (text2) * CleanXfac) >> 1,
+					 (screens[0].height * 180) / 200, text2);
 }
 
 int V_DrawPatchFlipped (int, int, screen_t *, patch_t *);
@@ -539,12 +526,12 @@ void F_CastDrawer (void)
 	F_CastPrint (castorder[castnum].name);
 	
 	// draw the current frame in the middle of the screen
-	sprdef = &sprites[caststate->sprite];
+	sprdef = &sprites[castsprite];
 	sprframe = &sprdef->spriteframes[ caststate->frame & FF_FRAMEMASK];
 	lump = sprframe->lump[0];
 	flip = (BOOL)sprframe->flip[0];
 						
-	patch = W_CacheLumpNum (lump+firstspritelump, PU_CACHE);
+	patch = W_CacheLumpNum (lump, PU_CACHE);
 	if (flip)
 		V_DrawPatchFlipped (160,170,&screens[0],patch);
 	else
@@ -703,7 +690,7 @@ void F_BunnyScroll (void)
 		stage = 6;
 	if (stage > laststage)
 	{
-		S_StartSound (ORIGIN_AMBIENT, sfx_pistol);
+		S_StartSound (ORIGIN_AMBIENT, "weapons/pistol", 64);
 		laststage = stage;
 	}
 		
diff --git a/code/G_game.c b/code/G_game.c
index 78028f4f6d..5d92cb5ea3 100644
--- a/code/G_game.c
+++ b/code/G_game.c
@@ -24,13 +24,16 @@
 
 #include <string.h>
 #include <stdlib.h>
+#include <stdio.h>
+#include <stddef.h>
 
+#include "version.h"
+#include "minilzo.h"
+#include "m_alloc.h"
 #include "doomdef.h" 
 #include "doomstat.h"
-
 #include "d_proto.h"
 #include "d_netinf.h"
-
 #include "z_zone.h"
 #include "f_finale.h"
 #include "m_argv.h"
@@ -38,42 +41,26 @@
 #include "m_menu.h"
 #include "m_random.h"
 #include "i_system.h"
-
 #include "p_setup.h"
 #include "p_saveg.h"
 #include "p_tick.h"
-
 #include "d_main.h"
-
 #include "wi_stuff.h"
 #include "hu_stuff.h"
 #include "st_stuff.h"
 #include "am_map.h"
-
 #include "c_consol.h"
 #include "c_cvars.h"
 #include "c_bind.h"
 #include "c_dispch.h"
-
-// Needs access to LFB.
 #include "v_video.h"
-
 #include "w_wad.h"
-
 #include "p_local.h" 
-
 #include "s_sound.h"
-
-// Data.
 #include "dstrings.h"
-#include "sounds.h"
-
-// SKY handling - still the wrong place.
 #include "r_data.h"
 #include "r_sky.h"
-
 #include "r_draw.h"
-
 #include "g_game.h"
 #include "g_level.h"
 
@@ -81,6 +68,9 @@
 #define SAVEGAMESIZE	0x2c000
 #define SAVESTRINGSIZE	24
 
+#define TURN180_TICKS	9				// [RH] # of ticks to complete a turn180
+
+size_t	savegamesize = SAVEGAMESIZE;	// killough	// [RH] made global
 
 BOOL	G_CheckDemoStatus (void); 
 void	G_ReadDemoTiccmd (ticcmd_t* cmd, int player); 
@@ -89,7 +79,6 @@ void	G_PlayerReborn (int player);
  
 void	G_DoReborn (int playernum); 
  
-void	G_DoLoadLevel (void); 
 void	G_DoNewGame (void); 
 void	G_DoLoadGame (void); 
 void	G_DoPlayDemo (void); 
@@ -116,7 +105,8 @@ BOOL 			noblit; 				// for comparative timing purposes
  
 BOOL	 		viewactive; 
  
-cvar_t			*deathmatch; 			// only if started as net death 
+cvar_t			*deathmatch; 			// deathmatch?
+cvar_t			*teamplay;				// [RH] teamplay flag
 BOOL 			netgame;				// only true if packets are broadcast 
 BOOL 			playeringame[MAXPLAYERS]; 
 player_t		players[MAXPLAYERS]; 
@@ -131,7 +121,7 @@ BOOL 			demoplayback;
 BOOL 			netdemo; 
 byte*			demobuffer;
 byte*			demo_p;
-byte*			demoend;
+size_t			maxdemosize;
 byte*			zdemformend;			// end of FORM ZDEM chunk
 byte*			zdembodyend;			// end of ZDEM BODY chunk
 BOOL 			singledemo; 			// quit after playing a demo from cmdline 
@@ -171,7 +161,10 @@ int 			turnheld;								// for accelerative turning
 int 			mousex;
 int 			mousey; 		
 
-// joystick values are repeated 
+// joystick values are repeated
+// [RH] now, if the joystick is enabled, it will generate an event every tick
+//		so the values here are reset to zero after each tic build (in case
+//		use_joystick gets set to 0 when the joystick is off center)
 int 			joyxmove;
 int 			joyymove;
  
@@ -181,8 +174,6 @@ char			savedescription[32];
 // [RH] Name of screenshot file to generate (usually NULL)
 char			*shotfile;
 
-#define BODYQUESIZE 	32
-
 mobj_t* 		bodyque[BODYQUESIZE]; 
 int 			bodyqueslot; 
 
@@ -227,14 +218,86 @@ void Cmd_Pause (player_t *plyr, int argc, char **argv)
 	sendpause = true;
 }
 
+static int turntick;
+
+void Cmd_Turn180 (player_t *plyr, int argc, char **argv)
+{
+	turntick = TURN180_TICKS;
+}
+
+//
+// [RH] WeapNext and WeapPrev commands
+//
+
+static const char *weaponnames[] = {
+	"Fist",
+	"Pistol",
+	"Shotgun",
+	"Chaingun",
+	"Rocket Launcher",
+	"Plasma Gun",
+	"BFG9000",
+	"Chainsaw",
+	"Super Shotgun",
+	"Chainsaw"
+};
+
+void Cmd_WeapNext (player_t *plyr, int argc, char **argv)
+{
+	gitem_t *item = FindItem (weaponnames[plyr->readyweapon]);
+	int selected_weapon;
+	int i, index;
+
+	if (!item)
+		return;
+
+	selected_weapon = ITEM_INDEX(item);
+
+	for (i = 1; i <= num_items; i++) {
+		index = (selected_weapon + i) % num_items;
+		if (!(itemlist[index].flags & IT_WEAPON))
+			continue;
+		if (!plyr->weaponowned[itemlist[index].offset])
+			continue;
+		if (!plyr->ammo[weaponinfo[itemlist[index].offset].ammo])
+			continue;
+		Impulse = itemlist[index].offset + 50;
+		return;
+	}
+}
+
+void Cmd_WeapPrev (player_t *plyr, int argc, char **argv)
+{
+	gitem_t *item = FindItem (weaponnames[plyr->readyweapon]);
+	int selected_weapon;
+	int i, index;
+
+	if (!item)
+		return;
+
+	selected_weapon = ITEM_INDEX(item);
+
+	for (i = 1; i <= num_items; i++) {
+		index = (selected_weapon + num_items - i) % num_items;
+		if (!(itemlist[index].flags & IT_WEAPON))
+			continue;
+		if (!plyr->weaponowned[itemlist[index].offset])
+			continue;
+		if (!plyr->ammo[weaponinfo[itemlist[index].offset].ammo])
+			continue;
+		Impulse = itemlist[index].offset + 50;
+		return;
+	}
+}
+
 //
 // G_BuildTiccmd
 // Builds a ticcmd from all of the available inputs
-// or reads it from the demo buffer. 
-// If recording a demo, write it out 
-// 
-void G_BuildTiccmd (ticcmd_t* cmd) 
-{ 
+// or reads it from the demo buffer.
+// If recording a demo, write it out
+//
+void G_BuildTiccmd (ticcmd_t *cmd)
+{
 	BOOL 		strafe;
 	int 		speed;
 	int 		tspeed; 
@@ -242,66 +305,53 @@ void G_BuildTiccmd (ticcmd_t* cmd)
 	int 		side;
 	int			look;
 	int			fly;
-	
+
 	ticcmd_t*	base;
 
 	base = I_BaseTiccmd (); 			// empty, or external driver
-	memcpy (cmd,base,sizeof(*cmd)); 
-		
-	cmd->consistancy = 
-		consistancy[consoleplayer][maketic%BACKUPTICS]; 
+	memcpy (cmd,base,sizeof(*cmd));
+
+	cmd->consistancy = consistancy[consoleplayer][maketic%BACKUPTICS];
 
- 
 	strafe = Actions & ACTION_STRAFE;
 	speed = ((Actions & ACTION_SPEED) || (cl_run->value)) ? 1 : 0;
- 
-	forward = side = look = fly = 0;
-	
-	// use two stage accelerative turning
-	// on the keyboard and joystick
-	if (joyxmove < 0
-		|| joyxmove > 0  
-		|| (Actions & ACTION_LEFT)
-		|| (Actions & ACTION_RIGHT))
-		turnheld += ticdup; 
-	else 
-		turnheld = 0; 
 
-	if (turnheld < SLOWTURNTICS) 
-		tspeed = 2; 			// slow turn 
-	else 
+	forward = side = look = fly = 0;
+
+	// [RH] only use two stage accelerative turning on the keyboard
+	//		and not the joystick, since we treat the joystick as
+	//		the analog device it is.
+	if ((Actions & ACTION_LEFT) || (Actions & ACTION_RIGHT))
+		turnheld += ticdup;
+	else
+		turnheld = 0;
+
+	if (turnheld < SLOWTURNTICS)
+		tspeed = 2; 			// slow turn
+	else
 		tspeed = speed;
 	
 	// let movement keys cancel each other out
-	if (strafe) 
-	{ 
-		if (Actions & ACTION_RIGHT) 
+	if (strafe)
+	{
+		if (Actions & ACTION_RIGHT)
 		{
 			// fprintf(stderr, "strafe right\n");
-			side += sidemove[speed]; 
+			side += sidemove[speed];
 		}
-		if (Actions & ACTION_LEFT) 
+		if (Actions & ACTION_LEFT)
 		{
 			//	fprintf(stderr, "strafe left\n");
-			side -= sidemove[speed]; 
+			side -= sidemove[speed];
 		}
-		if (joyxmove > 0) 
-			side += sidemove[speed]; 
-		if (joyxmove < 0) 
-			side -= sidemove[speed]; 
- 
-	} 
-	else 
-	{ 
-		if (Actions & ACTION_RIGHT) 
-			cmd->ucmd.yaw -= angleturn[tspeed]; 
-		if (Actions & ACTION_LEFT) 
-			cmd->ucmd.yaw += angleturn[tspeed]; 
-		if (joyxmove > 0) 
-			cmd->ucmd.yaw -= angleturn[tspeed]; 
-		if (joyxmove < 0) 
-			cmd->ucmd.yaw += angleturn[tspeed]; 
-	} 
+	}
+	else
+	{
+		if (Actions & ACTION_RIGHT)
+			cmd->ucmd.yaw -= angleturn[tspeed];
+		if (Actions & ACTION_LEFT)
+			cmd->ucmd.yaw += angleturn[tspeed];
+	}
 
 	if (Actions & ACTION_LOOKUP)
 		look += lookspeed[speed];
@@ -325,30 +375,45 @@ void G_BuildTiccmd (ticcmd_t* cmd)
 			forward -= forwardmove[speed];
 	}
 
-	if (joyymove < 0) 
-		forward += forwardmove[speed]; 
-	if (joyymove > 0) 
-		forward -= forwardmove[speed]; 
-	if (Actions & ACTION_MOVERIGHT) 
-		side += sidemove[speed]; 
-	if (Actions & ACTION_MOVELEFT) 
+	if (Actions & ACTION_MOVERIGHT)
+		side += sidemove[speed];
+	if (Actions & ACTION_MOVELEFT)
 		side -= sidemove[speed];
 
 	// buttons
-	if (Actions & ACTION_ATTACK) 
-		cmd->ucmd.buttons |= BT_ATTACK; 
- 
-	if (Actions & ACTION_USE) 
+	if (Actions & ACTION_ATTACK)
+		cmd->ucmd.buttons |= BT_ATTACK;
+
+	if (Actions & ACTION_USE)
 		cmd->ucmd.buttons |= BT_USE;
 
 	if (Actions & ACTION_JUMP)
 		cmd->ucmd.buttons |= BT_JUMP;
 
-	// chainsaw overrides 
-	if (Impulse >= 1 && Impulse <= NUMWEAPONS-1) {
+	// [RH] Handle impulses. If they are between 1 and 7,
+	//		they get sent as weapon change events.
+	if (Impulse >= 1 && Impulse <= 7) {
 		cmd->ucmd.buttons |= BT_CHANGE;
 		cmd->ucmd.buttons |= (Impulse - 1) << BT_WEAPONSHIFT;
-		Impulse = 0;
+	} else {
+		cmd->ucmd.impulse = Impulse;
+	}
+	Impulse = 0;
+
+	// [RH] Scale joystick moves to full range of allowed speeds
+	if (strafe || lookstrafe->value)
+		side += (MAXPLMOVE * joyxmove) / 256;
+	else 
+		cmd->ucmd.yaw -= (angleturn[1] * joyxmove) / 256; 
+
+	// [RH] Scale joystick moves over full range
+	if (Actions & ACTION_MLOOK) {
+		if (invertmouse->value)
+			look -= (joyymove * 32767) / 256;
+		else
+			look += (joyymove * 32767) / 256;
+	} else {
+		forward += (MAXPLMOVE * joyymove) / 256;
 	}
 
 	if ((Actions & ACTION_MLOOK) || freelook->value) {
@@ -359,10 +424,6 @@ void G_BuildTiccmd (ticcmd_t* cmd)
 			look -= val;
 		else
 			look += val;
-		if (look > 32767)
-			look = 32767;
-		else if (look < -32767)
-			look = -32767;
 	} else {
 		forward += (int)((float)mousey * m_forward->value);
 	}
@@ -370,6 +431,11 @@ void G_BuildTiccmd (ticcmd_t* cmd)
 	if (sendcenterview) {
 		sendcenterview = false;
 		look = -32768;
+	} else {
+		if (look > 32767)
+			look = 32767;
+		else if (look < -32767)
+			look = -32767;
 	}
 
 	if (strafe || lookstrafe->value)
@@ -378,7 +444,7 @@ void G_BuildTiccmd (ticcmd_t* cmd)
 		cmd->ucmd.yaw -= (int)((float)(mousex*0x8) * m_yaw->value); 
 
 	mousex = mousey = 0; 
-		 
+
 	if (forward > MAXPLMOVE) 
 		forward = MAXPLMOVE; 
 	else if (forward < -MAXPLMOVE) 
@@ -408,6 +474,15 @@ void G_BuildTiccmd (ticcmd_t* cmd)
 
 	cmd->ucmd.forwardmove <<= 8;
 	cmd->ucmd.sidemove <<= 8;
+
+	// [RH] 180-degree turn overrides all other yaws
+	if (turntick) {
+		turntick--;
+		cmd->ucmd.yaw = (ANG180 / TURN180_TICKS) >> 16;
+	}
+
+	joyxmove = 0;
+	joyymove = 0;
 } 
  
 
@@ -418,7 +493,8 @@ static void ChangeSpy (void)
 	// [RH] Use some BOOM code here:
 	ST_Start();		// killough 3/7/98: switch status bar views too
 	HU_Start();
-	S_UpdateSounds(players[displayplayer].mo);
+	players[consoleplayer].camera = players[displayplayer].mo;
+	S_UpdateSounds(players[consoleplayer].camera);
 }
 
 void Cmd_SpyNext (player_t *plyr, int argc, char **argv)
@@ -461,8 +537,7 @@ BOOL G_Responder (event_t* ev)
 	// any other key pops up menu if in demos
 	// [RH] But only if the key isn't bound to a "special" command
 	if (gameaction == ga_nothing && !singledemo && 
-		(demoplayback || gamestate == GS_DEMOSCREEN) 
-		) 
+		(demoplayback || gamestate == GS_DEMOSCREEN)) 
 	{
 		char *cmd = C_GetBinding (ev->data1);
 
@@ -483,11 +558,11 @@ BOOL G_Responder (event_t* ev)
 				M_StartControlPanel (); 
 				return true; 
 			} else {
-				return C_DoKey (ev->data1, false);
+				return C_DoKey (ev);
 			}
 		}
 		if (cmd && cmd[0] == '+')
-			return C_DoKey (ev->data1, true);
+			return C_DoKey (ev);
 
 		return false; 
 	} 
@@ -520,12 +595,12 @@ BOOL G_Responder (event_t* ev)
 	switch (ev->type) 
 	{ 
 	  case ev_keydown:
-		if (C_DoKey (ev->data1, false))
-		  return true;
+		if (C_DoKey (ev))
+			return true;
 		break;
  
 	  case ev_keyup: 
-		C_DoKey (ev->data1, true);
+		C_DoKey (ev);
 		break;
 
 	  // [RH] mouse buttons are now sent with key up/down events
@@ -578,7 +653,7 @@ void G_Ticker (void)
 		switch (gameaction) 
 		{ 
 		  case ga_loadlevel: 
-			G_DoLoadLevel (); 
+			G_DoLoadLevel (-1); 
 			break; 
 		  case ga_newgame: 
 			G_DoNewGame (); 
@@ -610,9 +685,14 @@ void G_Ticker (void)
 			}
 			gameaction = ga_nothing; 
 			break; 
+		  case ga_fullconsole:
+			C_FullConsole ();
+			gameaction = ga_nothing;
+			break;
 		  case ga_nothing: 
 			break; 
-		} 
+		}
+		C_AdjustBottom ();
 	}
 
 	// get commands, check consistancy,
@@ -636,7 +716,7 @@ void G_Ticker (void)
 			if (cmd->ucmd.forwardmove > TURBOTHRESHOLD
 				&& !(gametic&31) && ((gametic>>5)&3) == i )
 			{
-				Printf ("%s is turbo!\n",players[i].userinfo->netname);
+				Printf ("%s is turbo!\n", players[i].userinfo.netname);
 			}
 
 			if (netgame && !netdemo && !(gametic%ticdup) )
@@ -764,7 +844,7 @@ void G_PlayerReborn (int player)
 	int 		killcount;
 	int 		itemcount;
 	int 		secretcount;
-	userinfo_t  *userinfo;	// [RH] Save userinfo
+	userinfo_t  userinfo;	// [RH] Save userinfo
 
 	p = &players[player];
 
@@ -773,7 +853,7 @@ void G_PlayerReborn (int player)
 	killcount = p->killcount;
 	itemcount = p->itemcount;
 	secretcount = p->secretcount;
-	userinfo = p->userinfo;
+	memcpy (&userinfo, &p->userinfo, sizeof(userinfo));
 
 	memset (p, 0, sizeof(*p));
 
@@ -782,17 +862,17 @@ void G_PlayerReborn (int player)
 	p->killcount = killcount;
 	p->itemcount = itemcount;
 	p->secretcount = secretcount;
-	p->userinfo = userinfo;
+	memcpy (&p->userinfo, &userinfo, sizeof(userinfo));
 
 	p->usedown = p->attackdown = p->jumpdown = true;	// don't do anything immediately
 	p->playerstate = PST_LIVE;
-	p->health = deh_StartHealth;		// [RH] Used to be MAXHEALTH
+	p->health = deh.StartHealth;		// [RH] Used to be MAXHEALTH
 	p->readyweapon = p->pendingweapon = wp_pistol;
 	p->weaponowned[wp_fist] = true;
 	p->weaponowned[wp_pistol] = true;
-	p->ammo[am_clip] = deh_StartBullets; // [RH] Used to be 50
+	p->ammo[am_clip] = deh.StartBullets; // [RH] Used to be 50
 
-	for (i=0 ; i<NUMAMMO ; i++)
+	for (i = 0; i < NUMAMMO; i++)
 		p->maxammo[i] = maxammo[i];
 }
 
@@ -824,15 +904,25 @@ BOOL G_CheckSpot (int playernum, mapthing2_t *mthing)
 	if (!players[playernum].mo)
 	{
 		// first spawn of level, before corpses
-		for (i=0 ; i<playernum ; i++)
-			if (players[i].mo->x == x
-				&& players[i].mo->y == y)
+		for (i = 0; i < playernum; i++)
+			if (players[i].mo->x == x && players[i].mo->y == y)
 				return false;
 		return true;
 	}
 
 	players[playernum].mo->z = z;	// [RH] Checks are now full 3-D
-	if (!P_CheckPosition (players[playernum].mo, x, y))
+
+	// killough 4/2/98: fix bug where P_CheckPosition() uses a non-solid
+	// corpse to detect collisions with other players in DM starts
+	//
+	// Old code:
+	// if (!P_CheckPosition (players[playernum].mo, x, y))
+	//    return false;
+
+	players[playernum].mo->flags |=  MF_SOLID;
+	i = P_CheckPosition(players[playernum].mo, x, y);
+	players[playernum].mo->flags &= ~MF_SOLID;
+	if (!i)
 		return false;
 
 	// flush an old corpse if needed
@@ -848,9 +938,8 @@ BOOL G_CheckSpot (int playernum, mapthing2_t *mthing)
 					  , z
 					  , MT_TFOG, 0);
 
-	// [RH] consoleplayer changed to displayplayer
-	if (players[displayplayer].viewz != 1)
-		S_StartSound (mo, sfx_telept);	// don't start sound on first frame 
+	if (level.time)
+		S_StartSound (mo, "misc/teleport", 32);	// don't start sound on first frame 
 
 	return true;
 }
@@ -912,12 +1001,12 @@ static mapthing2_t *SelectRandomDeathmatchSpot (int playernum, int selections)
 		i = P_Random (pr_dmspawn) % selections;
 		if (G_CheckSpot (playernum, &deathmatchstarts[i]) )
 		{
-
 			return &deathmatchstarts[i];
 		}
 	}
 
-	return NULL;
+	// [RH] return a spot anyway, since we allow telefragging when a player spawns
+	return olddemo ? NULL : &deathmatchstarts[i];
 }
 
 void G_DeathMatchSpawnPlayer (int playernum)
@@ -926,10 +1015,9 @@ void G_DeathMatchSpawnPlayer (int playernum)
 	mapthing2_t *spot;
 
 	selections = deathmatch_p - deathmatchstarts;
-	// [RH] 4 changed to doomcom->numplayers
-	if (selections < doomcom->numplayers)
-		I_Error ("Only %i deathmatch spots, %d required",
-				 selections, doomcom->numplayers); 
+	// [RH] We can get by with just 1 deathmatch start
+	if (selections < 1)
+		I_Error ("No deathmatch starts");
 
 	// At level start, none of the players have mobjs attached to them,
 	// so we always use the random deathmatch spawn. During the game,
@@ -969,7 +1057,8 @@ void G_DoReborn (int playernum)
 		// respawn at the start
 
 		// first dissasociate the corpse
-		players[playernum].mo->player = NULL;
+		if (players[playernum].mo)
+			players[playernum].mo->player = NULL;
 
 		// spawn at random spot if in death match
 		if (deathmatch->value)
@@ -990,10 +1079,9 @@ void G_DoReborn (int playernum)
 			if (G_CheckSpot (playernum, &playerstarts[i]) )
 			{
 				int oldtype = playerstarts[i].type;
-				if (playernum < 4)
-					playerstarts[i].type = playernum+1; 	// fake as other player
-				else
-					playerstarts[i].type = playernum+4001-4;	// [RH] fake as high player
+
+				// fake as other player
+				playerstarts[i].type = (playernum < 4) ? playernum + 1 : playernum + 4001 - 4;
 				P_SpawnPlayer (&playerstarts[i]);
 				playerstarts[i].type = oldtype; 			// restore 
 				return;
@@ -1022,7 +1110,7 @@ void G_ScreenShot (char *filename)
 extern BOOL setsizeneeded;
 void R_ExecuteSetViewSize (void);
 
-char	savename[256];
+char savename[256];
 
 void G_LoadGame (char* name)
 {
@@ -1030,52 +1118,59 @@ void G_LoadGame (char* name)
 	gameaction = ga_loadgame;
 }
 
-#define VERSIONSIZE 			16
-
 
 void G_DoLoadGame (void)
 {
 	int 		length;
 	int 		i;
-	char		vcheck[VERSIONSIZE];
 	char		mapname[9];
 
 	gameaction = ga_nothing;
 
 	length = M_ReadFile (savename, &savebuffer);
-	save_p = savebuffer + SAVESTRINGSIZE;
+	save_p = savebuffer + SAVESTRINGSIZE;	// skip the description field
 
-	// skip the description field
-	memset (vcheck,0,sizeof(vcheck));
-	sprintf (vcheck,"version %ia",VERSION);
-	if (strcmp (save_p, vcheck))
-		return; 						// bad version
-	save_p += VERSIONSIZE;
+	if (strncmp (save_p, SAVESIG, 16))	// Bad version
+		I_Error ("Savegame is from a different version\n");
+
+	save_p += 16;
 
 	memcpy (mapname, save_p, 8);
 	mapname[8] = 0;
+
 	save_p += 8;
 	for (i=0 ; i<MAXPLAYERS ; i++)
 		playeringame[i] = *save_p++;
 
-	C_ReadCVars (&save_p);			// [RH] Read server info cvars
-
-	// load a base level
-	G_InitNew (mapname);
+	C_ReadCVars (&save_p);		// [RH] read server info cvars
 
 	// dearchive all the modifications
-	P_UnArchiveLevelLocals ();		// [RH] dearchive level locals
+	G_UnArchiveSnapshots ();	// [RH] restore all level snapshots
 	P_UnArchivePlayers ();
-	P_UnArchiveWorld ();
-	P_UnArchiveThinkers ();
-	P_UnArchiveSpecials ();
 	P_UnArchiveRNGState ();		// [RH] retrieve the state of the RNG
+	P_UnArchiveACSDefereds ();	// [RH] restore script info on other maps
+
+	// load a base level
+	{
+		// [RH] G_InitNew zaps these
+		byte *saved = save_p, *savedbuffer = savebuffer;
+		savegamerestore = true;		// [RH] Use the player mobjs in the savegame
+		G_InitNew (mapname);
+		savegamerestore = false;
+		save_p = saved;
+		savebuffer = savedbuffer;
+	}
+	level.time = ReadLong (&save_p);
+
+	memcpy (WorldVars, save_p, sizeof(WorldVars));	// [RH] restore world vars
+	save_p += sizeof(WorldVars);
 
 	if (*save_p != 0x1d)
 		I_Error ("Bad savegame");
 
 	// done
 	Z_Free (savebuffer);
+	save_p = savebuffer = NULL;
 
 	if (setsizeneeded)
 		R_ExecuteSetViewSize ();
@@ -1097,56 +1192,85 @@ void G_SaveGame (int slot, char *description)
 	sendsave = true;
 }
 
+void G_BuildSaveName (char *name, int slot)
+{
+	if (M_CheckParm ("-cdrom"))
+		sprintf(name, "c:\\zdoomdat\\%s%d.zds", SAVEGAMENAME, slot);
+	else
+		sprintf (name, "%s%d.zds", SAVEGAMENAME, slot);
+}
+
+// Check for overrun and realloc if necessary -- Lee Killough 1/22/98
+void CheckSaveGame (size_t size)
+{
+	size_t pos = save_p - savebuffer;
+	size += 1024;	// breathing room
+	if (pos+size > savegamesize)
+		save_p = (savebuffer = Realloc (savebuffer,
+			   savegamesize += (size+1023) & ~1023)) + pos;
+}
+
 void G_DoSaveGame (void)
 {
 	char		name[100];
-	char		name2[VERSIONSIZE];
 	char*		description;
-	int 		length;
 	int 		i;
 
-	if (M_CheckParm("-cdrom"))
-		sprintf(name,"c:\\doomdata\\"SAVEGAMENAME"%d.dsg",savegameslot);
-	else
-		sprintf (name,SAVEGAMENAME"%d.dsg",savegameslot);
+	G_SnapshotLevel ();
+
+	G_BuildSaveName (name, savegameslot);
 	description = savedescription;
 
-	save_p = savebuffer = Z_Malloc (SAVEGAMESIZE + 0x4000, PU_STATIC, 0);
+	save_p = savebuffer = Malloc (savegamesize);
 
+	CheckSaveGame (SAVESTRINGSIZE+16+sizeof(unsigned long));
 	memcpy (save_p, description, SAVESTRINGSIZE);
 	save_p += SAVESTRINGSIZE;
-	memset (name2,0,sizeof(name2));
-	sprintf (name2,"version %ia",VERSION);
-	memcpy (save_p, name2, VERSIONSIZE);
-	save_p += VERSIONSIZE;
+
+	strncpy (save_p, SAVESIG, 16);
+	save_p += 16;
 
 	memcpy (save_p, level.mapname, 8);
 	save_p += 8;
+
 	for (i=0 ; i<MAXPLAYERS ; i++)
 		*save_p++ = playeringame[i];
 	C_WriteCVars (&save_p, CVAR_SERVERINFO);	// [RH] Save serverinfo cvars
 
-	P_ArchiveLevelLocals ();	// [RH] Archive level locals
+	// killough 3/22/98: add Z_CheckHeap after each call to ensure consistency
+	Z_CheckHeap ();
+	G_ArchiveSnapshots ();		// [RH] save level snapshots
+	Z_CheckHeap ();
 	P_ArchivePlayers ();
-	P_ArchiveWorld ();
-	P_ArchiveThinkers ();
-	P_ArchiveSpecials ();
+	Z_CheckHeap ();
 	P_ArchiveRNGState ();		// [RH] save the state of the RNG
+	Z_CheckHeap ();
+	P_ArchiveACSDefereds ();	// [RH] archive script info on other maps
+	Z_CheckHeap ();
+	WriteLong (level.time, &save_p);
+	memcpy (save_p, WorldVars, sizeof(WorldVars));	// [RH] Save world vars
+	save_p += sizeof(WorldVars);
 
 	*save_p++ = 0x1d;			// consistancy marker
 
-	length = save_p - savebuffer;
-	if (length > SAVEGAMESIZE)
-		I_Error ("Savegame buffer overrun");
-	M_WriteFile (name, savebuffer, length);
-	Z_Free (savebuffer);
+	{
+		FILE *file = fopen (name, "wb");
+
+		if (file) {
+			fwrite (savebuffer, 1, save_p - savebuffer, file);
+			fclose (file);
+		} else {
+			Printf ("Could not create savegame\n");
+		}
+	}
+
+	free (savebuffer);
+	savebuffer = save_p = NULL;
+
 	gameaction = ga_nothing;
 	savedescription[0] = 0;
 
 	players[consoleplayer].message = GGSAVED;
-
-	// draw the pattern into the back screen
-	R_FillBackScreen ();
 }
 
 
@@ -1228,6 +1352,7 @@ void Cmd_Stop (player_t *plyr, int argc, char **argv)
 {
 	stoprecording = true;
 }
+extern byte *lenspot;
 
 void G_WriteDemoTiccmd (ticcmd_t *cmd, int player)
 {
@@ -1263,10 +1388,15 @@ void G_WriteDemoTiccmd (ticcmd_t *cmd, int player)
 		memcpy (&LastUserCmd, &cmd->ucmd, sizeof(usercmd_t));
 	}
 
-	if (demo_p > demoend - 16) {
-		// no more space
-		G_CheckDemoStatus (); 
-		return; 
+	// [RH] Bigger safety margin
+	if (demo_p > demobuffer + maxdemosize - 64) {
+		ptrdiff_t pos = demo_p - demobuffer;
+		ptrdiff_t spot = lenspot - demobuffer;
+		// [RH] Allocate more space for the demo
+		maxdemosize += 0x20000;
+		demobuffer = Realloc (demobuffer, maxdemosize);
+		demo_p = demobuffer + pos;
+		lenspot = demobuffer + spot;
 	}
 
 //	if (!clonecount)
@@ -1281,21 +1411,17 @@ void G_WriteDemoTiccmd (ticcmd_t *cmd, int player)
 void G_RecordDemo (char* name)
 {
 	int	i;
-	int	maxsize;
 
 	usergame = false;
 	strcpy (demoname, name);
 	FixPathSeperator (demoname);
 	DefaultExtension (demoname, ".lmp");
-	maxsize = 0x20000;
 	i = M_CheckParm ("-maxdemo");
-	if (i && i<myargc-1) {
-		maxsize = atoi(myargv[i+1])*1024;
-		if (maxsize < 0x20000)
-			maxsize = 0x20000;
-	}
-	demobuffer = Z_Malloc (maxsize,PU_STATIC,NULL);
-	demoend = demobuffer + maxsize;
+	if (i && i<myargc-1)
+		maxdemosize = atoi(myargv[i+1])*1024;
+	if (maxdemosize < 0x20000)
+		maxdemosize = 0x20000;
+	demobuffer = Malloc (maxdemosize);
 
 	demorecording = true; 
 }
@@ -1521,25 +1647,23 @@ void G_DoPlayDemo (void)
 
 		SetCVarFloat (gameskill, skill);
 
-		AddCommandString ("set fraglimit 0; set timelimit 0; set cheats 0, sv_gravity 800");
+		AddCommandString ("set fraglimit 0; set timelimit 0; set cheats 0; sv_gravity 800");
 
 		{
 			// Setup compatible userinfo
-			static char greenPlayer[] = "\\name\\Green\\autoaim\\50000\\color\\74 fc 6c";
-			static char indigoPlayer[] = "\\name\\Indigo\\autoaim\\50000\\color\\80 80 80";
-			static char brownPlayer[] = "\\name\\Brown\\autoaim\\50000\\color\\bc 78 48";
-			static char redPlayer[] = "\\name\\Red\\autoaim\\50000\\color\\fc 00 00";
+			static char *playerStreams[4] = {
+				"\\name\\Green\\autoaim\\5000\\color\\74 fc 6c\\skin\\base\\gender\\male",
+				"\\name\\Indigo\\autoaim\\5000\\color\\80 80 80\\skin\\base\\gender\\male",
+				"\\name\\Brown\\autoaim\\5000\\color\\bc 78 48\\skin\\base\\gender\\male",
+				"\\name\\Red\\autoaim\\5000\\color\\fc 00 00\\skin\\base\\gender\\male"
+			};
 			byte *stream;
+			int jookie;
 
-			stream = greenPlayer;
-			D_ReadUserInfoStrings (0, &stream, false);
-			stream = indigoPlayer;
-			D_ReadUserInfoStrings (1, &stream, false);
-			stream = brownPlayer;
-			D_ReadUserInfoStrings (2, &stream, false);
-			stream = redPlayer;
-			D_ReadUserInfoStrings (3, &stream, false);
-
+			for (jookie = 0; jookie < 4; jookie++) {
+				stream = playerStreams[jookie];
+				D_ReadUserInfoStrings (jookie, &stream, false);
+			}
 			R_BuildCompatiblePlayerTranslations ();
 		}
 	} else {
@@ -1589,10 +1713,12 @@ extern cvar_t *color;
 
 BOOL G_CheckDemoStatus (void)
 {
+	if (!demorecording) {
 	// [RH] Restore the player's userinfo settings.
-	D_UserInfoChanged (name);
-	D_UserInfoChanged (autoaim);
-	D_UserInfoChanged (color);
+		D_UserInfoChanged (name);
+		D_UserInfoChanged (autoaim);
+		D_UserInfoChanged (color);
+	}
 
 	if (timingdemo)
 	{
@@ -1602,8 +1728,8 @@ BOOL G_CheckDemoStatus (void)
 		endtime = I_GetTimeReally () - starttime;
 		C_RestoreCVars ();		// [RH] Restore cvars demo might have changed
 
-		I_Error ("timed %i gametics in %i realtics (%.1f fps)",gametic 
-				 , endtime, (float)gametic/(float)endtime*(float)TICRATE);
+		I_Error ("timed %i gametics in %i realtics (%.1f fps)", gametic,
+				 endtime, (float)gametic/(float)endtime*(float)TICRATE);
 	}
 
 	if (demoplayback)
@@ -1611,7 +1737,7 @@ BOOL G_CheckDemoStatus (void)
 		C_RestoreCVars ();		// [RH] Restore cvars demo might have changed
 
 		if (singledemo)
-			I_Quit ();
+			exit (0);
 
 		Z_ChangeTag (demobuffer, PU_CACHE);
 		olddemo = false;
@@ -1644,10 +1770,10 @@ BOOL G_CheckDemoStatus (void)
 		WriteLong (demo_p - demobuffer - 8, &formlen);
 
 		M_WriteFile (demoname, demobuffer, demo_p - demobuffer); 
-		Z_Free (demobuffer); 
+		free (demobuffer); 
 		demorecording = false;
 		stoprecording = false;
-		I_Error ("Demo %s recorded",demoname); 
+		Printf ("Demo %s recorded\n", demoname); 
 	}
 
 	return false; 
diff --git a/code/G_game.h b/code/G_game.h
index f198e19dc1..8ada3a6957 100644
--- a/code/G_game.h
+++ b/code/G_game.h
@@ -42,6 +42,7 @@ void G_LoadGame (char* name);
 void G_DoLoadGame (void);
 
 // Called by M_Responder.
+void G_BuildSaveName (char *name, int slot);
 void G_SaveGame (int slot, char* description);
 
 // Only called by startup code.
@@ -62,10 +63,10 @@ void G_ScreenShot (char *filename);
 
 void G_PlayerFinishLevel (int player);
 
+#define BODYQUESIZE 	32
+struct mobj_s;
+extern struct mobj_s *bodyque[BODYQUESIZE]; 
+extern int bodyqueslot; 
+
 
 #endif
-//-----------------------------------------------------------------------------
-//
-// $Log:$
-//
-//-----------------------------------------------------------------------------
diff --git a/code/G_level.c b/code/G_level.c
index b19c96a33a..fe0badfbe3 100644
--- a/code/G_level.c
+++ b/code/G_level.c
@@ -22,6 +22,16 @@
 #include "v_video.h"
 #include "st_stuff.h"
 #include "hu_stuff.h"
+#include "p_saveg.h"
+#include "p_acs.h"
+#include "d_proto.h"
+
+#include "minilzo.h"
+
+// [RH] Output buffer size for LZO compression.
+//		Extra space in case uncompressable.
+#define OUT_LEN(a)		((a) + (a) / 64 + 16 + 3)
+
 
 static level_info_t *FindDefLevelInfo (char *mapname);
 static cluster_info_t *FindDefClusterInfo (int cluster);
@@ -32,7 +42,12 @@ extern int timingdemo;
 int starttime;
 
 
+// ACS variables with world scope
+int WorldVars[NUM_WORLDVARS];
+
+
 extern BOOL netdemo;
+BOOL savegamerestore;
 
 extern int mousex, mousey, joyxmove, joyymove, Impulse;
 extern BOOL sendpause, sendsave, sendcenterview;
@@ -46,6 +61,9 @@ static cluster_info_t *wadclusterinfos;
 static int numwadlevelinfos = 0;
 static int numwadclusterinfos = 0;
 
+BOOL HexenHack;
+
+
 static int FindWadLevelInfo (char *name)
 {
 	int i;
@@ -110,6 +128,9 @@ void G_ParseMapInfo (void)
 					int map = atoi (com_token);
 					sprintf (com_token, "MAP%02u", map);
 					SKYFLATNAME[5] = 0;
+					// Hexen levels are automatically nointermission
+					levelflags = LEVEL_NOINTERMISSION;
+					HexenHack = true;
 				}
 				if ((levelindex = FindWadLevelInfo (com_token)) == -1)
 				{
@@ -118,14 +139,27 @@ void G_ParseMapInfo (void)
 					memset (wadlevelinfos + levelindex, 0, sizeof(level_pwad_info_t));
 				}
 				levelinfo = wadlevelinfos + levelindex;
+				levelinfo->snapshot = NULL;
+				levelinfo->outsidefog = 0xff000000;
 				strncpy (levelinfo->mapname, com_token, 8);
+				strncpy (levelinfo->fadetable, "COLORMAP", 8);
+
 				data = COM_Parse (data);
 				ReplaceString (&levelinfo->level_name, com_token);
 
 				mapinfo = data;
+
+				// Set up levelnum now so that the Teleport_NewMap specials
+				// in hexen.wad work without modification.
+				if (!strnicmp (levelinfo->mapname, "MAP", 3) && levelinfo->mapname[5] == 0) {
+					int mapnum = atoi (levelinfo->mapname + 3);
+
+					if (mapnum >= 1 && mapnum <= 99)
+						levelinfo->levelnum = mapnum;
+				}
+
 			} else if (levelindex > -1) {
-				if (!stricmp (com_token, "levelnum") ||
-					!stricmp (com_token, "warptrans")) {
+				if (!stricmp (com_token, "levelnum")) {
 					// levelnum <levelnum>
 					mapinfo = COM_Parse (data);
 					levelinfo->levelnum = atoi (com_token);
@@ -149,6 +183,11 @@ void G_ParseMapInfo (void)
 					// cluster <clusternum>
 					mapinfo = COM_Parse (data);
 					levelinfo->cluster = atoi (com_token);
+					if (HexenHack) {
+						cluster_info_t *cluster = FindClusterInfo (levelinfo->cluster);
+						if (cluster)
+							cluster->flags |= CLUSTER_HUB;
+					}
 
 				} else if (!stricmp (com_token, "sky1")) {
 					// sky1 <sky1texture> <sky1scrollspeed>
@@ -176,6 +215,18 @@ void G_ParseMapInfo (void)
 						levelinfo->fadeto = V_GetColorFromString (NULL, com_token);
 					}
 				
+				} else if (!stricmp (com_token, "outsidefog")) {
+					// outsidefog <colorname> OR fade <colordescriptor>
+					char *colorstring;
+
+					mapinfo = COM_Parse (data);
+					if ( (colorstring = V_GetColorStringByName (com_token)) ) {
+						levelinfo->outsidefog = V_GetColorFromString (NULL, colorstring);
+						free (colorstring);
+					} else {
+						levelinfo->outsidefog = V_GetColorFromString (NULL, com_token);
+					}
+				
 				} else if (!stricmp (com_token, "titlepatch")) {
 					// titlepatch <patchname>
 					mapinfo = COM_Parse (data);
@@ -250,14 +301,19 @@ void G_ParseMapInfo (void)
 					// lightning
 					mapinfo = data;
 
+				} else if (!stricmp (com_token, "fadetable")) {
+					// fadetable
+					mapinfo = COM_Parse (data);
+					uppercopy (levelinfo->fadetable, com_token);
+
 				} else if (!stricmp (com_token, "cdtrack") ||
-						   !stricmp (com_token, "fadetable") ||
 						   !stricmp (com_token, "cd_start_track") ||
 						   !stricmp (com_token, "cd_end1_track") ||
 						   !stricmp (com_token, "cd_end2_track") ||
 						   !stricmp (com_token, "cd_end3_track") ||
 						   !stricmp (com_token, "cd_intermission_track") ||
-						   !stricmp (com_token, "cd_title_track")) {
+						   !stricmp (com_token, "cd_title_track") ||
+						   !stricmp (com_token, "warptrans")) {
 					mapinfo = COM_Parse (data);
 
 				}
@@ -301,6 +357,11 @@ void G_ParseMapInfo (void)
 					mapinfo = COM_Parse (data);
 					strncpy (clusterinfo->finaleflat, com_token, 8);
 
+				} else if (!stricmp (com_token, "hub")) {
+					// hub
+					mapinfo = data;
+					clusterinfo->flags |= CLUSTER_HUB;
+
 				}
 			}
 		}
@@ -312,12 +373,38 @@ void G_ParseMapInfo (void)
 	}
 }
 
+static void zapDefereds (acsdefered_t *def)
+{
+	while (def) {
+		acsdefered_t *next = def->next;
+		Z_Free (def);
+		def = next;
+	}
+}
+
+void P_RemoveDefereds (void)
+{
+	int i;
+
+	// Remove any existing defereds
+	for (i = 0; i < numwadlevelinfos; i++)
+		if (wadlevelinfos[i].defered) {
+			zapDefereds (wadlevelinfos[i].defered);
+			wadlevelinfos[i].defered = NULL;
+		}
+
+	for (i = 0; LevelInfos[i].level_name; i++)
+		if (LevelInfos[i].defered) {
+			zapDefereds (LevelInfos[i].defered);
+			LevelInfos[i].defered = NULL;
+		}
+}
 //
 // G_InitNew
 // Can be called by the startup code or the menu task,
 // consoleplayer, displayplayer, playeringame[] should be set.
 //
-static char		d_mapname[9];
+static char d_mapname[9];
 
 void G_DeferedInitNew (char *mapname)
 {
@@ -367,12 +454,17 @@ void G_InitNew (char *mapname)
 {
 	int i;
 
-	// [RH] Mark all levels as not visited
-	for (i = 0; i < numwadlevelinfos; i++)
-		wadlevelinfos[i].flags &= ~LEVEL_VISITED;
+	if (!savegamerestore)
+		G_ClearSnapshots ();
 
-	for (i = 0; LevelInfos[i].mapname[0]; i++)
-		LevelInfos[i].flags &= ~LEVEL_VISITED;
+	// [RH] Mark all levels as not visited
+	if (!savegamerestore) {
+		for (i = 0; i < numwadlevelinfos; i++)
+			wadlevelinfos[i].flags &= ~LEVEL_VISITED;
+
+		for (i = 0; LevelInfos[i].mapname[0]; i++)
+			LevelInfos[i].flags &= ~LEVEL_VISITED;
+	}
 
 	UnlatchCVars ();
 
@@ -391,7 +483,7 @@ void G_InitNew (char *mapname)
 
 	// [RH] If this map doesn't exist, bomb out
 	if (W_CheckNumForName (mapname) == -1) {
-		I_Error ("Could not start map %s\n", mapname);
+		I_Error ("Could not find map %s\n", mapname);
 	}
 
 	if ((gameskill->value == sk_nightmare) || (dmflags & DF_MONSTERS_RESPAWN) )
@@ -418,44 +510,70 @@ void G_InitNew (char *mapname)
 		mobjinfo[MT_TROOPSHOT].speed = 10*FRACUNIT;
 	}
 
-	M_ClearRandom ();
+	if (!savegamerestore)
+		M_ClearRandom ();
+
+	// [RH] Clear ACS world variables and time
+	//		(Savegame restores them after calling G_InitNew)
+	memset (WorldVars, 0, sizeof(WorldVars));
+	level.time = 0;
 
 	// force players to be initialized upon first level load
-	for (i=0 ; i<MAXPLAYERS ; i++)
-		players[i].playerstate = PST_REBORN;
+	if (!savegamerestore)
+		for (i=0 ; i<MAXPLAYERS ; i++)
+			players[i].playerstate = PST_REBORN;
 
 	usergame = true;				// will be set false if a demo
 	paused = false;
 	demoplayback = false;
 	automapactive = false;
 	viewactive = true;
- 
-	viewactive = true;
 
 	strncpy (level.mapname, mapname, 8);
-	G_DoLoadLevel ();
+	G_DoLoadLevel (0);
 }
 
 //
 // G_DoCompleted
 //
 BOOL 			secretexit;
+static int		startpos;	// [RH] Support for multiple starts per level
 extern char*	pagename;
- 
-void G_ExitLevel (void)
+extern BOOL		NoWipe;		// [RH] Don't wipe when travelling in hubs
+
+// [RH] The position parameter to these next two functions should
+//		match the first parameter of the single player start spots
+//		that should appear in the next map.
+static void goOn (int position)
+{
+	cluster_info_t *thiscluster = FindClusterInfo (level.cluster);
+	cluster_info_t *nextcluster = FindClusterInfo (FindLevelInfo (level.nextmap)->cluster);
+
+
+	startpos = position;
+	gameaction = ga_completed;
+
+	if (thiscluster && (thiscluster->flags & CLUSTER_HUB)) {
+		if ((level.flags & LEVEL_NOINTERMISSION) || (nextcluster == thiscluster))
+			NoWipe = 4;
+		D_DrawIcon = "TELEICON";
+	}
+}
+
+void G_ExitLevel (int position)
 {
 	secretexit = false;
-	gameaction = ga_completed;
+	goOn (position);
 }
 
 // Here's for the german edition.
-void G_SecretExitLevel (void) 
+void G_SecretExitLevel (int position) 
 {
 	// [RH] Check for secret levels is done in 
 	//		G_DoCompleted()
 
 	secretexit = true;
-	gameaction = ga_completed;
+	goOn (position);
 }
 
 void G_DoCompleted (void) 
@@ -468,18 +586,9 @@ void G_DoCompleted (void)
 	if (!(level.flags & LEVEL_CHANGEMAPCHEAT))
 		FindLevelInfo (level.mapname)->flags |= LEVEL_VISITED;
 
-	for (i=0 ; i<MAXPLAYERS ; i++)
-		if (playeringame[i])
-			G_PlayerFinishLevel (i);		// take away cards and stuff 
-
 	if (automapactive)
 		AM_Stop ();
 
-	if (level.flags & LEVEL_NOINTERMISSION) {
-		G_WorldDone ();
-		return;
-	}
-
 	wminfo.epsd = level.cluster - 1;		// Only used for DOOM I.
 	strncpy (wminfo.lname0, level.info->pname, 8);
 	strncpy (wminfo.current, level.mapname, 8);
@@ -524,11 +633,46 @@ void G_DoCompleted (void)
 		wminfo.plyr[i].fragcount = players[i].fragcount;
 	}
 
+	// [RH] If we're in a hub and staying within that hub, take a snapshot
+	//		of the level. If we're traveling to a new hub, take stuff from
+	//		the player and clear the world vars. If this is just an
+	//		ordinary cluster (not a hub), take stuff from the player, but
+	//		leave the world vars alone.
+	{
+		cluster_info_t *thiscluster = FindClusterInfo (level.cluster);
+		cluster_info_t *nextcluster = FindClusterInfo (FindLevelInfo (level.nextmap)->cluster);
+
+		if (thiscluster != nextcluster ||
+			deathmatch->value ||
+			!(thiscluster->flags & CLUSTER_HUB)) {
+			for (i=0 ; i<MAXPLAYERS ; i++)
+				if (playeringame[i])
+					G_PlayerFinishLevel (i);	// take away cards and stuff
+
+				if (nextcluster->flags & CLUSTER_HUB) {
+					memset (WorldVars, 0, sizeof(WorldVars));
+					P_RemoveDefereds ();
+					G_ClearSnapshots ();
+				}
+		} else {
+			G_SnapshotLevel ();
+		}
+		if (!(nextcluster->flags & CLUSTER_HUB) || !(thiscluster->flags & CLUSTER_HUB))
+			level.time = 0;	// Reset time to zero if not entering/staying in a hub
+
+		if (!deathmatch->value &&
+			(level.flags & LEVEL_NOINTERMISSION) ||
+			((nextcluster == thiscluster) && (thiscluster->flags & CLUSTER_HUB))) {
+			G_WorldDone ();
+			return;
+		}
+	}
+
 	gamestate = GS_INTERMISSION;
 	viewactive = false;
 	automapactive = false;
 
-// [RH] If you ever get a statistics driver operational, uncomment this.
+// [RH] If you ever get a statistics driver operational, adapt this.
 //	if (statcopy)
 //		memcpy (statcopy, &wminfo, sizeof(wminfo));
 		
@@ -538,19 +682,33 @@ void G_DoCompleted (void)
 //
 // G_DoLoadLevel 
 //
-extern	gamestate_t 	wipegamestate; 
+extern gamestate_t 	wipegamestate; 
+extern float BaseBlendA;
  
-void G_DoLoadLevel (void) 
+void G_DoLoadLevel (int position) 
 { 
-	int i; 
+	static int lastposition = 0;
+	gamestate_t oldgs = gamestate;
+	int i;
+
+	if (position == -1)
+		position = lastposition;
+	else
+		lastposition = position;
 
 	G_InitLevelLocals ();
 
 	Printf ("\n\35\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36"
 			"\36\36\36\36\36\36\36\36\36\36\36\36\37\n%s\n\n",
 			level.level_name);
+
+	if (wipegamestate == GS_LEVEL) 
+		wipegamestate = -1; 			// force a wipe 
+
+	gamestate = GS_LEVEL; 
 	
-	C_HideConsole ();
+	if (demoplayback || oldgs == GS_STARTUP)
+		C_HideConsole ();
 	C_FlushDisplay ();
 
 	// Set the sky map.
@@ -569,11 +727,6 @@ void G_DoLoadLevel (void)
 	// [RH] Set up details about sky rendering
 	R_InitSkyMap (r_stretchsky);
 
-	if (wipegamestate == GS_LEVEL) 
-		wipegamestate = -1; 			// force a wipe 
-
-	gamestate = GS_LEVEL; 
-
 	for (i=0 ; i<MAXPLAYERS ; i++) 
 	{ 
 		if (playeringame[i] && players[i].playerstate == PST_DEAD) 
@@ -592,9 +745,7 @@ void G_DoLoadLevel (void)
 		headsecnode = NULL;
 	}
 
-
-	S_ClearAmbients ();							// [RH] Clear all ambient sounds
-	P_SetupLevel (level.mapname);	 
+	P_SetupLevel (level.mapname, position);	 
 	displayplayer = consoleplayer;				// view the guy you are playing
 	ST_Start();		// [RH] Make sure status bar knows who we are
 	HU_Start();
@@ -610,6 +761,10 @@ void G_DoLoadLevel (void)
 
 	level.starttime = I_GetTime ();
 
+	G_UnSnapshotLevel (!savegamerestore);	// [RH] Restore the state of the level.
+
+	P_DoDeferedScripts ();	// [RH] Do script actions that were triggerd on another map.
+
 	if (timingdemo) {
 		static BOOL firstTime = true;
 
@@ -643,8 +798,9 @@ void G_WorldDone (void)
 		else
 			nextcluster = FindClusterInfo (FindLevelInfo (level.secretmap)->cluster);
 
-		if (nextcluster->cluster != level.cluster) {
-			// Only start the finale if the next level's cluster is different than the current one.
+		if (nextcluster->cluster != level.cluster && !deathmatch->value) {
+			// Only start the finale if the next level's cluster is different
+			// than the current one and we're not in deathmatch.
 			if (nextcluster->entertext) {
 				F_StartFinale (nextcluster->messagemusic, nextcluster->finaleflat, nextcluster->entertext);
 			} else if (thiscluster->exittext) {
@@ -664,12 +820,14 @@ void G_DoWorldDone (void)
 	} else {
 		strncpy (level.mapname, wminfo.next, 8);
 	}
-	G_DoLoadLevel (); 
+	G_DoLoadLevel (startpos);
+	startpos = 0;
 	gameaction = ga_nothing; 
 	viewactive = true; 
 } 
  
 
+extern dyncolormap_t NormalLight;
 
 void G_InitLevelLocals ()
 {
@@ -677,21 +835,32 @@ void G_InitLevelLocals ()
 	level_info_t *info;
 	int i;
 
+	BaseBlendA = 0.0f;		// Remove underwater blend effect, if any
+	NormalLight.maps = realcolormaps;
+
 	if ((i = FindWadLevelInfo (level.mapname)) > -1) {
 		level_pwad_info_t *pinfo = wadlevelinfos + i;
 
 		level.info = (level_info_t *)pinfo;
 		level.skyspeed1 = pinfo->skyspeed1;
 		level.skyspeed2 = pinfo->skyspeed2;
-		level.fadeto = pinfo->fadeto;
 		info = (level_info_t *)pinfo;
 		strncpy (level.skypic2, pinfo->skypic2, 8);
+		level.fadeto = pinfo->fadeto;
+		if (level.fadeto) {
+			NormalLight.maps = DefaultPalette->maps.colormaps;
+		} else {
+			R_SetDefaultColormap (pinfo->fadetable);
+		}
+		level.outsidefog = pinfo->outsidefog;
 	} else {
 		info = FindDefLevelInfo (level.mapname);
 		level.info = info;
 		level.skyspeed1 =  level.skyspeed2 = 0;
 		level.fadeto = 0;
+		level.outsidefog = 0xff000000;	// 0xff000000 signals not to handle it special
 		level.skypic2[0] = 0;
+		R_SetDefaultColormap ("COLORMAP");
 	}
 
 	if (info->level_name) {
@@ -719,6 +888,8 @@ void G_InitLevelLocals ()
 		level.levelnum = 1;
 	}
 
+	memset (level.vars, 0, sizeof(level.vars));
+
 	if (oldfade != level.fadeto)
 		RefreshPalettes ();
 }
@@ -867,6 +1038,255 @@ void G_SetLevelStrings (void)
 		strncpy (level.level_name, level.info->level_name, 63);
 }
 
+
+// Archives the current level
+void G_SnapshotLevel (void)
+{
+	save_p = savebuffer = Malloc (savegamesize);
+
+	if (level.info->snapshot)
+		Z_Free (level.info->snapshot);
+
+	WriteLong (level.flags, &save_p);
+	WriteLong (level.fadeto, &save_p);
+	WriteLong (level.found_secrets, &save_p);
+	WriteLong (level.found_items, &save_p);
+	WriteLong (level.killed_monsters, &save_p);
+	memcpy (save_p, level.vars, sizeof(level.vars));
+	save_p += sizeof(level.vars);
+
+	P_ArchiveWorld ();
+	Z_CheckHeap ();
+	P_ArchiveThinkers ();
+	Z_CheckHeap ();
+	P_ArchiveSpecials ();
+	Z_CheckHeap ();
+	P_ArchiveScripts ();
+	Z_CheckHeap ();
+
+	// Now compress it. This seems to shrink the data down to
+	// about 20% of its original size fairly consistantly.
+	{
+		int outlen;
+		int len = save_p - savebuffer;
+		lzo_byte *compressed;
+		lzo_byte *wrkmem;
+		int r;
+
+		compressed = Z_Malloc (OUT_LEN(len), PU_STATIC, 0);
+		wrkmem = Z_Malloc (LZO1X_1_MEM_COMPRESS, PU_STATIC, 0);
+		r = lzo1x_1_compress (savebuffer, len, compressed, &outlen, wrkmem);
+		Z_Free (wrkmem);
+
+		// If the data could not be compressed, store it as-is.
+		if (r != LZO_E_OK || outlen > len) {
+			DPrintf ("Snapshot uncompressable\n");
+			outlen = 0;
+		} else {
+			DPrintf ("Snapshot: %d .. %d bytes\n", len, outlen);
+		}
+
+		level.info->snapshot = Z_Malloc (((outlen == 0) ? len : outlen) + sizeof(int)*2, PU_STATIC, 0);
+		((int *)(level.info->snapshot))[0] = outlen;
+		((int *)(level.info->snapshot))[1] = len;
+		if (outlen == 0)
+			memcpy (level.info->snapshot + sizeof(int)*2, savebuffer, len);
+		else
+			memcpy (level.info->snapshot + sizeof(int)*2, compressed, outlen);
+		Z_Free (compressed);
+	}
+	free (savebuffer);
+	savebuffer = save_p = NULL;
+}
+
+// Unarchives the current level based on its snapshot
+// The level should have already been loaded and setup.
+void G_UnSnapshotLevel (BOOL keepPlayers)
+{
+	int expandsize, cprlen;
+	byte *expand;
+
+	if (!level.info->snapshot)
+		return;
+
+	cprlen = ((int *)(level.info->snapshot))[0];
+	expandsize = ((int *)(level.info->snapshot))[1];
+	
+	if (cprlen) {
+		int r, newlen;
+
+		expand = Z_Malloc (expandsize, PU_STATIC, 0);
+		r = lzo1x_decompress (level.info->snapshot + sizeof(int)*2, cprlen, expand, &newlen, NULL);
+		if (r != LZO_E_OK || newlen != expandsize) {
+			Printf ("Could not decompress snapshot");
+			Z_Free (expand);
+			return;
+		}
+		save_p = expand;
+	} else {
+		save_p = level.info->snapshot + sizeof(int)*2;
+		expand = NULL;
+	}
+
+	level.flags = ReadLong (&save_p);
+	level.fadeto = ReadLong (&save_p);
+	level.found_secrets = ReadLong (&save_p);
+	level.found_items = ReadLong (&save_p);
+	level.killed_monsters = ReadLong (&save_p);
+	memcpy (level.vars, save_p, sizeof(level.vars));
+	save_p += sizeof(level.vars);
+
+	P_UnArchiveWorld ();
+	P_UnArchiveThinkers (keepPlayers);
+	P_UnArchiveSpecials ();
+	P_UnArchiveScripts ();
+
+	if (expand)
+		Z_Free (expand);
+
+	// No reason to keep the snapshot around once the level's been entered.
+	Z_Free (level.info->snapshot);
+	level.info->snapshot = NULL;
+
+	save_p = NULL;
+}
+
+void G_ClearSnapshots (void)
+{
+	int i;
+
+	for (i = 0; i < numwadlevelinfos; i++)
+		if (wadlevelinfos[i].snapshot) {
+			Z_Free (wadlevelinfos[i].snapshot);
+			wadlevelinfos[i].snapshot = NULL;
+		}
+
+	for (i = 0; LevelInfos[i].level_name; i++)
+		if (LevelInfos[i].snapshot) {
+			Z_Free (LevelInfos[i].snapshot);
+			LevelInfos[i].snapshot = NULL;
+		}
+}
+
+static void writeSnapShot (level_info_t *i)
+{
+	int len;
+
+	len = ((int *)(i->snapshot))[0];
+	if (len == 0)
+		len = ((int *)(i->snapshot))[1];
+
+	CheckSaveGame (len + 8 + sizeof(int)*2 + 4);
+
+	memcpy (save_p, i->mapname, 8);
+	save_p += 8;
+	PADSAVEP();
+	memcpy (save_p, i->snapshot, len + sizeof(int)*2);
+	save_p += len + sizeof(int)*2;
+}
+
+void G_ArchiveSnapshots (void)
+{
+	int i;
+
+	for (i = 0; i < numwadlevelinfos; i++)
+		if (wadlevelinfos[i].snapshot)
+			writeSnapShot ((level_info_t *)&wadlevelinfos[i]);
+
+	for (i = 0; LevelInfos[i].level_name; i++)
+		if (LevelInfos[i].snapshot)
+			writeSnapShot (&LevelInfos[i]);
+
+	// Signal end of snapshots
+	CheckSaveGame (1);
+	*save_p++ = 0;
+}
+
+void G_UnArchiveSnapshots (void)
+{
+	level_info_t *i;
+	int shortsize, fullsize, savesize;
+
+	G_ClearSnapshots ();
+	while (*save_p) {
+		i = FindLevelInfo (save_p);
+		save_p += 8;
+		PADSAVEP();
+		shortsize = ((int *)save_p)[0];
+		fullsize = ((int *)save_p)[1];
+		savesize = (shortsize ? shortsize : fullsize) + sizeof(int)*2;
+		if (i) {
+			i->snapshot = Z_Malloc (savesize, PU_STATIC, 0);
+			memcpy (i->snapshot, save_p, savesize);
+		}
+		save_p += savesize;
+	}
+	save_p++;
+}
+
+
+static void writeDefereds (level_info_t *i)
+{
+	acsdefered_t *def = i->defered;
+
+	memcpy (save_p, i->mapname, 8);
+	save_p += 8;
+
+	while (def) {
+		CheckSaveGame (sizeof (*def));
+		memcpy (save_p, def, sizeof(*def));
+		save_p += sizeof(*def);
+		def = def->next;
+	}
+}
+
+void P_ArchiveACSDefereds (void)
+{
+	int i;
+
+	for (i = 0; i < numwadlevelinfos; i++)
+		if (wadlevelinfos[i].defered)
+			writeDefereds ((level_info_t *)&wadlevelinfos[i]);
+
+	for (i = 0; LevelInfos[i].level_name; i++)
+		if (LevelInfos[i].defered)
+			writeDefereds (&LevelInfos[i]);
+
+	// Signal end of defereds
+	CheckSaveGame (1);
+	*save_p++ = 0;
+}
+
+void P_UnArchiveACSDefereds (void)
+{
+	level_info_t *i;
+	acsdefered_t *def, **prev;
+
+	P_RemoveDefereds ();
+
+	while (*save_p) {
+		i = FindLevelInfo (save_p);
+		if (!i) {
+			char name[9];
+
+			strncpy (name, save_p, 8);
+			name[8] = 0;
+			I_Error ("Unknown map %s in savegame", name);
+		}
+		save_p += 8;
+		prev = &i->defered;
+		do {
+			def = Z_Malloc (sizeof(*def), PU_STATIC, 0);
+			memcpy (def, save_p, sizeof(*def));
+			save_p += sizeof(*def);
+			*prev = def;
+			prev = &def->next;
+		} while (*prev);
+	}
+	save_p++;
+}
+
+
 // Static level info from original game
 // The level names and cluster messages now get filled in
 // by G_SetLevelStrings().
diff --git a/code/G_level.h b/code/G_level.h
index ca16ebbf9a..ad48a40148 100644
--- a/code/G_level.h
+++ b/code/G_level.h
@@ -5,6 +5,9 @@
 #include "doomdef.h"
 #include "m_fixed.h"
 
+#define NUM_MAPVARS				32
+#define NUM_WORLDVARS			64
+
 #define LEVEL_NOINTERMISSION	0x00000001
 #define	LEVEL_DOUBLESKY			0x00000004
 #define LEVEL_NOSOUNDCLIPPING	0x00000008
@@ -23,6 +26,7 @@
 #define LEVEL_CHANGEMAPCHEAT	0x40000000		// Don't display cluster messages
 #define LEVEL_VISITED			0x80000000		// Used for intermission map
 
+struct acsdefered_s;
 
 struct level_info_s {
 	char		mapname[8];
@@ -36,6 +40,8 @@ struct level_info_s {
 	char		music[8];
 	unsigned	flags;
 	int			cluster;
+	byte		*snapshot;
+	struct acsdefered_s *defered;
 };
 typedef struct level_info_s level_info_t;
 
@@ -51,11 +57,15 @@ struct level_pwad_info_s {
 	char		music[8];
 	unsigned	flags;
 	int			cluster;
+	byte		*snapshot;
+	struct acsdefered_s *defered;
 
 	char		skypic2[8];
 	fixed_t		skyspeed1;
 	fixed_t		skyspeed2;
 	unsigned	fadeto;
+	char		fadetable[8];
+	unsigned	outsidefog;
 };
 typedef struct level_pwad_info_s level_pwad_info_t;
 
@@ -76,6 +86,7 @@ struct level_locals_s {
 	unsigned	flags;
 
 	unsigned	fadeto;					// The color the palette fades to (usually black)
+	unsigned	outsidefog;				// The fog for sectors with sky ceilings
 
 	char		music[8];
 	char		skypic1[8];
@@ -92,6 +103,12 @@ struct level_locals_s {
 
 	int			total_monsters;
 	int			killed_monsters;
+
+	// The following are all used for ACS scripting
+	byte		*behavior;
+	int			*scripts;
+	int			*strings;
+	int			vars[NUM_MAPVARS];
 };
 typedef struct level_locals_s level_locals_t;
 
@@ -101,13 +118,21 @@ struct cluster_info_s {
 	char		finaleflat[8];
 	char		*exittext;
 	char		*entertext;
+	int			flags;
 };
 typedef struct cluster_info_s cluster_info_t;
 
+// Only one cluster flag right now
+#define CLUSTER_HUB		0x00000001
+
 extern level_locals_t level;
 extern level_info_t LevelInfos[];
 extern cluster_info_t ClusterInfos[];
 
+extern int WorldVars[NUM_WORLDVARS];
+
+extern BOOL savegamerestore;
+
 void G_InitNew (char *mapname);
 
 // Can be called by the startup code or M_Responder.
@@ -115,10 +140,10 @@ void G_InitNew (char *mapname);
 // but a warp test can start elsewhere
 void G_DeferedInitNew (char *mapname);
 
-void G_ExitLevel (void);
-void G_SecretExitLevel (void);
+void G_ExitLevel (int position);
+void G_SecretExitLevel (int position);
 
-void G_DoLoadLevel (void);
+void G_DoLoadLevel (int position);
 
 void G_InitLevelLocals (void);
 
@@ -132,4 +157,10 @@ char *CalcMapName (int episode, int level);
 
 void G_ParseMapInfo (void);
 
+void G_ClearSnapshots (void);
+void G_SnapshotLevel (void);
+void G_UnSnapshotLevel (BOOL keepPlayers);
+void G_ArchiveSnapshots (void);
+void G_UnArchiveSnapshots (void);
+
 #endif //__G_LEVEL_H__
\ No newline at end of file
diff --git a/code/Hu_stuff.c b/code/Hu_stuff.c
index 427c14dc47..b418ae7c26 100644
--- a/code/Hu_stuff.c
+++ b/code/Hu_stuff.c
@@ -40,7 +40,6 @@
 
 // Data.
 #include "dstrings.h"
-#include "sounds.h"
 
 #include "c_consol.h"
 #include "c_dispch.h"
@@ -71,7 +70,7 @@ cvar_t *chat_macros[10];
 
 static player_t*	plr;
 patch_t*			hu_font[HU_FONTSIZE];
-BOOL 				chat_on;
+int 				chat_on;
 static hu_itext_t	w_chat;
 
 static BOOL			message_on;
@@ -120,11 +119,15 @@ void HU_Start(void)
 	if (headsupactive)
 		HU_Stop();
 
-	plr = &players[displayplayer];		// [RH] Not consoleplayer
+	// [RH] Give status bar preference to the camera
+	if (players[consoleplayer].camera && players[consoleplayer].camera->player)
+		plr = players[consoleplayer].camera->player;
+	else
+		plr = &players[consoleplayer];
 	message_on = false;
 	message_dontfuckwithme = false;
 	message_nottobefuckedwith = false;
-	chat_on = false;
+	chat_on = 0;
 
 	// create the chat widget
 	HUlib_initIText(&w_chat,
@@ -139,8 +142,8 @@ void HU_Drawer(void)
 {
 	HUlib_drawIText(&w_chat);
 
-	if (deathmatch->value && ((Actions & ACTION_SHOWSCORES) || players[displayplayer].health <= 0))
-		HU_DrawScores (displayplayer);
+	if (deathmatch->value && ((Actions & ACTION_SHOWSCORES) || plr->health <= 0))
+		HU_DrawScores (plr - players);
 }
 
 void HU_Erase(void)
@@ -170,7 +173,9 @@ void HU_DrawScores (int player)
 	maxwidth = 0;
 	for (i = 0; i < MAXPLAYERS; i++) {
 		if (playeringame[i]) {
-			int width = V_StringWidth (players[i].userinfo->netname);
+			int width = V_StringWidth (players[i].userinfo.netname);
+			if (teamplay->value)
+				width += V_StringWidth (players[i].userinfo.team) + 24;
 			if (width > maxwidth)
 				maxwidth = width;
 		}
@@ -183,7 +188,7 @@ void HU_DrawScores (int player)
 	if (y < 48) y = 48;
 
 	for (i = 0; i < MAXPLAYERS && y < ST_Y - 12 * CleanYfac; i++) {
-		int color = players[sortedplayers[i]].userinfo->color;
+		int color = players[sortedplayers[i]].userinfo.color;
 		char str[24];
 
 		if (playeringame[sortedplayers[i]]) {
@@ -197,7 +202,11 @@ void HU_DrawScores (int player)
 			sprintf (str, "%d", players[sortedplayers[i]].fragcount);
 			V_DrawTextClean (margin, y, str);
 
-			strcpy (str, players[sortedplayers[i]].userinfo->netname);
+			if (teamplay->value)
+				sprintf (str, "%s (%s)", players[sortedplayers[i]].userinfo.netname,
+						 players[sortedplayers[i]].userinfo.team);
+			else
+				strcpy (str, players[sortedplayers[i]].userinfo.netname);
 
 			if (sortedplayers[i] != player)
 				for (j = 0; j < 23 && str[j]; j++)
@@ -258,6 +267,12 @@ BOOL HU_Responder (event_t *ev)
 
 	if (chat_on)
 	{
+		// [RH] You can actually cancel out of messagemode now
+		if (ev->data1 == KEY_ESCAPE) {
+			chat_on = 0;
+			return true;
+		}
+
 		c = ev->data3;	// [RH] Use localized keymap
 
 		// send a macro
@@ -268,10 +283,10 @@ BOOL HU_Responder (event_t *ev)
 			if (c > 9)
 				return false;
 
-			ShoveChatStr (chat_macros[c]->string, 0);
+			ShoveChatStr (chat_macros[c]->string, chat_on - 1);
 			
 			// leave chat mode
-			chat_on = false;
+			chat_on = 0;
 			eatkey = true;
 		}
 		else
@@ -281,10 +296,10 @@ BOOL HU_Responder (event_t *ev)
 			eatkey = HUlib_keyInIText(&w_chat, c);
 
 			if (ev->data1 == KEY_ENTER) {
-				chat_on = false;
-				ShoveChatStr (w_chat.l.l, 0);
+				ShoveChatStr (w_chat.l.l, chat_on - 1);
+				chat_on = 0;
 			} else if (ev->data1 == KEY_ESCAPE)
-				chat_on = false;
+				chat_on = 0;
 		}
 	}
 
@@ -293,11 +308,9 @@ BOOL HU_Responder (event_t *ev)
 
 void Cmd_MessageMode (player_t *plyr, int argc, char **argv)
 {
-	if (netgame) {
-		chat_on = true;
-		C_HideConsole ();
-		HUlib_resetIText (&w_chat);
-	}
+	chat_on = 1;
+	C_HideConsole ();
+	HUlib_resetIText (&w_chat);
 }
 
 void Cmd_Say (player_t *plyr, int argc, char **argv)
@@ -305,4 +318,18 @@ void Cmd_Say (player_t *plyr, int argc, char **argv)
 	if (argc > 1) {
 		ShoveChatStr (BuildString (argc - 1, argv + 1), 0);
 	}
-}
\ No newline at end of file
+}
+
+void Cmd_MessageMode2 (player_t *plyr, int argc, char **argv)
+{
+	chat_on = 2;
+	C_HideConsole ();
+	HUlib_resetIText (&w_chat);
+}
+
+void Cmd_Say_Team (player_t *plyr, int argc, char **argv)
+{
+	if (argc > 1) {
+		ShoveChatStr (BuildString (argc - 1, argv + 1), 1);
+	}
+}
diff --git a/code/I_music.c b/code/I_music.c
deleted file mode 100644
index e883a8cdcb..0000000000
--- a/code/I_music.c
+++ /dev/null
@@ -1,354 +0,0 @@
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <mmsystem.h>
-
-#include "m_argv.h"
-#include "i_music.h"
-#include "w_wad.h"
-#include "c_consol.h"
-
-#include "../midas/include/midasdll.h"
-
-#define TYPE_MIDI		0
-#define TYPE_MOD		1
-#define TYPE_CD			2
-
-#define STATE_STOPPED	0
-#define STATE_PLAYING	1
-#define STATE_PAUSED	2
-
-struct MusInfo {
-	int type;
-	int status;
-	union {
-		MIDASmodule module;
-		MCIDEVICEID mciDevice;
-	};
-	union {
-		DWORD unpausePosition;
-		int cdTrack;
-		MIDASmodulePlayHandle handle;
-	};
-	char *filename;
-	BOOL looping;
-};
-typedef struct MusInfo info_t;
-
-static info_t *currSong;
-
-extern HWND Window;
-
-/* Music using Windows MIDI device - yuck */
-
-static int		nomusic = 0;
-static char		musName[512];
-static char		midName[512];
-static int		musicdies=-1;
-static int		musicvolume;
-
-void I_SetMusicVolume (int volume)
-{
-	if (volume != 127) {
-		// Internal state variable.
-		musicvolume = volume;
-		// Now set volume on output device.
-		if (currSong && currSong->type == TYPE_MOD)
-			MIDASsetMusicVolume (currSong->handle, musicvolume);
-	}
-}
-
-void I_InitMusic (void)
-{
-	char *temp;
-
-	Printf ("I_InitMusic\n");
-	
-	nomusic = !!M_CheckParm("-nomusic") || !!M_CheckParm("-nosound");
-
-	/* Create temporary file names: */
-
-	temp = getenv("TEMP");
-	if ( temp == NULL )
-		temp = ".";
-	strcpy(musName, temp);
-
-	while ( musName[strlen(musName)-1] == '\\' )
-		musName[strlen(musName)-1] = 0;
-
-	strcat(musName, "\\");
-	strcpy(midName, musName);
-
-	strcat(musName, "doomtemp.mus");
-	strcat(midName, "doomtemp.mid");
-}
-
-
-void I_ShutdownMusic(void)
-{
-	if (currSong) {
-		I_UnRegisterSong ((int)currSong);
-		currSong = NULL;
-	}
-	remove (midName);
-	remove (musName);
-}
-
-
-
-int SendMCI(MCIDEVICEID device, UINT msg, DWORD command, DWORD param)
-{
-	int res;
-
-	res = mciSendCommand(device, msg, command, param);
-	if (res) {
-		char errorStr[256];
-
-		mciGetErrorString(res, errorStr, 255);
-		Printf_Bold ("MCI error:\n");
-		Printf ("%s\n", errorStr);
-	}
-	
-	return res;
-}
-
-
-void I_PlaySong (int handle, int _looping)
-{
-	info_t *info = (info_t *)handle;
-
-	if (!info || nomusic)
-		return;
-
-	info->status = STATE_STOPPED;
-	info->looping = _looping;
-
-	switch (info->type) {
-		case TYPE_MIDI: {
-			MCI_OPEN_PARMS openParms;
-			MCI_PLAY_PARMS playParms;
-
-			openParms.lpstrDeviceType = "sequencer";
-			openParms.lpstrElementName = info->filename;
-			if (SendMCI (0, MCI_OPEN, MCI_OPEN_TYPE | MCI_OPEN_ELEMENT, (DWORD)&openParms))
-				return;
-
-			playParms.dwCallback = (DWORD)Window;
-			if(SendMCI (openParms.wDeviceID, MCI_PLAY, MCI_NOTIFY, (DWORD)&playParms)) {
-				SendMCI (openParms.wDeviceID, MCI_CLOSE, 0, (DWORD)NULL);
-				return;
-			}
-
-			info->mciDevice = openParms.wDeviceID;
-			info->status = STATE_PLAYING;
-			break;
-			}
-		case TYPE_MOD:
-			if (info->handle = MIDASplayModule (info->module, _looping)) {
-				MIDASsetMusicVolume (info->handle, musicvolume);
-				info->status = STATE_PLAYING;
-			}
-			break;
-	}
-	currSong = info;
-}
-
-void I_RestartSong (void)
-{
-	MCI_PLAY_PARMS playParms;
-
-	if (!currSong ||
-		currSong->type != TYPE_MIDI ||
-		currSong->status != STATE_PLAYING)
-		return;
-
-	if (!currSong->looping) {
-		I_StopSong ((int)currSong);
-		return;
-	}
-
-	playParms.dwFrom = 0;
-	playParms.dwCallback = (DWORD)Window;
-	if (SendMCI (currSong->mciDevice, MCI_PLAY, MCI_NOTIFY | MCI_FROM, (DWORD)(LPVOID)&playParms)) {
-		SendMCI (currSong->mciDevice, MCI_CLOSE, 0, (DWORD)NULL);
-		currSong->mciDevice = 0;
-		currSong = NULL;
-	}
-}
-
-void I_PauseSong (int handle)
-{
-	info_t *info = (info_t *)handle;
-
-	if (!info || info->status != STATE_PLAYING)
-		return;
-
-	switch (info->type) {
-		case TYPE_MIDI: {
-			MCI_SET_PARMS setParms;
-			MCI_STATUS_PARMS statusParms;
-
-			setParms.dwTimeFormat = MCI_FORMAT_MILLISECONDS;
-			if (SendMCI (info->mciDevice, MCI_SET, MCI_SET_TIME_FORMAT, (DWORD)&setParms))
-				return;
-
-			statusParms.dwCallback = (DWORD)Window;
-			statusParms.dwItem = MCI_STATUS_POSITION;
-			if (SendMCI (info->mciDevice, MCI_STATUS, MCI_STATUS_ITEM, (DWORD)&statusParms))
-				return;
-
-			info->unpausePosition = statusParms.dwReturn;
-			SendMCI (info->mciDevice, MCI_STOP, 0, (DWORD)NULL);
-			info->status = STATE_PAUSED;
-			}
-			break;
-		case TYPE_MOD:
-			break;
-	}
-}
-
-void I_ResumeSong (int handle)
-{
-	info_t *info = (info_t *)handle;
-
-	if (!info || info->status != STATE_PAUSED)
-		return;
-
-	switch (info->type) {
-		case TYPE_MIDI: {
-			MCI_SET_PARMS setParms;
-			MCI_PLAY_PARMS playParms;
-
-			setParms.dwTimeFormat = MCI_FORMAT_MILLISECONDS;
-			if (SendMCI (info->mciDevice, MCI_SET, MCI_SET_TIME_FORMAT, (DWORD)&setParms))
-				return;
-			
-			playParms.dwCallback = (DWORD)Window;
-			playParms.dwTo = 0;
-			playParms.dwFrom = info->unpausePosition;
-			if (SendMCI (info->mciDevice, MCI_PLAY, MCI_NOTIFY | MCI_FROM, (DWORD)&playParms))
-				return;
-
-			info->status = STATE_PLAYING;
-			}
-			break;
-		case TYPE_MOD:
-			break;
-	}
-}
-
-void I_StopSong(int handle)
-{
-	info_t *info = (info_t *)handle;
-	
-	if (!info || info->status == STATE_STOPPED)
-		return;
-
-	info->status = STATE_STOPPED;
-
-	switch (info->type) {
-		case TYPE_MIDI:
-			SendMCI (info->mciDevice, MCI_STOP, 0, (DWORD)NULL);
-			SendMCI (info->mciDevice, MCI_CLOSE, 0, (DWORD)NULL);
-			info->mciDevice = 0;
-			break;
-		case TYPE_MOD:
-			MIDASstopModule (info->handle);
-			info->handle = 0;
-			break;
-	}
-	if (info == currSong)
-		currSong = NULL;
-}
-
-void I_UnRegisterSong(int handle)
-{
-	info_t *info = (info_t *)handle;
-
-	if (info) {
-		I_StopSong (handle);
-		switch (info->type) {
-			case TYPE_MIDI:
-				if (info->filename)
-					remove (info->filename);
-				break;
-			case TYPE_MOD:
-				MIDASfreeModule (info->module);
-				break;
-		}
-		free (info);
-	}
-}
-
-extern int convert( const char *mus, const char *mid, int nodisplay, int div,
-					int size, int nocomp, int *ow );
-
-
-int I_RegisterSong(void* data, int musicLen)
-{
-	FILE *f;
-	int ow = 2;
-	info_t *info;
-
-	if (!(info = malloc (sizeof(info_t))))
-		return 0;
-
-	info->status = STATE_STOPPED;
-	info->unpausePosition = 0;
-
-	if ( (f = fopen(musName, "wb")) == NULL ) {
-		Printf ("Unable to open temporary music file %s", musName);
-		free (info);
-		return 0;
-	}
-	if ( fwrite(data, musicLen, 1, f) != 1 ) {
-		fclose (f);
-		Printf ("Unable to write temporary music file\n");
-		free (info);
-		return 0;
-	}
-	fclose(f);
-
-	if (*(int *)data == (('M')|(('U')<<8)|(('S')<<16)|((0x1a)<<24))) {
-		// This is a mus file
-		info->type = TYPE_MIDI;
-
-		convert(musName, midName, 1, 89, 0, 1, &ow);
-
-		remove (musName);
-		info->filename = midName;
-	} else if (*(int *)data == (('M')|(('T')<<8)|(('h')<<16)|(('d')<<24))) {
-		// This is a midi file
-		info->type = TYPE_MIDI;
-		remove (midName);
-		rename (musName, midName);
-		info->filename = midName;
-	} else {
-		if (info->module = MIDASloadModule (musName)) {
-			// This is a module
-			info->type = TYPE_MOD;
-			remove (musName);
-			info->filename = NULL;
-		} else {
-			// This is not any known music format
-			// (or could not load mod)
-			remove (musName);
-			free (info);
-			info = NULL;
-		}
-	}
-
-	return (int)info;
-}
-
-// Is the song playing?
-int I_QrySongPlaying(int handle)
-{
-	info_t *info = (info_t *)handle;
-
-	if (!info)
-		return 0;
-	else if (info->looping == 1)
-		return 1;
-	else
-		return info->status;
-}
\ No newline at end of file
diff --git a/code/Info.c b/code/Info.c
index 9edfbc7127..b1773c7681 100644
--- a/code/Info.c
+++ b/code/Info.c
@@ -29,7 +29,6 @@
 #endif
 
 // Data.
-#include "sounds.h"
 #include "m_fixed.h"
 
 #include "info.h"
@@ -50,8 +49,8 @@ char *sprnames[NUMSPRITES] = {
     "POL3","POL1","POL6","GOR2","GOR3","GOR4","GOR5","SMIT","COL1","COL2",
     "COL3","COL4","CAND","CBRA","COL6","TRE1","TRE2","ELEC","CEYE","FSKU",
     "COL5","TBLU","TGRN","TRED","SMBT","SMGT","SMRT","HDB1","HDB2","HDB3",
-    "HDB4","HDB5","HDB6","POB1","POB2","BRS1","TLMP","TLP2","GIB0","GIB1",
-	"GIB2","GIB3","GIB4","GIB5","GIB6","GIB7","UNKN"
+    "HDB4","HDB5","HDB6","POB1","POB2","BRS1","TLMP","TLP2","TNT1","GIB0",
+	"GIB1","GIB2","GIB3","GIB4","GIB5","GIB6","GIB7","UNKN","TLGL"
 };
 
 
@@ -130,8 +129,8 @@ void A_BrainSpit();
 void A_SpawnSound();
 void A_SpawnFly();
 void A_BrainExplode();
-void A_Ambient();	// [RH] Play ambient sound
-
+void A_Ambient();		// [RH] Play ambient sound
+void P_RemoveMobj();	// [RH] Used by temporary switch mobj
 
 state_t	states[NUMSTATES] = {
     {SPR_TROO,0,-1,{NULL},S_NULL,0,0},	// S_NULL
@@ -1101,6 +1100,7 @@ state_t	states[NUMSTATES] = {
     {SPR_TLP2,32769,4,{NULL},S_TECH2LAMP3,0,0},	// S_TECH2LAMP2
     {SPR_TLP2,32770,4,{NULL},S_TECH2LAMP4,0,0},	// S_TECH2LAMP3
     {SPR_TLP2,32771,4,{NULL},S_TECH2LAMP,0,0},	// S_TECH2LAMP4
+	{SPR_TNT1,0,-1,{NULL},S_NULL,0,0},	// S_TNT1
     {SPR_GIB0,0,-1,{NULL},S_NULL,0,0},	// S_GIB0
     {SPR_GIB1,0,-1,{NULL},S_NULL,0,0},	// S_GIB1
     {SPR_GIB2,0,-1,{NULL},S_NULL,0,0},	// S_GIB2
@@ -1110,7 +1110,13 @@ state_t	states[NUMSTATES] = {
     {SPR_GIB6,0,-1,{NULL},S_NULL,0,0},	// S_GIB6
     {SPR_GIB7,0,-1,{NULL},S_NULL,0,0},	// S_GIB7
 	{SPR_TROO,0,1,{A_Ambient},S_AMBIENTSOUND,0,0},	// S_AMBIENTSOUND
-	{SPR_UNKN,0,-1,{NULL},S_NULL,0,0}	// S_UNKNOWNTHING
+	{SPR_UNKN,0,-1,{NULL},S_NULL,0,0},	// S_UNKNOWNTHING
+	{SPR_TLGL,32768,4,{NULL},S_BRIDGE2,0,0},	// S_BRIDGE1
+	{SPR_TLGL,32769,4,{NULL},S_BRIDGE3,0,0},	// S_BRIDGE2
+	{SPR_TLGL,32770,4,{NULL},S_BRIDGE4,0,0},	// S_BRIDGE3
+	{SPR_TLGL,32771,4,{NULL},S_BRIDGE5,0,0},	// S_BRIDGE4
+	{SPR_TLGL,32772,4,{NULL},S_BRIDGE1,0,0},	// S_BRIDGE5
+	{SPR_TNT1,0,60*TICRATE,{P_RemoveMobj},S_NULL,0,0},	// S_SWITCHTEMP
 };
 
 
@@ -1121,23 +1127,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_PLAY,		// spawnstate
 	100,		// spawnhealth
 	S_PLAY_RUN1,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	0,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_PLAY_PAIN,		// painstate
 	255,		// painchance
-	sfx_plpain,		// painsound
+	"*pain100_1",		// painsound
 	S_NULL,		// meleestate
 	S_PLAY_ATK1,		// missilestate
 	S_PLAY_DIE1,		// deathstate
 	S_PLAY_XDIE1,		// xdeathstate
-	sfx_pldeth,		// deathsound
+	"*death1",		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	56*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID|MF_SHOOTABLE|MF_DROPOFF|MF_PICKUP|MF_NOTDMATCH,		// flags
 	S_NULL		// raisestate
     },
@@ -1147,23 +1153,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_POSS_STND,		// spawnstate
 	20,		// spawnhealth
 	S_POSS_RUN1,		// seestate
-	sfx_posit1,		// seesound
+	"grunt/sight1",		// seesound
 	8,		// reactiontime
-	sfx_pistol,		// attacksound
+	"grunt/attack",		// attacksound
 	S_POSS_PAIN,		// painstate
 	200,		// painchance
-	sfx_popain,		// painsound
+	"grunt/pain",		// painsound
 	0,		// meleestate
 	S_POSS_ATK1,		// missilestate
 	S_POSS_DIE1,		// deathstate
 	S_POSS_XDIE1,		// xdeathstate
-	sfx_podth1,		// deathsound
+	"grunt/death1",		// deathsound
 	8,		// speed
 	20*FRACUNIT,		// radius
 	56*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_posact,		// activesound
+	"grunt/active",		// activesound
 	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
 	S_POSS_RAISE1		// raisestate
     },
@@ -1173,23 +1179,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_SPOS_STND,		// spawnstate
 	30,		// spawnhealth
 	S_SPOS_RUN1,		// seestate
-	sfx_posit2,		// seesound
+	"shotguy/sight1",		// seesound
 	8,		// reactiontime
 	0,		// attacksound
 	S_SPOS_PAIN,		// painstate
 	170,		// painchance
-	sfx_popain,		// painsound
+	"shotguy/pain",		// painsound
 	0,		// meleestate
 	S_SPOS_ATK1,		// missilestate
 	S_SPOS_DIE1,		// deathstate
 	S_SPOS_XDIE1,		// xdeathstate
-	sfx_podth2,		// deathsound
+	"shotguy/death1",		// deathsound
 	8,		// speed
 	20*FRACUNIT,		// radius
 	56*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_posact,		// activesound
+	"shotguy/active",		// activesound
 	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
 	S_SPOS_RAISE1		// raisestate
     },
@@ -1199,23 +1205,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_VILE_STND,		// spawnstate
 	700,		// spawnhealth
 	S_VILE_RUN1,		// seestate
-	sfx_vilsit,		// seesound
+	"vile/sight",		// seesound
 	8,		// reactiontime
 	0,		// attacksound
 	S_VILE_PAIN,		// painstate
 	10,		// painchance
-	sfx_vipain,		// painsound
+	"vile/pain",		// painsound
 	0,		// meleestate
 	S_VILE_ATK1,		// missilestate
 	S_VILE_DIE1,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_vildth,		// deathsound
+	"vile/death",		// deathsound
 	15,		// speed
 	20*FRACUNIT,		// radius
 	56*FRACUNIT,		// height
 	500,		// mass
 	0,		// damage
-	sfx_vilact,		// activesound
+	"vile/active",		// activesound
 	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
 	S_NULL		// raisestate
     },
@@ -1225,23 +1231,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_FIRE1,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_NOBLOCKMAP|MF_NOGRAVITY|MF_TRANSLUC50,		// flags
 	S_NULL		// raisestate
     },
@@ -1251,23 +1257,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_SKEL_STND,		// spawnstate
 	300,		// spawnhealth
 	S_SKEL_RUN1,		// seestate
-	sfx_skesit,		// seesound
+	"skeleton/sight",		// seesound
 	8,		// reactiontime
 	0,		// attacksound
 	S_SKEL_PAIN,		// painstate
 	100,		// painchance
-	sfx_popain,		// painsound
+	"skeleton/pain",		// painsound
 	S_SKEL_FIST1,		// meleestate
 	S_SKEL_MISS1,		// missilestate
 	S_SKEL_DIE1,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_skedth,		// deathsound
+	"skeleton/death",		// deathsound
 	10,		// speed
 	20*FRACUNIT,		// radius
 	56*FRACUNIT,		// height
 	500,		// mass
 	0,		// damage
-	sfx_skeact,		// activesound
+	"skeleton/active",		// activesound
 	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
 	S_SKEL_RAISE1		// raisestate
     },
@@ -1277,23 +1283,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_TRACER,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_skeatk,		// seesound
+	"skeleton/attack",		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_TRACEEXP1,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_barexp,		// deathsound
+	"skeleton/tracex",		// deathsound
 	10*FRACUNIT,		// speed
 	11*FRACUNIT,		// radius
 	8*FRACUNIT,		// height
 	100,		// mass
 	10,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_NOBLOCKMAP|MF_MISSILE|MF_DROPOFF|MF_NOGRAVITY|MF_TRANSLUC50,		// flags
 	S_NULL		// raisestate
     },
@@ -1303,23 +1309,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_SMOKE1,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_NOBLOCKMAP|MF_NOGRAVITY|MF_TRANSLUC50,		// flags
 	S_NULL		// raisestate
     },
@@ -1329,23 +1335,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_FATT_STND,		// spawnstate
 	600,		// spawnhealth
 	S_FATT_RUN1,		// seestate
-	sfx_mansit,		// seesound
+	"fatso/sight",		// seesound
 	8,		// reactiontime
 	0,		// attacksound
 	S_FATT_PAIN,		// painstate
 	80,		// painchance
-	sfx_mnpain,		// painsound
+	"fatso/pain",		// painsound
 	0,		// meleestate
 	S_FATT_ATK1,		// missilestate
 	S_FATT_DIE1,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_mandth,		// deathsound
+	"fatso/death",		// deathsound
 	8,		// speed
 	48*FRACUNIT,		// radius
 	64*FRACUNIT,		// height
 	1000,		// mass
 	0,		// damage
-	sfx_posact,		// activesound
+	"fatso/active",		// activesound
 	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
 	S_FATT_RAISE1		// raisestate
     },
@@ -1355,23 +1361,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_FATSHOT1,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_firsht,		// seesound
+	"fatso/attack",		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_FATSHOTX1,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_firxpl,		// deathsound
+	"fatso/shotx",		// deathsound
 	20*FRACUNIT,		// speed
 	6*FRACUNIT,		// radius
 	32*FRACUNIT,		// height
 	100,		// mass
 	8,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_NOBLOCKMAP|MF_MISSILE|MF_DROPOFF|MF_NOGRAVITY|MF_TRANSLUC50,		// flags
 	S_NULL		// raisestate
     },
@@ -1381,23 +1387,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_CPOS_STND,		// spawnstate
 	70,		// spawnhealth
 	S_CPOS_RUN1,		// seestate
-	sfx_posit2,		// seesound
+	"chainguy/sight1",		// seesound
 	8,		// reactiontime
 	0,		// attacksound
 	S_CPOS_PAIN,		// painstate
 	170,		// painchance
-	sfx_popain,		// painsound
+	"chainguy/pain",		// painsound
 	0,		// meleestate
 	S_CPOS_ATK1,		// missilestate
 	S_CPOS_DIE1,		// deathstate
 	S_CPOS_XDIE1,		// xdeathstate
-	sfx_podth2,		// deathsound
+	"chainguy/death1",		// deathsound
 	8,		// speed
 	20*FRACUNIT,		// radius
 	56*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_posact,		// activesound
+	"chainguy/active",		// activesound
 	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
 	S_CPOS_RAISE1		// raisestate
     },
@@ -1407,23 +1413,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_TROO_STND,		// spawnstate
 	60,		// spawnhealth
 	S_TROO_RUN1,		// seestate
-	sfx_bgsit1,		// seesound
+	"imp/sight1",		// seesound
 	8,		// reactiontime
 	0,		// attacksound
 	S_TROO_PAIN,		// painstate
 	200,		// painchance
-	sfx_popain,		// painsound
+	"imp/pain",		// painsound
 	S_TROO_ATK1,		// meleestate
 	S_TROO_ATK1,		// missilestate
 	S_TROO_DIE1,		// deathstate
 	S_TROO_XDIE1,		// xdeathstate
-	sfx_bgdth1,		// deathsound
+	"imp/death1",		// deathsound
 	8,		// speed
 	20*FRACUNIT,		// radius
 	56*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_bgact,		// activesound
+	"imp/active",		// activesound
 	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
 	S_TROO_RAISE1		// raisestate
     },
@@ -1433,23 +1439,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_SARG_STND,		// spawnstate
 	150,		// spawnhealth
 	S_SARG_RUN1,		// seestate
-	sfx_sgtsit,		// seesound
+	"demon/sight",		// seesound
 	8,		// reactiontime
-	sfx_sgtatk,		// attacksound
+	"demon/melee",		// attacksound
 	S_SARG_PAIN,		// painstate
 	180,		// painchance
-	sfx_dmpain,		// painsound
+	"demon/pain",		// painsound
 	S_SARG_ATK1,		// meleestate
 	0,		// missilestate
 	S_SARG_DIE1,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_sgtdth,		// deathsound
+	"demon/death",		// deathsound
 	10,		// speed
 	30*FRACUNIT,		// radius
 	56*FRACUNIT,		// height
 	400,		// mass
 	0,		// damage
-	sfx_dmact,		// activesound
+	"demon/active",		// activesound
 	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
 	S_SARG_RAISE1		// raisestate
     },
@@ -1459,23 +1465,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_SARG_STND,		// spawnstate
 	150,		// spawnhealth
 	S_SARG_RUN1,		// seestate
-	sfx_sgtsit,		// seesound
+	"spectre/sight",		// seesound
 	8,		// reactiontime
-	sfx_sgtatk,		// attacksound
+	"spectre/attack",		// attacksound
 	S_SARG_PAIN,		// painstate
 	180,		// painchance
-	sfx_dmpain,		// painsound
+	"spectre/pain",		// painsound
 	S_SARG_ATK1,		// meleestate
 	0,		// missilestate
 	S_SARG_DIE1,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_sgtdth,		// deathsound
+	"spectre/death",		// deathsound
 	10,		// speed
 	30*FRACUNIT,		// radius
 	56*FRACUNIT,		// height
 	400,		// mass
 	0,		// damage
-	sfx_dmact,		// activesound
+	"spectre/active",		// activesound
 	MF_SOLID|MF_SHOOTABLE|MF_SHADOW|MF_COUNTKILL,		// flags
 	S_SARG_RAISE1		// raisestate
     },
@@ -1485,23 +1491,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_HEAD_STND,		// spawnstate
 	400,		// spawnhealth
 	S_HEAD_RUN1,		// seestate
-	sfx_cacsit,		// seesound
+	"caco/sight",		// seesound
 	8,		// reactiontime
 	0,		// attacksound
 	S_HEAD_PAIN,		// painstate
 	128,		// painchance
-	sfx_dmpain,		// painsound
+	"caco/pain",		// painsound
 	0,		// meleestate
 	S_HEAD_ATK1,		// missilestate
 	S_HEAD_DIE1,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_cacdth,		// deathsound
+	"caco/death",		// deathsound
 	8,		// speed
 	31*FRACUNIT,		// radius
 	56*FRACUNIT,		// height
 	400,		// mass
 	0,		// damage
-	sfx_dmact,		// activesound
+	"caco/active",		// activesound
 	MF_SOLID|MF_SHOOTABLE|MF_FLOAT|MF_NOGRAVITY|MF_COUNTKILL,		// flags
 	S_HEAD_RAISE1		// raisestate
     },
@@ -1511,23 +1517,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_BOSS_STND,		// spawnstate
 	1000,		// spawnhealth
 	S_BOSS_RUN1,		// seestate
-	sfx_brssit,		// seesound
+	"baron/sight",		// seesound
 	8,		// reactiontime
 	0,		// attacksound
 	S_BOSS_PAIN,		// painstate
 	50,		// painchance
-	sfx_dmpain,		// painsound
+	"baron/pain",		// painsound
 	S_BOSS_ATK1,		// meleestate
 	S_BOSS_ATK1,		// missilestate
 	S_BOSS_DIE1,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_brsdth,		// deathsound
+	"baron/death",		// deathsound
 	8,		// speed
 	24*FRACUNIT,		// radius
 	64*FRACUNIT,		// height
 	1000,		// mass
 	0,		// damage
-	sfx_dmact,		// activesound
+	"baron/active",		// activesound
 	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
 	S_BOSS_RAISE1		// raisestate
     },
@@ -1537,23 +1543,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_BRBALL1,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_firsht,		// seesound
+	"baron/attack",		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_BRBALLX1,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_firxpl,		// deathsound
+	"baron/shotx",		// deathsound
 	15*FRACUNIT,		// speed
 	6*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	8,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_NOBLOCKMAP|MF_MISSILE|MF_DROPOFF|MF_NOGRAVITY|MF_TRANSLUC50,		// flags
 	S_NULL		// raisestate
     },
@@ -1563,23 +1569,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_BOS2_STND,		// spawnstate
 	500,		// spawnhealth
 	S_BOS2_RUN1,		// seestate
-	sfx_kntsit,		// seesound
+	"knight/sight",		// seesound
 	8,		// reactiontime
 	0,		// attacksound
 	S_BOS2_PAIN,		// painstate
 	50,		// painchance
-	sfx_dmpain,		// painsound
+	"knight/pain",		// painsound
 	S_BOS2_ATK1,		// meleestate
 	S_BOS2_ATK1,		// missilestate
 	S_BOS2_DIE1,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_kntdth,		// deathsound
+	"knight/death",		// deathsound
 	8,		// speed
 	24*FRACUNIT,		// radius
 	64*FRACUNIT,		// height
 	1000,		// mass
 	0,		// damage
-	sfx_dmact,		// activesound
+	"knight/active",		// activesound
 	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
 	S_BOS2_RAISE1		// raisestate
     },
@@ -1591,21 +1597,21 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_SKULL_RUN1,		// seestate
 	0,		// seesound
 	8,		// reactiontime
-	sfx_sklatk,		// attacksound
+	"skull/melee",		// attacksound
 	S_SKULL_PAIN,		// painstate
 	256,		// painchance
-	sfx_dmpain,		// painsound
+	"skull/pain",		// painsound
 	0,		// meleestate
 	S_SKULL_ATK1,		// missilestate
 	S_SKULL_DIE1,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_firxpl,		// deathsound
+	"skull/death",		// deathsound
 	8,		// speed
 	16*FRACUNIT,		// radius
 	56*FRACUNIT,		// height
 	50,		// mass
 	3,		// damage
-	sfx_dmact,		// activesound
+	"skull/active",		// activesound
 	MF_SOLID|MF_SHOOTABLE|MF_FLOAT|MF_NOGRAVITY,		// flags
 	S_NULL		// raisestate
     },
@@ -1615,23 +1621,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_SPID_STND,		// spawnstate
 	3000,		// spawnhealth
 	S_SPID_RUN1,		// seestate
-	sfx_spisit,		// seesound
+	"spider/sight",		// seesound
 	8,		// reactiontime
-	sfx_shotgn,		// attacksound
+	"spider/attack",		// attacksound
 	S_SPID_PAIN,		// painstate
 	40,		// painchance
-	sfx_dmpain,		// painsound
+	"spider/pain",		// painsound
 	0,		// meleestate
 	S_SPID_ATK1,		// missilestate
 	S_SPID_DIE1,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_spidth,		// deathsound
+	"spider/death",		// deathsound
 	12,		// speed
 	128*FRACUNIT,		// radius
 	100*FRACUNIT,		// height
 	1000,		// mass
 	0,		// damage
-	sfx_dmact,		// activesound
+	"spider/active",		// activesound
 	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
 	S_NULL		// raisestate
     },
@@ -1641,23 +1647,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_BSPI_STND,		// spawnstate
 	500,		// spawnhealth
 	S_BSPI_SIGHT,		// seestate
-	sfx_bspsit,		// seesound
+	"baby/sight",		// seesound
 	8,		// reactiontime
 	0,		// attacksound
 	S_BSPI_PAIN,		// painstate
 	128,		// painchance
-	sfx_dmpain,		// painsound
+	"baby/pain",		// painsound
 	0,		// meleestate
 	S_BSPI_ATK1,		// missilestate
 	S_BSPI_DIE1,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_bspdth,		// deathsound
+	"baby/death",		// deathsound
 	12,		// speed
 	64*FRACUNIT,		// radius
 	64*FRACUNIT,		// height
 	600,		// mass
 	0,		// damage
-	sfx_bspact,		// activesound
+	"baby/active",		// activesound
 	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
 	S_BSPI_RAISE1		// raisestate
     },
@@ -1667,23 +1673,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_CYBER_STND,		// spawnstate
 	4000,		// spawnhealth
 	S_CYBER_RUN1,		// seestate
-	sfx_cybsit,		// seesound
+	"cyber/sight",		// seesound
 	8,		// reactiontime
 	0,		// attacksound
 	S_CYBER_PAIN,		// painstate
 	20,		// painchance
-	sfx_dmpain,		// painsound
+	"cyber/pain",		// painsound
 	0,		// meleestate
 	S_CYBER_ATK1,		// missilestate
 	S_CYBER_DIE1,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_cybdth,		// deathsound
+	"cyber/death",		// deathsound
 	16,		// speed
 	40*FRACUNIT,		// radius
 	110*FRACUNIT,		// height
 	1000,		// mass
 	0,		// damage
-	sfx_dmact,		// activesound
+	"cyber/active",		// activesound
 	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
 	S_NULL		// raisestate
     },
@@ -1693,23 +1699,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_PAIN_STND,		// spawnstate
 	400,		// spawnhealth
 	S_PAIN_RUN1,		// seestate
-	sfx_pesit,		// seesound
+	"pain/sight",		// seesound
 	8,		// reactiontime
 	0,		// attacksound
 	S_PAIN_PAIN,		// painstate
 	128,		// painchance
-	sfx_pepain,		// painsound
+	"pain/pain",		// painsound
 	0,		// meleestate
 	S_PAIN_ATK1,		// missilestate
 	S_PAIN_DIE1,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_pedth,		// deathsound
+	"pain/death",		// deathsound
 	8,		// speed
 	31*FRACUNIT,		// radius
 	56*FRACUNIT,		// height
 	400,		// mass
 	0,		// damage
-	sfx_dmact,		// activesound
+	"pain/active",		// activesound
 	MF_SOLID|MF_SHOOTABLE|MF_FLOAT|MF_NOGRAVITY|MF_COUNTKILL,		// flags
 	S_PAIN_RAISE1		// raisestate
     },
@@ -1719,23 +1725,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_SSWV_STND,		// spawnstate
 	50,		// spawnhealth
 	S_SSWV_RUN1,		// seestate
-	sfx_sssit,		// seesound
+	"wolfss/sight",		// seesound
 	8,		// reactiontime
 	0,		// attacksound
 	S_SSWV_PAIN,		// painstate
 	170,		// painchance
-	sfx_popain,		// painsound
+	"wolfss/pain",		// painsound
 	0,		// meleestate
 	S_SSWV_ATK1,		// missilestate
 	S_SSWV_DIE1,		// deathstate
 	S_SSWV_XDIE1,		// xdeathstate
-	sfx_ssdth,		// deathsound
+	"wolfss/death",		// deathsound
 	8,		// speed
 	20*FRACUNIT,		// radius
 	56*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_posact,		// activesound
+	"wolfss/active",		// activesound
 	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL,		// flags
 	S_SSWV_RAISE1		// raisestate
     },
@@ -1745,23 +1751,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_KEENSTND,		// spawnstate
 	100,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_KEENPAIN,		// painstate
 	256,		// painchance
-	sfx_keenpn,		// painsound
+	"keen/pain",		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_COMMKEEN,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_keendt,		// deathsound
+	"keen/death",		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	72*FRACUNIT,		// height
 	10000000,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY|MF_SHOOTABLE|MF_COUNTKILL,		// flags
 	S_NULL		// raisestate
     },
@@ -1771,23 +1777,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_BRAIN,		// spawnstate
 	250,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_BRAIN_PAIN,		// painstate
 	255,		// painchance
-	sfx_bospn,		// painsound
+	"brain/pain",		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_BRAIN_DIE1,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_bosdth,		// deathsound
+	"brain/death",		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	86*FRACUNIT,		// height
 	10000000,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID|MF_SHOOTABLE,		// flags
 	S_NULL		// raisestate
     },
@@ -1797,23 +1803,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_BRAINEYE,		// spawnstate
 	1000,		// spawnhealth
 	S_BRAINEYESEE,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	32*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_NOBLOCKMAP|MF_NOSECTOR,		// flags
 	S_NULL		// raisestate
     },
@@ -1823,23 +1829,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_NULL,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	32*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_NOBLOCKMAP|MF_NOSECTOR,		// flags
 	S_NULL		// raisestate
     },
@@ -1849,23 +1855,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_SPAWN1,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_bospit,		// seesound
+	"brain/spit",		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_firxpl,		// deathsound
+	"brain/spawn",		// deathsound
 	10*FRACUNIT,		// speed
 	6*FRACUNIT,		// radius
 	32*FRACUNIT,		// height
 	100,		// mass
 	3,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_NOBLOCKMAP|MF_MISSILE|MF_DROPOFF|MF_NOGRAVITY|MF_NOCLIP,		// flags
 	S_NULL		// raisestate
     },
@@ -1875,23 +1881,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_SPAWNFIRE1,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	78*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_NOBLOCKMAP|MF_NOGRAVITY|MF_TRANSLUC50,		// flags
 	S_NULL		// raisestate
     },
@@ -1901,23 +1907,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_BAR1,		// spawnstate
 	20,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_BEXP,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_barexp,		// deathsound
+	"world/barrelx",		// deathsound
 	0,		// speed
 	10*FRACUNIT,		// radius
 	34*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID|MF_SHOOTABLE|MF_NOBLOOD,		// flags
 	S_NULL		// raisestate
     },
@@ -1927,24 +1933,24 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_TBALL1,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_firsht,		// seesound
+	"imp/attack",		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_TBALLX1,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_firxpl,		// deathsound
+	"imp/shotx",		// deathsound
 	10*FRACUNIT,		// speed
 	6*FRACUNIT,		// radius
 	8*FRACUNIT,		// height
 	100,		// mass
 	3,		// damage
-	sfx_None,		// activesound
-	MF_NOBLOCKMAP|MF_MISSILE|MF_DROPOFF|MF_NOGRAVITY|MF_TRANSLUC50,		// flags
+	NULL,		// activesound
+	MF_NOBLOCKMAP|MF_MISSILE|MF_DROPOFF|MF_NOGRAVITY|MF_TRANSLUC75,		// flags
 	S_NULL		// raisestate
     },
 
@@ -1953,23 +1959,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_RBALL1,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_firsht,		// seesound
+	"caco/attack",		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_RBALLX1,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_firxpl,		// deathsound
+	"caco/shotx",		// deathsound
 	10*FRACUNIT,		// speed
 	6*FRACUNIT,		// radius
 	8*FRACUNIT,		// height
 	100,		// mass
 	5,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_NOBLOCKMAP|MF_MISSILE|MF_DROPOFF|MF_NOGRAVITY|MF_TRANSLUC50,		// flags
 	S_NULL		// raisestate
     },
@@ -1979,23 +1985,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_ROCKET,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_rlaunc,		// seesound
+	"weapons/rocklf",		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_EXPLODE1,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_barexp,		// deathsound
+	"weapons/rocklx",		// deathsound
 	20*FRACUNIT,		// speed
 	11*FRACUNIT,		// radius
 	8*FRACUNIT,		// height
 	100,		// mass
 	20,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_NOBLOCKMAP|MF_MISSILE|MF_DROPOFF|MF_NOGRAVITY,		// flags
 	S_NULL		// raisestate
     },
@@ -2005,23 +2011,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_PLASBALL,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_plasma,		// seesound
+	"weapons/plasmaf",		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_PLASEXP,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_firxpl,		// deathsound
+	"weapons/plasmax",		// deathsound
 	25*FRACUNIT,		// speed
 	13*FRACUNIT,		// radius
 	8*FRACUNIT,		// height
 	100,		// mass
 	5,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_NOBLOCKMAP|MF_MISSILE|MF_DROPOFF|MF_NOGRAVITY|MF_TRANSLUC50,		// flags
 	S_NULL		// raisestate
     },
@@ -2033,21 +2039,21 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_NULL,		// seestate
 	0,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_BFGLAND,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_rxplod,		// deathsound
+	"weapons/bfgx",		// deathsound
 	25*FRACUNIT,		// speed
 	13*FRACUNIT,		// radius
 	8*FRACUNIT,		// height
 	100,		// mass
 	100,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_NOBLOCKMAP|MF_MISSILE|MF_DROPOFF|MF_NOGRAVITY|MF_TRANSLUC50,		// flags
 	S_NULL		// raisestate
     },
@@ -2057,23 +2063,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_ARACH_PLAZ,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_plasma,		// seesound
+	"baby/attack",		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_ARACH_PLEX,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_firxpl,		// deathsound
+	"baby/shotx",		// deathsound
 	25*FRACUNIT,		// speed
 	13*FRACUNIT,		// radius
 	8*FRACUNIT,		// height
 	100,		// mass
 	5,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_NOBLOCKMAP|MF_MISSILE|MF_DROPOFF|MF_NOGRAVITY|MF_TRANSLUC50,		// flags
 	S_NULL		// raisestate
     },
@@ -2083,23 +2089,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_PUFF1,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_NOBLOCKMAP|MF_NOGRAVITY|MF_TRANSLUC50,		// flags
 	S_NULL		// raisestate
     },
@@ -2109,23 +2115,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_BLOOD1,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_NOBLOCKMAP,		// flags
 	S_NULL		// raisestate
     },
@@ -2135,23 +2141,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_TFOG,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_NOBLOCKMAP|MF_NOGRAVITY|MF_TRANSLUC50,		// flags
 	S_NULL		// raisestate
     },
@@ -2161,23 +2167,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_IFOG,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_NOBLOCKMAP|MF_NOGRAVITY|MF_TRANSLUC50,		// flags
 	S_NULL		// raisestate
     },
@@ -2187,23 +2193,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_NULL,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_NOBLOCKMAP|MF_NOSECTOR,		// flags
 	S_NULL		// raisestate
     },
@@ -2213,23 +2219,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_BFGEXP,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_NOBLOCKMAP|MF_NOGRAVITY|MF_TRANSLUC50,		// flags
 	S_NULL		// raisestate
     },
@@ -2239,23 +2245,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_ARM1,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPECIAL,		// flags
 	S_NULL		// raisestate
     },
@@ -2265,23 +2271,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_ARM2,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPECIAL,		// flags
 	S_NULL		// raisestate
     },
@@ -2291,24 +2297,24 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_BON1,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
-	MF_SPECIAL|MF_COUNTITEM|MF_TRANSLUC75,		// flags
+	NULL,		// activesound
+	MF_SPECIAL|MF_COUNTITEM,		// flags
 	S_NULL		// raisestate
     },
 
@@ -2317,23 +2323,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_BON2,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPECIAL|MF_COUNTITEM,		// flags
 	S_NULL		// raisestate
     },
@@ -2343,23 +2349,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_BKEY,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPECIAL|MF_NOTDMATCH,		// flags
 	S_NULL		// raisestate
     },
@@ -2369,23 +2375,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_RKEY,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPECIAL|MF_NOTDMATCH,		// flags
 	S_NULL		// raisestate
     },
@@ -2395,23 +2401,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_YKEY,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPECIAL|MF_NOTDMATCH,		// flags
 	S_NULL		// raisestate
     },
@@ -2421,23 +2427,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_YSKULL,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPECIAL|MF_NOTDMATCH,		// flags
 	S_NULL		// raisestate
     },
@@ -2447,23 +2453,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_RSKULL,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPECIAL|MF_NOTDMATCH,		// flags
 	S_NULL		// raisestate
     },
@@ -2473,23 +2479,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_BSKULL,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPECIAL|MF_NOTDMATCH,		// flags
 	S_NULL		// raisestate
     },
@@ -2499,23 +2505,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_STIM,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPECIAL,		// flags
 	S_NULL		// raisestate
     },
@@ -2525,23 +2531,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_MEDI,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPECIAL,		// flags
 	S_NULL		// raisestate
     },
@@ -2551,23 +2557,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_SOUL,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPECIAL|MF_COUNTITEM|MF_TRANSLUC50,		// flags
 	S_NULL		// raisestate
     },
@@ -2577,23 +2583,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_PINV,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPECIAL|MF_COUNTITEM|MF_TRANSLUC50,		// flags
 	S_NULL		// raisestate
     },
@@ -2603,23 +2609,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_PSTR,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPECIAL|MF_COUNTITEM,		// flags
 	S_NULL		// raisestate
     },
@@ -2629,23 +2635,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_PINS,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPECIAL|MF_COUNTITEM|MF_TRANSLUC50,		// flags
 	S_NULL		// raisestate
     },
@@ -2655,23 +2661,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_SUIT,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	46*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPECIAL,		// flags
 	S_NULL		// raisestate
     },
@@ -2681,23 +2687,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_PMAP,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPECIAL|MF_COUNTITEM,		// flags
 	S_NULL		// raisestate
     },
@@ -2707,23 +2713,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_PVIS,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	10*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPECIAL|MF_COUNTITEM,		// flags
 	S_NULL		// raisestate
     },
@@ -2733,23 +2739,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_MEGA,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPECIAL|MF_COUNTITEM|MF_TRANSLUC50,		// flags
 	S_NULL		// raisestate
     },
@@ -2759,23 +2765,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_CLIP,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	10*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPECIAL,		// flags
 	S_NULL		// raisestate
     },
@@ -2785,23 +2791,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_AMMO,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPECIAL,		// flags
 	S_NULL		// raisestate
     },
@@ -2811,23 +2817,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_ROCK,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	26*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPECIAL,		// flags
 	S_NULL		// raisestate
     },
@@ -2837,23 +2843,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_BROK,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPECIAL,		// flags
 	S_NULL		// raisestate
     },
@@ -2863,23 +2869,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_CELL,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	10*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPECIAL,		// flags
 	S_NULL		// raisestate
     },
@@ -2889,23 +2895,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_CELP,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	18*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPECIAL,		// flags
 	S_NULL		// raisestate
     },
@@ -2915,23 +2921,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_SHEL,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	8*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPECIAL,		// flags
 	S_NULL		// raisestate
     },
@@ -2941,23 +2947,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_SBOX,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	10*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPECIAL,		// flags
 	S_NULL		// raisestate
     },
@@ -2967,23 +2973,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_BPAK,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	26*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPECIAL,		// flags
 	S_NULL		// raisestate
     },
@@ -2993,23 +2999,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_BFUG,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	20*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPECIAL,		// flags
 	S_NULL		// raisestate
     },
@@ -3019,23 +3025,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_MGUN,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPECIAL,		// flags
 	S_NULL		// raisestate
     },
@@ -3045,23 +3051,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_CSAW,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPECIAL,		// flags
 	S_NULL		// raisestate
     },
@@ -3071,23 +3077,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_LAUN,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPECIAL,		// flags
 	S_NULL		// raisestate
     },
@@ -3097,23 +3103,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_PLAS,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPECIAL,		// flags
 	S_NULL		// raisestate
     },
@@ -3123,23 +3129,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_SHOT,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPECIAL,		// flags
 	S_NULL		// raisestate
     },
@@ -3149,23 +3155,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_SHOT2,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPECIAL,		// flags
 	S_NULL		// raisestate
     },
@@ -3175,23 +3181,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_TECHLAMP,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	80*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID,		// flags
 	S_NULL		// raisestate
     },
@@ -3201,23 +3207,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_TECH2LAMP,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	60*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID,		// flags
 	S_NULL		// raisestate
     },
@@ -3227,23 +3233,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_COLU,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	48*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID,		// flags
 	S_NULL		// raisestate
     },
@@ -3253,23 +3259,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_TALLGRNCOL,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	52*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID,		// flags
 	S_NULL		// raisestate
     },
@@ -3279,23 +3285,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_SHRTGRNCOL,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	40*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID,		// flags
 	S_NULL		// raisestate
     },
@@ -3305,23 +3311,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_TALLREDCOL,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	52*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID,		// flags
 	S_NULL		// raisestate
     },
@@ -3331,23 +3337,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_SHRTREDCOL,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	40*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID,		// flags
 	S_NULL		// raisestate
     },
@@ -3357,23 +3363,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_SKULLCOL,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	40*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID,		// flags
 	S_NULL		// raisestate
     },
@@ -3383,23 +3389,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_HEARTCOL,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	40*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID,		// flags
 	S_NULL		// raisestate
     },
@@ -3409,23 +3415,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_EVILEYE,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	54*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID,		// flags
 	S_NULL		// raisestate
     },
@@ -3435,23 +3441,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_FLOATSKULL,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	26*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID,		// flags
 	S_NULL		// raisestate
     },
@@ -3461,23 +3467,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_TORCHTREE,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	56*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID,		// flags
 	S_NULL		// raisestate
     },
@@ -3487,23 +3493,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_BLUETORCH,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	68*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID,		// flags
 	S_NULL		// raisestate
     },
@@ -3513,23 +3519,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_GREENTORCH,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	68*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID,		// flags
 	S_NULL		// raisestate
     },
@@ -3539,23 +3545,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_REDTORCH,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	68*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID,		// flags
 	S_NULL		// raisestate
     },
@@ -3565,23 +3571,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_BTORCHSHRT,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
-	34*FRACUNIT,		// height
+	37*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID,		// flags
 	S_NULL		// raisestate
     },
@@ -3591,23 +3597,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_GTORCHSHRT,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
-	34*FRACUNIT,		// height
+	37*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID,		// flags
 	S_NULL		// raisestate
     },
@@ -3617,23 +3623,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_RTORCHSHRT,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
-	34*FRACUNIT,		// height
+	37*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID,		// flags
 	S_NULL		// raisestate
     },
@@ -3643,23 +3649,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_STALAGTITE,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	40*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID,		// flags
 	S_NULL		// raisestate
     },
@@ -3669,23 +3675,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_TECHPILLAR,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	128*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID,		// flags
 	S_NULL		// raisestate
     },
@@ -3695,23 +3701,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_CANDLESTIK,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	14*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	0,		// flags
 	S_NULL		// raisestate
     },
@@ -3721,23 +3727,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_CANDELABRA,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	60*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID,		// flags
 	S_NULL		// raisestate
     },
@@ -3747,23 +3753,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_BLOODYTWITCH,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	68*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
 	S_NULL		// raisestate
     },
@@ -3773,23 +3779,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_MEAT2,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	84*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
 	S_NULL		// raisestate
     },
@@ -3799,23 +3805,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_MEAT3,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	84*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
 	S_NULL		// raisestate
     },
@@ -3825,23 +3831,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_MEAT4,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	68*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
 	S_NULL		// raisestate
     },
@@ -3851,23 +3857,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_MEAT5,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	52*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
 	S_NULL		// raisestate
     },
@@ -3877,23 +3883,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_MEAT2,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	84*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
 	S_NULL		// raisestate
     },
@@ -3903,23 +3909,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_MEAT4,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	68*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
 	S_NULL		// raisestate
     },
@@ -3929,23 +3935,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_MEAT3,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	52*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
 	S_NULL		// raisestate
     },
@@ -3955,23 +3961,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_MEAT5,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	52*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
 	S_NULL		// raisestate
     },
@@ -3981,23 +3987,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_BLOODYTWITCH,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	68*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
 	S_NULL		// raisestate
     },
@@ -4007,23 +4013,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_HEAD_DIE6,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	38*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	0,		// flags
 	S_NULL		// raisestate
     },
@@ -4033,23 +4039,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_PLAY_DIE7,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	12*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	0,		// flags
 	S_NULL		// raisestate
     },
@@ -4059,23 +4065,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_POSS_DIE5,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	14*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	0,		// flags
 	S_NULL		// raisestate
     },
@@ -4085,23 +4091,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_SARG_DIE6,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	14*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	0,		// flags
 	S_NULL		// raisestate
     },
@@ -4111,23 +4117,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_SKULL_DIE6,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	0,		// flags
 	S_NULL		// raisestate
     },
@@ -4137,23 +4143,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_TROO_DIE5,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	18*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	0,		// flags
 	S_NULL		// raisestate
     },
@@ -4163,23 +4169,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_SPOS_DIE5,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	16*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	0,		// flags
 	S_NULL		// raisestate
     },
@@ -4189,23 +4195,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_PLAY_XDIE9,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	8*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	0,		// flags
 	S_NULL		// raisestate
     },
@@ -4215,23 +4221,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_PLAY_XDIE9,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	8*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	0,		// flags
 	S_NULL		// raisestate
     },
@@ -4241,23 +4247,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_HEADSONSTICK,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	64*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID,		// flags
 	S_NULL		// raisestate
     },
@@ -4267,23 +4273,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_GIBS,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	8*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	0,		// flags
 	S_NULL		// raisestate
     },
@@ -4293,23 +4299,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_HEADONASTICK,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	56*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID,		// flags
 	S_NULL		// raisestate
     },
@@ -4319,23 +4325,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_HEADCANDLES,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	42*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID,		// flags
 	S_NULL		// raisestate
     },
@@ -4345,23 +4351,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_DEADSTICK,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	64*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID,		// flags
 	S_NULL		// raisestate
     },
@@ -4371,23 +4377,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_LIVESTICK,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	64*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID,		// flags
 	S_NULL		// raisestate
     },
@@ -4397,23 +4403,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_BIGTREE,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	32*FRACUNIT,		// radius
 	108*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID,		// flags
 	S_NULL		// raisestate
     },
@@ -4423,23 +4429,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_BBAR1,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	32*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID,		// flags
 	S_NULL		// raisestate
     },
@@ -4449,23 +4455,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_HANGNOGUTS,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	88*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
 	S_NULL		// raisestate
     },
@@ -4475,23 +4481,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_HANGBNOBRAIN,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	88*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
 	S_NULL		// raisestate
     },
@@ -4501,23 +4507,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_HANGTLOOKDN,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	64*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
 	S_NULL		// raisestate
     },
@@ -4527,23 +4533,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_HANGTSKULL,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	64*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
 	S_NULL		// raisestate
     },
@@ -4553,23 +4559,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_HANGTLOOKUP,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	64*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
 	S_NULL		// raisestate
     },
@@ -4579,23 +4585,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_HANGTNOBRAIN,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	64*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_SOLID|MF_SPAWNCEILING|MF_NOGRAVITY,		// flags
 	S_NULL		// raisestate
     },
@@ -4605,23 +4611,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_COLONGIBS,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	4*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_NOBLOCKMAP,		// flags
 	S_NULL		// raisestate
     },
@@ -4631,23 +4637,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_SMALLPOOL,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	1*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_NOBLOCKMAP,		// flags
 	S_NULL		// raisestate
     },
@@ -4657,23 +4663,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_BRAINSTEM,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	20*FRACUNIT,		// radius
 	4*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_NOBLOCKMAP,		// flags
 	S_NULL		// raisestate
     },
@@ -4681,313 +4687,313 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	// [RH] Andy Baker's stealth monsters (next 12)
 
 	{		// MT_STEALTHBABY (ARACHNOTRON)
-	4050,		// doomednum
+	9050,		// doomednum
 	S_BSPI_STND,		// spawnstate
 	500,		// spawnhealth
 	S_BSPI_SIGHT,		// seestate
-	sfx_bspsit,		// seesound
+	"baby/sight",		// seesound
 	8,  // reactiontime
 	0,  // attacksound
 	S_BSPI_PAIN,  // painstate
 	128,  // painchance
-	sfx_dmpain,  // painsound
+	"baby/pain",  // painsound
 	0,  // meleestate
 	S_BSPI_ATK1,  // missilestate
 	S_BSPI_DIE1,  // deathstate
 	S_NULL,  // xdeathstate
-	sfx_bspdth,  // deathsound
+	"baby/death",  // deathsound
 	12,  // speed
 	64*FRACUNIT,  // radius
 	64*FRACUNIT,  // height
 	600,  // mass
 	0,  // damage
-	sfx_bspact,  // activesound
+	"baby/active",  // activesound
 	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_STEALTH,         // flags
 	S_BSPI_RAISE1  // raisestate
 	},
 
 	{           // MT_STEALTHVILE
-	4051,             // doomednum
+	9051,             // doomednum
 	S_VILE_STND,  // spawnstate
 	700,  // spawnhealth
 	S_VILE_RUN1,  // seestate
-	sfx_vilsit,  // seesound
+	"vile/sight",  // seesound
 	8,  // reactiontime
 	0,  // attacksound
 	S_VILE_PAIN,  // painstate
 	10,  // painchance
-	sfx_vipain,  // painsound
+	"vile/pain",  // painsound
 	0,  // meleestate
 	S_VILE_ATK1,  // missilestate
 	S_VILE_DIE1,  // deathstate
 	S_NULL,  // xdeathstate
-	sfx_vildth,  // deathsound
+	"vile/death",  // deathsound
 	15,  // speed
 	20*FRACUNIT,  // radius
 	56*FRACUNIT,  // height
 	500,  // mass
 	0,  // damage
-	sfx_vilact,  // activesound
+	"vile/active",  // activesound
 	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_STEALTH,             // flags
 	S_NULL  // raisestate
 	},
 
 	{           // MT_STEALTHBRUISER (BARONOFHELL)
-	4052,           // doomednum
+	9052,           // doomednum
 	S_BOSS_STND,  // spawnstate
 	1000,  // spawnhealth
 	S_BOSS_RUN1,  // seestate
-	sfx_brssit,  // seesound
+	"baron/sight",  // seesound
 	8,  // reactiontime
 	0,  // attacksound
 	S_BOSS_PAIN,  // painstate
 	50,  // painchance
-	sfx_dmpain,  // painsound
+	"baron/pain",  // painsound
 	S_BOSS_ATK1,  // meleestate
 	S_BOSS_ATK1,  // missilestate
 	S_BOSS_DIE1,  // deathstate
 	S_NULL,  // xdeathstate
-	sfx_brsdth,  // deathsound
+	"baron/death",  // deathsound
 	8,  // speed
 	24*FRACUNIT,  // radius
 	64*FRACUNIT,  // height
 	1000,  // mass
 	0,  // damage
-	sfx_dmact,  // activesound
+	"baron/active",  // activesound
 	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_STEALTH,        // flags
 	S_BOSS_RAISE1  // raisestate
 	},
 
 	{           // MT_STEALTHHEAD (CACODEMON)
-	4053,           // doomednum
+	9053,           // doomednum
 	S_HEAD_STND,  // spawnstate
 	400,  // spawnhealth
 	S_HEAD_RUN1,  // seestate
-	sfx_cacsit,  // seesound
+	"caco/sight",  // seesound
 	8,  // reactiontime
 	0,  // attacksound
 	S_HEAD_PAIN,  // painstate
 	128,  // painchance
-	sfx_dmpain,  // painsound
+	"caco/pain",  // painsound
 	0,  // meleestate
 	S_HEAD_ATK1,  // missilestate
 	S_HEAD_DIE1,  // deathstate
 	S_NULL,  // xdeathstate
-	sfx_cacdth,  // deathsound
+	"caco/death",  // deathsound
 	8,  // speed
 	31*FRACUNIT,  // radius
 	56*FRACUNIT,  // height
 	400,  // mass
 	0,  // damage
-	sfx_dmact,  // activesound
+	"caco/active",  // activesound
 	MF_SOLID|MF_SHOOTABLE|MF_FLOAT|MF_NOGRAVITY|MF_COUNTKILL|MF_STEALTH, // flags
 	S_HEAD_RAISE1  // raisestate
 	},
 
 	{               // MT_STEALTHCHAINGUY (CHAINGUNNER)
-	4054,           // doomednum
+	9054,           // doomednum
 	S_CPOS_STND,  // spawnstate
 	70,  // spawnhealth
 	S_CPOS_RUN1,  // seestate
-	sfx_posit2,  // seesound
+	"chainguy/sight1",  // seesound
 	8,  // reactiontime
 	0,  // attacksound
 	S_CPOS_PAIN,  // painstate
 	170,  // painchance
-	sfx_popain,  // painsound
+	"chainguy/pain",  // painsound
 	0,  // meleestate
 	S_CPOS_ATK1,  // missilestate
 	S_CPOS_DIE1,  // deathstate
 	S_CPOS_XDIE1,  // xdeathstate
-	sfx_podth2,  // deathsound
+	"chainguy/death",  // deathsound
 	8,  // speed
 	20*FRACUNIT,  // radius
 	56*FRACUNIT,  // height
 	100,  // mass
 	0,  // damage
-	sfx_posact,  // activesound
+	"chainguy/active",  // activesound
 	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_STEALTH, // flags
 	S_CPOS_RAISE1  // raisestate
 	},
 
 	{           // MT_STEALTHSERGEANT (DEMON)
-	4055,           // doomednum
+	9055,           // doomednum
 	S_SARG_STND,  // spawnstate
 	150,  // spawnhealth
 	S_SARG_RUN1,  // seestate
-	sfx_sgtsit,  // seesound
+	"demon/sight",  // seesound
 	8,  // reactiontime
-	sfx_sgtatk,  // attacksound
+	"demon/melee",  // attacksound
 	S_SARG_PAIN,  // painstate
 	180,  // painchance
-	sfx_dmpain,  // painsound
+	"demon/pain",  // painsound
 	S_SARG_ATK1,  // meleestate
 	0,  // missilestate
 	S_SARG_DIE1,  // deathstate
 	S_NULL,  // xdeathstate
-	sfx_sgtdth,  // deathsound
+	"demon/death",  // deathsound
 	10,  // speed
 	30*FRACUNIT,  // radius
 	56*FRACUNIT,  // height
 	400,  // mass
 	0,  // damage
-	sfx_dmact,  // activesound
+	"demon/active",  // activesound
 	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_STEALTH,      // flags
 	S_SARG_RAISE1  // raisestate
 	},
 
 	{           // MT_STEALTHKNIGHT
-	4056,             // doomednum
+	9056,             // doomednum
 	S_BOS2_STND,  // spawnstate
 	500,  // spawnhealth
 	S_BOS2_RUN1,  // seestate
-	sfx_kntsit,  // seesound
+	"knight/sight",  // seesound
 	8,  // reactiontime
 	0,  // attacksound
 	S_BOS2_PAIN,  // painstate
 	50,  // painchance
-	sfx_dmpain,  // painsound
+	"knight/pain",  // painsound
 	S_BOS2_ATK1,  // meleestate
 	S_BOS2_ATK1,  // missilestate
 	S_BOS2_DIE1,  // deathstate
 	S_NULL,  // xdeathstate
-	sfx_kntdth,  // deathsound
+	"knight/death",  // deathsound
 	8,  // speed
 	24*FRACUNIT,  // radius
 	64*FRACUNIT,  // height
 	1000,  // mass
 	0,  // damage
-	sfx_dmact,  // activesound
+	"knight/active",  // activesound
 	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_STEALTH,  // flags
 	S_BOS2_RAISE1  // raisestate
 	},
 
 	{           // MT_STEALTHTROOP (IMP)
-	4057,           // doomednum
+	9057,           // doomednum
 	S_TROO_STND,  // spawnstate
 	60,  // spawnhealth
 	S_TROO_RUN1,  // seestate
-	sfx_bgsit1,  // seesound
+	"imp/sight1",  // seesound
 	8,  // reactiontime
 	0,  // attacksound
 	S_TROO_PAIN,  // painstate
 	200,  // painchance
-	sfx_popain,  // painsound
+	"imp/pain",  // painsound
 	S_TROO_ATK1,  // meleestate
 	S_TROO_ATK1,  // missilestate
 	S_TROO_DIE1,  // deathstate
 	S_TROO_XDIE1,  // xdeathstate
-	sfx_bgdth1,  // deathsound
+	"imp/death1",  // deathsound
 	8,  // speed
 	20*FRACUNIT,  // radius
 	56*FRACUNIT,  // height
 	100,  // mass
 	0,  // damage
-	sfx_bgact,  // activesound
+	"imp/active",  // activesound
 	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_STEALTH, // flags
 	S_TROO_RAISE1  // raisestate
 	},
 
 	{           // MT_STEALTHFATSO
-	4058,             // doomednum
+	9058,             // doomednum
 	S_FATT_STND,  // spawnstate
 	600,  // spawnhealth
 	S_FATT_RUN1,  // seestate
-	sfx_mansit,  // seesound
+	"fatso/sight",  // seesound
 	8,  // reactiontime
 	0,  // attacksound
 	S_FATT_PAIN,  // painstate
 	80,  // painchance
-	sfx_mnpain,  // painsound
+	"fatso/pain",  // painsound
 	0,  // meleestate
 	S_FATT_ATK1,  // missilestate
 	S_FATT_DIE1,  // deathstate
 	S_NULL,  // xdeathstate
-	sfx_mandth,  // deathsound
+	"fatso/death",  // deathsound
 	8,  // speed
 	48*FRACUNIT,  // radius
 	64*FRACUNIT,  // height
 	1000,  // mass
 	0,  // damage
-	sfx_posact,  // activesound
-	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_STEALTH,             // flags
+	"fatso/active",  // activesound
+	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_STEALTH,  // flags
 	S_FATT_RAISE1  // raisestate
 	},
 
 	{           // MT_STEALTHUNDEAD
-	4059,             // doomednum
+	9059,             // doomednum
 	S_SKEL_STND,  // spawnstate
 	300,  // spawnhealth
 	S_SKEL_RUN1,  // seestate
-	sfx_skesit,  // seesound
+	"skeleton/sight",  // seesound
 	8,  // reactiontime
 	0,  // attacksound
 	S_SKEL_PAIN,  // painstate
 	100,  // painchance
-	sfx_popain,  // painsound
+	"skeleton/pain",  // painsound
 	S_SKEL_FIST1,  // meleestate
 	S_SKEL_MISS1,  // missilestate
 	S_SKEL_DIE1,  // deathstate
 	S_NULL,  // xdeathstate
-	sfx_skedth,  // deathsound
+	"skeleton/death",  // deathsound
 	10,  // speed
 	20*FRACUNIT,  // radius
 	56*FRACUNIT,  // height
 	500,  // mass
 	0,  // damage
-	sfx_skeact,  // activesound
+	"skeleton/active",  // activesound
 	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_STEALTH,       // flags
 	S_SKEL_RAISE1  // raisestate
 	},
 
 	{           // MT_STEALTHSHOTGUY
-	4060,              // doomednum
+	9060,              // doomednum
 	S_SPOS_STND,  // spawnstate
 	30,  // spawnhealth
 	S_SPOS_RUN1,  // seestate
-	sfx_posit2,  // seesound
+	"shotguy/sight1",  // seesound
 	8,  // reactiontime
 	0,  // attacksound
 	S_SPOS_PAIN,  // painstate
 	170,  // painchance
-	sfx_popain,  // painsound
+	"shotguy/pain",  // painsound
 	0,  // meleestate
 	S_SPOS_ATK1,  // missilestate
 	S_SPOS_DIE1,  // deathstate
 	S_SPOS_XDIE1,  // xdeathstate
-	sfx_podth2,  // deathsound
+	"shotguy/death1",  // deathsound
 	8,  // speed
 	20*FRACUNIT,  // radius
 	56*FRACUNIT,  // height
 	100,  // mass
 	0,  // damage
-	sfx_posact,  // activesound
+	"shotguy/active",  // activesound
 	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_STEALTH,             // flags
 	S_SPOS_RAISE1  // raisestate
 	},
 
 	{  // MT_STEALTHPOSSESSED
-	4061,           // doomednum
+	9061,           // doomednum
 	S_POSS_STND,  // spawnstate
 	20,  // spawnhealth
 	S_POSS_RUN1,  // seestate
-	sfx_posit1,  // seesound
+	"grunt/sight1",  // seesound
 	8,  // reactiontime
-	sfx_pistol,  // attacksound
+	"grunt/attack",  // attacksound
 	S_POSS_PAIN,  // painstate
 	200,  // painchance
-	sfx_popain,  // painsound
+	"grunt/pain",  // painsound
 	0,  // meleestate
 	S_POSS_ATK1,  // missilestate
 	S_POSS_DIE1,  // deathstate
 	S_POSS_XDIE1,  // xdeathstate
-	sfx_podth1,  // deathsound
+	"grunt/death1",  // deathsound
 	8,  // speed
 	20*FRACUNIT,  // radius
 	56*FRACUNIT,  // height
 	100,  // mass
 	0,  // damage
-	sfx_posact,  // activesound
+	"grunt/active",  // activesound
 	MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_STEALTH,             // flags
 	S_POSS_RAISE1  // raisestate
 	},
@@ -4997,23 +5003,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_GIB0,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	4*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_DROPOFF|MF_CORPSE,		// flags
 	S_NULL		// raisestate
     },
@@ -5023,23 +5029,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_GIB1,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	4*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_DROPOFF|MF_CORPSE,		// flags
 	S_NULL		// raisestate
     },
@@ -5049,23 +5055,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_GIB2,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	4*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_DROPOFF|MF_CORPSE,		// flags
 	S_NULL		// raisestate
     },
@@ -5075,23 +5081,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_GIB3,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	4*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_DROPOFF|MF_CORPSE,		// flags
 	S_NULL		// raisestate
     },
@@ -5101,23 +5107,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_GIB4,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	4*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_DROPOFF|MF_CORPSE,		// flags
 	S_NULL		// raisestate
     },
@@ -5127,23 +5133,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_GIB5,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	4*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_DROPOFF|MF_CORPSE,		// flags
 	S_NULL		// raisestate
     },
@@ -5153,23 +5159,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_GIB6,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	4*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_DROPOFF|MF_CORPSE,		// flags
 	S_NULL		// raisestate
     },
@@ -5179,23 +5185,23 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_GIB7,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	16*FRACUNIT,		// radius
 	4*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_DROPOFF|MF_CORPSE,		// flags
 	S_NULL		// raisestate
     },
@@ -5205,219 +5211,288 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = {
 	S_UNKNOWNTHING,		// spawnstate
 	1000,		// spawnhealth
 	S_NULL,		// seestate
-	sfx_None,		// seesound
+	NULL,		// seesound
 	8,		// reactiontime
-	sfx_None,		// attacksound
+	NULL,		// attacksound
 	S_NULL,		// painstate
 	0,		// painchance
-	sfx_None,		// painsound
+	NULL,		// painsound
 	S_NULL,		// meleestate
 	S_NULL,		// missilestate
 	S_NULL,		// deathstate
 	S_NULL,		// xdeathstate
-	sfx_None,		// deathsound
+	NULL,		// deathsound
 	0,		// speed
 	32*FRACUNIT,		// radius
 	56*FRACUNIT,		// height
 	100,		// mass
 	0,		// damage
-	sfx_None,		// activesound
+	NULL,		// activesound
 	MF_NOGRAVITY,		// flags
 	S_NULL		// raisestate
     },
 
-	// [RH] MT_AMBIENT0 - MT_AMBIENT63
-	{ 14001, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14002, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14003, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14004, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14005, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14006, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14007, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14008, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14009, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14010, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14011, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14012, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14013, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14014, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14015, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14016, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14017, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14018, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14019, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14020, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14021, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14022, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14023, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14024, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14025, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14026, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14027, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14028, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14029, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14030, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14031, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14032, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14033, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14034, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14035, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14036, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14037, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14038, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14039, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14040, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14041, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14042, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14043, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14044, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14045, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14046, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14047, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14048, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14049, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14050, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14051, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14052, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14053, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14054, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14055, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14056, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14057, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14058, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14059, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14060, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14061, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14062, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14063, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL },
-	{ 14064, S_NULL, 1000, S_NULL, sfx_None, 8, sfx_None, S_NULL, 0, sfx_None,
-	  S_NULL, S_NULL, S_NULL, S_NULL, sfx_None, 0, 16*FRACUNIT, 16*FRACUNIT,
-	  100, 0, sfx_None, MF_NOBLOCKMAP|MF_NOSECTOR, S_NULL }
+	{		// MT_MAPSPOT
+	9001,		// doomednum
+	S_TNT1,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	NULL,		// seesound
+	8,		// reactiontime
+	NULL,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	NULL,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	NULL,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	NULL,		// activesound
+	MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
+	{		// MT_MAPSPOTGRAV
+	9013,		// doomednum
+	S_TNT1,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	NULL,		// seesound
+	8,		// reactiontime
+	NULL,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	NULL,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	NULL,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	NULL,		// activesound
+	0,		// flags
+	S_NULL		// raisestate
+    },
+
+	{		// MT_BRIDGE
+	118,		// doomednum
+	S_BRIDGE1,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	NULL,		// seesound
+	8,		// reactiontime
+	NULL,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	NULL,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	NULL,		// deathsound
+	0,		// speed
+	36*FRACUNIT,		// radius
+	4*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	NULL,		// activesound
+	MF_SOLID|MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
+	// For use with wind and current effects
+	{		// MT_PUSH				// phares
+	5001,		// doomednum		//   |		//jff 5/11/98 deconflict
+	S_TNT1,		// spawnstate		//   V		// with DOSDoom
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	NULL,		// seesound
+	8,		// reactiontime
+	NULL,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	NULL,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	NULL,		// deathsound
+	0,		// speed
+	8,		// radius
+	8,		// height
+	10,		// mass
+	0,		// damage
+	NULL,		// activesound
+	MF_NOBLOCKMAP,		// flags
+	S_NULL		// raisestate
+	},
+
+	// For use with wind and current effects
+	{		// MT_PULL
+	5002,		// doomednum					//jff 5/11/98 deconflict
+	S_TNT1,		// spawnstate					// with DOSDoom
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	NULL,		// seesound
+	8,		// reactiontime
+	NULL,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	NULL,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	NULL,		// deathsound
+	0,		// speed
+	8,		// radius
+	8,		// height
+	10,		// mass
+	0,		// damage
+	NULL,		// activesound
+	MF_NOBLOCKMAP,		// flags
+	S_NULL		// raisestate
+	},
+
+	{		// [RH] MT_PATHNODE -- used for monster patrols
+	9024,		// doomednum
+	S_TNT1,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	NULL,		// seesound
+	8,		// reactiontime
+	NULL,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	NULL,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	NULL,		// deathsound
+	0,		// speed
+	8,		// radius
+	8,		// height
+	10,		// mass
+	0,		// damage
+	NULL,		// activesound
+	MF_NOBLOCKMAP,		// flags
+	S_NULL		// raisestate
+	},
+
+	{		// [RH] MT_AMBIENT (subsumes MT_AMBIENT0-MT_AMBIENT63)
+	14065,		// doomednum
+	S_AMBIENTSOUND,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	NULL,		// seesound
+	8,		// reactiontime
+	NULL,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	NULL,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	NULL,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	NULL,		// activesound
+	MF_NOBLOCKMAP|MF_NOSECTOR,		// flags
+	S_NULL		// raisestate
+	},
+
+	{		// [RH] MT_SWITCHTEMP (temporary mobj for switch sounds)
+	-1,		// doomednum
+	S_SWITCHTEMP,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	NULL,		// seesound
+	8,		// reactiontime
+	NULL,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	NULL,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	NULL,		// deathsound
+	0,		// speed
+	16*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	NULL,		// activesound
+	MF_NOBLOCKMAP|MF_NOSECTOR,		// flags
+	S_NULL		// raisestate
+	},
+
+    {		// [RH] MT_TELEPORTMAN2 - Height-sensitive teleport destination
+	9044,		// doomednum
+	S_NULL,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	NULL,		// seesound
+	8,		// reactiontime
+	NULL,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	NULL,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	NULL,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	NULL,		// activesound
+	MF_NOBLOCKMAP|MF_NOSECTOR,		// flags
+	S_NULL		// raisestate
+    },
+
+    {		// [RH] MT_CAMERA
+	9025,		// doomednum
+	S_TNT1,		// spawnstate
+	1000,		// spawnhealth
+	S_NULL,		// seestate
+	NULL,		// seesound
+	8,		// reactiontime
+	NULL,		// attacksound
+	S_NULL,		// painstate
+	0,		// painchance
+	NULL,		// painsound
+	S_NULL,		// meleestate
+	S_NULL,		// missilestate
+	S_NULL,		// deathstate
+	S_NULL,		// xdeathstate
+	NULL,		// deathsound
+	0,		// speed
+	20*FRACUNIT,		// radius
+	16*FRACUNIT,		// height
+	100,		// mass
+	0,		// damage
+	NULL,		// activesound
+	MF_NOBLOCKMAP|MF_NOGRAVITY,		// flags
+	S_NULL		// raisestate
+    },
+
 };
 
diff --git a/code/Info.h b/code/Info.h
index adb11190fd..a001ba053f 100644
--- a/code/Info.h
+++ b/code/Info.h
@@ -167,6 +167,7 @@ typedef enum
 	SPR_BRS1,
 	SPR_TLMP,
 	SPR_TLP2,
+	SPR_TNT1,
 	// [RH] Gibs
 	SPR_GIB0,
 	SPR_GIB1,
@@ -178,6 +179,7 @@ typedef enum
 	SPR_GIB7,
 	// [RH] Dummy for unknown mapthing
 	SPR_UNKN,
+	SPR_TLGL,
 	NUMSPRITES
 
 } spritenum_t;
@@ -1151,6 +1153,7 @@ typedef enum
 	S_TECH2LAMP2,
 	S_TECH2LAMP3,
 	S_TECH2LAMP4,
+	S_TNT1,
 	// [RH] gibs
 	S_GIB0,
 	S_GIB1,
@@ -1162,6 +1165,12 @@ typedef enum
 	S_GIB7,
 	S_AMBIENTSOUND,
 	S_UNKNOWNTHING,
+	S_BRIDGE1,
+	S_BRIDGE2,
+	S_BRIDGE3,
+	S_BRIDGE4,
+	S_BRIDGE5,
+	S_SWITCHTEMP,
 	NUMSTATES
 } statenum_t;
 
@@ -1333,7 +1342,7 @@ typedef enum {
 	MT_STEALTHUNDEAD,
 	MT_STEALTHSHOTGUY,
 	MT_STEALTHZOMBIE,
-	// [RH] Gibs
+	// [RH] Gibs (code is disabled)
 	MT_GIB0,
 	MT_GIB1,
 	MT_GIB2,
@@ -1342,72 +1351,18 @@ typedef enum {
 	MT_GIB5,
 	MT_GIB6,
 	MT_GIB7,
+	// [RH] Miscellaneous things
 	MT_UNKNOWNTHING,
-	// [RH] Ambient sounds (up to 64)
-	MT_AMBIENT0,
-	MT_AMBIENT1,
-	MT_AMBIENT2,
-	MT_AMBIENT3,
-	MT_AMBIENT4,
-	MT_AMBIENT5,
-	MT_AMBIENT6,
-	MT_AMBIENT7,
-	MT_AMBIENT8,
-	MT_AMBIENT9,
-	MT_AMBIENT10,
-	MT_AMBIENT11,
-	MT_AMBIENT12,
-	MT_AMBIENT13,
-	MT_AMBIENT14,
-	MT_AMBIENT15,
-	MT_AMBIENT16,
-	MT_AMBIENT17,
-	MT_AMBIENT18,
-	MT_AMBIENT19,
-	MT_AMBIENT20,
-	MT_AMBIENT21,
-	MT_AMBIENT22,
-	MT_AMBIENT23,
-	MT_AMBIENT24,
-	MT_AMBIENT25,
-	MT_AMBIENT26,
-	MT_AMBIENT27,
-	MT_AMBIENT28,
-	MT_AMBIENT29,
-	MT_AMBIENT30,
-	MT_AMBIENT31,
-	MT_AMBIENT32,
-	MT_AMBIENT33,
-	MT_AMBIENT34,
-	MT_AMBIENT35,
-	MT_AMBIENT36,
-	MT_AMBIENT37,
-	MT_AMBIENT38,
-	MT_AMBIENT39,
-	MT_AMBIENT40,
-	MT_AMBIENT41,
-	MT_AMBIENT42,
-	MT_AMBIENT43,
-	MT_AMBIENT44,
-	MT_AMBIENT45,
-	MT_AMBIENT46,
-	MT_AMBIENT47,
-	MT_AMBIENT48,
-	MT_AMBIENT49,
-	MT_AMBIENT50,
-	MT_AMBIENT51,
-	MT_AMBIENT52,
-	MT_AMBIENT53,
-	MT_AMBIENT54,
-	MT_AMBIENT55,
-	MT_AMBIENT56,
-	MT_AMBIENT57,
-	MT_AMBIENT58,
-	MT_AMBIENT59,
-	MT_AMBIENT60,
-	MT_AMBIENT61,
-	MT_AMBIENT62,
-	MT_AMBIENT63,
+	MT_MAPSPOT,
+	MT_MAPSPOTGRAV,
+	MT_BRIDGE,
+	MT_PUSH,		// Boom's push thing
+	MT_PULL,		// Boom's pull thing
+	MT_PATHNODE,
+	MT_AMBIENT,		// Ambient sounds
+	MT_SWITCHTEMP,	// Temporary mobj for switch sounds
+	MT_TELEPORTMAN2,// Teleport destination that pays attention to its height
+	MT_CAMERA,		// Camera used for "cutscenes"
 	NUMMOBJTYPES
 
 } mobjtype_t;
@@ -1418,23 +1373,23 @@ typedef struct
 	int spawnstate;
 	int spawnhealth;
 	int seestate;
-	int seesound;
+	char *seesound;		// [RH] not int
 	int reactiontime;
-	int attacksound;
+	char *attacksound;	// [RH] not int
 	int painstate;
 	int painchance;
-	int painsound;
+	char *painsound;	// [RH] not int
 	int meleestate;
 	int missilestate;
 	int deathstate;
 	int xdeathstate;
-	int deathsound;
+	char *deathsound;	// [RH] not int
 	int speed;
 	int radius;
 	int height;
 	int mass;
 	int damage;
-	int activesound;
+	char *activesound;	// [RH] not int
 	int flags;
 	int raisestate;
 
diff --git a/code/M_cheat.c b/code/M_cheat.c
index 21c70f27c7..d910eec873 100644
--- a/code/M_cheat.c
+++ b/code/M_cheat.c
@@ -114,9 +114,9 @@ void cht_DoCheat (player_t *player, int cheat)
 		case CHT_IDDQD:
 			if (!(player->cheats & CF_GODMODE)) {
 				if (player->mo)
-					player->mo->health = deh_GodHealth;
+					player->mo->health = deh.GodHealth;
 
-				player->health = deh_GodHealth;
+				player->health = deh.GodHealth;
 			}
 		case CHT_GOD:
 			player->cheats ^= CF_GODMODE;
@@ -153,8 +153,8 @@ void cht_DoCheat (player_t *player, int cheat)
 			cht_Give (player, "weapons");
 			cht_Give (player, "ammo");
 			cht_Give (player, "keys");
-			player->armorpoints = deh_KFAArmor;
-			player->armortype = deh_KFAAC;
+			player->armorpoints = deh.KFAArmor;
+			player->armortype = deh.KFAAC;
 			msg = STSTR_KFAADDED;
 			break;
 
@@ -162,8 +162,8 @@ void cht_DoCheat (player_t *player, int cheat)
 			cht_Give (player, "backpack");
 			cht_Give (player, "weapons");
 			cht_Give (player, "ammo");
-			player->armorpoints = deh_FAArmor;
-			player->armortype = deh_FAAC;
+			player->armorpoints = deh.FAArmor;
+			player->armortype = deh.FAAC;
 			msg = STSTR_FAADDED;
 			break;
 
@@ -201,10 +201,15 @@ void cht_DoCheat (player_t *player, int cheat)
 					if (currentthinker->function.acp1 == (actionf_p1) P_MobjThinker &&
 						(((mobj_t *) currentthinker)->flags & MF_COUNTKILL ||
 						 ((mobj_t *) currentthinker)->type == MT_SKULL))
-						{ // killough 3/6/98: kill even if PE is dead
+						{
+							if (((mobj_t *) currentthinker)->flags2 & MF2_INDESTRUCTABLE)
+								continue;	// [RH] Don't kill if indestructable
+
+							// killough 3/6/98: kill even if PE is dead
 							if (((mobj_t *) currentthinker)->health > 0)
 							{
 								killcount++;
+								((mobj_t *)currentthinker)->flags2 &= ~MF2_INVULNERABLE;
 								P_DamageMobj((mobj_t *)currentthinker, NULL, NULL, 10000, MOD_UNKNOWN);
 							}
 							if (((mobj_t *) currentthinker)->type == MT_PAIN)
@@ -223,7 +228,7 @@ void cht_DoCheat (player_t *player, int cheat)
 	if (player == &players[consoleplayer])
 		Printf ("%s\n", msg);
 	else
-		Printf ("%s is cheating: %s\n", player->userinfo->netname, msg);
+		Printf ("%s is a cheater: %s\n", player->userinfo.netname, msg);
 }
 
 void cht_Give (player_t *player, char *name)
@@ -233,7 +238,7 @@ void cht_Give (player_t *player, char *name)
 	gitem_t *it;
 
 	if (player != &players[consoleplayer])
-		Printf ("%s is cheating: give %s\n", player->userinfo->netname, name);
+		Printf ("%s is a cheater: give %s\n", player->userinfo.netname, name);
 
 	if (stricmp (name, "all") == 0)
 		giveall = true;
@@ -252,9 +257,9 @@ void cht_Give (player_t *player, char *name)
 			}
 		} else {
 			if (player->mo)
-				player->mo->health = deh_GodHealth;
+				player->mo->health = deh.GodHealth;
 	  
-			player->health = deh_GodHealth;
+			player->health = deh.GodHealth;
 		}
 
 		if (!giveall)
@@ -332,7 +337,7 @@ void cht_Give (player_t *player, char *name)
 		P_GiveWeapon (player, it->offset, 0);
 	} else if (it->flags & IT_KEY) {
 		P_GiveCard (player, it->offset);
-	} else if (it->flags & IT_POWER) {
+	} else if (it->flags & IT_POWERUP) {
 		P_GivePower (player, it->offset);
 	} else if (it->flags & IT_ARMOR) {
 		P_GiveArmor (player, it->offset);
diff --git a/code/M_menu.c b/code/M_menu.c
index 3c2033093b..97516b8aa0 100644
--- a/code/M_menu.c
+++ b/code/M_menu.c
@@ -60,14 +60,12 @@
 
 #include "m_argv.h"
 #include "m_swap.h"
+#include "m_random.h"
 
 #include "s_sound.h"
 
 #include "doomstat.h"
 
-// Data.
-#include "sounds.h"
-
 #include "m_menu.h"
 
 #include "v_text.h"
@@ -102,6 +100,7 @@ void	(*messageRoutine)(int response);
 
 // we are going to be entering a savegame string
 int 				genStringEnter;
+int					genStringLen;	// [RH] Max # of chars that can be entered
 void	(*genStringEnd)(int slot);
 int 				saveSlot;		// which slot to save in
 int 				saveCharIndex;	// which char we're editing
@@ -117,52 +116,19 @@ BOOL 				menuactive;
 extern BOOL			sendpause;
 char				savegamestrings[10][SAVESTRINGSIZE];
 
-char	endstring[160];
+char				endstring[160];
 
 
-//
-// MENU TYPEDEFS
-//
-typedef struct
-{
-	// -1 = no cursor here, 1 = ok, 2 = arrows ok
-	short		status;
-	
-	char		name[10];
-	
-	// choice = menu item #.
-	// if status = 2,
-	//	 choice=0:leftarrow,1:rightarrow
-	void		(*routine)(int choice);
-	
-	// hotkey in menu
-	char		alphaKey;						
-} menuitem_t;
-
-
-
-typedef struct menu_s
-{
-	short				numitems;		// # of menu items
-	struct menu_s*		prevMenu;		// previous menu
-	menuitem_t* 		menuitems;		// menu items
-	void				(*routine)();	// draw routine
-	short				x;
-	short				y;				// x,y of menu
-	short				lastOn; 		// last item user was on in menu
-} menu_t;
-
-short			itemOn; 				// menu item skull is on
-short			skullAnimCounter;		// skull animation counter
-short			whichSkull; 			// which skull to draw
-BOOL			drawSkull;				// [RH] don't always draw skull
+short				itemOn; 			// menu item skull is on
+short				skullAnimCounter;	// skull animation counter
+short				whichSkull; 		// which skull to draw
+BOOL				drawSkull;			// [RH] don't always draw skull
 
 // graphic name of skulls
-// warning: initializer-string for array of chars is too long
-char	skullName[2][/*8*/9] = {"M_SKULL1","M_SKULL2"};
+char				skullName[2][9] = {"M_SKULL1", "M_SKULL2"};
 
 // current menudef
-menu_t* currentMenu;						  
+oldmenu_t *currentMenu;						  
 
 //
 // PROTOTYPES
@@ -199,10 +165,10 @@ void M_DrawSound(void);
 void M_DrawLoad(void);
 void M_DrawSave(void);
 
-void M_DrawSaveLoadBorder(int x,int y);
-void M_SetupNextMenu(menu_t *menudef);
-void M_DrawEmptyCell(menu_t *menu,int item);
-void M_DrawSelCell(menu_t *menu,int item);
+void M_DrawSaveLoadBorder(int x,int y, int len);
+void M_SetupNextMenu(oldmenu_t *menudef);
+void M_DrawEmptyCell(oldmenu_t *menu,int item);
+void M_DrawSelCell(oldmenu_t *menu,int item);
 int  M_StringHeight(char *string);
 void M_StartControlPanel(void);
 void M_StartMessage(char *string,void *routine,BOOL input);
@@ -214,13 +180,21 @@ static void M_PlayerSetup (int choice);
 static void M_PlayerSetupTicker (void);
 static void M_PlayerSetupDrawer (void);
 static void M_EditPlayerName (int choice);
+static void M_EditPlayerTeam (int choice);
+static void M_PlayerTeamChanged (int choice);
 static void M_PlayerNameChanged (int choice);
 static void M_SlidePlayerRed (int choice);
 static void M_SlidePlayerGreen (int choice);
 static void M_SlidePlayerBlue (int choice);
+static void M_ChangeGender (int choice);
+static void M_ChangeSkin (int choice);
 static void M_ChangeAutoAim (int choice);
 BOOL M_DemoNoPlay;
 
+static screen_t FireScreen;
+static BOOL FireGood;
+static int FireWidth, FireHeight;
+
 
 //
 // DOOM MENU
@@ -237,7 +211,7 @@ enum
 	main_end
 } main_e;
 
-menuitem_t MainMenu[]=
+oldmenuitem_t MainMenu[]=
 {
 	{1,"M_NGAME",M_NewGame,'n'},
 	{1,"M_LOADG",M_LoadGame,'l'},
@@ -249,7 +223,7 @@ menuitem_t MainMenu[]=
 	{1,"M_QUITG",M_QuitDOOM,'q'}
 };
 
-menu_t	MainDef =
+oldmenu_t MainDef =
 {
 	main_end,
 	NULL,
@@ -272,7 +246,7 @@ enum
 	ep_end
 } episodes_e;
 
-menuitem_t EpisodeMenu[]=
+oldmenuitem_t EpisodeMenu[]=
 {
 	{1,"M_EPI1", M_Episode,'k'},
 	{1,"M_EPI2", M_Episode,'t'},
@@ -280,11 +254,11 @@ menuitem_t EpisodeMenu[]=
 	{1,"M_EPI4", M_Episode,'t'}
 };
 
-menu_t	EpiDef =
+oldmenu_t EpiDef =
 {
 	ep_end, 			// # of menu items
 	&MainDef,			// previous menu
-	EpisodeMenu,		// menuitem_t ->
+	EpisodeMenu,		// oldmenuitem_t ->
 	M_DrawEpisode,		// drawing routine ->
 	48,63,				// x,y
 	ep1 				// lastOn
@@ -303,7 +277,7 @@ enum
 	newg_end
 } newgame_e;
 
-menuitem_t NewGameMenu[]=
+oldmenuitem_t NewGameMenu[]=
 {
 	{1,"M_JKILL",		M_ChooseSkill, 'i'},
 	{1,"M_ROUGH",		M_ChooseSkill, 'h'},
@@ -312,11 +286,11 @@ menuitem_t NewGameMenu[]=
 	{1,"M_NMARE",		M_ChooseSkill, 'n'}
 };
 
-menu_t	NewDef =
+oldmenu_t NewDef =
 {
 	newg_end,			// # of menu items
 	&EpiDef,			// previous menu
-	NewGameMenu,		// menuitem_t ->
+	NewGameMenu,		// oldmenuitem_t ->
 	M_DrawNewGame,		// drawing routine ->
 	48,63,				// x,y
 	hurtme				// lastOn
@@ -326,38 +300,39 @@ menu_t	NewDef =
 //
 // [RH] Player Setup Menu
 //
+byte FireRemap[256];
 
 enum
 {
 	playername,
-	playerpad1,
-	playerpad2,
+	playerteam,
 	playerred,
 	playergreen,
 	playerblue,
-	playerpad3,
+	playersex,
+	playerskin,
 	playeraim,
 	psetup_end
 } psetup_e;
 
-menuitem_t PlayerSetupMenu[] =
+oldmenuitem_t PlayerSetupMenu[] =
 {
 	{ 1,"", M_EditPlayerName, 'n' },
-	{ -1,"",NULL, 0 },
-	{ -1,"",NULL, 0 },
+	{ 1,"", M_EditPlayerTeam, 't' },
 	{ 2,"", M_SlidePlayerRed, 'r' },
 	{ 2,"", M_SlidePlayerGreen, 'g' },
 	{ 2,"", M_SlidePlayerBlue, 'b' },
-	{ -1,"",NULL, 0 },
+	{ 2,"", M_ChangeGender, 'e' },
+	{ 2,"", M_ChangeSkin, 's' },
 	{ 2,"", M_ChangeAutoAim, 'a' }
 };
 
-menu_t PSetupDef = {
+oldmenu_t PSetupDef = {
 	psetup_end,
 	&MainDef,
 	PlayerSetupMenu,
 	M_PlayerSetupDrawer,
-	48,	63,
+	48,	47,
 	playername
 };
 
@@ -368,7 +343,7 @@ menu_t PSetupDef = {
 //
 BOOL OptionsActive;
 
-menu_t	OptionsDef =
+oldmenu_t OptionsDef =
 {
 	0,
 	&MainDef,
@@ -387,12 +362,12 @@ enum
 	read1_end
 } read_e;
 
-menuitem_t ReadMenu1[] =
+oldmenuitem_t ReadMenu1[] =
 {
 	{1,"",M_ReadThis2,0}
 };
 
-menu_t	ReadDef1 =
+oldmenu_t	ReadDef1 =
 {
 	read1_end,
 	&MainDef,
@@ -408,12 +383,12 @@ enum
 	read2_end
 } read_e2;
 
-menuitem_t ReadMenu2[]=
+oldmenuitem_t ReadMenu2[]=
 {
 	{1,"",M_FinishReadThis,0}
 };
 
-menu_t	ReadDef2 =
+oldmenu_t ReadDef2 =
 {
 	read2_end,
 	&ReadDef1,
@@ -439,7 +414,7 @@ enum
 	load_end
 } load_e;
 
-menuitem_t LoadMenu[]=
+oldmenuitem_t LoadMenu[]=
 {
 	{1,"", M_LoadSelect,'1'},
 	{1,"", M_LoadSelect,'2'},
@@ -451,7 +426,7 @@ menuitem_t LoadMenu[]=
 	{1,"", M_LoadSelect,'8'},
 };
 
-menu_t	LoadDef =
+oldmenu_t LoadDef =
 {
 	load_end,
 	&MainDef,
@@ -464,7 +439,7 @@ menu_t	LoadDef =
 //
 // SAVE GAME MENU
 //
-menuitem_t SaveMenu[]=
+oldmenuitem_t SaveMenu[]=
 {
 	{1,"", M_SaveSelect,'1'},
 	{1,"", M_SaveSelect,'2'},
@@ -476,7 +451,7 @@ menuitem_t SaveMenu[]=
 	{1,"", M_SaveSelect,'8'}
 };
 
-menu_t	SaveDef =
+oldmenu_t SaveDef =
 {
 	load_end,
 	&MainDef,
@@ -492,20 +467,20 @@ menu_t	SaveDef =
 void Cmd_Menu_Main (void *plyr, int argc, char **argv)
 {
 	M_StartControlPanel ();
-	S_StartSound(ORIGIN_AMBIENT,sfx_swtchn);
+	S_StartSound(ORIGIN_AMBIENT, "switches/normbutn", 100);
 }
 
 void Cmd_Menu_Load (void *plyr, int argc, char **argv)
 {	// F3
 	M_StartControlPanel();
-	S_StartSound(ORIGIN_AMBIENT,sfx_swtchn);
+	S_StartSound(ORIGIN_AMBIENT, "switches/normbutn", 100);
 	M_LoadGame(0);
 }
 
 void Cmd_Menu_Save (void *plyr, int argc, char **argv)
 {	// F2
 	M_StartControlPanel();
-	S_StartSound(ORIGIN_AMBIENT,sfx_swtchn);
+	S_StartSound(ORIGIN_AMBIENT, "switches/normbutn", 100);
 	M_SaveGame(0);
 }
 
@@ -520,51 +495,51 @@ void Cmd_Menu_Help (void *plyr, int argc, char **argv)
 	
 	itemOn = 0;
 	drawSkull = false;
-	S_StartSound(ORIGIN_AMBIENT,sfx_swtchn);
+	S_StartSound(ORIGIN_AMBIENT, "switches/normbutn", 100);
 }
 
 void Cmd_Quicksave (void *plyr, int argc, char **argv)
 {	// F6
-	S_StartSound(ORIGIN_AMBIENT,sfx_swtchn);
+	S_StartSound(ORIGIN_AMBIENT, "switches/normbutn", 100);
 	M_QuickSave();
 }
 
 void Cmd_Quickload (void *plyr, int argc, char **argv)
 {	// F9
-	S_StartSound(ORIGIN_AMBIENT,sfx_swtchn);
+	S_StartSound(ORIGIN_AMBIENT, "switches/normbutn", 100);
 	M_QuickLoad();
 }
 
 void Cmd_Menu_Endgame (void *plyr, int argc, char **argv)
 {	// F7
-	S_StartSound(ORIGIN_AMBIENT,sfx_swtchn);
+	S_StartSound(ORIGIN_AMBIENT, "switches/normbutn", 100);
 	M_EndGame(0);
 }
 
 void Cmd_Menu_Quit (void *plyr, int argc, char **argv)
 {	// F10
-	S_StartSound(ORIGIN_AMBIENT,sfx_swtchn);
+	S_StartSound(ORIGIN_AMBIENT, "switches/normbutn", 100);
 	M_QuitDOOM(0);
 }
 
 void Cmd_Menu_Game (void *plyr, int argc, char **argv)
 {
 	M_StartControlPanel ();
-	S_StartSound(ORIGIN_AMBIENT,sfx_swtchn);
+	S_StartSound(ORIGIN_AMBIENT, "switches/normbutn", 100);
 	M_NewGame(0);
 }
 								
 void Cmd_Menu_Options (void *plyr, int argc, char **argv)
 {
 	M_StartControlPanel ();
-	S_StartSound(ORIGIN_AMBIENT,sfx_swtchn);
+	S_StartSound(ORIGIN_AMBIENT, "switches/normbutn", 100);
 	M_Options(0);
 }
 
 void Cmd_Menu_Player (void *plyr, int argc, char **argv)
 {
 	M_StartControlPanel ();
-	S_StartSound(ORIGIN_AMBIENT,sfx_swtchn);
+	S_StartSound(ORIGIN_AMBIENT, "switches/normbutn", 100);
 	M_PlayerSetup(0);
 }
 
@@ -594,17 +569,14 @@ void M_ReadSaveStrings(void)
 	int 	i;
 	char	name[256];
 		
-	for (i = 0; i < load_end;i++)
+	for (i = 0; i < load_end; i++)
 	{
-		if (M_CheckParm("-cdrom"))
-			sprintf(name,"c:\\doomdata\\"SAVEGAMENAME"%d.dsg",i);
-		else
-			sprintf(name,SAVEGAMENAME"%d.dsg",i);
+		G_BuildSaveName (name, i);
 
 		handle = open (name, O_RDONLY | 0, 0666);
 		if (handle == -1)
 		{
-			strcpy(&savegamestrings[i][0],EMPTYSTRING);
+			strcpy (&savegamestrings[i][0], EMPTYSTRING);
 			LoadMenu[i].status = 0;
 			continue;
 		}
@@ -622,11 +594,11 @@ void M_DrawLoad(void)
 {
 	int i;
 		
-	V_DrawPatchClean (72,28,&screens[0],W_CacheLumpName("M_LOADG",PU_CACHE));
+	V_DrawPatchClean (72, 28, &screens[0], W_CacheLumpName ("M_LOADG",PU_CACHE));
 	for (i = 0; i < load_end; i++)
 	{
-		M_DrawSaveLoadBorder(LoadDef.x,LoadDef.y+LINEHEIGHT*i);
-		V_DrawRedTextClean(LoadDef.x,LoadDef.y+LINEHEIGHT*i,savegamestrings[i]);
+		M_DrawSaveLoadBorder (LoadDef.x, LoadDef.y+LINEHEIGHT*i, 24);
+		V_DrawRedTextClean (LoadDef.x, LoadDef.y+LINEHEIGHT*i, savegamestrings[i]);
 	}
 }
 
@@ -634,20 +606,21 @@ void M_DrawLoad(void)
 
 //
 // Draw border for the savegame description
+// [RH] Width of the border is variable
 //
-void M_DrawSaveLoadBorder(int x,int y)
+void M_DrawSaveLoadBorder (int x, int y, int len)
 {
 	int i;
 		
-	V_DrawPatchClean (x-8,y+7,&screens[0],W_CacheLumpName("M_LSLEFT",PU_CACHE));
+	V_DrawPatchClean (x-8, y+7, &screens[0], W_CacheLumpName ("M_LSLEFT",PU_CACHE));
 		
-	for (i = 0;i < 24;i++)
+	for (i = 0; i < len; i++)
 	{
-		V_DrawPatchClean (x,y+7,&screens[0],W_CacheLumpName("M_LSCNTR",PU_CACHE));
+		V_DrawPatchClean (x, y+7, &screens[0], W_CacheLumpName ("M_LSCNTR",PU_CACHE));
 		x += 8;
 	}
 
-	V_DrawPatchClean (x,y+7,&screens[0],W_CacheLumpName("M_LSRGHT",PU_CACHE));
+	V_DrawPatchClean (x, y+7, &screens[0], W_CacheLumpName ("M_LSRGHT",PU_CACHE));
 }
 
 
@@ -658,12 +631,10 @@ void M_DrawSaveLoadBorder(int x,int y)
 void M_LoadSelect (int choice)
 {
 	char name[256];
-		
-	if (M_CheckParm("-cdrom"))
-		sprintf(name,"c:\\doomdata\\"SAVEGAMENAME"%d.dsg",choice);
-	else
-		sprintf(name,SAVEGAMENAME"%d.dsg",choice);
+
+	G_BuildSaveName (name, choice);
 	G_LoadGame (name);
+	gamestate = gamestate == GS_FULLCONSOLE ? GS_HIDECONSOLE : gamestate;
 	M_ClearMenus ();
 }
 
@@ -693,7 +664,7 @@ void M_DrawSave(void)
 	V_DrawPatchClean (72,28,&screens[0],W_CacheLumpName("M_SAVEG",PU_CACHE));
 	for (i = 0; i < load_end; i++)
 	{
-		M_DrawSaveLoadBorder(LoadDef.x,LoadDef.y+LINEHEIGHT*i);
+		M_DrawSaveLoadBorder(LoadDef.x,LoadDef.y+LINEHEIGHT*i,24);
 		V_DrawRedTextClean(LoadDef.x,LoadDef.y+LINEHEIGHT*i,savegamestrings[i]);
 	}
 		
@@ -725,6 +696,7 @@ void M_SaveSelect(int choice)
 	// we are going to be intercepting all chars
 	genStringEnter = 1;
 	genStringEnd = M_DoSave;
+	genStringLen = SAVESTRINGSIZE-1;
 	
 	saveSlot = choice;
 	strcpy(saveOldString,savegamestrings[choice]);
@@ -763,7 +735,7 @@ void M_QuickSaveResponse(int ch)
 	if (ch == 'y')
 	{
 		M_DoSave(quickSaveSlot);
-		S_StartSound(ORIGIN_AMBIENT,sfx_swtchx);
+		S_StartSound(ORIGIN_AMBIENT, "switches/exitbutn", 100);
 	}
 }
 
@@ -771,7 +743,7 @@ void M_QuickSave(void)
 {
 	if (!usergame)
 	{
-		S_StartSound(ORIGIN_AMBIENT,sfx_oof);
+		S_StartSound(ORIGIN_AMBIENT, "player/male/grunt1", 100);
 		return;
 	}
 
@@ -800,7 +772,7 @@ void M_QuickLoadResponse(int ch)
 	if (ch == 'y')
 	{
 		M_LoadSelect(quickSaveSlot);
-		S_StartSound(ORIGIN_AMBIENT,sfx_swtchx);
+		S_StartSound(ORIGIN_AMBIENT, "switches/exitbutn", 100);
 	}
 }
 
@@ -902,7 +874,7 @@ void M_NewGame(int choice)
 		return;
 	}
 		
-	if ( gamemode == commercial )
+	if (gamemode == commercial)
 		M_SetupNextMenu(&NewDef);
 	else
 		M_SetupNextMenu(&EpiDef);
@@ -926,6 +898,7 @@ void M_VerifyNightmare(int ch)
 		
 	SetCVarFloat (gameskill, nightmare);
 	G_DeferedInitNew (CalcMapName (epi+1, 1));
+	gamestate = gamestate == GS_FULLCONSOLE ? GS_HIDECONSOLE : gamestate;
 	M_ClearMenus ();
 }
 
@@ -938,14 +911,15 @@ void M_ChooseSkill(int choice)
 	}
 
 	SetCVarFloat (gameskill, (float)choice);
+	gamestate = gamestate == GS_FULLCONSOLE ? GS_HIDECONSOLE : gamestate;
 	G_DeferedInitNew (CalcMapName (epi+1, 1));
+	gamestate = gamestate == GS_FULLCONSOLE ? GS_HIDECONSOLE : gamestate;
 	M_ClearMenus ();
 }
 
-void M_Episode(int choice)
+void M_Episode (int choice)
 {
-	if ( (gamemode == shareware)
-		 && choice)
+	if ((gamemode == shareware) && choice)
 	{
 		M_StartMessage(SWSTRING,NULL,false);
 		M_SetupNextMenu(&ReadDef1);
@@ -953,11 +927,10 @@ void M_Episode(int choice)
 	}
 
 	// Yet another hack...
-	if ( (gamemode == registered)
-		 && (choice > 2))
+	if ((gamemode == registered) && (choice > 2))
 	{
-	  Printf ("M_Episode: 4th episode requires UltimateDOOM\n");
-	  choice = 0;
+		Printf ("M_Episode: 4th episode requires Ultimate DOOM\n");
+		choice = 0;
 	}
 		 
 	epi = choice;
@@ -1001,7 +974,7 @@ void M_EndGame(int choice)
 	choice = 0;
 	if (!usergame)
 	{
-		S_StartSound(ORIGIN_AMBIENT,sfx_oof);
+		S_StartSound(ORIGIN_AMBIENT, "player/male/grunt1", 100);
 		return;
 	}
 		
@@ -1046,28 +1019,28 @@ void M_FinishReadThis(int choice)
 //
 // M_QuitDOOM
 //
-int quitsounds[8] =
+char *quitsounds[8] =
 {
-	sfx_pldeth,
-	sfx_dmpain,
-	sfx_popain,
-	sfx_slop,
-	sfx_telept,
-	sfx_posit1,
-	sfx_posit3,
-	sfx_sgtatk
+	"player/male/death1",
+	"demon/pain",
+	"grunt/pain",
+	"misc/gibbed",
+	"misc/teleport",
+	"grunt/sight1",
+	"grunt/sight3",
+	"demon/melee"
 };
 
-int quitsounds2[8] =
+char *quitsounds2[8] =
 {
-	sfx_vilact,
-	sfx_getpow,
-	sfx_boscub,
-	sfx_slop,
-	sfx_skeswg,
-	sfx_kntdth,
-	sfx_bspact,
-	sfx_sgtatk
+	"vile/active",
+	"misc/p_pkup",
+	"brain/cube",
+	"misc/gibbed",
+	"skeleton/swing",
+	"knight/death",
+	"baby/active",
+	"demon/melee"
 };
 
 
@@ -1078,13 +1051,14 @@ void M_QuitResponse(int ch)
 		return;
 	if (!netgame)
 	{
-		if (gamemode == commercial)
-			S_StartSound(ORIGIN_SURROUND,quitsounds2[(gametic>>2)&7]);
-		else
-			S_StartSound(ORIGIN_SURROUND,quitsounds[(gametic>>2)&7]);
+		if (gamemode == commercial) {
+			S_StartSound (ORIGIN_SURROUND, quitsounds2[(gametic>>2)&7], 100);
+		} else {
+			S_StartSound (ORIGIN_SURROUND, quitsounds[(gametic>>2)&7], 100);
+		}
 		I_WaitVBL(105);
 	}
-	I_Quit ();
+	exit (0);
 }
 
 
@@ -1108,22 +1082,25 @@ void M_QuitDOOM (int choice)
 //
 void M_DrawSlider (int x, int y, float min, float max, float cur);
 
+static char *genders[3] = { "male", "female", "neuter" };
 static state_t *PlayerState;
 static int PlayerTics;
 
-extern cvar_t *name;
+extern cvar_t *name, *team;
 
 static void M_PlayerSetup (int choice)
 {
 	choice = 0;
-	strncpy (savegamestrings[0], name->string, 23);
-	savegamestrings[0][23] = 0;
+	strcpy (savegamestrings[0], name->string);
+	strcpy (savegamestrings[1], team->string);
 	M_DemoNoPlay = true;
 	if (demoplayback)
 		G_CheckDemoStatus ();
 	M_SetupNextMenu (&PSetupDef);
 	PlayerState = &states[mobjinfo[MT_PLAYER].seestate];
 	PlayerTics = PlayerState->tics;
+	if (!FireGood)
+		FireGood = V_AllocScreen (&FireScreen, 72, 72 + 5, 8);
 }
 
 static void M_PlayerSetupTicker (void)
@@ -1152,47 +1129,208 @@ static void M_PlayerSetupDrawer (void)
 	}
 
 	// Draw player name box
-	V_DrawWhiteTextClean (PSetupDef.x + 8, PSetupDef.y - 12, "Your name");
-	M_DrawSaveLoadBorder (PSetupDef.x + 8, PSetupDef.y);
-	V_DrawRedTextClean (PSetupDef.x + 8, PSetupDef.y, savegamestrings[0]);
+	V_DrawRedTextClean (PSetupDef.x, PSetupDef.y, "Name");
+	M_DrawSaveLoadBorder (PSetupDef.x + 56, PSetupDef.y, MAXPLAYERNAME+1);
+	V_DrawRedTextClean (PSetupDef.x + 56, PSetupDef.y, savegamestrings[0]);
+
+	// Draw player team box
+	V_DrawRedTextClean (PSetupDef.x, PSetupDef.y + LINEHEIGHT, "Team");
+	M_DrawSaveLoadBorder (PSetupDef.x + 56, PSetupDef.y + LINEHEIGHT, MAXPLAYERNAME+1);
+	V_DrawRedTextClean (PSetupDef.x + 56, PSetupDef.y + LINEHEIGHT, savegamestrings[1]);
+
+	// Draw cursor for either of the above
 	if (genStringEnter)
-		V_DrawRedTextClean (PSetupDef.x + V_StringWidth(savegamestrings[0]) + 8, PSetupDef.y, "_");
+		V_DrawRedTextClean (PSetupDef.x + V_StringWidth(savegamestrings[saveSlot]) + 56, PSetupDef.y + ((saveSlot == 0) ? 0 : LINEHEIGHT), "_");
 
 	// Draw player character
 	{
-		int x = 320 - 88 - 32, y = PSetupDef.y + LINEHEIGHT*3 - 20;
+		int x = 320 - 88 - 32, y = PSetupDef.y + LINEHEIGHT*3 - 14;
 
 		x = (x-160)*CleanXfac+(screens[0].width>>1);
 		y = (y-100)*CleanYfac+(screens[0].height>>1);
-		V_Clear (x, y, x + 72 * CleanXfac, y + 72 * CleanYfac, &screens[0], 0);
+		if (!FireGood) {
+			V_Clear (x, y, x + 72 * CleanXfac, y + 72 * CleanYfac, &screens[0], 34);
+		} else {
+			// [RH] The following fire code is based on the PTC fire demo
+			int a, b;
+			byte *from;
+			int width, height, pitch;
+
+			V_LockScreen (&FireScreen);
+
+			width = FireScreen.width;
+			height = FireScreen.height;
+			pitch = FireScreen.pitch;
+
+			from = FireScreen.buffer + (height - 3) * pitch;
+			for (a = 0; a < width; a++, from++) {
+				*from = *(from + (pitch << 1)) = M_Random();
+			}
+
+			from = FireScreen.buffer;
+			for (b = 0; b < FireScreen.height - 4; b += 2) {
+				byte *pixel = from;
+
+				// special case: first pixel on line
+				byte *p = pixel + (pitch << 1);
+				unsigned int top = *p + *(p + width - 1) + *(p + 1);
+				unsigned int bottom = *(pixel + (pitch << 2));
+				unsigned int c1 = (top + bottom) >> 2;
+				if (c1 > 1) c1--;
+				*pixel = c1;
+				*(pixel + pitch) = (c1 + bottom) >> 1;
+				pixel++;
+
+				// main line loop
+				for (a = 1; a < width-1; a++)
+				{
+					// sum top pixels
+					p = pixel + (pitch << 1);
+					top = *p + *(p - 1) + *(p + 1);
+
+					// bottom pixel
+					bottom = *(pixel + (pitch << 2));
+
+					// combine pixels
+					c1 = (top + bottom) >> 2;
+					if (c1 > 1) c1--;
+
+					// store pixels
+					*pixel = c1;
+					*(pixel + pitch) = (c1 + bottom) >> 1;		// interpolate
+
+					// next pixel
+					pixel++;
+				}
+
+				// special case: last pixel on line
+				p = pixel + (pitch << 1);
+				top = *p + *(p - 1) + *(p - width + 1);
+				bottom = *(pixel + (pitch << 2));
+				c1 = (top + bottom) >> 2;
+				if (c1 > 1) c1--;
+				*pixel = c1;
+				*(pixel + pitch) = (c1 + bottom) >> 1;
+
+				// next line
+				from += pitch << 1;
+			}
+
+			y--;
+			pitch = screens[0].pitch;
+			switch (CleanXfac) {
+				case 1:
+					for (b = 0; b < FireScreen.height; b++) {
+						byte *to = screens[0].buffer + y * screens[0].pitch + x;
+						from = FireScreen.buffer + b * FireScreen.pitch;
+						y += CleanYfac;
+
+						for (a = 0; a < FireScreen.width; a++, to++, from++) {
+							int c;
+							for (c = CleanYfac; c; c--)
+								*(to + pitch*c) = FireRemap[*from];
+						}
+					}
+					break;
+
+				case 2:
+					for (b = 0; b < FireScreen.height; b++) {
+						byte *to = screens[0].buffer + y * screens[0].pitch + x;
+						from = FireScreen.buffer + b * FireScreen.pitch;
+						y += CleanYfac;
+
+						for (a = 0; a < FireScreen.width; a++, to += 2, from++) {
+							int c;
+							for (c = CleanYfac; c; c--) {
+								*(to + pitch*c) = FireRemap[*from];
+								*(to + pitch*c + 1) = FireRemap[*from];
+							}
+						}
+					}
+					break;
+
+				case 3:
+					for (b = 0; b < FireScreen.height; b++) {
+						byte *to = screens[0].buffer + y * screens[0].pitch + x;
+						from = FireScreen.buffer + b * FireScreen.pitch;
+						y += CleanYfac;
+
+						for (a = 0; a < FireScreen.width; a++, to += 3, from++) {
+							int c;
+							for (c = CleanYfac; c; c--) {
+								*(to + pitch*c) = FireRemap[*from];
+								*(to + pitch*c + 1) = FireRemap[*from];
+								*(to + pitch*c + 2) = FireRemap[*from];
+							}
+						}
+					}
+					break;
+
+				case 4:
+				default:
+					for (b = 0; b < FireScreen.height; b++) {
+						byte *to = screens[0].buffer + y * screens[0].pitch + x;
+						from = FireScreen.buffer + b * FireScreen.pitch;
+						y += CleanYfac;
+
+						for (a = 0; a < FireScreen.width; a++, to += 4, from++) {
+							int c;
+							for (c = CleanYfac; c; c--) {
+								*(to + pitch*c) = FireRemap[*from];
+								*(to + pitch*c + 1) = FireRemap[*from];
+								*(to + pitch*c + 2) = FireRemap[*from];
+								*(to + pitch*c + 3) = FireRemap[*from];
+							}
+						}
+					}
+					break;
+			}
+			V_UnlockScreen (&FireScreen);
+		}
 	}
 	{
 		spriteframe_t *sprframe =
-			&sprites[PlayerState->sprite].spriteframes[PlayerState->frame & FF_FRAMEMASK];
+			&sprites[skins[players[consoleplayer].userinfo.skin].sprite].spriteframes[PlayerState->frame & FF_FRAMEMASK];
 
 		V_ColorMap = translationtables + consoleplayer * 256;
-		V_DrawTranslatedPatchClean (320 - 52 - 32, PSetupDef.y + LINEHEIGHT*3 + 40,
+		V_DrawTranslatedPatchClean (320 - 52 - 32, PSetupDef.y + LINEHEIGHT*3 + 46,
 									&screens[0],
-									W_CacheLumpNum (sprframe->lump[0] + firstspritelump, PU_CACHE));
+									W_CacheLumpNum (sprframe->lump[0], PU_CACHE));
 	}
-	V_DrawPatchClean (320 - 88 - 32 + 36, PSetupDef.y + LINEHEIGHT*3 + 16,
+	V_DrawPatchClean (320 - 88 - 32 + 36, PSetupDef.y + LINEHEIGHT*3 + 22,
 					  &screens[0],
 					  W_CacheLumpName ("M_PBOX", PU_CACHE));
 
 	// Draw player color sliders
-	V_DrawWhiteTextClean (PSetupDef.x, PSetupDef.y + LINEHEIGHT*2, "Your color");
+	//V_DrawWhiteTextClean (PSetupDef.x, PSetupDef.y + LINEHEIGHT, "Color");
 
-	V_DrawRedTextClean (PSetupDef.x, PSetupDef.y + LINEHEIGHT*3, "Red");
-	V_DrawRedTextClean (PSetupDef.x, PSetupDef.y + LINEHEIGHT*4, "Green");
-	V_DrawRedTextClean (PSetupDef.x, PSetupDef.y + LINEHEIGHT*5, "Blue");
+	V_DrawRedTextClean (PSetupDef.x, PSetupDef.y + LINEHEIGHT*2, "Red");
+	V_DrawRedTextClean (PSetupDef.x, PSetupDef.y + LINEHEIGHT*3, "Green");
+	V_DrawRedTextClean (PSetupDef.x, PSetupDef.y + LINEHEIGHT*4, "Blue");
 
 	{
 		int x = V_StringWidth ("Green") + 8 + PSetupDef.x;
-		int color = players[consoleplayer].userinfo->color;
+		int color = players[consoleplayer].userinfo.color;
 
-		M_DrawSlider (x, PSetupDef.y + LINEHEIGHT*3, 0.0f, 255.0f, RPART(color));
-		M_DrawSlider (x, PSetupDef.y + LINEHEIGHT*4, 0.0f, 255.0f, GPART(color));
-		M_DrawSlider (x, PSetupDef.y + LINEHEIGHT*5, 0.0f, 255.0f, BPART(color));
+		M_DrawSlider (x, PSetupDef.y + LINEHEIGHT*2, 0.0f, 255.0f, RPART(color));
+		M_DrawSlider (x, PSetupDef.y + LINEHEIGHT*3, 0.0f, 255.0f, GPART(color));
+		M_DrawSlider (x, PSetupDef.y + LINEHEIGHT*4, 0.0f, 255.0f, BPART(color));
+	}
+
+	// Draw gender setting
+	{
+		int x = V_StringWidth ("Gender") + 8 + PSetupDef.x;
+		V_DrawRedTextClean (PSetupDef.x, PSetupDef.y + LINEHEIGHT*5, "Gender");
+		V_DrawWhiteTextClean (x, PSetupDef.y + LINEHEIGHT*5,
+							  genders[players[consoleplayer].userinfo.gender]);
+	}
+
+	// Draw skin setting
+	{
+		int x = V_StringWidth ("Skin") + 8 + PSetupDef.x;
+		V_DrawRedTextClean (PSetupDef.x, PSetupDef.y + LINEHEIGHT*6, "Skin");
+		V_DrawWhiteTextClean (x, PSetupDef.y + LINEHEIGHT*6,
+							  skins[players[consoleplayer].userinfo.skin].name);
 	}
 
 	// Draw autoaim setting
@@ -1211,6 +1349,30 @@ static void M_PlayerSetupDrawer (void)
 	}
 }
 
+static void M_ChangeGender (int choice)
+{
+	int gender = players[consoleplayer].userinfo.gender;
+
+	if (!choice)
+		gender = (gender == 0) ? 2 : gender - 1;
+	else
+		gender = (gender == 2) ? 0 : gender + 1;
+
+	cvar_set ("gender", genders[gender]);
+}
+
+static void M_ChangeSkin (int choice)
+{
+	int skin = players[consoleplayer].userinfo.skin;
+
+	if (!choice)
+		skin = (skin == 0) ? numskins - 1 : skin - 1;
+	else
+		skin = (skin < numskins - 1) ? skin + 1 : 0;
+
+	cvar_set ("skin", skins[skin].name);
+}
+
 static void M_ChangeAutoAim (int choice)
 {
 	static const float ranges[] = { 0, 0.25, 0.5, 1, 2, 3, 5000 };
@@ -1245,6 +1407,7 @@ static void M_EditPlayerName (int choice)
 	// we are going to be intercepting all chars
 	genStringEnter = 1;
 	genStringEnd = M_PlayerNameChanged;
+	genStringLen = MAXPLAYERNAME;
 	
 	saveSlot = 0;
 	strcpy(saveOldString,savegamestrings[0]);
@@ -1261,6 +1424,29 @@ static void M_PlayerNameChanged (int choice)
 	AddCommandString (command);
 }
 
+static void M_EditPlayerTeam (int choice)
+{
+	// we are going to be intercepting all chars
+	genStringEnter = 1;
+	genStringEnd = M_PlayerTeamChanged;
+	genStringLen = MAXPLAYERNAME;
+	
+	saveSlot = 1;
+	strcpy(saveOldString,savegamestrings[1]);
+	if (!strcmp(savegamestrings[1],EMPTYSTRING))
+		savegamestrings[1][0] = 0;
+	saveCharIndex = strlen(savegamestrings[1]);
+}
+
+static void M_PlayerTeamChanged (int choice)
+{
+	char command[SAVESTRINGSIZE+8];
+
+	sprintf (command, "team \"%s\"", savegamestrings[1]);
+	AddCommandString (command);
+}
+
+
 static void SendNewColor (int red, int green, int blue)
 {
 	char command[24];
@@ -1271,7 +1457,7 @@ static void SendNewColor (int red, int green, int blue)
 
 static void M_SlidePlayerRed (int choice)
 {
-	int color = players[consoleplayer].userinfo->color;
+	int color = players[consoleplayer].userinfo.color;
 	int red = RPART(color);
 
 	if (choice == 0) {
@@ -1289,7 +1475,7 @@ static void M_SlidePlayerRed (int choice)
 
 static void M_SlidePlayerGreen (int choice)
 {
-	int color = players[consoleplayer].userinfo->color;
+	int color = players[consoleplayer].userinfo.color;
 	int green = GPART(color);
 
 	if (choice == 0) {
@@ -1307,7 +1493,7 @@ static void M_SlidePlayerGreen (int choice)
 
 static void M_SlidePlayerBlue (int choice)
 {
-	int color = players[consoleplayer].userinfo->color;
+	int color = players[consoleplayer].userinfo.color;
 	int blue = BPART(color);
 
 	if (choice == 0) {
@@ -1327,13 +1513,13 @@ static void M_SlidePlayerBlue (int choice)
 //
 //		Menu Functions
 //
-void M_DrawEmptyCell (menu_t *menu, int item)
+void M_DrawEmptyCell (oldmenu_t *menu, int item)
 {
 	V_DrawPatchClean (menu->x - 10,		menu->y+item*LINEHEIGHT - 1, &screens[0],
 					   W_CacheLumpName("M_CELL1",PU_CACHE));
 }
 
-void M_DrawSelCell (menu_t *menu, int item)
+void M_DrawSelCell (oldmenu_t *menu, int item)
 {
 	V_DrawPatchClean (menu->x - 10,		menu->y+item*LINEHEIGHT - 1, &screens[0],
 					   W_CacheLumpName("M_CELL2",PU_CACHE));
@@ -1398,21 +1584,13 @@ BOOL M_Responder (event_t* ev)
 		ch2 = ev->data2;		// ASCII
 	}
 	
-	if (ch == -1 && !menuactive)
+	if (ch == -1 || chat_on)
 		return false;
 
 	if (menuactive && OptionsActive) {
-		if (ev->type == ev_keydown) {
-			OptionsActive = M_OptResponder (ev);
-			return true;
-		} else {
-			return false;
-		}
+		OptionsActive = M_OptResponder (ev);
+		return true;
 	}
-
-	// [RH] Ignore key up events totally.
-	if (ev->type == ev_keyup)
-		return false;
 	
 	// Save Game string input
 	// [RH] and Player Name string input
@@ -1436,7 +1614,7 @@ BOOL M_Responder (event_t* ev)
 		  case KEY_ENTER:
 			genStringEnter = 0;
 			if (savegamestrings[saveSlot][0])
-				genStringEnd(saveSlot);	// [RH] M_DoSave() or M_PlayerNameChanged
+				genStringEnd(saveSlot);	// [RH] Function to call when enter is pressed
 			break;
 								
 		  default:
@@ -1445,9 +1623,9 @@ BOOL M_Responder (event_t* ev)
 				if (ch-HU_FONTSTART < 0 || ch-HU_FONTSTART >= HU_FONTSIZE)
 					break;
 			if (ch >= 32 && ch <= 127 &&
-				saveCharIndex < SAVESTRINGSIZE-1 &&
+				saveCharIndex < genStringLen &&
 				V_StringWidth(savegamestrings[saveSlot]) <
-				(SAVESTRINGSIZE-2)*8)
+				(genStringLen-1)*8)
 			{
 				savegamestrings[saveSlot][saveCharIndex++] = ch;
 				savegamestrings[saveSlot][saveCharIndex] = 0;
@@ -1470,20 +1648,27 @@ BOOL M_Responder (event_t* ev)
 			messageRoutine(ch2);
 						
 		menuactive = false;
-		S_StartSound(ORIGIN_AMBIENT,sfx_swtchx);
+		S_StartSound(ORIGIN_AMBIENT, "switches/exitbutn", 100);
 		return true;
 	}
 		
 	// [RH] F-Keys are now just normal keys that can be bound,
 	//		so they aren't checked here anymore.
 	
+	// If devparm is set, pressing F1 always takes a screenshot no matter
+	// what it's bound to. (for those who don't bother to read the docs)
+	if (devparm && ch == KEY_F1) {
+		G_ScreenShot (NULL);
+		return true;
+	}
+
 	// Pop-up menu?
 	if (!menuactive)
 	{
 		if (ch == KEY_ESCAPE)
 		{
 			M_StartControlPanel ();
-			S_StartSound(ORIGIN_AMBIENT,sfx_swtchn);
+			S_StartSound(ORIGIN_AMBIENT, "switches/normbutn", 100);
 			return true;
 		}
 		return false;
@@ -1499,7 +1684,7 @@ BOOL M_Responder (event_t* ev)
 			if (itemOn+1 > currentMenu->numitems-1)
 				itemOn = 0;
 			else itemOn++;
-			S_StartSound(ORIGIN_AMBIENT,sfx_pstop);
+			S_StartSound(ORIGIN_AMBIENT, "plats/pt1_stop", 100);
 		} while(currentMenu->menuitems[itemOn].status==-1);
 		return true;
 				
@@ -1509,7 +1694,7 @@ BOOL M_Responder (event_t* ev)
 			if (!itemOn)
 				itemOn = currentMenu->numitems-1;
 			else itemOn--;
-			S_StartSound(ORIGIN_AMBIENT,sfx_pstop);
+			S_StartSound(ORIGIN_AMBIENT, "plats/pt1_stop", 100);
 		} while(currentMenu->menuitems[itemOn].status==-1);
 		return true;
 
@@ -1517,7 +1702,7 @@ BOOL M_Responder (event_t* ev)
 		if (currentMenu->menuitems[itemOn].routine &&
 			currentMenu->menuitems[itemOn].status == 2)
 		{
-			S_StartSound(ORIGIN_AMBIENT,sfx_stnmov);
+			S_StartSound(ORIGIN_AMBIENT, "plats/pt1_mid", 100);
 			currentMenu->menuitems[itemOn].routine(0);
 		}
 		return true;
@@ -1526,7 +1711,7 @@ BOOL M_Responder (event_t* ev)
 		if (currentMenu->menuitems[itemOn].routine &&
 			currentMenu->menuitems[itemOn].status == 2)
 		{
-			S_StartSound(ORIGIN_AMBIENT,sfx_stnmov);
+			S_StartSound(ORIGIN_AMBIENT, "plats/pt1_mid", 100);
 			currentMenu->menuitems[itemOn].routine(1);
 		}
 		return true;
@@ -1539,12 +1724,12 @@ BOOL M_Responder (event_t* ev)
 			if (currentMenu->menuitems[itemOn].status == 2)
 			{
 				currentMenu->menuitems[itemOn].routine(1);		// right arrow
-				S_StartSound(ORIGIN_AMBIENT,sfx_stnmov);
+				S_StartSound(ORIGIN_AMBIENT, "plats/pt1_mid", 100);
 			}
 			else
 			{
 				currentMenu->menuitems[itemOn].routine(itemOn);
-				S_StartSound(ORIGIN_AMBIENT,sfx_pistol);
+				S_StartSound(ORIGIN_AMBIENT, "weapons/pistol", 100);
 			}
 		}
 		return true;
@@ -1554,6 +1739,7 @@ BOOL M_Responder (event_t* ev)
 	  //	  is now ignored.
 	  case KEY_ESCAPE:
 		currentMenu->lastOn = itemOn;
+
 		if (currentMenu->prevMenu)
 		{
 			M_DemoNoPlay = false;
@@ -1563,28 +1749,30 @@ BOOL M_Responder (event_t* ev)
 			//		main menu (for backing out of Read This!.
 			if (currentMenu == &MainDef)
 				drawSkull = true;
-			S_StartSound(ORIGIN_AMBIENT,sfx_swtchn);
+			S_StartSound(ORIGIN_AMBIENT, "switches/normbutn", 100);
 		} else {
 			M_ClearMenus ();
-			S_StartSound(ORIGIN_AMBIENT,sfx_swtchx);
+			S_StartSound(ORIGIN_AMBIENT, "switches/exitbutn", 100);
 		}
 		return true;
 		
 	  default:
-		for (i = itemOn+1;i < currentMenu->numitems;i++)
-			if (currentMenu->menuitems[i].alphaKey == ch2)
-			{
-				itemOn = i;
-				S_StartSound(ORIGIN_AMBIENT,sfx_pstop);
-				return true;
-			}
-		for (i = 0;i <= itemOn;i++)
-			if (currentMenu->menuitems[i].alphaKey == ch2)
-			{
-				itemOn = i;
-				S_StartSound(ORIGIN_AMBIENT,sfx_pstop);
-				return true;
-			}
+		if (ch2) {
+			for (i = itemOn+1;i < currentMenu->numitems;i++)
+				if (currentMenu->menuitems[i].alphaKey == ch2)
+				{
+					itemOn = i;
+					S_StartSound(ORIGIN_AMBIENT, "plats/pt1_stop", 100);
+					return true;
+				}
+			for (i = 0;i <= itemOn;i++)
+				if (currentMenu->menuitems[i].alphaKey == ch2)
+				{
+					itemOn = i;
+					S_StartSound(ORIGIN_AMBIENT, "plats/pt1_stop", 100);
+					return true;
+				}
+		}
 		break;
 		
 	}
@@ -1627,7 +1815,7 @@ void M_Drawer (void)
 	static short	y;
 	short			i;
 	short			max;
-	char			string[40];
+	char			string[80];
 	int 			start;
 
 	inhelpscreens = false;
@@ -1644,7 +1832,7 @@ void M_Drawer (void)
 			for (i = 0;i < (int)strlen(messageString+start);i++)
 				if (*(messageString+start+i) == '\n')
 				{
-					memset(string,0,40);
+					memset(string,0,80);
 					strncpy(string,messageString+start,i);
 					start += i+1;
 					break;
@@ -1702,10 +1890,15 @@ void M_Drawer (void)
 //
 void M_ClearMenus (void)
 {
+	if (FireGood) {
+		V_FreeScreen (&FireScreen);
+		FireGood = false;
+	}
 	menuactive = 0;
 	drawSkull = true;
 	I_ResumeMouse ();		// [RH] Recapture the mouse in windowed modes.
 	M_DemoNoPlay = false;
+	C_HideConsole ();		// [RH] Hide the console if we can.
 	// if (!netgame && usergame && paused)
 	//		 sendpause = true;
 }
@@ -1716,7 +1909,7 @@ void M_ClearMenus (void)
 //
 // M_SetupNextMenu
 //
-void M_SetupNextMenu(menu_t *menudef)
+void M_SetupNextMenu(oldmenu_t *menudef)
 {
 	currentMenu = menudef;
 	itemOn = currentMenu->lastOn;
@@ -1742,9 +1935,11 @@ void M_Ticker (void)
 //
 // M_Init
 //
+extern cvar_t *screenblocks;
+
 void M_Init (void)
 {
-	extern cvar_t *screenblocks;
+	int i;
 
 	currentMenu = &MainDef;
 	OptionsActive = false;
@@ -1761,8 +1956,6 @@ void M_Init (void)
 
 	// Here we could catch other version dependencies,
 	//	like HELP1/2, and four episodes.
-
-  
 	switch ( gamemode )
 	{
 	  case commercial:
@@ -1791,5 +1984,9 @@ void M_Init (void)
 		break;
 	}
 	M_OptInit ();
+
+	// [RH] Build a palette translation table for the fire
+	for (i = 0; i < 255; i++)
+		FireRemap[i] = BestColor (DefaultPalette->basecolors, i, 0, 0, DefaultPalette->numcolors);
 }
 
diff --git a/code/M_menu.h b/code/M_menu.h
index 6595ad3e1b..c1daf79285 100644
--- a/code/M_menu.h
+++ b/code/M_menu.h
@@ -26,6 +26,7 @@
 
 
 #include "d_event.h"
+#include "c_cvars.h"
 
 //
 // MENUS
@@ -37,7 +38,6 @@
 // Does all the real work of the menu interaction.
 BOOL M_Responder (event_t *ev);
 
-
 // Called by main loop,
 // only used for menu (skull cursor) animation.
 void M_Ticker (void);
@@ -66,8 +66,102 @@ void M_OptDrawer (void);
 // [RH] Initialize options menu
 void M_OptInit (void);
 
+void M_SwitchMenu (struct menu_s *menu);
 
 
+//
+// MENU TYPEDEFS
+//
+typedef enum {
+	whitetext,
+	redtext,
+	more,
+	slider,
+	discrete,
+	control,
+	screenres,
+	bitflag,
+	listelement
+} itemtype;
+
+typedef struct menuitem_s {
+	itemtype		  type;
+	char			 *label;
+	union {
+		cvar_t			**cvar;
+		int				  selmode;
+		int				  flagmask;
+	} a;
+	union {
+		float			  min;		/* aka numvalues aka invflag */
+		int				  key1;
+		char			 *res1;
+	} b;
+	union {
+		float			  max;
+		int				  key2;
+		char			 *res2;
+	} c;
+	union {
+		float			  step;
+		char			 *res3;
+	} d;
+	union {
+		struct value_s	 *values;
+		char			 *command;
+		void			(*cfunc)(cvar_t *cvar, float newval);
+		void			(*mfunc)(void);
+		void			(*lfunc)(int);
+		int				  highlight;
+		int				 *flagint;
+	} e;
+} menuitem_t;
+
+typedef struct menu_s {
+	char			title[8];
+	int				lastOn;
+	int				numitems;
+	int				indent;
+	menuitem_t	   *items;
+	struct menu_s  *prevmenu;
+} menu_t;
+
+typedef struct value_s {
+	float		value;
+	char		*name;
+} value_t;
+
+typedef struct
+{
+	// -1 = no cursor here, 1 = ok, 2 = arrows ok
+	short		status;
+	
+	char		name[10];
+	
+	// choice = menu item #.
+	// if status = 2,
+	//	 choice=0:leftarrow,1:rightarrow
+	void		(*routine)(int choice);
+	
+	// hotkey in menu
+	char		alphaKey;						
+} oldmenuitem_t;
+
+typedef struct oldmenu_s
+{
+	short				numitems;		// # of menu items
+	struct oldmenu_s*	prevMenu;		// previous menu
+	oldmenuitem_t		*menuitems;		// menu items
+	void				(*routine)();	// draw routine
+	short				x;
+	short				y;				// x,y of menu
+	short				lastOn; 		// last item user was on in menu
+} oldmenu_t;
+
+extern value_t YesNo[2];
+extern value_t NoYes[2];
+extern value_t OnOff[2];
+
 #endif	  
 //-----------------------------------------------------------------------------
 //
diff --git a/code/M_misc.c b/code/M_misc.c
index 452c099f73..8fe16bd8d9 100644
--- a/code/M_misc.c
+++ b/code/M_misc.c
@@ -26,6 +26,7 @@
 
 
 #include "doomtype.h"
+#include "version.h"
 
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -146,6 +147,9 @@ char *GetConfigPath (void)
 		return copystring (myargv[p+1]);
 	}
 
+	if (M_CheckParm ("-cdrom"))
+		return copystring ("c:\\zdoomdat\\zdoom.cfg");
+
 	path = Malloc (strlen (progdir) + 11);
 
 	strcpy (path, progdir);
@@ -156,24 +160,36 @@ char *GetConfigPath (void)
 char *GetAutoexecPath (void)
 {
 	cvar_t *autovar;
-	char *path = Malloc (strlen (progdir) + 13);
 
-	strcpy (path, progdir);
-	strcat (path, "autoexec.cfg");
+	if (M_CheckParm ("-cdrom")) {
+		return copystring ("c:\\zdoomdat\\autoexec.cfg");
+	} else {
+		char *path = Malloc (strlen (progdir) + 13);
 
-	autovar = cvar ("autoexec", path, CVAR_ARCHIVE);
-	free (path);
+		strcpy (path, progdir);
+		strcat (path, "autoexec.cfg");
 
-	return autovar->string;
+		autovar = cvar ("autoexec", path, CVAR_ARCHIVE);
+		free (path);
+
+		return autovar->string;
+	}
 }
 
 //
 // M_SaveDefaults
 //
+
+// [RH] Don't write a config file if M_LoadDefaults hasn't been called.
+static BOOL DefaultsLoaded;
+
 void M_SaveDefaults (void)
 {
-	FILE*		f;
-	char*		configfile;
+	FILE *f;
+	char *configfile;
+
+	if (!DefaultsLoaded)
+		return;
 
 	configfile = GetConfigPath ();
 
@@ -201,7 +217,8 @@ void M_SaveDefaults (void)
 //
 // M_LoadDefaults
 //
-extern byte 	scantokey[128];
+extern byte scantokey[128];
+extern int cvar_defflags;
 
 void M_LoadDefaults (void)
 {
@@ -220,15 +237,17 @@ void M_LoadDefaults (void)
 	configver = cvar ("configver", VERSIONSTR, CVAR_ARCHIVE);
 
 	configfile = GetConfigPath ();
-	execcommand = Malloc (strlen (configfile) + 6);
-	sprintf (execcommand, "exec %s", configfile);
+	execcommand = Malloc (strlen (configfile) + 8);
+	sprintf (execcommand, "exec \"%s\"", configfile);
 	free (configfile);
+	cvar_defflags = CVAR_ARCHIVE;
 	AddCommandString (execcommand);
+	cvar_defflags = 0;
 	free (execcommand);
 
 	configfile = GetAutoexecPath ();
-	execcommand = Malloc (strlen (configfile) + 6);
-	sprintf (execcommand, "exec %s", configfile);
+	execcommand = Malloc (strlen (configfile) + 8);
+	sprintf (execcommand, "exec \"%s\"", configfile);
 	AddCommandString (execcommand);
 	free (execcommand);
 
@@ -237,6 +256,8 @@ void M_LoadDefaults (void)
 		if (!stricmp (C_GetBinding (KEY_F5), "menu_video"))
 			AddCommandString ("bind f5 menu_display");
 	}
+
+	DefaultsLoaded = true;
 }
 
 
@@ -354,16 +375,23 @@ extern unsigned IndexedPalette[256];
 
 void M_ScreenShot (char *filename)
 {
-	byte*		linear;
-	char		lbmname[16];
+	byte *linear;
+	char  autoname[32];
+	char *lbmname;
 	
 	// find a file name to save it to
 	if (!filename) {
+		if (M_CheckParm ("-cdrom")) {
+			strcpy (autoname, "C:\\ZDOOMDAT\\");
+			lbmname = autoname + 12;
+		} else {
+			lbmname = autoname;
+		}
 		if (!FindFreeName (lbmname, "tga\0pcx" + (screens[0].is8bit << 2))) {
 			Printf ("M_ScreenShot: Delete some screenshots\n");
 			return;
 		}
-		filename = lbmname;
+		filename = autoname;
 	}
 
 	if (screens[0].is8bit) {
diff --git a/code/P_ceilng.c b/code/P_ceilng.c
new file mode 100644
index 0000000000..291da1918e
--- /dev/null
+++ b/code/P_ceilng.c
@@ -0,0 +1,476 @@
+// Emacs style mode select	 -*- C++ -*- 
+//-----------------------------------------------------------------------------
+//
+// $Id:$
+//
+// Copyright (C) 1993-1996 by id Software, Inc.
+//
+// This source is available for distribution and/or modification
+// only under the terms of the DOOM Source Code License as
+// published by id Software. All rights reserved.
+//
+// The source is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// FITNESS FOR A PARTICULAR PURPOSE. See the DOOM Source Code License
+// for more details.
+//
+// $Log:$
+//
+// DESCRIPTION:  Ceiling aninmation (lowering, crushing, raising)
+//
+//-----------------------------------------------------------------------------
+
+
+
+#include "m_alloc.h"
+
+#include "z_zone.h"
+#include "doomdef.h"
+#include "p_local.h"
+
+#include "s_sound.h"
+
+// State.
+#include "doomstat.h"
+#include "r_state.h"
+
+//
+// CEILINGS
+//
+
+
+// [RH] Active ceilings are now linked together in a list instead
+//		of stored in an array. Similar to what Lee Killough did
+//		with BOOM except I link the ceilings themselves together.
+ceiling_t *activeceilings;
+
+
+//
+// T_MoveCeiling
+//
+void T_MoveCeiling (ceiling_t* ceiling)
+{
+	result_e res;
+		
+	switch(ceiling->direction)
+	{
+	  case 0:
+		// IN STASIS
+		break;
+	  case 1:
+		// UP
+		res = T_MovePlane(ceiling->sector,
+						  ceiling->speed,
+						  ceiling->topheight,
+						  -1,1,ceiling->direction);
+		
+		// Make moving sound
+		if (!(level.time&7) && (ceiling->silent == 0))
+			S_StartSound ((mobj_t *)&ceiling->sector->soundorg, "plats/pt1_mid", 119);
+		
+		if (res == pastdest)
+		{
+			switch (ceiling->type)
+			{
+			  case ceilCrushAndRaise:
+				if (ceiling->silent == 1)
+					S_StartSound((mobj_t *)&ceiling->sector->soundorg, "plats/pt1_stop", 100);
+				ceiling->direction = -1;
+				ceiling->speed = ceiling->speed1;
+				break;
+				
+			  // movers with texture change, change the texture then get removed
+			  case genCeilingChgT:
+			  case genCeilingChg0:
+				ceiling->sector->special = ceiling->newspecial;
+			  case genCeilingChg:
+				ceiling->sector->ceilingpic = ceiling->texture;
+				// fall through
+			  default:
+				P_RemoveActiveCeiling(ceiling);
+				break;
+			}
+			
+		}
+		break;
+		
+	  case -1:
+		// DOWN
+		res = T_MovePlane(ceiling->sector,
+						  ceiling->speed,
+						  ceiling->bottomheight,
+						  ceiling->crush,1,ceiling->direction);
+		
+		// Make moving noise
+		if (!(level.time&7) && !ceiling->silent)
+			S_StartSound((mobj_t *)&ceiling->sector->soundorg, "plats/pt1_mid", 119);
+		
+		if (res == pastdest)
+		{
+			switch (ceiling->type)
+			{
+			  case ceilCrushAndRaise:
+			  case ceilCrushRaiseAndStay:
+				if (ceiling->silent == 1)
+					S_StartSound ((mobj_t *)&ceiling->sector->soundorg, "plats/pt1_stop", 100);
+				ceiling->speed = ceiling->speed2;
+				ceiling->direction = 1;
+				break;
+
+			  // in the case of ceiling mover/changer, change the texture
+			  // then remove the active ceiling
+			  case genCeilingChgT:
+			  case genCeilingChg0:
+				ceiling->sector->special = ceiling->newspecial;
+			  case genCeilingChg:
+				ceiling->sector->ceilingpic = ceiling->texture;
+				// fall through
+			  default:
+				P_RemoveActiveCeiling(ceiling);
+				break;
+			}
+		}
+		else // ( res != pastdest )
+		{
+			if (res == crushed)
+			{
+				switch (ceiling->type)
+				{
+				  case ceilCrushAndRaise:
+				  case ceilLowerAndCrush:
+					if (ceiling->speed1 == FRACUNIT && ceiling->speed2 == FRACUNIT)
+						ceiling->speed = FRACUNIT / 8;
+						break;
+
+				  default:
+					break;
+				}
+			}
+		}
+		break;
+	}
+}
+
+
+//
+// EV_DoCeiling
+// Move a ceiling up/down and all around!
+//
+// [RH] Added tag, speed, speed2, height, crush, silent, change params
+BOOL EV_DoCeiling (ceiling_e type, line_t *line,
+				   int tag, fixed_t speed, fixed_t speed2, fixed_t height,
+				   int crush, int silent, int change)
+{
+	int 		secnum;
+	BOOL 		rtn;
+	sector_t*	sec;
+	ceiling_t*	ceiling;
+	BOOL		manual = false;
+	fixed_t		targheight;
+		
+	rtn = false;
+
+	// check if a manual trigger, if so do just the sector on the backside
+	if (tag == 0)
+	{
+		if (!line || !(sec = line->backsector))
+			return rtn;
+		secnum = sec-sectors;
+		manual = true;
+		// [RH] Hack to let manual crushers be retriggerable, too
+		tag ^= secnum | 0x1000000;
+		P_ActivateInStasisCeiling (tag);
+		goto manual_ceiling;
+	}
+	
+	//	Reactivate in-stasis ceilings...for certain types.
+	// This restarts a crusher after it has been stopped
+	if (type == ceilCrushAndRaise)
+	{
+		P_ActivateInStasisCeiling (tag);
+	}
+
+	secnum = -1;
+	// affects all sectors with the same tag as the linedef
+	while ((secnum = P_FindSectorFromTag (tag, secnum)) >= 0)
+	{
+		sec = &sectors[secnum];
+manual_ceiling:
+		// if ceiling already moving, don't start a second function on it
+		if (P_SectorActive (ceiling_special,sec))	//jff 2/22/98
+			continue;
+		
+		// new door thinker
+		rtn = 1;
+		ceiling = Z_Malloc (sizeof(*ceiling), PU_LEVSPEC, 0);
+		P_AddThinker (&ceiling->thinker);
+		sec->ceilingdata = ceiling;					//jff 2/22/98
+		ceiling->thinker.function.acp1 = (actionf_p1)T_MoveCeiling;
+		ceiling->sector = sec;
+		ceiling->crush = -1;
+		ceiling->speed = ceiling->speed1 = speed;
+		ceiling->speed2 = speed2;
+		ceiling->silent = silent;
+		
+		switch(type)
+		{
+		  case ceilCrushAndRaise:
+		  case ceilCrushRaiseAndStay:
+			ceiling->topheight = sec->ceilingheight;
+		  case ceilLowerAndCrush:
+			ceiling->crush = crush;
+			targheight = ceiling->bottomheight = sec->floorheight + 8*FRACUNIT;
+			ceiling->direction = -1;
+			break;
+
+		  case ceilRaiseToHighest:
+			targheight = ceiling->topheight = P_FindHighestCeilingSurrounding (sec);
+			ceiling->direction = 1;
+			break;
+
+		  case ceilLowerByValue:
+			targheight = ceiling->bottomheight = sec->ceilingheight - height;
+			ceiling->direction = -1;
+			break;
+
+		  case ceilRaiseByValue:
+			targheight = ceiling->topheight = sec->ceilingheight + height;
+			ceiling->direction = 1;
+			break;
+
+		  case ceilMoveToValue:
+			{
+			  int diff = height - sec->ceilingheight;
+
+			  if (diff < 0) {
+				  targheight = ceiling->bottomheight = height;
+				  ceiling->direction = -1;
+			  } else {
+				  targheight = ceiling->topheight = height;
+				  ceiling->direction = 1;
+			  }
+			}
+			break;
+
+		  case ceilLowerToHighestFloor:
+			targheight = ceiling->bottomheight = P_FindHighestFloorSurrounding (sec);
+			ceiling->direction = -1;
+			break;
+
+		  case ceilRaiseToHighestFloor:
+			targheight = ceiling->topheight = P_FindHighestFloorSurrounding (sec);
+			ceiling->direction = 1;
+			break;
+
+		  case ceilLowerInstant:
+			targheight = ceiling->bottomheight = sec->ceilingheight - height;
+			ceiling->direction = -1;
+			ceiling->speed = height;
+			break;
+
+		  case ceilRaiseInstant:
+			targheight = ceiling->topheight = sec->ceilingheight + height;
+			ceiling->direction = 1;
+			ceiling->speed = height;
+			break;
+
+		  case ceilLowerToNearest:
+			targheight = ceiling->bottomheight =
+				P_FindNextLowestCeiling (sec, sec->ceilingheight);
+			ceiling->direction = 1;
+			break;
+
+		  case ceilRaiseToNearest:
+			targheight = ceiling->topheight =
+				P_FindNextHighestCeiling (sec, sec->ceilingheight);
+			ceiling->direction = 1;
+			break;
+
+		  case ceilLowerToLowest:
+			targheight = ceiling->bottomheight = P_FindLowestCeilingSurrounding (sec);
+			ceiling->direction = -1;
+			break;
+
+		  case ceilRaiseToLowest:
+			targheight = ceiling->topheight = P_FindLowestCeilingSurrounding (sec);
+			ceiling->direction = -1;
+			break;
+
+		  case ceilLowerToFloor:
+			targheight = ceiling->bottomheight = sec->floorheight;
+			ceiling->direction = -1;
+			break;
+
+		  case ceilRaiseToFloor:
+			targheight = ceiling->topheight = sec->floorheight;
+			ceiling->direction = 1;
+			break;
+
+		  case ceilLowerToHighest:
+			targheight = ceiling->bottomheight = P_FindHighestCeilingSurrounding (sec);
+			ceiling->direction = -1;
+			break;
+
+		  case ceilLowerByTexture:
+			targheight = ceiling->bottomheight =
+				sec->ceilingheight - P_FindShortestUpperAround (secnum);
+			ceiling->direction = -1;
+			break;
+
+		  case ceilRaiseByTexture:
+			targheight = ceiling->topheight =
+				sec->ceilingheight + P_FindShortestUpperAround (secnum);
+			ceiling->direction = 1;
+			break;
+		  
+		}
+				
+		ceiling->tag = tag;
+		ceiling->type = type;
+
+		// set texture/type change properties
+		if (change & 3)		// if a texture change is indicated
+		{
+			if (change & 4)	// if a numeric model change
+			{
+				sector_t *sec;
+
+				//jff 5/23/98 find model with floor at target height if target
+				//is a floor type
+				sec = (type == ceilRaiseToHighest ||
+					   type == ceilRaiseToFloor ||
+					   type == ceilLowerToHighest ||
+					   type == ceilLowerToFloor) ?
+					P_FindModelFloorSector (targheight, secnum) :
+					P_FindModelCeilingSector (targheight, secnum);
+				if (sec)
+				{
+					ceiling->texture = sec->ceilingpic;
+					switch (change & 3)
+					{
+						case 1:		// type is zeroed
+							ceiling->newspecial = 0;
+							ceiling->type = genCeilingChg0;
+							break;
+						case 2:		// type is copied
+							ceiling->newspecial = sec->special;
+							ceiling->type = genCeilingChgT;
+							break;
+						case 3:		// type is left alone
+							ceiling->type = genCeilingChg;
+							break;
+					}
+				}
+			}
+			else if (line)	// else if a trigger model change
+			{
+
+				ceiling->texture = line->frontsector->ceilingpic;
+				switch (change & 3)
+				{
+					case 1:		// type is zeroed
+						ceiling->newspecial = 0;
+						ceiling->type = genCeilingChg0;
+						break;
+					case 2:		// type is copied
+						ceiling->newspecial = line->frontsector->special;
+						ceiling->type = genCeilingChgT;
+						break;
+					case 3:		// type is left alone
+						ceiling->type = genCeilingChg;
+						break;
+				}
+			}
+		}
+
+		P_AddActiveCeiling(ceiling);
+
+		if (manual)
+			return rtn;
+	}
+	return rtn;
+}
+
+
+//
+// Add an active ceiling
+// [RH] Rewritten to use list
+//
+void P_AddActiveCeiling (ceiling_t *c)
+{
+	c->next = activeceilings;
+	c->prev = NULL;
+	activeceilings = c;
+}
+
+
+
+//
+// Remove a ceiling's thinker
+// [RH] Rewritten to use list
+//
+void P_RemoveActiveCeiling (ceiling_t *c)
+{
+	ceiling_t *scan = activeceilings;
+
+	while (scan) {
+		if (scan == c) {
+			c->sector->ceilingdata = NULL;
+			if (c == activeceilings) {
+				activeceilings = c->next;
+			} else {
+				if (c->prev)
+					c->prev->next = c->next;
+				if (c->next)
+					c->next->prev = c->prev;
+			}
+			P_RemoveThinker (&c->thinker);
+			break;
+		}
+		scan = scan->next;
+	}
+}
+
+
+
+//
+// Restart a ceiling that's in-stasis
+// [RH] Passed a tag instead of a line and rewritten to use list
+//
+void P_ActivateInStasisCeiling (int tag)
+{
+	ceiling_t *scan = activeceilings;
+
+	while (scan) {
+		if (scan->tag == tag && scan->direction == 0) {
+			scan->direction = scan->olddirection;
+			scan->thinker.function.acp1 = (actionf_p1) T_MoveCeiling;
+		}
+		scan = scan->next;
+	}
+}
+
+
+
+//
+// EV_CeilingCrushStop
+// Stop a ceiling from crushing!
+// [RH] Passed a tag instead of a line and rewritten to use list
+//
+BOOL EV_CeilingCrushStop (int tag)
+{
+	BOOL rtn = false;
+	ceiling_t *scan = activeceilings;
+
+	while (scan) {
+		if (scan->tag == tag && scan->direction != 0) {
+			scan->olddirection = scan->direction;
+			scan->thinker.function.acv = (actionf_v) NULL;
+			scan->direction = 0;		// in-stasis;
+			rtn = true;
+		}
+		scan = scan->next;
+	}
+
+	return rtn;
+}
diff --git a/code/P_doors.c b/code/P_doors.c
index 4fd7a5c06d..d1a7faa5fa 100644
--- a/code/P_doors.c
+++ b/code/P_doors.c
@@ -17,6 +17,7 @@
 // $Log:$
 //
 // DESCRIPTION: Door animation code (opening/closing)
+//		[RH] Removed sliding door code and simplified for Hexen-ish specials
 //
 //-----------------------------------------------------------------------------
 
@@ -35,36 +36,35 @@
 
 // Data.
 #include "dstrings.h"
-#include "sounds.h"
 
 #include "c_consol.h"
 
-#if 0
-//
-// Sliding door frame information
-//
-slidename_t 	slideFrameNames[MAXSLIDEDOORS] =
-{
-	{"GDOORF1","GDOORF2","GDOORF3","GDOORF4",	// front
-	 "GDOORB1","GDOORB2","GDOORB3","GDOORB4"},	// back
-		 
-	{"\0","\0","\0","\0"}
-};
-#endif
-
 
 //
 // VERTICAL DOORS
 //
 
+// [RH] DoorSound: Plays door sound depending on its direction and speed
+static void DoorSound (vldoor_t *door, fixed_t speed, BOOL raise)
+{
+	char *snd;
+
+	if (raise)
+		snd = (speed >= FRACUNIT*8) ? "doors/dr2_open" : "doors/dr1_open";
+	else
+		snd = (speed >= FRACUNIT*8) ? "doors/dr2_clos" : "doors/dr1_clos";
+
+	S_StartSound ((mobj_t *)&door->sector->soundorg, snd, 100);
+}
+
 //
 // T_VerticalDoor
 //
-void T_VerticalDoor (vldoor_t* door)
+void T_VerticalDoor (vldoor_t *door)
 {
-	result_e	res;
+	result_e res;
 		
-	switch(door->direction)
+	switch (door->direction)
 	{
 	  case 0:
 		// WAITING
@@ -72,22 +72,14 @@ void T_VerticalDoor (vldoor_t* door)
 		{
 			switch(door->type)
 			{
-			  case blazeRaise:
+			  case doorRaise:
 				door->direction = -1; // time to go back down
-				S_StartSound((mobj_t *)&door->sector->soundorg,
-							 sfx_bdcls);
+				DoorSound (door, door->speed, false);
 				break;
 				
-			  case normal:
-				door->direction = -1; // time to go back down
-				S_StartSound((mobj_t *)&door->sector->soundorg,
-							 sfx_dorcls);
-				break;
-				
-			  case close30ThenOpen:
+			  case doorCloseWaitOpen:
 				door->direction = 1;
-				S_StartSound((mobj_t *)&door->sector->soundorg,
-							 sfx_doropn);
+				DoorSound (door, door->speed, true);
 				break;
 				
 			  default:
@@ -102,11 +94,10 @@ void T_VerticalDoor (vldoor_t* door)
 		{
 			switch(door->type)
 			{
-			  case raiseIn5Mins:
+			  case doorRaiseIn5Mins:
 				door->direction = 1;
-				door->type = normal;
-				S_StartSound((mobj_t *)&door->sector->soundorg,
-							 sfx_doropn);
+				door->type = doorRaise;
+				DoorSound (door, door->speed, true);
 				break;
 				
 			  default:
@@ -120,27 +111,20 @@ void T_VerticalDoor (vldoor_t* door)
 		res = T_MovePlane(door->sector,
 						  door->speed,
 						  door->sector->floorheight,
-						  false,1,door->direction);
+						  -1,1,door->direction);
 		if (res == pastdest)
 		{
 			switch(door->type)
 			{
-			  case blazeRaise:
-			  case blazeClose:
-				door->sector->ceilingdata = NULL;  //jff 2/22/98
-				P_RemoveThinker (&door->thinker);  // unlink and free
-				S_StartSound((mobj_t *)&door->sector->soundorg, sfx_bdcls);
-				break;
-				
-			  case normal:
-			  case close:
+			  case doorRaise:
+			  case doorClose:
 				door->sector->ceilingdata = NULL;  //jff 2/22/98
 				P_RemoveThinker (&door->thinker);  // unlink and free
 				break;
 				
-			  case close30ThenOpen:
+			  case doorCloseWaitOpen:
 				door->direction = 0;
-				door->topcountdown = TICRATE*30;
+				door->topcountdown = door->topwait;
 				break;
 				
 			  default:
@@ -151,14 +135,12 @@ void T_VerticalDoor (vldoor_t* door)
 		{
 			switch(door->type)
 			{
-			  case blazeClose:
-			  case close:				// DO NOT GO BACK UP!
+			  case doorClose:				// DO NOT GO BACK UP!
 				break;
 				
 			  default:
 				door->direction = 1;
-				S_StartSound((mobj_t *)&door->sector->soundorg,
-							 sfx_doropn);
+				DoorSound (door, door->speed, true);
 				break;
 			}
 		}
@@ -169,21 +151,19 @@ void T_VerticalDoor (vldoor_t* door)
 		res = T_MovePlane(door->sector,
 						  door->speed,
 						  door->topheight,
-						  false,1,door->direction);
+						  -1,1,door->direction);
 		
 		if (res == pastdest)
 		{
 			switch(door->type)
 			{
-			  case blazeRaise:
-			  case normal:
+			  case doorRaise:
 				door->direction = 0; // wait at top
 				door->topcountdown = door->topwait;
 				break;
 				
-			  case close30ThenOpen:
-			  case blazeOpen:
-			  case open:
+			  case doorCloseWaitOpen:
+			  case doorOpen:
 				door->sector->ceilingdata = NULL;  //jff 2/22/98
 				P_RemoveThinker (&door->thinker);  // unlink and free
 				break;
@@ -197,139 +177,110 @@ void T_VerticalDoor (vldoor_t* door)
 }
 
 
-//
-// EV_DoLockedDoor
-// Move a locked door up/down
-//
+// [RH] Merged EV_VerticalDoor and EV_DoLockedDoor into EV_DoDoor
+//		and made them more general to support the new specials.
 
-int
-EV_DoLockedDoor
-( line_t*		line,
-  vldoor_e		type,
-  mobj_t*		thing )
+// [RH] SpawnDoor: Helper function for EV_DoDoor
+static BOOL SpawnDoor (sector_t *sec, vldoor_e type, fixed_t speed, int delay)
 {
-	player_t*	p;
-		
-	p = thing->player;
-		
-	if (!p)
-		return 0;
-				
-	switch(line->special)
+	// new door thinker
+	vldoor_t *door = Z_Malloc (sizeof(*door), PU_LEVSPEC, 0);
+	P_AddThinker (&door->thinker);
+	sec->ceilingdata = door;	//jff 2/22/98
+
+	door->thinker.function.acp1 = (actionf_p1) T_VerticalDoor;
+	door->sector = sec;
+	door->type = type;
+	door->topwait = delay;
+	door->speed = speed;
+
+	switch(type)
 	{
-	  case 99:	// Blue Lock
-	  case 133:
-		if (!p->cards[it_bluecard] && !p->cards[it_blueskull])
-		{
-			C_MidPrint (PD_BLUEO);
-			S_StartSound(ORIGIN_AMBIENT,sfx_oof);
-			return 0;
-		}
-		break;
-		
-	  case 134: // Red Lock
-	  case 135:
-		if (!p->cards[it_redcard] && !p->cards[it_redskull])
-		{
-			C_MidPrint (PD_REDO);
-			S_StartSound(ORIGIN_AMBIENT,sfx_oof);
-			return 0;
-		}
-		break;
-		
-	  case 136: // Yellow Lock
-	  case 137:
-		if (!p->cards[it_yellowcard] &&
-			!p->cards[it_yellowskull])
-		{
-			C_MidPrint (PD_YELLOWO);
-			S_StartSound(ORIGIN_AMBIENT,sfx_oof);
-			return 0;
-		}
-		break;	
-	}
-
-	return EV_DoDoor(line,type);
-}
-
-
-int EV_DoDoor (line_t *line, vldoor_e type)
-{
-	int 		secnum,rtn;
-	sector_t*	sec;
-	vldoor_t*	door;
-		
-	secnum = -1;
-	rtn = 0;
-	
-	while ((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
-	{
-		sec = &sectors[secnum];
-		// if the ceiling already moving, don't start the door action
-		if (P_SectorActive(ceiling_special,sec)) //jff 2/22/98
-			continue;
-
-		// new door thinker
-		rtn = 1;
-		door = Z_Malloc (sizeof(*door), PU_LEVSPEC, 0);
-		P_AddThinker (&door->thinker);
-		sec->ceilingdata = door;	//jff 2/22/98
-
-		door->thinker.function.acp1 = (actionf_p1) T_VerticalDoor;
-		door->sector = sec;
-		door->type = type;
-		door->topwait = VDOORWAIT;
-		door->speed = VDOORSPEED;
-				
-		switch(type)
-		{
-		  case blazeClose:
-			door->topheight = P_FindLowestCeilingSurrounding(sec);
+		case doorClose:
+			door->topheight = P_FindLowestCeilingSurrounding (sec) - 4*FRACUNIT;
 			door->topheight -= 4*FRACUNIT;
 			door->direction = -1;
-			door->speed = VDOORSPEED * 4;
-			S_StartSound((mobj_t *)&door->sector->soundorg,
-						 sfx_bdcls);
+			DoorSound (door, speed, false);
 			break;
-			
-		  case close:
-			door->topheight = P_FindLowestCeilingSurrounding(sec);
-			door->topheight -= 4*FRACUNIT;
-			door->direction = -1;
-			S_StartSound((mobj_t *)&door->sector->soundorg,
-						 sfx_dorcls);
+
+		case doorOpen:
+		case doorRaise:
+			door->direction = 1;
+			door->topheight = P_FindLowestCeilingSurrounding (sec) - 4*FRACUNIT;
+			if (door->topheight != sec->ceilingheight)
+				DoorSound (door, speed, true);
 			break;
-			
-		  case close30ThenOpen:
+
+		case doorCloseWaitOpen:
 			door->topheight = sec->ceilingheight;
 			door->direction = -1;
-			S_StartSound((mobj_t *)&door->sector->soundorg,
-						 sfx_dorcls);
-			break;
-			
-		  case blazeRaise:
-		  case blazeOpen:
-			door->direction = 1;
-			door->topheight = P_FindLowestCeilingSurrounding(sec);
-			door->topheight -= 4*FRACUNIT;
-			door->speed = VDOORSPEED * 4;
-			if (door->topheight != sec->ceilingheight)
-				S_StartSound((mobj_t *)&door->sector->soundorg,
-							 sfx_bdopn);
-			break;
-			
-		  case normal:
-		  case open:
-			door->direction = 1;
-			door->topheight = P_FindLowestCeilingSurrounding(sec);
-			door->topheight -= 4*FRACUNIT;
-			if (door->topheight != sec->ceilingheight)
-				S_StartSound((mobj_t *)&door->sector->soundorg,
-							 sfx_doropn);
-			break;
-			
-		  default:
+			DoorSound (door, speed, false);
 			break;
+	}
+
+	return true;
+}
+
+BOOL EV_DoDoor (vldoor_e type, line_t *line, mobj_t *thing,
+				int tag, int speed, int delay, keytype_t lock)
+{
+	BOOL		rtn = false;
+	int 		secnum;
+	sector_t*	sec;
+
+	if (lock && !P_CheckKeys (thing->player, lock, tag))
+		return false;
+
+	if (tag == 0) {		// [RH] manual door
+		if (!line)
+			return false;
+
+		// if the wrong side of door is pushed, give oof sound
+		if (line->sidenum[1]==-1)				// killough
+		{
+			S_StartSound (thing, "*grunt1", 78);
+			return false;
+		}
+
+		// get the sector on the second side of activating linedef
+		sec = sides[line->sidenum[1]].sector;
+		secnum = sec-sectors;
+
+		// if door already has a thinker, use it
+		if (sec->ceilingdata)			//jff 2/22/98
+		{
+			vldoor_t *door = sec->ceilingdata;	//jff 2/22/98
+			if (type == doorRaise) {
+				// ONLY FOR "RAISE" DOORS, NOT "OPEN"s
+				if (door->direction == -1) {
+					door->direction = 1;	// go back up
+				}
+				else if ((line->flags & ML_ACTIVATIONMASK) != ML_ACTIVATEPUSH)
+					// [RH] activate push doors don't go back down when you
+					//		run into them (otherwise opening them would be
+					//		a real pain).
+				{
+					if (!thing->player)
+						return false;		// JDC: bad guys never close doors
+					
+					door->direction = -1;	// start going down immediately
+				}
+				return true;
+			}
+		}
+		rtn = SpawnDoor (sec, type, speed, delay);
+
+	} else {	// [RH] Remote door
+
+		secnum = -1;
+		while ((secnum = P_FindSectorFromTag (tag,secnum)) >= 0)
+		{
+			sec = &sectors[secnum];
+			// if the ceiling already moving, don't start the door action
+			if (P_SectorActive (ceiling_special,sec)) //jff 2/22/98
+				continue;
+
+			rtn |= SpawnDoor (sec, type, speed, delay);
 		}
 				
 	}
@@ -337,171 +288,14 @@ int EV_DoDoor (line_t *line, vldoor_e type)
 }
 
 
-//
-// EV_VerticalDoor : open a door manually, no tag value
-//
-void EV_VerticalDoor (line_t *line, mobj_t *thing)
-{
-	player_t*	player;
-	int 		secnum;
-	sector_t*	sec;
-	vldoor_t*	door;
-	int 		side;
-		
-	side = 0;	// only front sides can be used
-
-	//	Check for locks
-	player = thing->player;
-				
-	switch(line->special)
-	{
-	  case 26: // Blue Lock
-	  case 32:
-		if ( !player )
-			return;
-		
-		if (!player->cards[it_bluecard] && !player->cards[it_blueskull])
-		{
-			C_MidPrint (PD_BLUEK);
-			S_StartSound(ORIGIN_AMBIENT,sfx_oof);
-			return;
-		}
-		break;
-		
-	  case 27: // Yellow Lock
-	  case 34:
-		if ( !player )
-			return;
-		
-		if (!player->cards[it_yellowcard] &&
-			!player->cards[it_yellowskull])
-		{
-			C_MidPrint (PD_YELLOWK);
-			S_StartSound(ORIGIN_AMBIENT,sfx_oof);
-			return;
-		}
-		break;
-		
-	  case 28: // Red Lock
-	  case 33:
-		if ( !player )
-			return;
-		
-		if (!player->cards[it_redcard] && !player->cards[it_redskull])
-		{
-			C_MidPrint (PD_REDK);
-			S_StartSound(ORIGIN_AMBIENT,sfx_oof);
-			return;
-		}
-		break;
-	}
-		
-	// if the wrong side of door is pushed, give oof sound
-	if (line->sidenum[1]==-1)				// killough
-	{
-		S_StartSound(player->mo,sfx_oof);	// killough 3/20/98
-		return /*0*/;
-	}
-
-	// get the sector on the second side of activating linedef
-	sec = sides[line->sidenum[1]].sector;
-	secnum = sec-sectors;
-
-	// if door already has a thinker, use it
-	if (sec->ceilingdata)			//jff 2/22/98
-	{
-		door = sec->ceilingdata;	//jff 2/22/98
-		switch(line->special)
-		{
-		  case	1: // ONLY FOR "RAISE" DOORS, NOT "OPEN"s
-		  case	26:
-		  case	27:
-		  case	28:
-		  case	117:
-			if (door->direction == -1)
-				door->direction = 1;	// go back up
-			else
-			{
-				if (!thing->player)
-					return; 			// JDC: bad guys never close doors
-				
-				door->direction = -1;	// start going down immediately
-			}
-			return;
-		}
-	}
-		
-	// for proper sound
-	switch(line->special)
-	{
-	  case 117: // BLAZING DOOR RAISE
-	  case 118: // BLAZING DOOR OPEN
-		S_StartSound((mobj_t *)&sec->soundorg,sfx_bdopn);
-		break;
-		
-	  case 1:	// NORMAL DOOR SOUND
-	  case 31:
-		S_StartSound((mobj_t *)&sec->soundorg,sfx_doropn);
-		break;
-		
-	  default:	// LOCKED DOOR SOUND
-		S_StartSound((mobj_t *)&sec->soundorg,sfx_doropn);
-		break;
-	}
-		
-	
-	// new door thinker
-	door = Z_Malloc (sizeof(*door), PU_LEVSPEC, 0);
-	P_AddThinker (&door->thinker);
-	sec->ceilingdata = door;	//jff 2/22/98
-	door->thinker.function.acp1 = (actionf_p1) T_VerticalDoor;
-	door->sector = sec;
-	door->direction = 1;
-	door->speed = VDOORSPEED;
-	door->topwait = VDOORWAIT;
-
-	switch(line->special)
-	{
-	  case 1:
-	  case 26:
-	  case 27:
-	  case 28:
-		door->type = normal;
-		break;
-		
-	  case 31:
-	  case 32:
-	  case 33:
-	  case 34:
-		door->type = open;
-		line->special = 0;
-		break;
-		
-	  case 117: // blazing door raise
-		door->type = blazeRaise;
-		door->speed = VDOORSPEED*4;
-		break;
-	  case 118: // blazing door open
-		door->type = blazeOpen;
-		line->special = 0;
-		door->speed = VDOORSPEED*4;
-		break;
-	}
-	
-	// find the top and bottom of the movement range
-	door->topheight = P_FindLowestCeilingSurrounding(sec);
-	door->topheight -= 4*FRACUNIT;
-}
-
-
 //
 // Spawn a door that closes after 30 seconds
 //
 void P_SpawnDoorCloseIn30 (sector_t* sec)
 {
-	vldoor_t*	door;
+	vldoor_t *door;
 		
-	door = Z_Malloc ( sizeof(*door), PU_LEVSPEC, 0);
+	door = Z_Malloc (sizeof(*door), PU_LEVSPEC, 0);
 
 	P_AddThinker (&door->thinker);
 
@@ -511,17 +305,17 @@ void P_SpawnDoorCloseIn30 (sector_t* sec)
 	door->thinker.function.acp1 = (actionf_p1)T_VerticalDoor;
 	door->sector = sec;
 	door->direction = 0;
-	door->type = normal;
-	door->speed = VDOORSPEED;
+	door->type = doorRaise;
+	door->speed = FRACUNIT*2;
 	door->topcountdown = 30 * TICRATE;
 }
 
 //
 // Spawn a door that opens after 5 minutes
 //
-void P_SpawnDoorRaiseIn5Mins (sector_t *sec, int secnum)
+void P_SpawnDoorRaiseIn5Mins (sector_t *sec)
 {
-	vldoor_t*	door;
+	vldoor_t *door;
 
 	door = Z_Malloc ( sizeof(*door), PU_LEVSPEC, 0);
 	
@@ -533,221 +327,10 @@ void P_SpawnDoorRaiseIn5Mins (sector_t *sec, int secnum)
 	door->thinker.function.acp1 = (actionf_p1)T_VerticalDoor;
 	door->sector = sec;
 	door->direction = 2;
-	door->type = raiseIn5Mins;
-	door->speed = VDOORSPEED;
+	door->type = doorRaiseIn5Mins;
+	door->speed = FRACUNIT * 2;
 	door->topheight = P_FindLowestCeilingSurrounding(sec);
 	door->topheight -= 4*FRACUNIT;
-	door->topwait = VDOORWAIT;
+	door->topwait = (150*TICRATE)/35;
 	door->topcountdown = 5 * 60 * TICRATE;
 }
-
-
-
-// UNUSED
-// Separate into p_slidoor.c?
-
-#if 0			// ABANDONED TO THE MISTS OF TIME!!!
-//
-// EV_SlidingDoor : slide a door horizontally
-// (animate midtexture, then set noblocking line)
-//
-
-
-slideframe_t slideFrames[MAXSLIDEDOORS];
-
-void P_InitSlidingDoorFrames (void)
-{
-	int 		i;
-	int 		f1;
-	int 		f2;
-	int 		f3;
-	int 		f4;
-
-	// DOOM II ONLY...
-	if ( gamemode != commercial)
-		return;
-
-	for (i = 0;i < MAXSLIDEDOORS; i++)
-	{
-		if (!slideFrameNames[i].frontFrame1[0])
-			break;
-
-		f1 = R_TextureNumForName(slideFrameNames[i].frontFrame1);
-		f2 = R_TextureNumForName(slideFrameNames[i].frontFrame2);
-		f3 = R_TextureNumForName(slideFrameNames[i].frontFrame3);
-		f4 = R_TextureNumForName(slideFrameNames[i].frontFrame4);
-
-		slideFrames[i].frontFrames[0] = f1;
-		slideFrames[i].frontFrames[1] = f2;
-		slideFrames[i].frontFrames[2] = f3;
-		slideFrames[i].frontFrames[3] = f4;
-
-		f1 = R_TextureNumForName(slideFrameNames[i].backFrame1);
-		f2 = R_TextureNumForName(slideFrameNames[i].backFrame2);
-		f3 = R_TextureNumForName(slideFrameNames[i].backFrame3);
-		f4 = R_TextureNumForName(slideFrameNames[i].backFrame4);
-
-		slideFrames[i].backFrames[0] = f1;
-		slideFrames[i].backFrames[1] = f2;
-		slideFrames[i].backFrames[2] = f3;
-		slideFrames[i].backFrames[3] = f4;
-	}
-}
-
-
-//
-// Return index into "slideFrames" array
-// for which door type to use
-//
-int P_FindSlidingDoorType (line_t *line)
-{
-	int 		i;
-	int 		val;
-
-	for (i = 0;i < MAXSLIDEDOORS;i++)
-	{
-		val = sides[line->sidenum[0]].midtexture;
-		if (val == slideFrames[i].frontFrames[0])
-			return i;
-	}
-
-	return -1;
-}
-
-void T_SlidingDoor (slidedoor_t *door)
-{
-	switch(door->status)
-	{
-	  case sd_opening:
-		if (!door->timer--)
-		{
-			if (++door->frame == SNUMFRAMES)
-			{
-				// IF DOOR IS DONE OPENING...
-				sides[door->line->sidenum[0]].midtexture = 0;
-				sides[door->line->sidenum[1]].midtexture = 0;
-				door->line->flags &= ML_BLOCKING^0xff;
-
-				if (door->type == sdt_openOnly)
-				{
-					door->frontsector->specialdata = NULL;
-					P_RemoveThinker (&door->thinker);
-					break;
-				}
-
-				door->timer = SDOORWAIT;
-				door->status = sd_waiting;
-			}
-			else
-			{
-				// IF DOOR NEEDS TO ANIMATE TO NEXT FRAME...
-				door->timer = SWAITTICS;
-
-				sides[door->line->sidenum[0]].midtexture =
-					slideFrames[door->whichDoorIndex].
-					frontFrames[door->frame];
-				sides[door->line->sidenum[1]].midtexture =
-					slideFrames[door->whichDoorIndex].
-					backFrames[door->frame];
-			}
-		}
-		break;
-
-	  case sd_waiting:
-		// IF DOOR IS DONE WAITING...
-		if (!door->timer--)
-		{
-			// CAN DOOR CLOSE?
-			if (door->frontsector->thinglist != NULL ||
-				door->backsector->thinglist != NULL)
-			{
-				door->timer = SDOORWAIT;
-				break;
-			}
-
-			//door->frame = SNUMFRAMES-1;
-			door->status = sd_closing;
-			door->timer = SWAITTICS;
-		}
-		break;
-						
-	  case sd_closing:
-		if (!door->timer--)
-		{
-			if (--door->frame < 0)
-			{
-				// IF DOOR IS DONE CLOSING...
-				door->line->flags |= ML_BLOCKING;
-				door->frontsector->specialdata = NULL;
-				P_RemoveThinker (&door->thinker);
-				break;
-			}
-			else
-			{
-				// IF DOOR NEEDS TO ANIMATE TO NEXT FRAME...
-				door->timer = SWAITTICS;
-										
-				sides[door->line->sidenum[0]].midtexture =
-					slideFrames[door->whichDoorIndex].
-					frontFrames[door->frame];
-				sides[door->line->sidenum[1]].midtexture =
-					slideFrames[door->whichDoorIndex].
-					backFrames[door->frame];
-			}
-		}
-		break;
-	}
-}
-
-
-
-void EV_SlidingDoor (line_t *line, mobj_t *thing)
-{
-	sector_t*			sec;
-	slidedoor_t*		door;
-		
-	// DOOM II ONLY...
-	if (gamemode != commercial)
-		return;
-	
-	// Make sure door isn't already being animated
-	sec = line->frontsector;
-	door = NULL;
-	if (sec->specialdata)
-	{
-		if (!thing->player)
-			return;
-						
-		door = sec->specialdata;
-		if (door->type == sdt_openAndClose)
-		{
-			if (door->status == sd_waiting)
-				door->status = sd_closing;
-		}
-		else
-			return;
-	}
-	
-	// Init sliding door vars
-	if (!door)
-	{
-		door = Z_Malloc (sizeof(*door), PU_LEVSPEC, 0);
-		P_AddThinker (&door->thinker);
-		sec->specialdata = door;
-				
-		door->type = sdt_openAndClose;
-		door->status = sd_opening;
-		door->whichDoorIndex = P_FindSlidingDoorType(line);
-
-		if (door->whichDoorIndex < 0)
-			I_Error("EV_SlidingDoor: Can't use texture for sliding door!");
-						
-		door->frontsector = sec;
-		door->backsector = line->backsector;
-		door->thinker.function = T_SlidingDoor;
-		door->timer = SWAITTICS;
-		door->frame = 0;
-		door->line = line;
-	}
-}
-#endif
diff --git a/code/P_enemy.c b/code/P_enemy.c
index 115f530915..52ddbc6f88 100644
--- a/code/P_enemy.c
+++ b/code/P_enemy.c
@@ -31,6 +31,7 @@
 
 #include "doomdef.h"
 #include "p_local.h"
+#include "p_lnspec.h"
 
 #include "s_sound.h"
 
@@ -40,9 +41,6 @@
 #include "doomstat.h"
 #include "r_state.h"
 
-// Data.
-#include "sounds.h"
-
 #include "c_cvars.h"
 
 cvar_t *testgibs;
@@ -101,12 +99,9 @@ void A_Fall (mobj_t *actor);
 // sound blocking lines cut off traversal.
 //
 
-mobj_t* 		soundtarget;
+mobj_t *soundtarget;
 
-void
-P_RecursiveSound
-( sector_t* 	sec,
-  int			soundblocks )
+void P_RecursiveSound (sector_t *sec, int soundblocks)
 {
 	int 		i;
 	line_t* 	check;
@@ -156,10 +151,7 @@ P_RecursiveSound
 // If a monster yells at a player,
 // it will alert other monsters to the player.
 //
-void
-P_NoiseAlert
-( mobj_t*		target,
-  mobj_t*		emmiter )
+void P_NoiseAlert (mobj_t *target, mobj_t *emmiter)
 {
 	if (target->player && (target->player->cheats & CF_NOTARGET))
 		return;
@@ -175,10 +167,10 @@ P_NoiseAlert
 //
 // P_CheckMeleeRange
 //
-BOOL P_CheckMeleeRange (mobj_t*		actor)
+BOOL P_CheckMeleeRange (mobj_t *actor)
 {
-	mobj_t* 	pl;
-	fixed_t 	dist;
+	mobj_t *pl;
+	fixed_t dist;
 		
 	if (!actor->target)
 		return false;
@@ -189,13 +181,19 @@ BOOL P_CheckMeleeRange (mobj_t*		actor)
 	if (dist >= MELEERANGE-20*FRACUNIT+pl->info->radius)
 		return false;
 
-	// [RH] Don't melee things too far above or below actor
-	if (pl->z > actor->z + actor->height + 20*FRACUNIT)
-		return false;
-	if (pl->z + pl->height < actor->z - 20*FRACUNIT)
-		return false;
+	// [RH] If moving toward goal, then we've reached it.
+	if (actor->target == actor->goal)
+		return true;
+
+	// [RH] Don't melee things too far above or below actor.
+	if (!olddemo) {
+		if (pl->z > actor->z + actor->height + 20*FRACUNIT)
+			return false;
+		if (pl->z + pl->height < actor->z - 20*FRACUNIT)
+			return false;
+	}
 		
-	if (! P_CheckSight (actor, pl) )
+	if (! P_CheckSight (actor, pl, false) )
 		return false;
 														
 	return true;				
@@ -204,11 +202,11 @@ BOOL P_CheckMeleeRange (mobj_t*		actor)
 //
 // P_CheckMissileRange
 //
-BOOL P_CheckMissileRange (mobj_t* actor)
+BOOL P_CheckMissileRange (mobj_t *actor)
 {
-	fixed_t 	dist;
+	fixed_t dist;
 		
-	if (! P_CheckSight (actor, actor->target) )
+	if (! P_CheckSight (actor, actor->target, false) )
 		return false;
 		
 	if ( actor->flags & MF_JUSTHIT )
@@ -277,12 +275,12 @@ fixed_t yspeed[8] = {0,47000,FRACUNIT,47000,0,-47000,-FRACUNIT,-47000};
 extern	line_t	**spechit;
 extern	int 	numspechit;
 
-BOOL P_Move (mobj_t* actor)
+BOOL P_Move (mobj_t *actor)
 {
 	fixed_t	tryx;
 	fixed_t	tryy;
 	
-	line_t* 	ld;
+	line_t* ld;
 	
 	// warning: 'catch', 'throw', and 'try'
 	// are all C++ reserved words
@@ -295,10 +293,11 @@ BOOL P_Move (mobj_t* actor)
 	if ((unsigned)actor->movedir >= 8)
 		I_Error ("Weird actor->movedir!");
 				
-	tryx = actor->x + actor->info->speed*xspeed[actor->movedir];
-	tryy = actor->y + actor->info->speed*yspeed[actor->movedir];
+	tryx = actor->x + actor->info->speed * xspeed[actor->movedir];
+	tryy = actor->y + actor->info->speed * yspeed[actor->movedir];
 
-	try_ok = P_TryMove (actor, tryx, tryy);
+	// killough 3/15/98: don't jump over dropoffs:
+	try_ok = P_TryMove (actor, tryx, tryy, false);
 
 	if (!try_ok)
 	{
@@ -324,14 +323,17 @@ BOOL P_Move (mobj_t* actor)
 		{
 			ld = spechit[numspechit];
 			// if the special is not a door
-			// that can be opened,
-			// return false
-			if (P_UseSpecialLine (actor, ld,0))
-				good = true;
+			// that can be opened, return false
+			if ((ld->flags & ML_ACTIVATIONMASK) == ML_ACTIVATEPUSH)
+				good = P_PushSpecialLine (actor,
+					P_PointOnLineSide (actor->x, actor->y, ld),
+					ld);	// [RH] Try to push the line
+			else
+				good = P_UseSpecialLine (actor, ld, 0);
 		}
-		return good;
-	}
-	else
+		return good && (olddemo || (P_Random (pr_trywalk) & 3));	//jff 8/13/98
+	}													// 1 in 4 try a different dir
+	else												// avoid stuck in doorway
 	{
 		actor->flags &= ~MF_INFLOAT;
 	}
@@ -355,7 +357,7 @@ BOOL P_Move (mobj_t* actor)
 // If a door is in the way,
 // an OpenDoor call is made to start it opening.
 //
-BOOL P_TryWalk (mobj_t* actor)
+BOOL P_TryWalk (mobj_t *actor)
 {		
 	if (!P_Move (actor))
 	{
@@ -369,7 +371,7 @@ BOOL P_TryWalk (mobj_t* actor)
 
 
 
-void P_NewChaseDir (mobj_t* 	actor)
+void P_NewChaseDir (mobj_t *actor)
 {
 	fixed_t 	deltax;
 	fixed_t 	deltay;
@@ -381,11 +383,14 @@ void P_NewChaseDir (mobj_t* 	actor)
 	
 	dirtype_t	turnaround;
 
-	if (!actor->target)
-		I_Error ("P_NewChaseDir: called with no target");
+	if (!actor->target) {
+		Printf ("P_NewChaseDir: called with no target");
+		P_SetMobjState (actor, actor->info->spawnstate);
+		return;
+	}
 				
 	olddir = actor->movedir;
-	turnaround=opposite[olddir];
+	turnaround = opposite[olddir];
 
 	deltax = actor->target->x - actor->x;
 	deltay = actor->target->y - actor->y;
@@ -405,64 +410,60 @@ void P_NewChaseDir (mobj_t* 	actor)
 		d[2]=DI_NODIR;
 
 	// try direct route
-	if (d[1] != DI_NODIR
-		&& d[2] != DI_NODIR)
+	if (d[1] != DI_NODIR && d[2] != DI_NODIR)
 	{
-		actor->movedir = diags[((deltay<0)<<1)+(deltax>0)];
+		actor->movedir = diags[((deltay<0)<<1) + (deltax>0)];
 		if (actor->movedir != turnaround && P_TryWalk(actor))
 			return;
 	}
 
 	// try other directions
-	if (P_Random (pr_newchasedir) > 200
-		||	abs(deltay)>abs(deltax))
+	if (P_Random (pr_newchasedir) > 200 || abs(deltay) > abs(deltax))
 	{
-		tdir=d[1];
-		d[1]=d[2];
-		d[2]=tdir;
+		tdir = d[1];
+		d[1] = d[2];
+		d[2] = tdir;
 	}
 
-	if (d[1]==turnaround)
-		d[1]=DI_NODIR;
-	if (d[2]==turnaround)
-		d[2]=DI_NODIR;
+	if (d[1] == turnaround)
+		d[1] = DI_NODIR;
+	if (d[2] == turnaround)
+		d[2] = DI_NODIR;
 		
-	if (d[1]!=DI_NODIR)
+	if (d[1] != DI_NODIR)
 	{
 		actor->movedir = d[1];
-		if (P_TryWalk(actor))
+		if (P_TryWalk (actor))
 		{
 			// either moved forward or attacked
 			return;
 		}
 	}
 
-	if (d[2]!=DI_NODIR)
+	if (d[2] != DI_NODIR)
 	{
-		actor->movedir =d[2];
+		actor->movedir = d[2];
 
-		if (P_TryWalk(actor))
+		if (P_TryWalk (actor))
 			return;
 	}
 
 	// there is no direct path to the player,
 	// so pick another direction.
-	if (olddir!=DI_NODIR)
+	if (olddir != DI_NODIR)
 	{
-		actor->movedir =olddir;
+		actor->movedir = olddir;
 
-		if (P_TryWalk(actor))
+		if (P_TryWalk (actor))
 			return;
 	}
 
 	// randomly determine direction of search
 	if (P_Random (pr_newchasedir) & 1)	
 	{
-		for ( tdir=DI_EAST;
-			  tdir<=DI_SOUTHEAST;
-			  tdir++ )
+		for (tdir = DI_EAST; tdir <= DI_SOUTHEAST; tdir++)
 		{
-			if (tdir!=turnaround)
+			if (tdir != turnaround)
 			{
 				actor->movedir =tdir;
 				
@@ -473,13 +474,11 @@ void P_NewChaseDir (mobj_t* 	actor)
 	}
 	else
 	{
-		for ( tdir=DI_SOUTHEAST;
-			  tdir != (DI_EAST-1);
-			  tdir-- )
+		for (tdir = DI_SOUTHEAST; tdir != (DI_EAST-1); tdir--)
 		{
-			if (tdir!=turnaround)
+			if (tdir != turnaround)
 			{
-				actor->movedir =tdir;
+				actor->movedir = tdir;
 				
 				if ( P_TryWalk(actor) )
 					return;
@@ -487,7 +486,7 @@ void P_NewChaseDir (mobj_t* 	actor)
 		}
 	}
 
-	if (turnaround !=  DI_NODIR)
+	if (turnaround != DI_NODIR)
 	{
 		actor->movedir =turnaround;
 		if ( P_TryWalk(actor) )
@@ -516,18 +515,17 @@ BOOL P_LookForPlayers (mobj_t *actor, BOOL allaround)
 	sector = actor->subsector->sector;
 		
 	c = 0;
-	stop = (actor->lastlook-1)&(MAXPLAYERS-1);
+	stop = (actor->lastlook-1) & (MAXPLAYERS-1);
 		
 	for ( ; ; actor->lastlook = (actor->lastlook+1)&(MAXPLAYERS-1) )
 	{
 		if (!playeringame[actor->lastlook])
 			continue;
 						
-		if (c++ == 2
-			|| actor->lastlook == stop)
+		if (c++ == 2 || actor->lastlook == stop)
 		{
-			// done looking
-			return false;		
+			// done looking		// [RH] use goal as target
+			return (actor->target = actor->goal) ? true : false;
 		}
 		
 		player = &players[actor->lastlook];
@@ -538,7 +536,7 @@ BOOL P_LookForPlayers (mobj_t *actor, BOOL allaround)
 		if (player->health <= 0)
 			continue;			// dead
 
-		if (!P_CheckSight (actor, player->mo))
+		if (!P_CheckSight (actor, player->mo, false))
 			continue;			// out of sight
 						
 		if (!allaround)
@@ -558,12 +556,29 @@ BOOL P_LookForPlayers (mobj_t *actor, BOOL allaround)
 					continue;	// behind back
 			}
 		}
-				
+		
+		// [RH] Need to be sure the reactiontime is 0 if the monster is
+		//		leaving its goal to go after a player.
+		if (actor->goal && actor->target == actor->goal)
+			actor->reactiontime = 0;
+
 		actor->target = player->mo;
 		return true;
 	}
 
-//	return false;
+	// Use last known enemy if no players sighted -- killough 2/15/98:
+
+	if (/*smartypants && */ !olddemo)
+		if (actor->lastenemy && actor->lastenemy->health > 0)
+		{
+			actor->target = actor->lastenemy;
+			actor->lastenemy = NULL;
+			return true;
+		}
+
+	// [RH] Use goal as a last resort
+	return (actor->target = actor->goal) ? true : false;
+
 }
 
 
@@ -572,11 +587,10 @@ BOOL P_LookForPlayers (mobj_t *actor, BOOL allaround)
 // DOOM II special, map 32.
 // Uses special tag 666.
 //
-void A_KeenDie (mobj_t* mo)
+void A_KeenDie (mobj_t *mo)
 {
 	thinker_t*	th;
 	mobj_t* 	mo2;
-	line_t		junk;
 
 	A_Fall (mo);
 	
@@ -597,8 +611,7 @@ void A_KeenDie (mobj_t* mo)
 		}
 	}
 
-	junk.tag = 666;
-	EV_DoDoor(&junk,open);
+	EV_DoDoor (doorOpen, NULL, NULL, 666, 2*FRACUNIT, 0, 0);
 }
 
 
@@ -609,10 +622,18 @@ void A_KeenDie (mobj_t* mo)
 //
 // A_Look
 // Stay in state until a player is sighted.
+// [RH] Will also leave state to move to goal.
 //
-void A_Look (mobj_t* actor)
+void A_Look (mobj_t *actor)
 {
-	mobj_t* 	targ;
+	mobj_t *targ;
+
+	// [RH] Set goal now if appropriate
+	if (actor->special == Thing_SetGoal && actor->args[0] == 0) {
+		actor->special = 0;
+		actor->goal = P_FindGoal (NULL, actor->args[1], MT_PATHNODE);
+		actor->reactiontime = actor->args[2] * TICRATE + level.time;
+	}
 
 	actor->threshold = 0;		// any shot will wake up
 	targ = actor->subsector->sector->soundtarget;
@@ -626,14 +647,13 @@ void A_Look (mobj_t* actor)
 		P_IncreaseVisibility(actor);
 	}
 
-	if (targ
-		&& (targ->flags & MF_SHOOTABLE) )
+	if (targ && (targ->flags & MF_SHOOTABLE) )
 	{
 		actor->target = targ;
 
 		if ( actor->flags & MF_AMBUSH )
 		{
-			if (P_CheckSight (actor, actor->target))
+			if (P_CheckSight (actor, actor->target, false))
 				goto seeyou;
 		}
 		else
@@ -646,39 +666,32 @@ void A_Look (mobj_t* actor)
 				
 	// go into chase state
   seeyou:
-	if (actor->info->seesound)
-	{
-		int 			sound;
-				
-		switch (actor->info->seesound)
-		{
-		  case sfx_posit1:
-		  case sfx_posit2:
-		  case sfx_posit3:
-			sound = sfx_posit1+P_Random(pr_look)%3;
-			break;
+	// [RH] Don't start chasing after a goal if it isn't time yet.
+	if (actor->target == actor->goal) {
+		if (actor->reactiontime > level.time)
+			actor->target = NULL;
+	} else if (actor->info->seesound) {
+		char sound[MAX_SNDNAME];
 
-		  case sfx_bgsit1:
-		  case sfx_bgsit2:
-			sound = sfx_bgsit1+P_Random(pr_look)%2;
-			break;
+		strcpy (sound, actor->info->seesound);
 
-		  default:
-			sound = actor->info->seesound;
-			break;
+		if (sound[strlen(sound)-1] == '1') {
+			sound[strlen(sound)-1] = P_Random(pr_look)%3 + '1';
+			if (S_FindSound (sound) == -1)
+				sound[strlen(sound)-1] = '1';
 		}
 
-		if (actor->type==MT_SPIDER
-			|| actor->type == MT_CYBORG)
+		if (actor->type==MT_SPIDER || actor->type == MT_CYBORG)
 		{
 			// full volume
-			S_StartSound (ORIGIN_SURROUND, sound);
+			S_StartSound (ORIGIN_SURROUND, sound, 90);
 		}
 		else
-			S_StartSound (actor, sound);
+			S_StartSound (actor, sound, 90);
 	}
 
-	P_SetMobjState (actor, actor->info->seestate);
+	if (actor->target)
+		P_SetMobjState (actor, actor->info->seestate);
 }
 
 
@@ -687,9 +700,9 @@ void A_Look (mobj_t* actor)
 // Actor has a melee attack,
 // so it tries to close as fast as possible
 //
-void A_Chase (mobj_t*	actor)
+void A_Chase (mobj_t *actor)
 {
-	int 		delta;
+	int delta;
 
 	// [RH] Andy Baker's stealth monsters
 	if (actor->flags & MF_STEALTH)
@@ -700,12 +713,10 @@ void A_Chase (mobj_t*	actor)
 	if (actor->reactiontime)
 		actor->reactiontime--;
 								
-
 	// modify target threshold
-	if	(actor->threshold)
+	if (actor->threshold)
 	{
-		if (!actor->target
-			|| actor->target->health <= 0)
+		if (!actor->target || actor->target->health <= 0)
 		{
 			actor->threshold = 0;
 		}
@@ -725,15 +736,16 @@ void A_Chase (mobj_t*	actor)
 			actor->angle += ANG90/2;
 	}
 
-	if (!actor->target
-		|| !(actor->target->flags&MF_SHOOTABLE))
+	if (!actor->target || !(actor->target->flags&MF_SHOOTABLE))
 	{
 		// look for a new target
-		if (P_LookForPlayers(actor,true))
+		if (P_LookForPlayers (actor, true) && actor->target != actor->goal)
 			return; 	// got a new target
 		
-		P_SetMobjState (actor, actor->info->spawnstate);
-		return;
+		if (actor->target == NULL) {
+			P_SetMobjState (actor, actor->info->spawnstate);
+			return;
+		}
 	}
 	
 	// do not attack twice in a row
@@ -745,12 +757,24 @@ void A_Chase (mobj_t*	actor)
 		return;
 	}
 	
+	// [RH] Don't attack if just moving toward goal
+	if (actor->target == actor->goal) {
+		if (P_CheckMeleeRange (actor)) {
+			// reached the goal
+			actor->reactiontime = actor->goal->args[1] * TICRATE + level.time;
+			actor->goal = P_FindGoal (NULL, actor->goal->args[0], MT_PATHNODE);
+			actor->target = NULL;
+			P_SetMobjState (actor, actor->info->spawnstate);
+			return;
+		}
+		goto nomissile;
+	}
+
 	// check for melee attack
-	if (actor->info->meleestate
-		&& P_CheckMeleeRange (actor))
+	if (actor->info->meleestate && P_CheckMeleeRange (actor))
 	{
 		if (actor->info->attacksound)
-			S_StartSound (actor, actor->info->attacksound);
+			S_StartSound (actor, actor->info->attacksound, 70);
 
 		P_SetMobjState (actor, actor->info->meleestate);
 		return;
@@ -778,15 +802,14 @@ void A_Chase (mobj_t*	actor)
 	// possibly choose another target
 	if (netgame
 		&& !actor->threshold
-		&& !P_CheckSight (actor, actor->target) )
+		&& !P_CheckSight (actor, actor->target, false) )
 	{
 		if (P_LookForPlayers(actor,true))
 			return; 	// got a new target
 	}
 	
 	// chase towards player
-	if (--actor->movecount<0
-		|| !P_Move (actor))
+	if (--actor->movecount < 0 || !P_Move (actor))
 	{
 		P_NewChaseDir (actor);
 	}
@@ -794,7 +817,7 @@ void A_Chase (mobj_t*	actor)
 	// make active sound
 	if (actor->info->activesound && P_Random (pr_chase) < 3)
 	{
-		S_StartSound (actor, actor->info->activesound);
+		S_StartSound (actor, actor->info->activesound, 120);
 	}
 }
 
@@ -802,7 +825,7 @@ void A_Chase (mobj_t*	actor)
 //
 // A_FaceTarget
 //
-void A_FaceTarget (mobj_t* actor)
+void A_FaceTarget (mobj_t *actor)
 {
 	if (!actor->target)
 		return;
@@ -831,7 +854,7 @@ void A_FaceTarget (mobj_t* actor)
 //
 // A_PosAttack
 //
-void A_PosAttack (mobj_t* actor)
+void A_PosAttack (mobj_t *actor)
 {
 	int angle;
 	int damage;
@@ -845,14 +868,14 @@ void A_PosAttack (mobj_t* actor)
 	angle = actor->angle;
 	slope = P_AimLineAttack (actor, angle, MISSILERANGE);
 
-	S_StartSound (actor, sfx_pistol);
+	S_StartSound (actor, "grunt/attack", 64);
 	t = P_Random(pr_posattack);
 	angle += (t - P_Random (pr_posattack))<<20;
 	damage = ((P_Random (pr_posattack)%5)+1)*3;
 	P_LineAttack (actor, angle, MISSILERANGE, slope, damage);
 }
 
-void A_SPosAttack (mobj_t* actor)
+void A_SPosAttack (mobj_t *actor)
 {
 	int i;
 	int bangle;
@@ -861,7 +884,7 @@ void A_SPosAttack (mobj_t* actor)
 	if (!actor->target)
 		return;
 
-	S_StartSound (actor, sfx_shotgn);
+	S_StartSound (actor, "shotguy/attack", 64);
 	A_FaceTarget (actor);
 	bangle = actor->angle;
 	slope = P_AimLineAttack (actor, bangle, MISSILERANGE);
@@ -875,7 +898,7 @@ void A_SPosAttack (mobj_t* actor)
     }
 }
 
-void A_CPosAttack (mobj_t* actor)
+void A_CPosAttack (mobj_t *actor)
 {
 	int angle;
 	int bangle;
@@ -892,7 +915,7 @@ void A_CPosAttack (mobj_t* actor)
 		P_IncreaseVisibility(actor);
 	}
 
-	S_StartSound (actor, sfx_shotgn);
+	S_StartSound (actor, "chainguy/attack", 64);
 	A_FaceTarget (actor);
 	bangle = actor->angle;
 	slope = P_AimLineAttack (actor, bangle, MISSILERANGE);
@@ -903,7 +926,7 @@ void A_CPosAttack (mobj_t* actor)
 	P_LineAttack (actor, angle, MISSILERANGE, slope, damage);
 }
 
-void A_CPosRefire (mobj_t* actor)
+void A_CPosRefire (mobj_t *actor)
 {		
 	// keep firing unless target got out of sight
 	A_FaceTarget (actor);
@@ -913,14 +936,14 @@ void A_CPosRefire (mobj_t* actor)
 
 	if (!actor->target
 		|| actor->target->health <= 0
-		|| !P_CheckSight (actor, actor->target) )
+		|| !P_CheckSight (actor, actor->target, false) )
 	{
 		P_SetMobjState (actor, actor->info->seestate);
 	}
 }
 
 
-void A_SpidRefire (mobj_t* actor)
+void A_SpidRefire (mobj_t *actor)
 {		
 	// keep firing unless target got out of sight
 	A_FaceTarget (actor);
@@ -930,7 +953,7 @@ void A_SpidRefire (mobj_t* actor)
 
 	if (!actor->target
 		|| actor->target->health <= 0
-		|| !P_CheckSight (actor, actor->target) )
+		|| !P_CheckSight (actor, actor->target, false) )
 	{
 		P_SetMobjState (actor, actor->info->seestate);
 	}
@@ -957,54 +980,47 @@ void A_BspiAttack (mobj_t *actor)
 //
 // A_TroopAttack
 //
-void A_TroopAttack (mobj_t* actor)
+void A_TroopAttack (mobj_t *actor)
 {
-	int damage;
-		
 	if (!actor->target)
 		return;
 				
 	A_FaceTarget (actor);
 	if (P_CheckMeleeRange (actor))
 	{
-		S_StartSound (actor, sfx_claw);
-		damage = (P_Random (pr_troopattack)%8+1)*3;
+		int damage = (P_Random (pr_troopattack)%8+1)*3;
+		S_StartSound (actor, "imp/melee", 70);
 		P_DamageMobj (actor->target, actor, actor, damage, MOD_HIT);
 		return;
 	}
-
 	
 	// launch a missile
 	P_SpawnMissile (actor, actor->target, MT_TROOPSHOT);
 }
 
 
-void A_SargAttack (mobj_t* actor)
+void A_SargAttack (mobj_t *actor)
 {
-	int 		damage;
-
 	if (!actor->target)
 		return;
 				
 	A_FaceTarget (actor);
 	if (P_CheckMeleeRange (actor))
 	{
-		damage = ((P_Random (pr_sargattack)%10)+1)*4;
+		int damage = ((P_Random (pr_sargattack)%10)+1)*4;
 		P_DamageMobj (actor->target, actor, actor, damage, MOD_HIT);
 	}
 }
 
-void A_HeadAttack (mobj_t* actor)
+void A_HeadAttack (mobj_t *actor)
 {
-	int damage;
-		
 	if (!actor->target)
 		return;
 				
 	A_FaceTarget (actor);
 	if (P_CheckMeleeRange (actor))
 	{
-		damage = (P_Random (pr_headattack)%6+1)*10;
+		int damage = (P_Random (pr_headattack)%6+1)*10;
 		P_DamageMobj (actor->target, actor, actor, damage, MOD_HIT);
 		return;
 	}
@@ -1013,7 +1029,7 @@ void A_HeadAttack (mobj_t* actor)
 	P_SpawnMissile (actor, actor->target, MT_HEADSHOT);
 }
 
-void A_CyberAttack (mobj_t* actor)
+void A_CyberAttack (mobj_t *actor)
 {		
 	if (!actor->target)
 		return;
@@ -1023,17 +1039,15 @@ void A_CyberAttack (mobj_t* actor)
 }
 
 
-void A_BruisAttack (mobj_t* actor)
+void A_BruisAttack (mobj_t *actor)
 {
-	int damage;
-		
 	if (!actor->target)
 		return;
 				
 	if (P_CheckMeleeRange (actor))
 	{
-		S_StartSound (actor, sfx_claw);
-		damage = (P_Random (pr_bruisattack)%8+1)*10;
+		int damage = (P_Random (pr_bruisattack)%8+1)*10;
+		S_StartSound (actor, "baron/melee", 70);
 		P_DamageMobj (actor->target, actor, actor, damage, MOD_HIT);
 		return;
 	}
@@ -1046,9 +1060,9 @@ void A_BruisAttack (mobj_t* actor)
 //
 // A_SkelMissile
 //
-void A_SkelMissile (mobj_t* actor)
+void A_SkelMissile (mobj_t *actor)
 {		
-	mobj_t* 	mo;
+	mobj_t *mo;
 		
 	if (!actor->target)
 		return;
@@ -1065,7 +1079,7 @@ void A_SkelMissile (mobj_t* actor)
 
 int 	TRACEANGLE = 0xc000000;
 
-void A_Tracer (mobj_t* actor)
+void A_Tracer (mobj_t *actor)
 {
 	angle_t 	exact;
 	fixed_t 	dist;
@@ -1146,18 +1160,16 @@ void A_Tracer (mobj_t* actor)
 }
 
 
-void A_SkelWhoosh (mobj_t*		actor)
+void A_SkelWhoosh (mobj_t *actor)
 {
 	if (!actor->target)
 		return;
 	A_FaceTarget (actor);
-	S_StartSound (actor,sfx_skeswg);
+	S_StartSound (actor, "skeleton/swing", 70);
 }
 
 void A_SkelFist (mobj_t *actor)
 {
-	int 		damage;
-
 	if (!actor->target)
 		return;
 				
@@ -1165,8 +1177,8 @@ void A_SkelFist (mobj_t *actor)
 		
 	if (P_CheckMeleeRange (actor))
 	{
-		damage = ((P_Random (pr_skelfist)%10)+1)*6;
-		S_StartSound (actor, sfx_skepch);
+		int damage = ((P_Random (pr_skelfist)%10)+1)*6;
+		S_StartSound (actor, "skeleton/melee", 70);
 		P_DamageMobj (actor->target, actor, actor, damage, MOD_HIT);
 	}
 }
@@ -1182,7 +1194,7 @@ mobj_t* 		vileobj;
 fixed_t 		viletryx;
 fixed_t 		viletryy;
 
-BOOL PIT_VileCheck (mobj_t*	thing)
+BOOL PIT_VileCheck (mobj_t *thing)
 {
 	int 	maxdist;
 	BOOL 	check;
@@ -1230,7 +1242,7 @@ BOOL PIT_VileCheck (mobj_t*	thing)
 // A_VileChase
 // Check for ressurecting a body
 //
-void A_VileChase (mobj_t* actor)
+void A_VileChase (mobj_t *actor)
 {
 	int 				xl;
 	int 				xh;
@@ -1273,7 +1285,7 @@ void A_VileChase (mobj_t* actor)
 					actor->target = temp;
 										
 					P_SetMobjState (actor, S_VILE_HEAL1);
-					S_StartSound (corpsehit, sfx_slop);
+					S_StartSound (corpsehit, "vile/raise", 78);
 					info = corpsehit->info;
 					
 					P_SetMobjState (corpsehit,info->raisestate);
@@ -1297,9 +1309,9 @@ void A_VileChase (mobj_t* actor)
 //
 // A_VileStart
 //
-void A_VileStart (mobj_t* actor)
+void A_VileStart (mobj_t *actor)
 {
-	S_StartSound (actor, sfx_vilatk);
+	S_StartSound (actor, "vile/start", 70);
 }
 
 
@@ -1307,21 +1319,21 @@ void A_VileStart (mobj_t* actor)
 // A_Fire
 // Keep fire in front of player unless out of sight
 //
-void A_Fire (mobj_t* actor);
+void A_Fire (mobj_t *actor);
 
-void A_StartFire (mobj_t* actor)
+void A_StartFire (mobj_t *actor)
 {
-	S_StartSound(actor,sfx_flamst);
+	S_StartSound(actor, "vile/firestrt", 32);
 	A_Fire(actor);
 }
 
-void A_FireCrackle (mobj_t* actor)
+void A_FireCrackle (mobj_t *actor)
 {
-	S_StartSound(actor,sfx_flame);
+	S_StartSound(actor, "vile/firecrkl", 32);
 	A_Fire(actor);
 }
 
-void A_Fire (mobj_t* actor)
+void A_Fire (mobj_t *actor)
 {
 	mobj_t* 	dest;
 	unsigned	an;
@@ -1331,7 +1343,7 @@ void A_Fire (mobj_t* actor)
 		return;
 				
 	// don't move it if the vile lost sight
-	if (!P_CheckSight (actor->target, dest) )
+	if (!P_CheckSight (actor->target, dest, false) )
 		return;
 
 	an = dest->angle >> ANGLETOFINESHIFT;
@@ -1374,20 +1386,20 @@ void A_VileTarget (mobj_t *actor)
 //
 // A_VileAttack
 //
-void A_VileAttack (mobj_t* actor)
+void A_VileAttack (mobj_t *actor)
 {		
-	mobj_t* 	fire;
-	int 		an;
+	mobj_t *fire;
+	int an;
 		
 	if (!actor->target)
 		return;
 	
 	A_FaceTarget (actor);
 
-	if (!P_CheckSight (actor, actor->target) )
+	if (!P_CheckSight (actor, actor->target, false) )
 		return;
 
-	S_StartSound (actor, sfx_barexp);
+	S_StartSound (actor, "vile/stop", 60);
 	P_DamageMobj (actor->target, actor, actor, 20, MOD_UNKNOWN);
 	actor->target->momz = 1000*FRACUNIT/actor->target->info->mass;
 		
@@ -1409,8 +1421,7 @@ void A_VileAttack (mobj_t* actor)
 
 //
 // Mancubus attack,
-// firing three missiles (bruisers)
-// in three different directions?
+// firing three missiles (bruisers) in three different directions?
 // Doesn't look like it. 
 //
 #define FATSPREAD		(ANG90/8)
@@ -1418,7 +1429,7 @@ void A_VileAttack (mobj_t* actor)
 void A_FatRaise (mobj_t *actor)
 {
 	A_FaceTarget (actor);
-	S_StartSound (actor, sfx_manatk);
+	S_StartSound (actor, "fatso/attack", 64);
 }
 
 
@@ -1481,9 +1492,9 @@ void A_FatAttack3 (mobj_t *actor)
 // SkullAttack
 // Fly at the player like a missile.
 //
-#define SKULLSPEED				(20*FRACUNIT)
+#define SKULLSPEED (20*FRACUNIT)
 
-void A_SkullAttack (mobj_t* actor)
+void A_SkullAttack (mobj_t *actor)
 {
 	mobj_t* 			dest;
 	angle_t 			an;
@@ -1495,7 +1506,7 @@ void A_SkullAttack (mobj_t* actor)
 	dest = actor->target;		
 	actor->flags |= MF_SKULLFLY;
 
-	S_StartSound (actor, actor->info->attacksound);
+	S_StartSound (actor, actor->info->attacksound, 70);
 	A_FaceTarget (actor);
 	an = actor->angle >> ANGLETOFINESHIFT;
 	actor->momx = FixedMul (SKULLSPEED, finecosine[an]);
@@ -1542,22 +1553,48 @@ void A_PainShootSkull (mobj_t *actor, angle_t angle)
 	if (count > 20)
 		return;
 
-
-	// okay, there's playe for another one
+	// okay, there's room for another one
 	an = angle >> ANGLETOFINESHIFT;
 	
-	prestep =
-		4*FRACUNIT
-		+ 3*(actor->info->radius + mobjinfo[MT_SKULL].radius)/2;
+	prestep = 4*FRACUNIT + 3*(actor->info->radius + mobjinfo[MT_SKULL].radius)/2;
 	
 	x = actor->x + FixedMul (prestep, finecosine[an]);
 	y = actor->y + FixedMul (prestep, finesine[an]);
 	z = actor->z + 8*FRACUNIT;
 				
 	newmobj = P_SpawnMobj (x , y, z, MT_SKULL, 0);
+	if (olddemo)													// phares
+		newmobj = P_SpawnMobj(x, y, z, MT_SKULL, 0);				//   |
+	else															//   V
+	{
+		// Check whether the Lost Soul is being fired through a 1-sided
+		// wall or an impassible line, or a "monsters can't cross" line.
+		// If it is, then we don't allow the spawn. This is a bug fix, but
+		// it should be considered an enhancement, since it may disturb
+		// existing demos, so don't do it in compatibility mode.
+
+		if (Check_Sides(actor,x,y))
+			return;
+
+		newmobj = P_SpawnMobj(x, y, z, MT_SKULL, 0);
+
+		// Check to see if the new Lost Soul's z value is above the
+		// ceiling of its new sector, or below the floor. If so, kill it.
+
+		if ((newmobj->z >
+             (newmobj->subsector->sector->ceilingheight - newmobj->height)) ||
+            (newmobj->z < newmobj->subsector->sector->floorheight))
+		{
+			// kill it immediately
+			P_DamageMobj(newmobj,actor,actor,10000,MOD_UNKNOWN);
+			return;													//   ^
+		}															//   |
+	}																// phares
 
 	// Check for movements.
-	if (!P_TryMove (newmobj, newmobj->x, newmobj->y))
+	// killough 3/15/98: don't jump over dropoffs:
+
+	if (!P_TryMove (newmobj, newmobj->x, newmobj->y, false))
 	{
 		// kill it immediately
 		P_DamageMobj (newmobj,actor,actor,10000,MOD_UNKNOWN);		
@@ -1573,7 +1610,7 @@ void A_PainShootSkull (mobj_t *actor, angle_t angle)
 // A_PainAttack
 // Spawn a lost soul and launch it at the target
 // 
-void A_PainAttack (mobj_t* actor)
+void A_PainAttack (mobj_t *actor)
 {
 	if (!actor->target)
 		return;
@@ -1582,8 +1619,7 @@ void A_PainAttack (mobj_t* actor)
 	A_PainShootSkull (actor, actor->angle);
 }
 
-
-void A_PainDie (mobj_t* actor)
+void A_PainDie (mobj_t *actor)
 {
 	A_Fall (actor);
 	A_PainShootSkull (actor, actor->angle+ANG90);
@@ -1592,56 +1628,58 @@ void A_PainDie (mobj_t* actor)
 }
 
 
-
-
-
-
-void A_Scream (mobj_t* actor)
+void A_Scream (mobj_t *actor)
 {
-	int 		sound;
-		
-	switch (actor->info->deathsound)
-	{
-	  case 0:
-		return;
-				
-	  case sfx_podth1:
-	  case sfx_podth2:
-	  case sfx_podth3:
-		sound = sfx_podth1 + P_Random (pr_scream) % 3;
-		break;
-				
-	  case sfx_bgdth1:
-	  case sfx_bgdth2:
-		sound = sfx_bgdth1 + P_Random (pr_scream) % 2;
-		break;
-		
-	  default:
-		sound = actor->info->deathsound;
-		break;
+	char sound[MAX_SNDNAME];
+
+	strcpy (sound, actor->info->deathsound);
+
+	if (sound[strlen(sound)-1] == '1') {
+		sound[strlen(sound)-1] = P_Random(pr_look)%3 + '1';
+		if (S_FindSound (sound) == -1)
+			sound[strlen(sound)-1] = '1';
 	}
 
 	// Check for bosses.
-	if (actor->type==MT_SPIDER
-		|| actor->type == MT_CYBORG)
+	if (actor->type==MT_SPIDER || actor->type == MT_CYBORG)
 	{
 		// full volume
-		S_StartSound (ORIGIN_SURROUND, sound);
+		S_StartSound (ORIGIN_SURROUND, sound, 70);
 	}
 	else
-		S_StartSound (actor, sound);
+		S_StartSound (actor, sound, 70);
 }
 
 
-void A_XScream (mobj_t* actor)
+void A_XScream (mobj_t *actor)
 {
-	S_StartSound (actor, sfx_slop); 	
+	if (actor->player)
+		S_StartSound (actor, "*gibbed", 78);
+	else
+		S_StartSound (actor, "misc/gibbed", 78);
 }
 
-void A_Pain (mobj_t* actor)
+void A_Pain (mobj_t *actor)
 {
-	if (actor->info->painsound)
-		S_StartSound (actor, actor->info->painsound);	
+	// [RH] Have some variety in player pain sounds
+	if (actor->player) {
+		// [RH] Allow for a little more variety in pain sounds
+		int l, r = (P_Random (pr_playerpain) & 1) + 1;
+		char nametemp[128];
+
+		if (actor->health < 25)
+			l = 25;
+		else if (actor->health < 50)
+			l = 50;
+		else if (actor->health < 75)
+			l = 75;
+		else
+			l = 100;
+
+		sprintf (nametemp, "*pain%d_%d", l, r);
+		S_StartSound (actor, nametemp, 96);
+	} else if (actor->info->painsound)
+		S_StartSound (actor, actor->info->painsound, 96);	
 }
 
 
@@ -1673,7 +1711,7 @@ void A_Fall (mobj_t *actor)
 //
 // A_Explode
 //
-void A_Explode (mobj_t* thingy)
+void A_Explode (mobj_t *thingy)
 {
 	// [RH] figure out means of death;
 	int mod;
@@ -1682,6 +1720,9 @@ void A_Explode (mobj_t* thingy)
 		case MT_BARREL:
 			mod = MOD_BARREL;
 			break;
+		case MT_ROCKET:
+			mod = MOD_ROCKET;
+			break;
 		default:
 			mod = MOD_UNKNOWN;
 			break;
@@ -1696,11 +1737,10 @@ void A_Explode (mobj_t* thingy)
 // Possibly trigger special effects
 // if on first boss level
 //
-void A_BossDeath (mobj_t* mo)
+void A_BossDeath (mobj_t *mo)
 {
 	thinker_t*	th;
 	mobj_t* 	mo2;
-	line_t		junk;
 	int 		i;
 
 	// [RH] These all depend on the presence of level flags now
@@ -1751,15 +1791,13 @@ void A_BossDeath (mobj_t* mo)
 	{
 		if (mo->type == MT_FATSO)
 		{
-			junk.tag = 666;
-			EV_DoFloor(&junk,lowerFloorToLowest);
+			EV_DoFloor (floorLowerToLowest, NULL, 666, FRACUNIT, 0, 0, 0);
 			return;
 		}
 		
 		if (mo->type == MT_BABY)
 		{
-			junk.tag = 667;
-			EV_DoFloor(&junk,raiseToTexture);
+			EV_DoFloor (floorRaiseByTexture, NULL, 667, FRACUNIT, 0, 0, 0);
 			return;
 		}
 	}
@@ -1767,14 +1805,12 @@ void A_BossDeath (mobj_t* mo)
 	{
 		switch (level.flags & LEVEL_SPECACTIONSMASK) {
 			case LEVEL_SPECLOWERFLOOR:
-				junk.tag = 666;
-				EV_DoFloor (&junk, lowerFloorToLowest);
+				EV_DoFloor (floorLowerToLowest, NULL, 666, FRACUNIT, 0, 0, 0);
 				return;
 				break;
 			
 			case LEVEL_SPECOPENDOOR:
-				junk.tag = 666;
-				EV_DoDoor (&junk, blazeOpen);
+				EV_DoDoor (doorOpen, NULL, NULL, 666, 8*TICRATE, 0, 0);
 				return;
 				break;
 		}
@@ -1784,97 +1820,95 @@ void A_BossDeath (mobj_t* mo)
 	if (deathmatch->value && (dmflags & DF_NO_EXIT))
 		return;
 
-	G_ExitLevel ();
+	G_ExitLevel (0);
 }
 
 
-void A_Hoof (mobj_t* mo)
+void A_Hoof (mobj_t *mo)
 {
-	S_StartSound (mo, sfx_hoof);
+	S_StartSound (mo, "cyber/hoof", 70);
 	A_Chase (mo);
 }
 
-void A_Metal (mobj_t* mo)
+void A_Metal (mobj_t *mo)
 {
-	S_StartSound (mo, sfx_metal);
+	S_StartSound (mo, "spider/walk", 70);
 	A_Chase (mo);
 }
 
-void A_BabyMetal (mobj_t* mo)
+void A_BabyMetal (mobj_t *mo)
 {
-	S_StartSound (mo, sfx_bspwlk);
+	S_StartSound (mo, "baby/walk", 100);
 	A_Chase (mo);
 }
 
-void
-A_OpenShotgun2
-( player_t* 	player,
-  pspdef_t* 	psp )
+void A_OpenShotgun2 (player_t *player, pspdef_t *psp)
 {
-	S_StartSound (player->mo, sfx_dbopn);
+	S_StartSound (player->mo, "weapons/sshoto", 64);
 }
 
-void
-A_LoadShotgun2
-( player_t* 	player,
-  pspdef_t* 	psp )
+void A_LoadShotgun2 (player_t *player, pspdef_t *psp)
 {
-	S_StartSound (player->mo, sfx_dbload);
+	S_StartSound (player->mo, "weapons/sshotl", 64);
 }
 
-void
-A_ReFire
-( player_t* 	player,
-  pspdef_t* 	psp );
+void A_ReFire (player_t *player, pspdef_t *psp);
 
-void
-A_CloseShotgun2
-( player_t* 	player,
-  pspdef_t* 	psp )
+void A_CloseShotgun2 (player_t *player, pspdef_t *psp)
 {
-	S_StartSound (player->mo, sfx_dbcls);
+	S_StartSound (player->mo, "weapons/sshotc", 64);
 	A_ReFire(player,psp);
 }
 
 
 
-mobj_t* 		braintargets[32];
-int 			numbraintargets;
-int 			braintargeton;
+// killough 2/7/98: Remove limit on icon landings:
+mobj_t **braintargets;
+int    numbraintargets_alloc;
+int    numbraintargets;
 
-void A_BrainAwake (mobj_t *mo)
+struct brain_s brain;   // killough 3/26/98: global state of boss brain
+
+// killough 3/26/98: initialize icon landings at level startup,
+// rather than at boss wakeup, to prevent savegame-related crashes
+
+void P_SpawnBrainTargets (void)	// killough 3/26/98: renamed old function
 {
-	thinker_t*	thinker;
-	mobj_t* 	m;
-		
+	thinker_t *thinker;
+
 	// find all the target spots
 	numbraintargets = 0;
-	braintargeton = 0;
-		
-	thinker = thinkercap.next;
+	brain.targeton = 0;
+	brain.easy = 0;				// killough 3/26/98: always init easy to 0
+
 	for (thinker = thinkercap.next ;
 		 thinker != &thinkercap ;
 		 thinker = thinker->next)
-	{
-		if (thinker->function.acp1 != (actionf_p1)P_MobjThinker)
-			continue;	// not a mobj
-
-		m = (mobj_t *)thinker;
-
-		if (m->type == MT_BOSSTARGET )
+		if (thinker->function.acp1 == (actionf_p1)P_MobjThinker)
 		{
-			braintargets[numbraintargets] = m;
-			numbraintargets++;
+			mobj_t *m = (mobj_t *) thinker;
+
+			if (m->type == MT_BOSSTARGET )
+			{		// killough 2/7/98: remove limit on icon landings:
+				if (numbraintargets >= numbraintargets_alloc)
+					braintargets = realloc(braintargets,
+						(numbraintargets_alloc = numbraintargets_alloc ?
+						 numbraintargets_alloc*2 : 32) *sizeof *braintargets);
+				braintargets[numbraintargets++] = m;
+			}
 		}
-	}
-		
-	S_StartSound (ORIGIN_SURROUND,sfx_bossit);
+}
+
+void A_BrainAwake (mobj_t *mo)
+{
+	// killough 3/26/98: only generates sound now
+	S_StartSound (ORIGIN_SURROUND, "brain/sight", 70);
 }
 
 
 void A_BrainPain (mobj_t *mo)
 {
-	S_StartSound (ORIGIN_SURROUND2,sfx_bospn);
+	S_StartSound (ORIGIN_SURROUND2, "brain/pain", 70);
 }
 
 
@@ -1899,7 +1933,7 @@ void A_BrainScream (mobj_t *mo)
 			th->tics = 1;
 	}
 		
-	S_StartSound (ORIGIN_SURROUND,sfx_bosdth);
+	S_StartSound (ORIGIN_SURROUND, "brain/death", 70);
 }
 
 
@@ -1927,7 +1961,7 @@ void A_BrainDie (mobj_t *mo)
 	if (deathmatch->value && (dmflags & DF_NO_EXIT))
 		return;
 
-	G_ExitLevel ();
+	G_ExitLevel (0);
 }
 
 void A_BrainSpit (mobj_t *mo)
@@ -1935,19 +1969,17 @@ void A_BrainSpit (mobj_t *mo)
 	mobj_t* 	targ;
 	mobj_t* 	newmobj;
 	
-	static int	easy = 0;
-
 	// [RH] Do nothing if there are no brain targets.
 	if (numbraintargets == 0)
 		return;
 
-	easy ^= 1;
-	if (gameskill->value <= sk_easy && (!easy))
+	brain.easy ^= 1;		// killough 3/26/98: use brain struct
+	if (gameskill->value <= sk_easy && (!brain.easy))
 		return;
 				
 	// shoot a cube at current target
-	targ = braintargets[braintargeton];
-	braintargeton = (braintargeton+1)%numbraintargets;
+	targ = braintargets[brain.targeton++];	// killough 3/26/98:
+	brain.targeton %= numbraintargets;		// Use brain struct for targets
 
 	// spawn brain missile
 	newmobj = P_SpawnMissile (mo, targ, MT_SPAWNSHOT);
@@ -1955,21 +1987,21 @@ void A_BrainSpit (mobj_t *mo)
 	newmobj->reactiontime =
 		((targ->y - mo->y)/newmobj->momy) / newmobj->state->tics;
 
-	S_StartSound(ORIGIN_SURROUND, sfx_bospit);
+	S_StartSound (ORIGIN_SURROUND, "brain/spit", 70);
 }
 
 
 
-void A_SpawnFly (mobj_t* mo);
+void A_SpawnFly (mobj_t *mo);
 
 // travelling cube sound
-void A_SpawnSound (mobj_t* mo)	
+void A_SpawnSound (mobj_t *mo)	
 {
-	S_StartSound (mo,sfx_boscub);
+	S_StartSound (mo, "brain/cube", 70);
 	A_SpawnFly(mo);
 }
 
-void A_SpawnFly (mobj_t* mo)
+void A_SpawnFly (mobj_t *mo)
 {
 	mobj_t* 	newmobj;
 	mobj_t* 	fog;
@@ -1984,7 +2016,7 @@ void A_SpawnFly (mobj_t* mo)
 
 	// First spawn teleport fog.
 	fog = P_SpawnMobj (targ->x, targ->y, targ->z, MT_SPAWNFIRE, 0);
-	S_StartSound (fog, sfx_telept);
+	S_StartSound (fog, "misc/teleport", 32);
 
 	// Randomly select monster to spawn.
 	r = P_Random (pr_spawnfly);
@@ -2027,36 +2059,38 @@ void A_SpawnFly (mobj_t* mo)
 
 
 
-void A_PlayerScream (mobj_t* mo)
+void A_PlayerScream (mobj_t *mo)
 {
-	// Default death sound.
-	int 		sound = sfx_pldeth;
+	char nametemp[128];
+	char *sound;
 		
-	if ( (gamemode == commercial)
-		&&		(mo->health < -50))
+	if ( (gamemode == commercial) && (mo->health < -50))
 	{
-		// IF THE PLAYER DIES
-		// LESS THAN -50% WITHOUT GIBBING
-		sound = sfx_pdiehi;
+		// IF THE PLAYER DIES LESS THAN -50% WITHOUT GIBBING
+		sound = "*gibbed";
+	} else {
+		// [RH] More variety in death sounds
+		sprintf (nametemp, "*death%d", (P_Random (pr_playerscream)&3) + 1);
+		sound = nametemp;
 	}
 	
-	S_StartSound (mo, sound);
+	S_StartSound (mo, sound, 32);
 }
 
 
 /***** Start of new functions for Andy Baker's stealth monsters ******/
 
-void P_BecomeVisible(mobj_t* actor)
+void P_BecomeVisible (mobj_t *actor)
 {
-	actor->invisible = false;
+	actor->flags2 &= ~MF2_INVISIBLE;
 	actor->flags &= ~MF_TRANSLUCBITS;
 };
 
-void P_IncreaseVisibility(mobj_t* actor)
+void P_IncreaseVisibility (mobj_t *actor)
 {
-	if (actor->invisible) {
-			actor->invisible = false;
-			actor->flags |= MF_TRANSLUC25;
+	if (actor->flags2 & MF2_INVISIBLE) {
+		actor->flags2 &= ~MF2_INVISIBLE;
+		actor->flags |= MF_TRANSLUC25;
 	} else switch (actor->flags & MF_TRANSLUCBITS) {
 		case MF_TRANSLUC25:
 			actor->flags ^= MF_TRANSLUCBITS;
@@ -2070,9 +2104,9 @@ void P_IncreaseVisibility(mobj_t* actor)
 	}
 }
 
-void P_DecreaseVisibility(mobj_t* actor)
+void P_DecreaseVisibility (mobj_t *actor)
 {
-	if (actor->invisible)
+	if (actor->flags2 & MF2_INVISIBLE)
 		return;			// already invisible
 
 	switch (actor->flags & MF_TRANSLUCBITS) {
@@ -2087,7 +2121,7 @@ void P_DecreaseVisibility(mobj_t* actor)
 			break;
 		case MF_TRANSLUC25:
 			actor->flags &= ~MF_TRANSLUCBITS;
-			actor->invisible = true;
+			actor->flags2 |= MF2_INVISIBLE;
 	}
 }
 /***** End of new functions for Andy Baker's stealth monsters ******/
\ No newline at end of file
diff --git a/code/P_floor.c b/code/P_floor.c
index 883e17773a..d01b587cbb 100644
--- a/code/P_floor.c
+++ b/code/P_floor.c
@@ -26,15 +26,15 @@
 #include "z_zone.h"
 #include "doomdef.h"
 #include "p_local.h"
+#include "p_lnspec.h"
 
 #include "s_sound.h"
 
 // State.
 #include "doomstat.h"
 #include "r_state.h"
-// Data.
-#include "sounds.h"
 
+#include "tables.h"
 
 //
 // FLOORS
@@ -42,19 +42,23 @@
 
 //
 // Move a plane (floor or ceiling) and check for crushing
+// [RH] Made crush specify the actual amount of crushing damage inflictable.
+//		(Use -1 to prevent it from trying to crush)
 //
 result_e
 T_MovePlane
 ( sector_t* 	sector,
   fixed_t		speed,
   fixed_t		dest,
-  BOOL			crush,
+  int			crush,
   int			floorOrCeiling,
   int			direction )
 {
 	BOOL	 	flag;
 	fixed_t 	lastpos;
-		
+	fixed_t		destheight;	//jff 02/04/98 used to keep floors/ceilings
+							// from moving thru each other
+
 	switch(floorOrCeiling)
 	{
 	  case 0:
@@ -67,11 +71,11 @@ T_MovePlane
 			{
 				lastpos = sector->floorheight;
 				sector->floorheight = dest;
-				flag = P_CheckSector(sector,crush);
+				flag = P_CheckSector (sector, crush);
 				if (flag == true)
 				{
-					sector->floorheight =lastpos;
-					P_CheckSector(sector,crush);
+					sector->floorheight = lastpos;
+					P_CheckSector (sector, crush);
 					//return crushed;
 				}
 				return pastdest;
@@ -80,11 +84,11 @@ T_MovePlane
 			{
 				lastpos = sector->floorheight;
 				sector->floorheight -= speed;
-				flag = P_CheckSector(sector,crush);
+				flag = P_CheckSector (sector, crush);
 				if (flag == true)
 				{
 					sector->floorheight = lastpos;
-					P_CheckSector(sector,crush);
+					P_CheckSector (sector, crush);
 					return crushed;
 				}
 			}
@@ -92,15 +96,19 @@ T_MovePlane
 												
 		  case 1:
 			// UP
-			if (sector->floorheight + speed > dest)
+			// jff 02/04/98 keep floor from moving thru ceilings
+			// jff 2/22/98 weaken check to demo_compatibility
+			destheight = (olddemo || dest < sector->ceilingheight) ?
+						  dest : sector->ceilingheight;
+			if (sector->floorheight + speed > destheight)
 			{
 				lastpos = sector->floorheight;
-				sector->floorheight = dest;
-				flag = P_CheckSector(sector,crush);
+				sector->floorheight = destheight;
+				flag = P_CheckSector (sector, crush);
 				if (flag == true)
 				{
 					sector->floorheight = lastpos;
-					P_CheckSector(sector,crush);
+					P_CheckSector (sector, crush);
 					//return crushed;
 				}
 				return pastdest;
@@ -110,13 +118,13 @@ T_MovePlane
 				// COULD GET CRUSHED
 				lastpos = sector->floorheight;
 				sector->floorheight += speed;
-				flag = P_CheckSector(sector,crush);
+				flag = P_CheckSector (sector, crush);
 				if (flag == true)
 				{
 					if (crush == true)
 						return crushed;
 					sector->floorheight = lastpos;
-					P_CheckSector(sector,crush);
+					P_CheckSector (sector, crush);
 					return crushed;
 				}
 			}
@@ -130,16 +138,20 @@ T_MovePlane
 		{
 		  case -1:
 			// DOWN
-			if (sector->ceilingheight - speed < dest)
+			// jff 02/04/98 keep ceiling from moving thru floors
+			// jff 2/22/98 weaken check to demo_compatibility
+			destheight = (olddemo || dest > sector->floorheight) ?
+						  dest : sector->floorheight;
+			if (sector->ceilingheight - speed < destheight)
 			{
 				lastpos = sector->ceilingheight;
-				sector->ceilingheight = dest;
-				flag = P_CheckSector(sector,crush);
+				sector->ceilingheight = destheight;
+				flag = P_CheckSector (sector, crush);
 
 				if (flag == true)
 				{
 					sector->ceilingheight = lastpos;
-					P_CheckSector(sector,crush);
+					P_CheckSector (sector, crush);
 					//return crushed;
 				}
 				return pastdest;
@@ -149,14 +161,14 @@ T_MovePlane
 				// COULD GET CRUSHED
 				lastpos = sector->ceilingheight;
 				sector->ceilingheight -= speed;
-				flag = P_CheckSector(sector,crush);
+				flag = P_CheckSector (sector, crush);
 
 				if (flag == true)
 				{
 					if (crush == true)
 						return crushed;
 					sector->ceilingheight = lastpos;
-					P_CheckSector(sector,crush);
+					P_CheckSector (sector, crush);
 					return crushed;
 				}
 			}
@@ -168,11 +180,11 @@ T_MovePlane
 			{
 				lastpos = sector->ceilingheight;
 				sector->ceilingheight = dest;
-				flag = P_CheckSector(sector,crush);
+				flag = P_CheckSector (sector,crush);
 				if (flag == true)
 				{
 					sector->ceilingheight = lastpos;
-					P_CheckSector(sector,crush);
+					P_CheckSector (sector, crush);
 					//return crushed;
 				}
 				return pastdest;
@@ -181,13 +193,13 @@ T_MovePlane
 			{
 				lastpos = sector->ceilingheight;
 				sector->ceilingheight += speed;
-				flag = P_CheckSector(sector,crush);
+				flag = P_CheckSector (sector, crush);
 // UNUSED
 #if 0
 				if (flag == true)
 				{
 					sector->ceilingheight = lastpos;
-					P_CheckSector(sector,crush);
+					P_CheckSector (sector, crush);
 					return crushed;
 				}
 #endif
@@ -207,48 +219,114 @@ T_MovePlane
 void T_MoveFloor (floormove_t *floor)
 {
 	result_e res;
-		
+
+	// [RH] Handle reseting stairs
+	if (floor->type == buildStair || floor->type == waitStair) {
+		if (floor->resetcount) {
+			if (--floor->resetcount == 0) {
+				floor->type = resetStair;
+				floor->direction = (floor->direction > 0) ? -1 : 1;
+				floor->floordestheight = floor->orgheight;
+			}
+		}
+		if (floor->pausetime) {
+			if (!(level.time&7))
+				S_StartSound ((mobj_t *)&floor->sector->soundorg, "plats/pt1_mid", 119);
+			floor->pausetime--;
+			return;
+		} else if (floor->steptime) {
+			if (--floor->steptime == 0) {
+				floor->pausetime = floor->delay;
+				floor->steptime = floor->persteptime;
+			}
+		}
+	}
+
+	if (floor->type == waitStair)
+		return;
+
 	res = T_MovePlane(floor->sector,
 					  floor->speed,
 					  floor->floordestheight,
 					  floor->crush,0,floor->direction);
 	
-	if (!(level.time&7))
-		S_StartSound((mobj_t *)&floor->sector->soundorg,
-					 sfx_stnmov);
+	if (!(level.time&7) && (floor->type != resetStair) && (res != pastdest))
+		S_StartSound ((mobj_t *)&floor->sector->soundorg, "plats/pt1_mid", 119);
 	
 	if (res == pastdest)
 	{
-		floor->sector->floordata = NULL;
+		if (floor->type != resetStair)
+			S_StartSound ((mobj_t *)&floor->sector->soundorg, "plats/pt1_stop", 100);
 
-		if (floor->direction == 1)
+		if (floor->type == buildStair)
+			floor->type = waitStair;
+
+		if (floor->type != waitStair || floor->resetcount == 0)
 		{
-			switch(floor->type)
+			if (floor->direction == 1)
 			{
-			  case donutRaise:
-				floor->sector->special = (short)floor->newspecial;
-				floor->sector->floorpic = floor->texture;
-			  default:
-				break;
+				switch(floor->type)
+				{
+				  case donutRaise:
+				  case genFloorChgT:
+				  case genFloorChg0:
+					floor->sector->special = floor->newspecial;
+					//fall thru
+				  case genFloorChg:
+					floor->sector->floorpic = floor->texture;
+					break;
+				  default:
+					break;
+				}
+			}
+			else if (floor->direction == -1)
+			{
+				switch(floor->type)
+				{
+				  case floorLowerAndChange:
+				  case genFloorChgT:
+				  case genFloorChg0:
+					floor->sector->special = floor->newspecial;
+					//fall thru
+				  case genFloorChg:
+					floor->sector->floorpic = floor->texture;
+					break;
+				  default:
+					break;
+				}
+			}
+
+			floor->sector->floordata = NULL; //jff 2/22/98
+			P_RemoveThinker (&floor->thinker);
+
+			//jff 2/26/98 implement stair retrigger lockout while still building
+			// note this only applies to the retriggerable generalized stairs
+
+			if (floor->sector->stairlock == -2)		// if this sector is stairlocked
+			{
+				sector_t *sec = floor->sector;
+				sec->stairlock = -1;				// thinker done, promote lock to -1
+
+				while (sec->prevsec != -1 && sectors[sec->prevsec].stairlock != -2)
+					sec = &sectors[sec->prevsec];	// search for a non-done thinker
+				if (sec->prevsec == -1)				// if all thinkers previous are done
+				{
+					sec = floor->sector;			// search forward
+					while (sec->nextsec != -1 && sectors[sec->nextsec].stairlock != -2) 
+						sec = &sectors[sec->nextsec];
+					if (sec->nextsec == -1)			// if all thinkers ahead are done too
+					{
+						while (sec->prevsec != -1)	// clear all locks
+						{
+							sec->stairlock = 0;
+							sec = &sectors[sec->prevsec];
+						}
+						sec->stairlock = 0;
+					}
+				}
 			}
 		}
-		else if (floor->direction == -1)
-		{
-			switch(floor->type)
-			{
-			  case lowerAndChange:
-				floor->sector->special = (short)floor->newspecial;
-				floor->sector->floorpic = floor->texture;
-			  default:
-				break;
-			}
-		}
-		P_RemoveThinker(&floor->thinker);
-
-		S_StartSound((mobj_t *)&floor->sector->soundorg,
-					 sfx_pstop);
 	}
-
 }
 
 //
@@ -274,7 +352,7 @@ void T_MoveElevator (elevator_t* elevator)
 			elevator->sector,
 			elevator->speed,
 			elevator->ceilingdestheight,
-			0,
+			-1,
 			1,						// move floor
 			elevator->direction
 		);
@@ -284,7 +362,7 @@ void T_MoveElevator (elevator_t* elevator)
 				elevator->sector,
 				elevator->speed,
 				elevator->floordestheight,
-				0,
+				-1,
 				0,					// move ceiling
 				elevator->direction
 			);
@@ -296,7 +374,7 @@ void T_MoveElevator (elevator_t* elevator)
 			elevator->sector,
 			elevator->speed,
 			elevator->floordestheight,
-			0,
+			-1,
 			0,						 // move ceiling
 			elevator->direction
 		);
@@ -306,7 +384,7 @@ void T_MoveElevator (elevator_t* elevator)
 				elevator->sector,
 				elevator->speed,
 				elevator->ceilingdestheight,
-				0,
+				-1,
 				1,					// move floor
 				elevator->direction
 			);
@@ -314,7 +392,7 @@ void T_MoveElevator (elevator_t* elevator)
 
 	// make floor move sound
 	if (!(level.time&7))
-		S_StartSound((mobj_t *)&elevator->sector->soundorg, sfx_stnmov);
+		S_StartSound((mobj_t *)&elevator->sector->soundorg, "plats/pt1_mid", 119);
 
 	if (res == pastdest)			// if destination height acheived
 	{
@@ -323,296 +401,571 @@ void T_MoveElevator (elevator_t* elevator)
 		P_RemoveThinker(&elevator->thinker);	// remove elevator from actives
 
 		// make floor stop sound
-		S_StartSound((mobj_t *)&elevator->sector->soundorg, sfx_pstop);
+		S_StartSound((mobj_t *)&elevator->sector->soundorg, "plats/pt1_stop", 100);
 	}
 }
 
 //
 // HANDLE FLOOR TYPES
+// [RH] Added tag, speed, height, crush, change params.
 //
-int EV_DoFloor (line_t *line, floor_e floortype)
+BOOL EV_DoFloor (floor_e floortype, line_t *line, int tag,
+				 fixed_t speed, fixed_t height, int crush, int change)
 {
 	int 				secnum;
-	int 				rtn;
-	int 				i;
+	BOOL 				rtn;
 	sector_t*			sec;
 	floormove_t*		floor;
+	BOOL				manual = false;
+
+	rtn = false;
+
+	// check if a manual trigger, if so do just the sector on the backside
+	if (tag == 0)
+	{
+		if (!line || !(sec = line->backsector))
+			return rtn;
+		secnum = sec-sectors;
+		manual = true;
+		goto manual_floor;
+	}
 
 	secnum = -1;
-	rtn = 0;
-	while ((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
+	while ((secnum = P_FindSectorFromTag (tag, secnum)) >= 0)
 	{
 		sec = &sectors[secnum];
-				
+
+manual_floor:
 		// ALREADY MOVING?	IF SO, KEEP GOING...
 		if (P_SectorActive (floor_special, sec))	//jff 2/33/98
 			continue;
 		
 		// new floor thinker
-		rtn = 1;
+		rtn = true;
 		floor = Z_Malloc (sizeof(*floor), PU_LEVSPEC, 0);
 		P_AddThinker (&floor->thinker);
 		sec->floordata = floor;		//jff 2/22/98
 		floor->thinker.function.acp1 = (actionf_p1) T_MoveFloor;
 		floor->type = floortype;
-		floor->crush = false;
+		floor->crush = -1;
+		floor->speed = speed;
+		floor->sector = sec;
+		floor->resetcount = 0;					// [RH]
+		floor->orgheight = sec->floorheight;	// [RH]
 
 		switch(floortype)
 		{
-		  case lowerFloor:
+		  case floorLowerToHighest:
 			floor->direction = -1;
-			floor->sector = sec;
-			floor->speed = FLOORSPEED;
-			floor->floordestheight = 
-				P_FindHighestFloorSurrounding(sec);
-			break;
-
-		  case lowerFloorToLowest:
-			floor->direction = -1;
-			floor->sector = sec;
-			floor->speed = FLOORSPEED;
-			floor->floordestheight = 
-				P_FindLowestFloorSurrounding(sec);
-			break;
-
-		  case turboLower:
-			floor->direction = -1;
-			floor->sector = sec;
-			floor->speed = FLOORSPEED * 4;
-			floor->floordestheight = 
-				P_FindHighestFloorSurrounding(sec);
+			floor->floordestheight = P_FindHighestFloorSurrounding(sec);
+			// [RH] DOOM's turboLower type did this. I've just extended it
+			//		to be applicable to all LowerToHighest types.
 			if (floor->floordestheight != sec->floorheight)
-				floor->floordestheight += 8*FRACUNIT;
+				floor->floordestheight += height;
 			break;
 
-		  case raiseFloorCrush:
-			floor->crush = true;
-		  case raiseFloor:
-			floor->direction = 1;
+		  case floorLowerToLowest:
+			floor->direction = -1;
+			floor->floordestheight = P_FindLowestFloorSurrounding(sec);
+			break;
+
+		  case floorLowerToNearest:
+			//jff 02/03/30 support lowering floor to next lowest floor
+			floor->direction = -1;
+			floor->floordestheight =
+				P_FindNextLowestFloor (sec, sec->floorheight);
+			break;
+
+		  case floorLowerInstant:
+			floor->speed = height;
+		  case floorLowerByValue:
+			floor->direction = -1;
 			floor->sector = sec;
-			floor->speed = FLOORSPEED;
+			floor->floordestheight = sec->floorheight - height;
+			break;
+
+		  case floorRaiseInstant:
+			floor->speed = height;
+		  case floorRaiseByValue:
+			floor->direction = 1;
+			floor->floordestheight = sec->floorheight + height;
+			break;
+
+		  case floorMoveToValue:
+			floor->direction = (height - sec->floorheight) > 0 ? 1 : -1;
+			floor->floordestheight = height;
+			break;
+
+		  case floorRaiseAndCrush:
+			floor->crush = crush;
+		  case floorRaiseToLowestCeiling:
+			floor->direction = 1;
 			floor->floordestheight = 
 				P_FindLowestCeilingSurrounding(sec);
 			if (floor->floordestheight > sec->ceilingheight)
 				floor->floordestheight = sec->ceilingheight;
-			floor->floordestheight -= (8*FRACUNIT)*
-				(floortype == raiseFloorCrush);
+			if (floortype == floorRaiseAndCrush)
+				floor->floordestheight -= 8 * FRACUNIT;
 			break;
 
-		  case raiseFloorTurbo:
+		  case floorRaiseToHighest:
 			floor->direction = 1;
-			floor->sector = sec;
-			floor->speed = FLOORSPEED*4;
-			floor->floordestheight = 
-				P_FindNextHighestFloor(sec,sec->floorheight);
+			floor->floordestheight = P_FindHighestFloorSurrounding(sec);
 			break;
 
-		  case raiseFloorToNearest:
+		  case floorRaiseToNearest:
 			floor->direction = 1;
-			floor->sector = sec;
-			floor->speed = FLOORSPEED;
-			floor->floordestheight = 
-				P_FindNextHighestFloor(sec,sec->floorheight);
+			floor->floordestheight = P_FindNextHighestFloor(sec,sec->floorheight);
 			break;
 
-		  case raiseFloor24:
+		  case floorRaiseToLowest:
 			floor->direction = 1;
-			floor->sector = sec;
-			floor->speed = FLOORSPEED;
-			floor->floordestheight = floor->sector->floorheight +
-				24 * FRACUNIT;
-			break;
-		  case raiseFloor512:
-			floor->direction = 1;
-			floor->sector = sec;
-			floor->speed = FLOORSPEED;
-			floor->floordestheight = floor->sector->floorheight +
-				512 * FRACUNIT;
+			floor->floordestheight = P_FindLowestFloorSurrounding(sec);
 			break;
 
-		  case raiseFloor24AndChange:
+		  case floorRaiseToCeiling:
 			floor->direction = 1;
-			floor->sector = sec;
-			floor->speed = FLOORSPEED;
-			floor->floordestheight = floor->sector->floorheight +
-				24 * FRACUNIT;
+			floor->floordestheight = sec->ceilingheight;
+			break;
+
+		  case floorLowerToLowestCeiling:
+			floor->direction = -1;
+			floor->floordestheight = P_FindLowestCeilingSurrounding(sec);
+			break;
+
+		  case floorLowerByTexture:
+			floor->direction = -1;
+			floor->floordestheight = sec->floorheight -
+				P_FindShortestTextureAround (secnum);
+			break;
+
+		  case floorLowerToCeiling:
+			// [RH] Essentially instantly raises the floor to the ceiling
+			floor->direction = -1;
+			floor->floordestheight = sec->ceilingheight;
+			break;
+
+		  case floorRaiseByTexture:
+			floor->direction = 1;
+			// [RH] Use P_FindShortestTextureAround from BOOM to do this
+			//		since the code is identical to what was here. (Oddly
+			//		enough, BOOM preserved the code here even though it
+			//		also had this function.)
+			floor->floordestheight = sec->floorheight +
+				P_FindShortestTextureAround (secnum);
+			break;
+
+		  case floorRaiseAndChange:
+			floor->direction = 1;
+			floor->floordestheight = sec->floorheight +	height;
 			sec->floorpic = line->frontsector->floorpic;
 			sec->special = line->frontsector->special;
 			break;
-
-		  case raiseToTexture:
-		  {
-			  int		minsize = MAXINT;
-			  side_t*	side;
-								
-			  floor->direction = 1;
-			  floor->sector = sec;
-			  floor->speed = FLOORSPEED;
-			  for (i = 0; i < sec->linecount; i++)
-			  {
-				  if (twoSided (secnum, i) )
-				  {
-					  side = getSide(secnum,i,0);
-					  if (side->bottomtexture >= 0)
-						  if (textureheight[side->bottomtexture] < minsize)
-							  minsize = textureheight[side->bottomtexture];
-					  side = getSide(secnum,i,1);
-					  if (side->bottomtexture >= 0)
-						  if (textureheight[side->bottomtexture] < minsize)
-							  minsize = textureheight[side->bottomtexture];
-				  }
-			  }
-			  floor->floordestheight = floor->sector->floorheight + minsize;
-		  }
-		  break;
 		  
-		  case lowerAndChange:
+		  case floorLowerAndChange:
 			floor->direction = -1;
-			floor->sector = sec;
-			floor->speed = FLOORSPEED;
 			floor->floordestheight = 
-				P_FindLowestFloorSurrounding(sec);
+				P_FindLowestFloorSurrounding (sec);
 			floor->texture = sec->floorpic;
+			// jff 1/24/98 make sure floor->newspecial gets initialized
+			// in case no surrounding sector is at floordestheight
+			// --> should not affect compatibility <--
+			floor->newspecial = sec->special; 
 
-			for (i = 0; i < sec->linecount; i++)
+			//jff 5/23/98 use model subroutine to unify fixes and handling
+			sec = P_FindModelFloorSector (floor->floordestheight,sec-sectors);
+			if (sec)
 			{
-				if ( twoSided(secnum, i) )
-				{
-					if (getSide(secnum,i,0)->sector-sectors == secnum)
-					{
-						sec = getSector(secnum,i,1);
-
-						if (sec->floorheight == floor->floordestheight)
-						{
-							floor->texture = sec->floorpic;
-							floor->newspecial = sec->special;
-							break;
-						}
-					}
-					else
-					{
-						sec = getSector(secnum,i,0);
-
-						if (sec->floorheight == floor->floordestheight)
-						{
-							floor->texture = sec->floorpic;
-							floor->newspecial = sec->special;
-							break;
-						}
-					}
-				}
+				floor->texture = sec->floorpic;
+				floor->newspecial = sec->special;
 			}
+			break;
+
 		  default:
 			break;
 		}
+
+		if (change & 3) {
+			// [RH] Need to do some transferring
+			if (change & 4) {
+				// Numeric model change
+				sector_t *sec;
+
+				sec = (floortype == floorRaiseToLowestCeiling ||
+					   floortype == floorLowerToLowestCeiling ||
+					   floortype == floorRaiseToCeiling ||
+					   floortype == floorLowerToCeiling) ?
+					  P_FindModelCeilingSector (floor->floordestheight, secnum) :
+					  P_FindModelFloorSector (floor->floordestheight, secnum);
+
+				if (sec) {
+					floor->texture = sec->floorpic;
+					switch (change & 3) {
+						case 1:
+							floor->newspecial = 0;
+							floor->type = genFloorChg0;
+							break;
+						case 2:
+							floor->newspecial = sec->special;
+							floor->type = genFloorChgT;
+							break;
+						case 3:
+							floor->type = genFloorChg;
+							break;
+					}
+				}
+			} else if (line) {
+				// Trigger model change
+				floor->texture = line->frontsector->floorpic;
+
+				switch (change & 3) {
+					case 1:
+						floor->newspecial = 0;
+						floor->type = genFloorChg0;
+						break;
+					case 2:
+						floor->newspecial = sec->special;
+						floor->type = genFloorChgT;
+						break;
+					case 3:
+						floor->type = genFloorChg;
+						break;
+				}
+			}
+		}
+		if (manual)
+			return rtn;
+	}
+	return rtn;
+}
+
+// [RH]
+// EV_FloorCrushStop
+// Stop a floor from crushing!
+//
+BOOL EV_FloorCrushStop (int tag)
+{
+	int secnum = -1;
+
+	while ((secnum = P_FindSectorFromTag (tag, secnum)) >= 0)
+	{
+		sector_t *sec = sectors + secnum;
+
+		if (sec->floordata &&
+			((thinker_t *)(sec->floordata))->function.acp1 == T_MoveFloor &&
+			((floormove_t *)(sec->floordata))->type == floorRaiseAndCrush) {
+			P_RemoveThinker ((thinker_t *)(sec->floordata));
+			sec->floordata = NULL;
+		}
+	}
+	return true;
+}
+
+//
+// EV_DoChange()
+//
+// Handle pure change types. These change floor texture and sector type
+// by trigger or numeric model without moving the floor.
+//
+// The linedef causing the change and the type of change is passed
+// Returns true if any sector changes
+//
+// jff 3/15/98 added to better support generalized sector types
+// [RH] Added tag parameter.
+//
+BOOL EV_DoChange (line_t *line, change_e changetype, int tag)
+{
+	int			secnum;
+	BOOL		rtn;
+	sector_t	*sec;
+	sector_t	*secm;
+
+	secnum = -1;
+	rtn = false;
+	// change all sectors with the same tag as the linedef
+	while ((secnum = P_FindSectorFromTag (tag, secnum)) >= 0)
+	{
+		sec = &sectors[secnum];
+              
+		rtn = true;
+
+		// handle trigger or numeric change type
+		switch(changetype)
+		{
+			case trigChangeOnly:
+				if (line) { // [RH] if no line, no change
+					sec->floorpic = line->frontsector->floorpic;
+					sec->special = line->frontsector->special;
+				}
+				break;
+			case numChangeOnly:
+				secm = P_FindModelFloorSector (sec->floorheight,secnum);
+				if (secm) // if no model, no change
+				{
+					sec->floorpic = secm->floorpic;
+					sec->special = secm->special;
+				}
+				break;
+			default:
+				break;
+		}
 	}
 	return rtn;
 }
 
 
-
-
 //
 // BUILD A STAIRCASE!
+// [RH] Added stairsize, srcspeed, delay, reset, igntxt, usespecials parameters
+//		If usespecials is non-zero, then each sector in a stair is determined
+//		by its special. If usespecials is 2, each sector stays in "sync" with
+//		the others.
 //
-int EV_BuildStairs (line_t *line, stair_e type)
+BOOL EV_BuildStairs (int tag, stair_e type, line_t *line,
+					 fixed_t stairsize, fixed_t speed, int delay, int reset, int igntxt,
+					 int usespecials)
 {
 	int 				secnum;
+	int					osecnum;	//jff 3/4/98 save old loop index
 	int 				height;
 	int 				i;
 	int 				newsecnum;
 	int 				texture;
 	int 				ok;
-	int 				rtn;
+	int					persteptime;
+	BOOL 				rtn = false;
 	
 	sector_t*			sec;
 	sector_t*			tsec;
+	sector_t*			prev = NULL;
 
 	floormove_t*		floor;
-	
-	fixed_t 			stairsize;
-	fixed_t 			speed;
+	BOOL				manual = false;
+
+	if (speed == 0)
+		return false;
+
+	persteptime = FixedDiv (stairsize, speed) >> FRACBITS;
+
+	// check if a manual trigger, if so do just the sector on the backside
+	if (tag == 0)
+	{
+		if (!line || !(sec = line->backsector))
+			return rtn;
+		secnum = sec-sectors;
+		manual = true;
+		goto manual_stair;
+	}
 
 	secnum = -1;
-	rtn = 0;
-	while ((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
+	while ((secnum = P_FindSectorFromTag (tag, secnum)) >= 0)
 	{
 		sec = &sectors[secnum];
-				
+
+manual_stair:
 		// ALREADY MOVING?	IF SO, KEEP GOING...
-		if (P_SectorActive (floor_special, sec))	//jff 2/22/98
-			continue;
+		//jff 2/26/98 add special lockout condition to wait for entire
+		//staircase to build before retriggering
+		if (P_SectorActive (floor_special, sec) || sec->stairlock) {
+			if (!manual)
+				continue;
+			else
+				return rtn;
+		}
 		
 		// new floor thinker
-		rtn = 1;
+		rtn = true;
 		floor = Z_Malloc (sizeof(*floor), PU_LEVSPEC, 0);
 		P_AddThinker (&floor->thinker);
-		sec->floordata = floor;	//jff 2/22/98
+		sec->floordata = floor;		//jff 2/22/98
 		floor->thinker.function.acp1 = (actionf_p1) T_MoveFloor;
-		floor->direction = 1;
+		floor->direction = (type == buildUp) ? 1 : -1;
 		floor->sector = sec;
-		switch(type)
-		{
-		  case build8:
-			speed = FLOORSPEED/4;
-			stairsize = 8*FRACUNIT;
-			break;
-		  case turbo16:
-			speed = FLOORSPEED*4;
-			stairsize = 16*FRACUNIT;
-			break;
-		}
+		floor->type = buildStair;	//jff 3/31/98 do not leave uninited
+		floor->resetcount = reset;	// [RH] Tics until reset (0 if never)
+		floor->orgheight = sec->floorheight;	// [RH] Height to reset to
+		// [RH] Set up delay values
+		floor->delay = delay;
+		floor->pausetime = 0;
+		floor->steptime = floor->persteptime = persteptime;
+
+		if (!olddemo)
+			floor->crush = (!usespecials && speed == 4*FRACUNIT) ? 10 : -1; //jff 2/27/98 fix uninitialized crush field
+
 		floor->speed = speed;
-		height = sec->floorheight + stairsize;
+		height = sec->floorheight + stairsize * floor->direction;
 		floor->floordestheight = height;
 
 		texture = sec->floorpic;
+		osecnum = secnum;				//jff 3/4/98 preserve loop index
 		
 		// Find next sector to raise
-		// 1.	Find 2-sided line with same sector side[0]
+		// 1.	Find 2-sided line with same sector side[0] (lowest numbered)
 		// 2.	Other side is the next sector to raise
+		// 3.	Unless already moving, or different texture, then stop building
 		do
 		{
 			ok = 0;
-			for (i = 0;i < sec->linecount;i++)
-			{
-				if ( !((sec->lines[i])->flags & ML_TWOSIDED) )
-					continue;
 
-				tsec = (sec->lines[i])->frontsector;
-				newsecnum = tsec-sectors;
+			if (usespecials) {
+				// [RH] Find the next sector by scanning for Stairs_Special?
+				tsec = P_NextSpecialSector (sec,
+						(sec->special & 0xff) == Stairs_Special1 ?
+							Stairs_Special2 : Stairs_Special1, prev);
 
-				if (secnum != newsecnum)
-					continue;
+				if ( (ok = (tsec != NULL)) ) {
+					height += floor->direction * stairsize;
 
-				tsec = (sec->lines[i])->backsector;
+					// if sector's floor already moving, look for another
+					//jff 2/26/98 special lockout condition for retriggering
+					if (P_SectorActive (floor_special,tsec) || tsec->stairlock) {
+						prev = sec;
+						sec = tsec;
+						continue;
+					}
+				}
 				newsecnum = tsec - sectors;
+			} else {
+				for (i = 0; i < sec->linecount; i++)
+				{
+					if ( !((sec->lines[i])->flags & ML_TWOSIDED) )
+						continue;
 
-				if (tsec->floorpic != texture)
-					continue;
+					tsec = (sec->lines[i])->frontsector;
+					if (!tsec) continue;	//jff 5/7/98 if no backside, continue
+					newsecnum = tsec-sectors;
 
-				height += stairsize;
+					if (secnum != newsecnum)
+						continue;
 
-				// if sector's floor already moving, look for another
-				if (P_SectorActive(floor_special,tsec)) //jff 2/22/98
-					continue;
+					tsec = (sec->lines[i])->backsector;
+					newsecnum = tsec - sectors;
 
+					if (!igntxt && tsec->floorpic != texture)
+						continue;
+
+					height += floor->direction * stairsize;
+
+					// if sector's floor already moving, look for another
+					//jff 2/26/98 special lockout condition for retriggering
+					if (P_SectorActive (floor_special,tsec) || tsec->stairlock)
+						continue;
+
+					ok = true;
+					break;
+				}
+			}
+
+			if (ok) {
+				// jff 2/26/98
+				// link the stair chain in both directions
+				// lock the stair sector until building complete
+				sec->nextsec = newsecnum; // link step to next
+				tsec->prevsec = secnum;   // link next back
+				tsec->nextsec = -1;       // set next forward link as end
+				tsec->stairlock = -2;     // lock the step
+
+				prev = sec;
 				sec = tsec;
 				secnum = newsecnum;
-				floor = Z_Malloc (sizeof(*floor), PU_LEVSPEC, 0);
 
+				// create and initialize a thinker for the next step
+				floor = Z_Malloc (sizeof(*floor), PU_LEVSPEC, 0);
 				P_AddThinker (&floor->thinker);
 
-				sec->floordata = floor;
+				sec->floordata = floor;	//jff 2/22/98
 				floor->thinker.function.acp1 = (actionf_p1) T_MoveFloor;
-				floor->direction = 1;
+				floor->direction = (type == buildUp) ? 1 : -1;
 				floor->sector = sec;
-				floor->speed = speed;
 				floor->floordestheight = height;
-				ok = 1;
-				break;
+				// [RH] Set up delay values
+				floor->delay = delay;
+				floor->pausetime = 0;
+				floor->steptime = floor->persteptime = persteptime;
+
+				if (usespecials == 2) {
+					// [RH]
+					fixed_t rise = (floor->floordestheight - sec->floorheight)
+									* floor->direction;
+					floor->speed = FixedDiv (FixedMul (speed, rise), stairsize);
+				} else {
+					floor->speed = speed;
+				}
+				floor->type = buildStair;	//jff 3/31/98 do not leave uninited
+				//jff 2/27/98 fix uninitialized crush field
+				if (!olddemo)
+					floor->crush = (!usespecials && speed == 4*FRACUNIT) ? 10 : -1;
+				floor->resetcount = reset;	// [RH] Tics until reset (0 if never)
+				floor->orgheight = sec->floorheight;	// [RH] Height to reset to
 			}
 		} while(ok);
+		if (manual)
+			return rtn;
+		secnum = osecnum;	//jff 3/4/98 restore loop index
+	}
+	return rtn;
+}
+
+// [RH] Added pillarspeed and slimespeed parameters
+int EV_DoDonut (int tag, fixed_t pillarspeed, fixed_t slimespeed)
+{
+	sector_t*			s1;
+	sector_t*			s2;
+	sector_t*			s3;
+	int 				secnum;
+	int 				rtn;
+	int 				i;
+	floormove_t*		floor;
+		
+	secnum = -1;
+	rtn = 0;
+	while ((secnum = P_FindSectorFromTag(tag,secnum)) >= 0)
+	{
+		s1 = &sectors[secnum];					// s1 is pillar's sector
+				
+		// ALREADY MOVING?	IF SO, KEEP GOING...
+		if (P_SectorActive (floor_special, s1))	//jff 2/22/98
+			continue;
+						
+		rtn = 1;
+		s2 = getNextSector (s1->lines[0],s1);	// s2 is pool's sector
+		if (!s2)								// note lowest numbered line around
+			continue;							// pillar must be two-sided
+
+		for (i = 0; i < s2->linecount; i++)
+		{
+			if ((!s2->lines[i]->flags & ML_TWOSIDED) ||
+				(s2->lines[i]->backsector == s1))
+				continue;
+			s3 = s2->lines[i]->backsector;
+			
+			//	Spawn rising slime
+			floor = Z_Malloc (sizeof(*floor), PU_LEVSPEC, 0);
+			P_AddThinker (&floor->thinker);
+			s2->floordata = floor;	//jff 2/22/98
+			floor->thinker.function.acp1 = (actionf_p1) T_MoveFloor;
+			floor->type = donutRaise;
+			floor->crush = -1;
+			floor->direction = 1;
+			floor->sector = s2;
+			floor->speed = slimespeed;
+			floor->texture = s3->floorpic;
+			floor->newspecial = 0;
+			floor->floordestheight = s3->floorheight;
+			
+			//	Spawn lowering donut-hole
+			floor = Z_Malloc (sizeof(*floor), PU_LEVSPEC, 0);
+			P_AddThinker (&floor->thinker);
+			s1->floordata = floor;	//jff 2/22/98
+			floor->thinker.function.acp1 = (actionf_p1) T_MoveFloor;
+			floor->type = floorLowerToNearest;
+			floor->crush = -1;
+			floor->direction = -1;
+			floor->sector = s1;
+			floor->speed = pillarspeed;
+			floor->floordestheight = s3->floorheight;
+			break;
+		}
 	}
 	return rtn;
 }
@@ -625,18 +978,23 @@ int EV_BuildStairs (line_t *line, stair_e type)
 // Passed the linedef that triggered the elevator and the elevator action
 //
 // jff 2/22/98 new type to move floor and ceiling in parallel
+// [RH] Added speed, tag, and height parameters and new types.
 //
-int EV_DoElevator (line_t *line, elevator_e elevtype)
+BOOL EV_DoElevator (line_t *line, elevator_e elevtype,
+					fixed_t speed, fixed_t height, int tag)
 {
 	int			secnum;
-	int			rtn;
+	BOOL		rtn;
 	sector_t*	sec;
 	elevator_t*	elevator;
 
+	if (!line && (elevtype == elevateCurrent))
+		return false;
+
 	secnum = -1;
-	rtn = 0;
+	rtn = false;
 	// act on all sectors with the same tag as the triggering linedef
-	while ((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
+	while ((secnum = P_FindSectorFromTag (tag, secnum)) >= 0)
 	{
 		sec = &sectors[secnum];
 
@@ -645,22 +1003,22 @@ int EV_DoElevator (line_t *line, elevator_e elevtype)
 			continue;
 
 		// create and initialize new elevator thinker
-		rtn = 1;
+		rtn = true;
 		elevator = Z_Malloc (sizeof(*elevator), PU_LEVSPEC, 0);
 		P_AddThinker (&elevator->thinker);
 		sec->floordata = elevator; //jff 2/22/98
 		sec->ceilingdata = elevator; //jff 2/22/98
 		elevator->thinker.function.acp1 = (actionf_p1) T_MoveElevator;
 		elevator->type = elevtype;
+		elevator->sector = sec;
+		elevator->speed = speed;
 
 		// set up the fields according to the type of elevator action
-		switch(elevtype)
+		switch (elevtype)
 		{
 			// elevator down to next floor
 			case elevateDown:
 				elevator->direction = -1;
-				elevator->sector = sec;
-				elevator->speed = ELEVATORSPEED;
 				elevator->floordestheight =
 					P_FindNextLowestFloor(sec,sec->floorheight);
 				elevator->ceilingdestheight =
@@ -670,8 +1028,6 @@ int EV_DoElevator (line_t *line, elevator_e elevtype)
 			// elevator up to next floor
 			case elevateUp:
 				elevator->direction = 1;
-				elevator->sector = sec;
-				elevator->speed = ELEVATORSPEED;
 				elevator->floordestheight =
 					P_FindNextHighestFloor(sec,sec->floorheight);
 				elevator->ceilingdestheight =
@@ -680,8 +1036,6 @@ int EV_DoElevator (line_t *line, elevator_e elevtype)
 
 			// elevator to floor height of activating switch's front sector
 			case elevateCurrent:
-				elevator->sector = sec;
-				elevator->speed = ELEVATORSPEED;
 				elevator->floordestheight = line->frontsector->floorheight;
 				elevator->ceilingdestheight =
 					elevator->floordestheight + sec->ceilingheight - sec->floorheight;
@@ -689,9 +1043,94 @@ int EV_DoElevator (line_t *line, elevator_e elevtype)
 					elevator->floordestheight>sec->floorheight?  1 : -1;
 				break;
 
-			default:
+			// [RH] elevate up by a specific amount
+			case elevateRaise:
+				elevator->direction = 1;
+				elevator->floordestheight = sec->floorheight + height;
+				elevator->ceilingdestheight = sec->ceilingheight + height;
+				break;
+
+			// [RH] elevate down by a specific amount
+			case elevateLower:
+				elevator->direction = -1;
+				elevator->floordestheight = sec->floorheight - height;
+				elevator->ceilingdestheight = sec->ceilingheight - height;
 				break;
 		}
 	}
 	return rtn;
 }
+
+
+//
+// [RH]
+// Floor waggling
+//
+// The floor waggles through a sine wave with ~4096 entries.
+void T_Waggle (waggle_t *w)
+{
+	fixed_t destheight = FixedMul (finesine[w->x], (w->amp*w->ampfactor)>>6) + w->baseline;
+
+	T_MovePlane(w->sector,
+				1,
+				destheight,
+				2,0,
+				destheight < w->sector->floorheight ? 1 : -1);
+	w->x = (w->x + w->freq) & (FINEANGLES - 1);
+
+	switch (w->stage) {
+		case -1:
+			if ( ++w->ampfactor > 64 ) {
+				w->ampfactor = 64;
+				w->stage = 0;
+			}
+			break;
+
+		case 0:
+			if (w->timetodie)
+				if (--w->timetodie == 0)
+					w->stage = 1;
+			break;
+
+		case 1:
+			if ( w->ampfactor-- <= 0 ) {
+				w->sector->floordata = NULL;
+				P_RemoveThinker (&w->thinker);
+			}
+			break;
+	}
+}
+
+BOOL EV_DoFloorWaggle (int tag, fixed_t amp, fixed_t freq, int offset, int time)
+{
+	int  secnum;
+	BOOL rtn;
+
+	secnum = -1;
+	rtn = false;
+	while ((secnum = P_FindSectorFromTag (tag, secnum)) >= 0)
+	{
+		sector_t *sec = sectors + secnum;
+		waggle_t *w;
+
+		if (P_SectorActive (floor_special, sec))
+			continue;
+
+		rtn = true;
+
+		w = Z_Malloc (sizeof(*w), PU_LEVSPEC, 0);
+		P_AddThinker (&w->thinker);
+		sec->floordata = w;
+		w->thinker.function.acp1 = (actionf_p1) T_Waggle;
+
+		w->sector = sec;
+		w->baseline = sec->floorheight;
+		w->x = offset & (FINEANGLES-1);
+		w->amp = amp;
+		w->freq = freq * 2;
+		w->timetodie = time;
+		w->ampfactor = 0;
+		w->stage = -1;
+	}
+	return rtn;
+}
\ No newline at end of file
diff --git a/code/P_inter.c b/code/P_inter.c
index ae4d437007..b41813a284 100644
--- a/code/P_inter.c
+++ b/code/P_inter.c
@@ -27,7 +27,6 @@
 // Data.
 #include "doomdef.h"
 #include "dstrings.h"
-#include "sounds.h"
 
 #include "doomstat.h"
 
@@ -43,6 +42,7 @@
 #include "s_sound.h"
 
 #include "p_inter.h"
+#include "p_lnspec.h"
 
 
 #define BONUSADD		6
@@ -177,8 +177,8 @@ BOOL P_GiveWeapon (player_t *player, weapontype_t weapon, BOOL dropped)
 			P_GiveAmmo (player, weaponinfo[weapon].ammo, 2);
 		player->pendingweapon = weapon;
 
-		if (player == &players[displayplayer])		// [RH] Not consoleplayer
-			S_StartSound (ORIGIN_AMBIENT, sfx_wpnup);
+		if (player->mo == players[consoleplayer].camera)	// [RH] Use camera
+			S_StartSound (ORIGIN_AMBIENT, "misc/w_pkup", 78);
 		return false;
 	}
 		
@@ -327,7 +327,7 @@ void P_TouchSpecialThing (mobj_t *special, mobj_t *toucher)
 	}
 	
 		
-	sound = sfx_itemup; 
+	sound = 0; 
 	player = toucher->player;
 
 	// Dead thing touching.
@@ -340,13 +340,13 @@ void P_TouchSpecialThing (mobj_t *special, mobj_t *toucher)
 	{
 		// armor
 	  case SPR_ARM1:
-		if (!P_GiveArmor (player, deh_GreenAC))
+		if (!P_GiveArmor (player, deh.GreenAC))
 			return;
 		player->message = GOTARMOR;
 		break;
 				
 	  case SPR_ARM2:
-		if (!P_GiveArmor (player, deh_BlueAC))
+		if (!P_GiveArmor (player, deh.BlueAC))
 			return;
 		player->message = GOTMEGA;
 		break;
@@ -354,38 +354,38 @@ void P_TouchSpecialThing (mobj_t *special, mobj_t *toucher)
 		// bonus items
 	  case SPR_BON1:
 		player->health++;				// can go over 100%
-		if (player->health > deh_MaxSoulsphere)
-			player->health = deh_MaxSoulsphere;
+		if (player->health > deh.MaxSoulsphere)
+			player->health = deh.MaxSoulsphere;
 		player->mo->health = player->health;
 		player->message = GOTHTHBONUS;
 		break;
 		
 	  case SPR_BON2:
 		player->armorpoints++;			// can go over 100%
-		if (player->armorpoints > deh_MaxArmor)
-			player->armorpoints = deh_MaxArmor;
+		if (player->armorpoints > deh.MaxArmor)
+			player->armorpoints = deh.MaxArmor;
 		if (!player->armortype)
-			player->armortype = deh_GreenAC;
+			player->armortype = deh.GreenAC;
 		player->message = GOTARMBONUS;
 		break;
 		
 	  case SPR_SOUL:
-		player->health += deh_SoulsphereHealth;
-		if (player->health > deh_MaxSoulsphere)
-			player->health = deh_MaxSoulsphere;
+		player->health += deh.SoulsphereHealth;
+		if (player->health > deh.MaxSoulsphere)
+			player->health = deh.MaxSoulsphere;
 		player->mo->health = player->health;
 		player->message = GOTSUPER;
-		sound = sfx_getpow;
+		sound = 1;
 		break;
 		
 	  case SPR_MEGA:
 		if (gamemode != commercial)
 			return;
-		player->health = deh_MegasphereHealth;
+		player->health = deh.MegasphereHealth;
 		player->mo->health = player->health;
-		P_GiveArmor (player,deh_BlueAC);
+		P_GiveArmor (player,deh.BlueAC);
 		player->message = GOTMSPHERE;
-		sound = sfx_getpow;
+		sound = 1;
 		break;
 		
 		// cards
@@ -394,6 +394,7 @@ void P_TouchSpecialThing (mobj_t *special, mobj_t *toucher)
 		if (!player->cards[it_bluecard])
 			player->message = GOTBLUECARD;
 		P_GiveCard (player, it_bluecard);
+		sound = 3;
 		if (!netgame)
 			break;
 		return;
@@ -402,6 +403,7 @@ void P_TouchSpecialThing (mobj_t *special, mobj_t *toucher)
 		if (!player->cards[it_yellowcard])
 			player->message = GOTYELWCARD;
 		P_GiveCard (player, it_yellowcard);
+		sound = 3;
 		if (!netgame)
 			break;
 		return;
@@ -410,6 +412,7 @@ void P_TouchSpecialThing (mobj_t *special, mobj_t *toucher)
 		if (!player->cards[it_redcard])
 			player->message = GOTREDCARD;
 		P_GiveCard (player, it_redcard);
+		sound = 3;
 		if (!netgame)
 			break;
 		return;
@@ -418,6 +421,7 @@ void P_TouchSpecialThing (mobj_t *special, mobj_t *toucher)
 		if (!player->cards[it_blueskull])
 			player->message = GOTBLUESKUL;
 		P_GiveCard (player, it_blueskull);
+		sound = 3;
 		if (!netgame)
 			break;
 		return;
@@ -426,6 +430,7 @@ void P_TouchSpecialThing (mobj_t *special, mobj_t *toucher)
 		if (!player->cards[it_yellowskull])
 			player->message = GOTYELWSKUL;
 		P_GiveCard (player, it_yellowskull);
+		sound = 3;
 		if (!netgame)
 			break;
 		return;
@@ -434,6 +439,7 @@ void P_TouchSpecialThing (mobj_t *special, mobj_t *toucher)
 		if (!player->cards[it_redskull])
 			player->message = GOTREDSKULL;
 		P_GiveCard (player, it_redskull);
+		sound = 3;
 		if (!netgame)
 			break;
 		return;
@@ -461,7 +467,7 @@ void P_TouchSpecialThing (mobj_t *special, mobj_t *toucher)
 		if (!P_GivePower (player, pw_invulnerability))
 			return;
 		player->message = GOTINVUL;
-		sound = sfx_getpow;
+		sound = 1;
 		break;
 		
 	  case SPR_PSTR:
@@ -470,35 +476,35 @@ void P_TouchSpecialThing (mobj_t *special, mobj_t *toucher)
 		player->message = GOTBERSERK;
 		if (player->readyweapon != wp_fist)
 			player->pendingweapon = wp_fist;
-		sound = sfx_getpow;
+		sound = 1;
 		break;
 		
 	  case SPR_PINS:
 		if (!P_GivePower (player, pw_invisibility))
 			return;
 		player->message = GOTINVIS;
-		sound = sfx_getpow;
+		sound = 1;
 		break;
 		
 	  case SPR_SUIT:
 		if (!P_GivePower (player, pw_ironfeet))
 			return;
 		player->message = GOTSUIT;
-		sound = sfx_getpow;
+		sound = 1;
 		break;
 		
 	  case SPR_PMAP:
 		if (!P_GivePower (player, pw_allmap))
 			return;
 		player->message = GOTMAP;
-		sound = sfx_getpow;
+		sound = 1;
 		break;
 		
 	  case SPR_PVIS:
 		if (!P_GivePower (player, pw_infrared))
 			return;
 		player->message = GOTVISOR;
-		sound = sfx_getpow;
+		sound = 1;
 		break;
 		
 		// ammo
@@ -575,49 +581,49 @@ void P_TouchSpecialThing (mobj_t *special, mobj_t *toucher)
 		if (!P_GiveWeapon (player, wp_bfg, false) )
 			return;
 		player->message = GOTBFG9000;
-		sound = sfx_wpnup;		
+		sound = 2;		
 		break;
 		
 	  case SPR_MGUN:
 		if (!P_GiveWeapon (player, wp_chaingun, special->flags&MF_DROPPED) )
 			return;
 		player->message = GOTCHAINGUN;
-		sound = sfx_wpnup;		
+		sound = 2;		
 		break;
 		
 	  case SPR_CSAW:
 		if (!P_GiveWeapon (player, wp_chainsaw, false) )
 			return;
 		player->message = GOTCHAINSAW;
-		sound = sfx_wpnup;		
+		sound = 2;		
 		break;
 		
 	  case SPR_LAUN:
 		if (!P_GiveWeapon (player, wp_missile, false) )
 			return;
 		player->message = GOTLAUNCHER;
-		sound = sfx_wpnup;		
+		sound = 2;		
 		break;
 		
 	  case SPR_PLAS:
 		if (!P_GiveWeapon (player, wp_plasma, false) )
 			return;
 		player->message = GOTPLASMA;
-		sound = sfx_wpnup;		
+		sound = 2;		
 		break;
 		
 	  case SPR_SHOT:
 		if (!P_GiveWeapon (player, wp_shotgun, special->flags&MF_DROPPED ) )
 			return;
 		player->message = GOTSHOTGUN;
-		sound = sfx_wpnup;		
+		sound = 2;		
 		break;
 				
 	  case SPR_SGN2:
 		if (!P_GiveWeapon (player, wp_supershotgun, special->flags&MF_DROPPED ) )
 			return;
 		player->message = GOTSHOTGUN2;
-		sound = sfx_wpnup;		
+		sound = 2;		
 		break;
 				
 	  default:
@@ -630,259 +636,329 @@ void P_TouchSpecialThing (mobj_t *special, mobj_t *toucher)
 	}
 	P_RemoveMobj (special);
 	player->bonuscount += BONUSADD;
-	if (player == &players[displayplayer]) {	// [RH] Not consoleplayer
-		if (sound == sfx_getpow)
-			S_StartSound (ORIGIN_SURROUND3, sound);
-		else
-			S_StartSound (ORIGIN_AMBIENT, sound);
+	if (player->mo == players[consoleplayer].camera) {	// [RH] Use camera
+		switch (sound) {
+			case 0:
+			case 3:
+				S_StartSound (ORIGIN_AMBIENT, "misc/i_pkup", 78);
+				break;
+			case 1:
+				S_StartSound (ORIGIN_SURROUND3, "misc/p_pkup", 78);
+				break;
+			case 2:
+				S_StartSound (ORIGIN_AMBIENT, "misc/w_pkup", 78);
+				break;
+		}
 	}
 }
 
 
+// [RH]
+// SexMessage: Replace parts of strings with gender-specific phrases
+//
+// The following expansions are performed:
+//		%g -> he/she/it
+//		%h -> him/her/it
+//		%p -> his/her/its
+//
+void SexMessage (const char *from, char *to, int gender)
+{
+	static const char *genderstuff[3][3] = {
+		{ "he",  "him", "his" },
+		{ "she", "her", "her" },
+		{ "it",  "it",  "its" }
+	};
+	static const int gendershift[3][3] = {
+		{ 2, 3, 3 },
+		{ 3, 3, 3 },
+		{ 2, 2, 3 }
+	};
+	int gendermsg;
+
+	do {
+		if (*from != '%') {
+			*to++ = *from;
+		} else {
+			switch (from[1]) {
+				case 'g':	gendermsg = 0;	break;
+				case 'h':	gendermsg = 1;	break;
+				case 'p':	gendermsg = 2;	break;
+				default:	gendermsg = -1;	break;
+			}
+			if (gendermsg < 0) {
+				*to++ = '%';
+			} else {
+				strcpy (to, genderstuff[gender][gendermsg]);
+				to += gendershift[gender][gendermsg];
+				from++;
+			}
+		}
+	} while (*from++);
+}
+
 // [RH]
 // ClientObituary: Show a message when a player dies
 //
 void ClientObituary (mobj_t *self, mobj_t *inflictor, mobj_t *attacker)
 {
-	int		mod;
-	char	*message;
-	char	*message2;
-	BOOL	friendly;
+	int	 mod;
+	char *message;
+	char gendermessage[1024];
+	BOOL friendly;
+	int  gender;
 
-	if (1) {
-		friendly = MeansOfDeath & MOD_FRIENDLY_FIRE;
-		mod = MeansOfDeath & ~MOD_FRIENDLY_FIRE;
-		message = NULL;
-		message2 = "";
+	if (!self->player)
+		return;
 
-		switch (mod) {
-			case MOD_SUICIDE:
-				message = "suicides";
-				break;
-			case MOD_FALLING:
-				message = "fell too far";
-				break;
-			case MOD_CRUSH:
-				message = "was squished";
-				break;
-			case MOD_EXIT:
-				message = "tried to leave";
-				break;
-			case MOD_WATER:
-				message = "has no gills";
-				break;
-			case MOD_SLIME:
-				message = "mutated";
-				break;
-			case MOD_LAVA:
-				message = "melted";
-				break;
-			case MOD_BARREL:
-				message = "went boom";
-				break;
-			case MOD_SPLASH:
-				message = "stood in the wrong spot";
-				break;
-		}
+	gender = self->player->userinfo.gender;
 
-		if (attacker && !message) {
-			if (attacker == self) {
-				switch (mod) {
-					case MOD_R_SPLASH:
-					case MOD_ROCKET:
-						message = "should have stood back";
-						break;
-					default:
-						message = "killed himself";
-						break;
-				}
-			} else if (!attacker->player) {
-				switch (attacker->type) {
-					case MT_STEALTHBABY:
-						message = "thought he saw an arachnotron";
-						break;
-					case MT_STEALTHVILE:
-						message = "thought he saw an archvile";
-						break;
-					case MT_STEALTHBRUISER:
-						message = "thought he saw a Baron of Hell";
-						break;
-					case MT_STEALTHHEAD:
-						message = "thought he saw a mancubus";
-						break;
-					case MT_STEALTHCHAINGUY:
-						message = "thought he saw a chaingunner";
-						break;
-					case MT_STEALTHSERGEANT:
-						message = "thought he saw a demon";
-						break;
-					case MT_STEALTHKNIGHT:
-						message = "thought he saw a Hell Knight";
-						break;
-					case MT_STEALTHIMP:
-						message = "thought he saw an imp";
-						break;
-					case MT_STEALTHFATSO:
-						message = "thought he saw a mancubus";
-						break;
-					case MT_STEALTHUNDEAD:
-						message = "thought he saw a revenant";
-						break;
-					case MT_STEALTHSHOTGUY:
-						message = "thought he saw a sargeant";
-						break;
-					case MT_STEALTHZOMBIE:
-						message = "thought he saw a zombieman";
-						break;
-					default:
-						if (mod == MOD_HIT) {
-							switch (attacker->type) {
-								case MT_UNDEAD:
-									message = "was punched by a revenant";
-									break;
-								case MT_TROOP:
-									message = "was slashed by an imp";
-									break;
-								case MT_HEAD:
-									message = "got too close to a mancubus";
-									break;
-								case MT_SERGEANT:
-									message = "was bit by a demon";
-									break;
-								case MT_SHADOWS:
-									message = "was eaten by a spectre";
-									break;
-								case MT_BRUISER:
-									message = "was ripped open by a Baron of Hell";
-									break;
-								case MT_KNIGHT:
-									message = "was gutted by a Hell Knight";
-									break;
-								default:
-									break;
-							}
-						} else {
-							switch (attacker->type) {
-								case MT_POSSESSED:
-									message = "was killed by a zombieman";
-									break;
-								case MT_SHOTGUY:
-									message = "was shot by a sargeant";
-									break;
-								case MT_VILE:
-									message = "was incinerated by an archvile";
-									break;
-								case MT_UNDEAD:
-									message = "couldn't evade a revenant's fireball";
-									break;
-								case MT_FATSO:
-									message = "was squashed by a mancubus";
-									break;
-								case MT_CHAINGUY:
-									message = "was perforated by a chaingunner";
-									break;
-								case MT_SKULL:
-									message = "was spooked by a lost soul";
-									break;
-								case MT_TROOP:
-									message = "was burned by an imp";
-									break;
-								case MT_HEAD:
-									message = "was mesmerized by a cacodemon";
-									break;
-								case MT_BRUISER:
-									message = "was bruised by a Baron of Hell";
-									break;
-								case MT_KNIGHT:
-									message = "was splayed by a Hell Knight";
-									break;
-								case MT_SPIDER:
-									message = "stood in awe of the spider mastermind";
-									break;
-								case MT_BABY:
-									message = "let an arachnotron get him";
-									break;
-								case MT_CYBORG:
-									message = "was splattered by a cyberdemon";
-									break;
-								case MT_WOLFSS:
-									message = "becomes Hitler's personal slave";
-									break;
-								default:
-									break;
-							}
-						}
-						break;
-				}
-			}
-		}
+	if (netgame && !deathmatch->value)
+		MeansOfDeath |= MOD_FRIENDLY_FIRE;
 
-		if (message) {
-			Printf ("%s %s.\n", self->player->userinfo->netname, message);
-			return;
-		}
+	friendly = MeansOfDeath & MOD_FRIENDLY_FIRE;
+	mod = MeansOfDeath & ~MOD_FRIENDLY_FIRE;
+	message = NULL;
 
-		if (attacker && attacker->player) {
+	switch (mod) {
+		case MOD_SUICIDE:
+			message = OB_SUICIDE;
+			break;
+		case MOD_FALLING:
+			message = OB_FALLING;
+			break;
+		case MOD_CRUSH:
+			message = OB_CRUSH;
+			break;
+		case MOD_EXIT:
+			message = OB_EXIT;
+			break;
+		case MOD_WATER:
+			message = OB_WATER;
+			break;
+		case MOD_SLIME:
+			message = OB_SLIME;
+			break;
+		case MOD_LAVA:
+			message = OB_LAVA;
+			break;
+		case MOD_BARREL:
+			message = OB_BARREL;
+			break;
+		case MOD_SPLASH:
+			message = OB_SPLASH;
+			break;
+	}
+
+	if (attacker && !message) {
+		if (attacker == self) {
 			switch (mod) {
-				case MOD_FIST:
-					message = "chewed on";
-					message2 = "'s fist";
-					break;
-				case MOD_CHAINSAW:
-					message = "was mowed over by";
-					message2 = "'s chainsaw";
-					break;
-				case MOD_PISTOL:
-					message = "was tickled by";
-					break;
-				case MOD_SHOTGUN:
-					message = "chewed on";
-					message2 = "'s boomstick";
-					break;
-				case MOD_SSHOTGUN:
-					message = "was splattered by";
-					message2 = "'s super shotgun";
-					break;
-				case MOD_CHAINGUN:
-					message = "was mowed down by";
+				case MOD_R_SPLASH:
+					message = OB_R_SPLASH;
 					break;
 				case MOD_ROCKET:
-					message = "rode";
-					message2 = "'s rocket";
+					message = OB_ROCKET;
 					break;
-				case MOD_R_SPLASH:
-					message = "almost dodged";
-					message2 = "'s rocket";
-					break;
-				case MOD_PLASMARIFLE:
-					message = "was melted by";
-					break;
-				case MOD_BFG_BOOM:
-					message = "was splintered by";
-					message2 = "'s BFG";
-					break;
-				case MOD_BFG_SPLASH:
-					message = "couldn't hide from";
-					message2 = "'s BFG";
-					break;
-				case MOD_TELEFRAG:
-					message = "was stepped on by";
-					break;
-				case MOD_FALLXFER:
-					message = "was";
-					message2 = "'s cushion";
+				default:
+					message = OB_KILLEDSELF;
+					break;
+			}
+		} else if (!attacker->player) {
+			switch (attacker->type) {
+				case MT_STEALTHBABY:
+					message = OB_STEALTHBABY;
+					break;
+				case MT_STEALTHVILE:
+					message = OB_STEALTHVILE;
+					break;
+				case MT_STEALTHBRUISER:
+					message = OB_STEALTHBARON;
+					break;
+				case MT_STEALTHHEAD:
+					message = OB_STEALTHCACO;
+					break;
+				case MT_STEALTHCHAINGUY:
+					message = OB_STEALTHCHAINGUY;
+					break;
+				case MT_STEALTHSERGEANT:
+					message = OB_STEALTHDEMON;
+					break;
+				case MT_STEALTHKNIGHT:
+					message = OB_STEALTHKNIGHT;
+					break;
+				case MT_STEALTHIMP:
+					message = OB_STEALTHIMP;
+					break;
+				case MT_STEALTHFATSO:
+					message = OB_STEALTHFATSO;
+					break;
+				case MT_STEALTHUNDEAD:
+					message = OB_STEALTHUNDEAD;
+					break;
+				case MT_STEALTHSHOTGUY:
+					message = OB_STEALTHSHOTGUY;
+					break;
+				case MT_STEALTHZOMBIE:
+					message = OB_STEALTHZOMBIE;
+					break;
+				default:
+					if (mod == MOD_HIT) {
+						switch (attacker->type) {
+							case MT_UNDEAD:
+								message = OB_UNDEADHIT;
+								break;
+							case MT_TROOP:
+								message = OB_IMPHIT;
+								break;
+							case MT_HEAD:
+								message = OB_CACOHIT;
+								break;
+							case MT_SERGEANT:
+								message = OB_DEMONHIT;
+								break;
+							case MT_SHADOWS:
+								message = OB_SPECTREHIT;
+								break;
+							case MT_BRUISER:
+								message = OB_BARONHIT;
+								break;
+							case MT_KNIGHT:
+								message = OB_KNIGHTHIT;
+								break;
+							default:
+								break;
+						}
+					} else {
+						switch (attacker->type) {
+							case MT_POSSESSED:
+								message = OB_ZOMBIE;
+								break;
+							case MT_SHOTGUY:
+								message = OB_SHOTGUY;
+								break;
+							case MT_VILE:
+								message = OB_VILE;
+								break;
+							case MT_UNDEAD:
+								message = OB_UNDEAD;
+								break;
+							case MT_FATSO:
+								message = OB_FATSO;
+								break;
+							case MT_CHAINGUY:
+								message = OB_CHAINGUY;
+								break;
+							case MT_SKULL:
+								message = OB_SKULL;
+								break;
+							case MT_TROOP:
+								message = OB_IMP;
+								break;
+							case MT_HEAD:
+								message = OB_CACO;
+								break;
+							case MT_BRUISER:
+								message = OB_BARON;
+								break;
+							case MT_KNIGHT:
+								message = OB_KNIGHT;
+								break;
+							case MT_SPIDER:
+								message = OB_SPIDER;
+								break;
+							case MT_BABY:
+								message = OB_BABY;
+								break;
+							case MT_CYBORG:
+								message = OB_CYBORG;
+								break;
+							case MT_WOLFSS:
+								message = OB_WOLFSS;
+								break;
+							default:
+								break;
+						}
+					}
 					break;
 			}
-		}
-
-		if (message) {
-			Printf ("%s %s %s%s\n", self->player->userinfo->netname, message,
-					attacker->player->userinfo->netname, message2);
-			return;
 		}
 	}
 
-	Printf ("%s died.\n", self->player->userinfo->netname);
+	if (message) {
+		SexMessage (message, gendermessage, gender);
+		Printf ("%s %s.\n", self->player->userinfo.netname, gendermessage);
+		return;
+	}
+
+	if (attacker && attacker->player) {
+		if (friendly) {
+			int rnum = P_Random (pr_obituary);
+
+			attacker->player->fragcount -= 2;
+			attacker->player->frags[attacker->player-players]++;
+			self = attacker;
+
+			if (rnum < 64)
+				message = OB_FRIENDLY1;
+			else if (rnum < 128)
+				message = OB_FRIENDLY2;
+			else if (rnum < 192)
+				message = OB_FRIENDLY3;
+			else
+				message = OB_FRIENDLY4;
+		} else {
+			switch (mod) {
+				case MOD_FIST:
+					message = OB_MPFIST;
+					break;
+				case MOD_CHAINSAW:
+					message = OB_MPCHAINSAW;
+					break;
+				case MOD_PISTOL:
+					message = OB_MPPISTOL;
+					break;
+				case MOD_SHOTGUN:
+					message = OB_MPSHOTGUN;
+					break;
+				case MOD_SSHOTGUN:
+					message = OB_MPSSHOTGUN;
+					break;
+				case MOD_CHAINGUN:
+					message = OB_MPCHAINGUN;
+					break;
+				case MOD_ROCKET:
+					message = OB_MPROCKET;
+					break;
+				case MOD_R_SPLASH:
+					message = OB_MPR_SPLASH;
+					break;
+				case MOD_PLASMARIFLE:
+					message = OB_MPPLASMARIFLE;
+					break;
+				case MOD_BFG_BOOM:
+					message = OB_MPBFG_BOOM;
+					break;
+				case MOD_BFG_SPLASH:
+					message = OB_MPBFG_SPLASH;
+					break;
+				case MOD_TELEFRAG:
+					message = OB_MPTELEFRAG;
+					break;
+			}
+		}
+	}
+
+	if (message) {
+		char work[256];
+
+		SexMessage (message, gendermessage, gender);
+		sprintf (work, "%%s %s\n", gendermessage);
+		Printf (work, self->player->userinfo.netname,
+				attacker->player->userinfo.netname);
+		return;
+	}
+
+	SexMessage (OB_DEFAULT, gendermessage, gender);
+	Printf ("%s %s.\n", self->player->userinfo.netname, gendermessage);
 }
 
 
@@ -904,6 +980,18 @@ void P_KillMobj (mobj_t *source, mobj_t *target, mobj_t *inflictor)
 	target->flags |= MF_CORPSE|MF_DROPOFF;
 	target->height >>= 2;
 
+	// [RH] If the thing has a special, execute and remove it
+	//		Note that the thing that killed it is considered
+	//		the activator of the script.
+	if (target->special) {
+		LineSpecials[target->special] (NULL, source, target->args[0],
+									   target->args[1], target->args[2],
+									   target->args[3], target->args[4]);
+		target->special = 0;
+	}
+	// [RH] Also set the thing's tid to 0.
+	target->tid = 0;
+
 	if (source && source->player)
 	{
 		// count for intermission
@@ -912,7 +1000,10 @@ void P_KillMobj (mobj_t *source, mobj_t *target, mobj_t *inflictor)
 			level.killed_monsters++;
 		}
 
-		if (target->player) {
+		// Don't count any frags at level start, because they're just telefrags
+		// resulting from insufficient deathmatch starts, and it wouldn't be
+		// fair to count them toward a player's score.
+		if (target->player && level.time) {
 			source->player->frags[target->player-players]++;
 			if (target->player == source->player)	// [RH] Cumulative frag count
 				source->player->fragcount--;
@@ -922,8 +1013,8 @@ void P_KillMobj (mobj_t *source, mobj_t *target, mobj_t *inflictor)
 			// [RH] Implement fraglimit
 			if (deathmatch->value && fraglimit->value &&
 				(int)fraglimit->value == source->player->fragcount) {
-				Printf ("%s got %d frags.\n", source->player->userinfo->netname, source->player->fragcount);
-				G_ExitLevel ();
+				Printf ("Fraglimit hit.\n");
+				G_ExitLevel (0);
 			}
 		}
 	}
@@ -973,10 +1064,8 @@ void P_KillMobj (mobj_t *source, mobj_t *target, mobj_t *inflictor)
 	if (target->tics < 1)
 		target->tics = 1;
 				
-	//	I_StartSound (&actor->r, actor->info->deathsound);
-
 	// [RH] Death messages
-	if (target->player)
+	if (target->player && level.time && !olddemo)
 		ClientObituary (target, inflictor, source);
 
 	// Drop stuff.
@@ -1003,7 +1092,6 @@ void P_KillMobj (mobj_t *source, mobj_t *target, mobj_t *inflictor)
 
 	mo = P_SpawnMobj (target->x,target->y,0, item, ONFLOORZ);
 	mo->flags |= MF_DROPPED;	// special versions of items
-
 }
 
 
@@ -1052,7 +1140,6 @@ void P_DamageMobj (mobj_t *target, mobj_t *inflictor, mobj_t *source, int damage
 	player = target->player;
 	if (player && gameskill->value == sk_baby)
 		damage >>= 1;	// take half damage in trainer mode
-				
 
 	// Some close combat weapons should not
 	// inflict thrust and push the victim out of reach,
@@ -1079,22 +1166,21 @@ void P_DamageMobj (mobj_t *target, mobj_t *inflictor, mobj_t *source, int damage
 			ang += ANG180;
 			thrust *= 4;
 		}
-				
+
 		ang >>= ANGLETOFINESHIFT;
 		target->momx += FixedMul (thrust, finecosine[ang]);
 		target->momy += FixedMul (thrust, finesine[ang]);
 	}
-	
+
 	// player specific
 	if (player)
 	{
 		// end of game hell hack
-		if (target->subsector->sector->special == 11
+		if (target->subsector->sector->special & 255 == dDamage_End
 			&& damage >= target->health)
 		{
 			damage = target->health - 1;
 		}
-		
 
 		// Below certain threshold,
 		// ignore damage in GOD mode, or with INVUL power.
@@ -1104,10 +1190,20 @@ void P_DamageMobj (mobj_t *target, mobj_t *inflictor, mobj_t *source, int damage
 		{
 			return;
 		}
-		
+
+		// [RH] Avoid friendly fire if enabled
+		if (teamplay->value && source && source->player &&
+			source->player->userinfo.team[0] &&
+			!stricmp (player->userinfo.team, source->player->userinfo.team)) {
+			if (dmflags & DF_NO_FRIENDLY_FIRE)
+				return;
+			else
+				MeansOfDeath |= MOD_FRIENDLY_FIRE;
+		}
+
 		if (player->armortype)
 		{
-			if (player->armortype == deh_GreenAC)
+			if (player->armortype == deh.GreenAC)
 				saved = damage/3;
 			else
 				saved = damage/2;
@@ -1137,37 +1233,49 @@ void P_DamageMobj (mobj_t *target, mobj_t *inflictor, mobj_t *source, int damage
 			I_Tactile (40,10,40+temp*2);
 	}
 	
-	// do the damage	
-	target->health -= damage;	
-	if (target->health <= 0)
-	{
-		P_KillMobj (source, target, inflictor);
-		return;
+	// do the damage
+	// [RH] Only if not immune
+	if (!(target->flags2 & (MF2_INVULNERABLE | MF2_INDESTRUCTABLE))) {
+		target->health -= damage;	
+		if (target->health <= 0)
+		{
+			P_KillMobj (source, target, inflictor);
+			return;
+		}
 	}
 
-	if ( (P_Random (pr_damagemobj) < target->info->painchance)
-		 && !(target->flags&MF_SKULLFLY) )
-	{
-		target->flags |= MF_JUSTHIT;	// fight back!
-		
-		P_SetMobjState (target, target->info->painstate);
-	}
-						
-	target->reactiontime = 0;			// we're awake now...	
+	if (!(target->flags2 & MF2_DORMANT)) {
+		// [RH] Only react if not dormant
+		if ( (P_Random (pr_damagemobj) < target->info->painchance)
+			 && !(target->flags&MF_SKULLFLY) )
+		{
+			target->flags |= MF_JUSTHIT;	// fight back!
+			
+			P_SetMobjState (target, target->info->painstate);
+		}
+							
+		target->reactiontime = 0;			// we're awake now...	
 
-	if ( (!target->threshold || target->type == MT_VILE)
-		 && source && source != target
-		 && source->type != MT_VILE)
-	{
-		// if not intent on another player,
-		// chase after this one
-		target->target = source;
-		target->threshold = BASETHRESHOLD;
-		if (target->state == &states[target->info->spawnstate]
-			&& target->info->seestate != S_NULL)
-			P_SetMobjState (target, target->info->seestate);
+		if ( (!target->threshold || target->type == MT_VILE)
+			 && source && source != target
+			 && source->type != MT_VILE)
+		{
+			// if not intent on another player, chase after this one
+
+			// killough 2/15/98: remember last enemy, to prevent
+			// sleeping early; 2/21/98: Place priority on players
+
+			if (!target->lastenemy || !target->lastenemy->player ||
+				 target->lastenemy->health <= 0)
+				target->lastenemy = target->target; // remember last enemy - killough
+
+			target->target = source;
+			target->threshold = BASETHRESHOLD;
+			if (target->state == &states[target->info->spawnstate]
+				&& target->info->seestate != S_NULL)
+				P_SetMobjState (target, target->info->seestate);
+		}
 	}
-						
 }
 
 BOOL CheckCheatmode (void);
diff --git a/code/P_lights.c b/code/P_lights.c
new file mode 100644
index 0000000000..5d1012ddd6
--- /dev/null
+++ b/code/P_lights.c
@@ -0,0 +1,530 @@
+// Emacs style mode select	 -*- C++ -*- 
+//-----------------------------------------------------------------------------
+//
+// $Id:$
+//
+// Copyright (C) 1993-1996 by id Software, Inc.
+//
+// This source is available for distribution and/or modification
+// only under the terms of the DOOM Source Code License as
+// published by id Software. All rights reserved.
+//
+// The source is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// FITNESS FOR A PARTICULAR PURPOSE. See the DOOM Source Code License
+// for more details.
+//
+// $Log:$
+//
+// DESCRIPTION:
+//		Handle Sector base lighting effects.
+//
+//-----------------------------------------------------------------------------
+
+
+
+#include "z_zone.h"
+#include "m_random.h"
+
+#include "doomdef.h"
+#include "p_local.h"
+
+#include "p_lnspec.h"
+
+// State.
+#include "r_state.h"
+
+// [RH] These functions only change the sector special in
+//		demo compatibility mode.
+extern BOOL olddemo;
+
+// [RH] Make sure the light level is in bounds.
+#define CLIPLIGHT(l)	(((l) < 0) ? 0 : (((l) > 255) ? 255 : (l)))
+
+//
+// FIRELIGHT FLICKER
+//
+
+//
+// T_FireFlicker
+//
+void T_FireFlicker (fireflicker_t *flick)
+{
+	int amount;
+		
+	if (--flick->count)
+		return;
+		
+	amount = (P_Random (pr_fireflicker) & 3) << 4;
+	
+	if (flick->sector->lightlevel - amount < flick->minlight)
+		flick->sector->lightlevel = (short)flick->minlight;
+	else
+		flick->sector->lightlevel = (short)(flick->maxlight - amount);
+
+	flick->count = 4;
+}
+
+
+
+//
+// P_SpawnFireFlicker
+//
+void P_SpawnFireFlicker (sector_t *sector)
+{
+	fireflicker_t *flick;
+
+	if (olddemo)
+		sector->special &= 0xff00;
+
+	flick = Z_Malloc ( sizeof(*flick), PU_LEVSPEC, 0);
+
+	P_AddThinker (&flick->thinker);
+
+	flick->thinker.function.acp1 = (actionf_p1) T_FireFlicker;
+	flick->sector = sector;
+	flick->maxlight = sector->lightlevel;
+	flick->minlight = P_FindMinSurroundingLight(sector,sector->lightlevel)+16;
+	flick->count = 4;
+}
+
+
+
+//
+// BROKEN LIGHT FLASHING
+//
+
+
+//
+// T_LightFlash
+// Do flashing lights.
+//
+void T_LightFlash (lightflash_t* flash)
+{
+	if (--flash->count)
+		return;
+		
+	if (flash->sector->lightlevel == flash->maxlight)
+	{
+		flash-> sector->lightlevel = flash->minlight;
+		flash->count = (P_Random (pr_lightflash) & flash->mintime) + 1;
+	}
+	else
+	{
+		flash-> sector->lightlevel = flash->maxlight;
+		flash->count = (P_Random (pr_lightflash) & flash->maxtime) + 1;
+	}
+
+}
+
+
+
+
+//
+// P_SpawnLightFlash
+// [RH] Added min and max parameters
+//
+void P_SpawnLightFlash (sector_t *sector, int min, int max)
+{
+	lightflash_t *flash;
+
+	if (olddemo)
+		sector->special &= 0xff00;
+		
+	flash = Z_Malloc ( sizeof(*flash), PU_LEVSPEC, 0);
+
+	P_AddThinker (&flash->thinker);
+
+	flash->thinker.function.acp1 = (actionf_p1) T_LightFlash;
+	flash->sector = sector;
+	if (min < 0) {
+		// If min is negative, find light levels like Doom.
+		flash->maxlight = sector->lightlevel;
+		flash->minlight = P_FindMinSurroundingLight(sector,sector->lightlevel);
+	} else {
+		// Otherwise, use the ones provided.
+		flash->maxlight = CLIPLIGHT(max);
+		flash->minlight = CLIPLIGHT(min);
+	}
+	flash->maxtime = 64;
+	flash->mintime = 7;
+	flash->count = (P_Random (pr_spawnlightflash) & flash->maxtime) + 1;
+}
+
+// [RH] New function to start light flashing on-demand.
+void EV_StartLightFlashing (int tag, int upper, int lower)
+{
+	int secnum;
+		
+	secnum = -1;
+	while ((secnum = P_FindSectorFromTag (tag,secnum)) >= 0)
+	{
+		sector_t *sec = &sectors[secnum];
+		if (P_SectorActive (lighting_special, sec))
+			continue;
+		
+		P_SpawnLightFlash (sec, lower, upper);
+	}
+}
+
+
+//
+// STROBE LIGHT FLASHING
+//
+
+
+//
+// T_StrobeFlash
+//
+void T_StrobeFlash (strobe_t *flash)
+{
+	if (--flash->count)
+		return;
+		
+	if (flash->sector->lightlevel == flash->minlight)
+	{
+		flash-> sector->lightlevel = (short)flash->maxlight;
+		flash->count = flash->brighttime;
+	}
+	else
+	{
+		flash-> sector->lightlevel = (short)flash->minlight;
+		flash->count = flash->darktime;
+	}
+
+}
+
+
+
+//
+// P_SpawnStrobeFlash
+// After the map has been loaded, scan each sector
+// for specials that spawn thinkers
+// [RH] brighttime is also adjustable
+//
+void P_SpawnStrobeFlash (sector_t *sector, int upper, int lower,
+						 int utics, int ltics, int inSync)
+{
+	strobe_t *flash;
+		
+	flash = Z_Malloc ( sizeof(*flash), PU_LEVSPEC, 0);
+
+	P_AddThinker (&flash->thinker);
+
+	flash->sector = sector;
+	flash->darktime = ltics;
+	flash->brighttime = utics;
+	flash->thinker.function.acp1 = (actionf_p1) T_StrobeFlash;
+
+	// [RH] If the upper light level is -1, we use Doom's mechanism
+	//		for setting this up. Otherwise, we use Hexen's.
+	if (upper < 0) {
+		flash->maxlight = sector->lightlevel;
+		flash->minlight = P_FindMinSurroundingLight(sector, sector->lightlevel);
+
+		if (flash->minlight == flash->maxlight)
+			flash->minlight = 0;
+
+		flash->count = inSync ? 1 : (P_Random (pr_spawnstrobeflash) & 7) + 1;
+	} else {
+		flash->maxlight = CLIPLIGHT(upper);
+		flash->minlight = CLIPLIGHT(lower);
+		flash->count = 1;	// Hexen-style is always in sync.
+	}
+	if (olddemo)
+		sector->special &= 0xff00;
+}
+
+
+//
+// Start strobing lights (usually from a trigger)
+// [RH] Made it more configurable.
+//
+void EV_StartLightStrobing (int tag, int upper, int lower, int utics, int ltics)
+{
+	int secnum;
+		
+	secnum = -1;
+	while ((secnum = P_FindSectorFromTag (tag,secnum)) >= 0)
+	{
+		sector_t *sec = &sectors[secnum];
+		if (P_SectorActive (lighting_special, sec))	//jff 2/22/98
+			continue;
+		
+		P_SpawnStrobeFlash (sec, upper, lower, utics, ltics, 0);
+	}
+}
+
+
+
+//
+// TURN LINE'S TAG LIGHTS OFF
+// [RH] Takes a tag instead of a line
+//
+void EV_TurnTagLightsOff (int tag)
+{
+	int i;
+	int secnum;
+
+	// [RH] Don't do a linear search
+	for (secnum = -1; (secnum = P_FindSectorFromTag (tag, secnum)) >= 0; ) 
+	{
+		sector_t *sector = sectors + secnum;
+		int min = sector->lightlevel;
+
+		for (i = 0; i < sector->linecount; i++)
+		{
+			sector_t *tsec = getNextSector (sector->lines[i],sector);
+			if (!tsec)
+				continue;
+			if (tsec->lightlevel < min)
+				min = tsec->lightlevel;
+		}
+		sector->lightlevel = min;
+	}
+}
+
+
+//
+// TURN LINE'S TAG LIGHTS ON
+// [RH] Takes a tag instead of a line
+//
+void EV_LightTurnOn (int tag, int bright)
+{
+	int secnum = -1;
+
+	// [RH] Don't do a linear search
+	while ((secnum = P_FindSectorFromTag (tag, secnum)) >= 0) 
+	{
+		sector_t *sector = sectors + secnum;
+
+		// bright = -1 means to search ([RH] Not 0)
+		// for highest light level
+		// surrounding sector
+		if (bright < 0)
+		{
+			int j;
+
+			bright = 0;
+			for (j = 0; j < sector->linecount; j++)
+			{
+				sector_t *temp = getNextSector (sector->lines[j], sector);
+
+				if (!temp)
+					continue;
+
+				if (temp->lightlevel > bright)
+					bright = temp->lightlevel;
+			}
+		}
+		sector->lightlevel = CLIPLIGHT(bright);
+	}
+}
+
+
+//
+// [RH] New function to adjust tagged sectors' light levels
+//		by a relative amount. Light levels are clipped to
+//		within the range 0-255 inclusive.
+//
+void EV_LightChange (int tag, int value)
+{
+	int secnum = -1;
+
+	while ((secnum = P_FindSectorFromTag (tag, secnum)) >= 0) {
+		int newlight = sectors[secnum].lightlevel + value;
+		sectors[secnum].lightlevel = CLIPLIGHT(newlight);
+	}
+}
+
+	
+//
+// Spawn glowing light
+//
+
+void T_Glow (glow_t *g)
+{
+	switch(g->direction)
+	{
+	  case -1:
+		// DOWN
+		g->sector->lightlevel -= GLOWSPEED;
+		if (g->sector->lightlevel <= g->minlight)
+		{
+			g->sector->lightlevel += GLOWSPEED;
+			g->direction = 1;
+		}
+		break;
+		
+	  case 1:
+		// UP
+		g->sector->lightlevel += GLOWSPEED;
+		if (g->sector->lightlevel >= g->maxlight)
+		{
+			g->sector->lightlevel -= GLOWSPEED;
+			g->direction = -1;
+		}
+		break;
+	}
+}
+
+
+void P_SpawnGlowingLight (sector_t *sector)
+{
+	glow_t *g;
+		
+	g = Z_Malloc( sizeof(*g), PU_LEVSPEC, 0);
+
+	P_AddThinker(&g->thinker);
+
+	g->sector = sector;
+	g->minlight = P_FindMinSurroundingLight(sector,sector->lightlevel);
+	g->maxlight = sector->lightlevel;
+	g->thinker.function.acp1 = (actionf_p1) T_Glow;
+	g->direction = -1;
+
+	if (olddemo)
+		sector->special &= 0xff00;
+}
+
+//
+// [RH] More glowing light, this time appropriate for Hexen-ish uses.
+//
+void T_Glow2 (glow2_t *g)
+{
+	if (g->tics++ >= g->maxtics) {
+		if (g->oneshot) {
+			g->sector->lightlevel = g->end;
+			P_RemoveThinker (&g->thinker);
+			return;
+		} else {
+			int temp = g->start;
+			g->start = g->end;
+			g->end = temp;
+			g->tics -= g->maxtics;
+		}
+	}
+
+	g->sector->lightlevel = ((g->end - g->start) * g->tics) / g->maxtics + g->start;
+}
+
+
+static void P_SpawnGlowingLight2 (sector_t *sector, int start, int end,
+								  int tics, BOOL oneshot)
+{
+	glow2_t *g;
+		
+	g = Z_Malloc( sizeof(*g), PU_LEVSPEC, 0);
+
+	P_AddThinker(&g->thinker);
+
+	g->sector = sector;
+	g->start = CLIPLIGHT(start);
+	g->end = CLIPLIGHT(end);
+	g->maxtics = tics;
+	g->tics = -1;
+	g->oneshot = oneshot;
+	g->thinker.function.acp1 = (actionf_p1) T_Glow2;
+}
+
+void EV_StartLightGlowing (int tag, int upper, int lower, int tics)
+{
+	int secnum;
+
+	if (upper < lower) {
+		int temp = upper;
+		upper = lower;
+		lower = temp;
+	}
+
+	secnum = -1;
+	while ((secnum = P_FindSectorFromTag (tag,secnum)) >= 0)
+	{
+		sector_t *sec = &sectors[secnum];
+		if (P_SectorActive (lighting_special, sec))
+			continue;
+		
+		P_SpawnGlowingLight2 (sec, upper, lower, tics, false);
+	}
+}
+
+void EV_StartLightFading (int tag, int value, int tics)
+{
+	int secnum;
+		
+	secnum = -1;
+	while ((secnum = P_FindSectorFromTag (tag,secnum)) >= 0)
+	{
+		sector_t *sec = &sectors[secnum];
+		if (P_SectorActive (lighting_special, sec))
+			continue;
+
+		// No need to fade if lightlevel is already at desired value.
+		if (sec->lightlevel == value)
+			continue;
+
+		P_SpawnGlowingLight2 (sec, sec->lightlevel, value, tics, true);
+	}
+}
+
+
+// [RH] Phased lighting ala Hexen
+void T_PhasedLight (phased_t *l)
+{
+	const int steps = 12;
+
+	if (l->phase < steps) {
+		l->sector->lightlevel = ((255 - l->baselevel) * l->phase) / steps + l->baselevel;
+	} else if (l->phase < 2*steps) {
+		l->sector->lightlevel = ((255 - l->baselevel) * (2*steps - l->phase - 1) / steps
+								+ l->baselevel);
+	} else {
+		l->sector->lightlevel = l->baselevel;
+	}
+
+	if (l->phase-- == 0)
+		l->phase = 63;
+}
+
+static int phasehelper (sector_t *sector, int index, int light, sector_t *prev)
+{
+	if (!sector) {
+		return index;
+	} else {
+		phased_t *l = Z_Malloc (sizeof(*l), PU_LEVSPEC, 0);
+		int numsteps;
+
+		l->sector = sector;
+		l->baselevel = sector->lightlevel ? sector->lightlevel : light;
+		numsteps = phasehelper (P_NextSpecialSector (sector,
+				(sector->special & 0x00ff) == LightSequenceSpecial1 ?
+					LightSequenceSpecial2 : LightSequenceSpecial1, prev),
+				index + 1, l->baselevel, sector);
+		l->phase = ((numsteps - index - 1) * 64) / numsteps;
+		l->thinker.function.acp1 = (actionf_p1) T_PhasedLight;
+
+		P_AddThinker (&l->thinker);
+
+		sector->special &= 0xff00;
+
+		return numsteps;
+	}
+}
+
+void P_SpawnLightSequence (sector_t *sector)
+{
+	phasehelper (sector, 0, 0, NULL);
+}
+
+void P_SpawnLightPhased (sector_t *sector)
+{
+	phased_t *l = Z_Malloc (sizeof(*l), PU_LEVSPEC, 0);
+
+	l->sector = sector;
+	l->baselevel = 48;
+	l->phase = 63 - (sector->lightlevel & 63);
+	l->thinker.function.acp1 = (actionf_p1) T_PhasedLight;
+	P_AddThinker (&l->thinker);
+
+	sector->special &= 0xff00;
+}
\ No newline at end of file
diff --git a/code/P_lnspec.c b/code/P_lnspec.c
new file mode 100644
index 0000000000..101388c49d
--- /dev/null
+++ b/code/P_lnspec.c
@@ -0,0 +1,1362 @@
+// p_lnspec.c: Code to handle line specials.
+//
+// Each function returns true if it caused something to happen
+// or false if it couldn't perform the desired action.
+
+#include "doomstat.h"
+#include "p_local.h"
+#include "p_lnspec.h"
+#include "g_level.h"
+#include "v_palett.h"
+#include "tables.h"
+
+#define FUNC(a) static BOOL a (line_t *ln, mobj_t *it, int arg0, int arg1, \
+							   int arg2, int arg3, int arg4)
+
+#define SPEED(a)		((a)*(FRACUNIT/8))
+#define TICS(a)			(((a)*TICRATE)/35)
+#define OCTICS(a)		(((a)*TICRATE)/8)
+#define	BYTEANGLE(a)	((angle_t)((a)<<24))
+
+
+// Used by the teleporters to know if they were
+// activated by walking across the backside of a line.
+int TeleportSide;
+
+// Set true if this special was activated from inside a script.
+BOOL InScript;
+
+FUNC(LS_NOP)
+{
+	return false;
+}
+
+FUNC(LS_Door_Close)
+// Door_Close (tag, speed)
+{
+	return EV_DoDoor (doorClose, ln, it, arg0, SPEED(arg1), 0, 0);
+}
+
+FUNC(LS_Door_Open)
+// Door_Open (tag, speed)
+{
+	return EV_DoDoor (doorOpen, ln, it, arg0, SPEED(arg1), 0, 0);
+}
+
+FUNC(LS_Door_Raise)
+// Door_Raise (tag, speed, delay)
+{
+	return EV_DoDoor (doorRaise, ln, it, arg0, SPEED(arg1), TICS(arg2), 0);
+}
+
+FUNC(LS_Door_LockedRaise)
+// Door_LocedRaise (tag, speed, delay, lock)
+{
+	return EV_DoDoor (arg2 ? doorRaise : doorOpen, ln, it,
+					  arg0, SPEED(arg1), TICS(arg2), arg3);
+}
+
+FUNC(LS_Door_CloseWaitOpen)
+// Door_CloseWaitOpen (tag, speed, delay)
+{
+	return EV_DoDoor (doorCloseWaitOpen, ln, it, arg0, SPEED(arg1), OCTICS(arg2), 0);
+}
+
+FUNC(LS_Generic_Door)
+// Generic_Door (tag, speed, kind, delay, lock)
+{
+	vldoor_e type;
+
+	switch (arg2) {
+		case 0: type = doorRaise;			break;
+		case 1: type = doorOpen;			break;
+		case 2: type = doorCloseWaitOpen;	break;
+		case 3: type = doorClose;			break;
+	}
+	return EV_DoDoor (type, ln, it, arg0, SPEED(arg1), OCTICS(arg3), arg4);
+}
+
+FUNC(LS_Floor_LowerByValue)
+// Floor_LowerByValue (tag, speed, height)
+{
+	return EV_DoFloor (floorLowerByValue, ln, arg0, SPEED(arg1), FRACUNIT*arg2, 0, 0);
+}
+
+FUNC(LS_Floor_LowerToLowest)
+// Floor_LowerToLowest (tag, speed)
+{
+	return EV_DoFloor (floorLowerToLowest, ln, arg0, SPEED(arg1), 0, 0, 0);
+}
+
+FUNC(LS_Floor_LowerToHighest)
+// Floor_LowerToHighest (tag, speed, adjust)
+{
+	return EV_DoFloor (floorLowerToHighest, ln, arg0, SPEED(arg1), (arg2-128)*FRACUNIT, 0, 0);
+}
+
+FUNC(LS_Floor_LowerToNearest)
+// Floor_LowerToNearest (tag, speed)
+{
+	return EV_DoFloor (floorLowerToNearest, ln, arg0, SPEED(arg1), 0, 0, 0);
+}
+
+FUNC(LS_Floor_RaiseByValue)
+// Floor_RaiseByValue (tag, speed, height)
+{
+	return EV_DoFloor (floorRaiseByValue, ln, arg0, SPEED(arg1), FRACUNIT*arg2, 0, 0);
+}
+
+FUNC(LS_Floor_RaiseToHighest)
+// Floor_RaiseToHighest (tag, speed)
+{
+	return EV_DoFloor (floorRaiseToHighest, ln, arg0, SPEED(arg1), 0, 0, 0);
+}
+
+FUNC(LS_Floor_RaiseToNearest)
+// Floor_RaiseToNearest (tag, speed)
+{
+	return EV_DoFloor (floorRaiseToNearest, ln, arg0, SPEED(arg1), 0, 0, 0);
+}
+
+FUNC(LS_Floor_RaiseAndCrush)
+// Floor_RaiseAndCrush (tag, speed, crush)
+{
+	return EV_DoFloor (floorRaiseAndCrush, ln, arg0, SPEED(arg1), 0, arg2, 0);
+}
+
+FUNC(LS_Floor_RaiseByValueTimes8)
+// FLoor_RaiseByValueTimes8 (tag, speed, height)
+{
+	return EV_DoFloor (floorRaiseByValue, ln, arg0, SPEED(arg1), FRACUNIT*arg2*8, 0, 0);
+}
+
+FUNC(LS_Floor_LowerByValueTimes8)
+// Floor_LowerByValueTimes8 (tag, speed, height)
+{
+	return EV_DoFloor (floorLowerByValue, ln, arg0, SPEED(arg1), FRACUNIT*arg2*8, 0, 0);
+}
+
+FUNC(LS_Floor_CrushStop)
+// Floor_CrushStop (tag)
+{
+	return EV_FloorCrushStop (arg0);
+}
+
+FUNC(LS_Floor_LowerInstant)
+// Floor_LowerInstant (tag, unused, height)
+{
+	return EV_DoFloor (floorLowerInstant, ln, arg0, 0, arg2*FRACUNIT*8, 0, 0);
+}
+
+FUNC(LS_Floor_RaiseInstant)
+// Floor_RaiseInstant (tag, unused, height)
+{
+	return EV_DoFloor (floorRaiseInstant, ln, arg0, 0, arg2*FRACUNIT*8, 0, 0);
+}
+
+FUNC(LS_Floor_MoveToValueTimes8)
+// Floor_MoveToValueTimes8 (tag, speed, height, negative)
+{
+	return EV_DoFloor (floorMoveToValue, ln, arg0, SPEED(arg1),
+					   arg2*FRACUNIT*8*(arg3?-1:1), 0, 0);
+}
+
+FUNC(LS_Floor_RaiseToLowestCeiling)
+// Floor_RaiseToLowestCeiling (tag, speed)
+{
+	return EV_DoFloor (floorRaiseToLowestCeiling, ln, arg0, SPEED(arg1), 0, 0, 0);
+}
+
+FUNC(LS_Floor_RaiseByTexture)
+// Floor_RaiseByTexture (tag, speed)
+{
+	return EV_DoFloor (floorRaiseByTexture, ln, arg0, SPEED(arg1), 0, 0, 0);
+}
+
+FUNC(LS_Floor_RaiseByValueTxTy)
+// Floor_RaiseByValueTxTy (tag, speed, height)
+{
+	return EV_DoFloor (floorRaiseAndChange, ln, arg0, SPEED(arg1), arg2*FRACUNIT, 0, 0);
+}
+
+FUNC(LS_Floor_LowerToLowestTxTy)
+// Floor_LowerToLowestTxTy (tag, speed)
+{
+	return EV_DoFloor (floorLowerAndChange, ln, arg0, SPEED(arg1), arg2*FRACUNIT, 0, 0);
+}
+
+FUNC(LS_Floor_Waggle)
+// Floor_Waggle (tag, amplitude, frequency, delay, time)
+{
+	return EV_DoFloorWaggle (arg0, arg1*FRACUNIT/8, arg2, TICS(arg3), arg4*TICRATE);
+}
+
+FUNC(LS_Floor_TransferTrigger)
+// Floor_TransferTrigger (tag)
+{
+	return EV_DoChange (ln, trigChangeOnly, arg0);
+}
+
+FUNC(LS_Floor_TransferNumeric)
+// Floor_TransferNumeric (tag)
+{
+	return EV_DoChange (ln, numChangeOnly, arg0);
+}
+
+FUNC(LS_Floor_Donut)
+// Floor_Donut (pillartag, pillarspeed, slimespeed)
+{
+	return EV_DoDonut (arg0, SPEED(arg1), SPEED(arg2));
+}
+
+FUNC(LS_Generic_Floor)
+// Generic_Floor (tag, speed, height, target, change/model/direct/crush)
+{
+	floor_e type;
+
+	if (arg4 & 8) {
+		switch (arg3) {
+			case 1: type = floorRaiseToHighest;			break;
+			case 2: type = floorRaiseToLowest;			break;
+			case 3: type = floorRaiseToNearest;			break;
+			case 4: type = floorRaiseToLowestCeiling;	break;
+			case 5: type = floorRaiseToCeiling;			break;
+			case 6: type = floorRaiseByTexture;			break;
+			default:type = floorRaiseByValue;			break;
+		}
+	} else {
+		switch (arg3) {
+			case 1: type = floorLowerToHighest;			break;
+			case 2: type = floorLowerToLowest;			break;
+			case 3: type = floorLowerToNearest;			break;
+			case 4: type = floorLowerToLowestCeiling;	break;
+			case 5: type = floorLowerToCeiling;			break;
+			case 6: type = floorLowerByTexture;			break;
+			default:type = floorLowerByValue;			break;
+		}
+	}
+
+	return EV_DoFloor (type, ln, arg0, SPEED(arg1), arg2*FRACUNIT,
+					   (arg4 & 16) ? 20 : -1, arg4 & 7);
+					   
+}
+
+FUNC(LS_Stairs_BuildDown)
+// Stair_BuildDown (tag, speed, height, delay, reset)
+{
+	return EV_BuildStairs (arg0, buildDown, ln,
+						   arg2 * FRACUNIT, SPEED(arg1), TICS(arg3), arg4, 0, 1);
+}
+
+FUNC(LS_Stairs_BuildUp)
+// Stairs_BuildUp (tag, speed, height, delay, reset)
+{
+	return EV_BuildStairs (arg0, buildUp, ln,
+						   arg2 * FRACUNIT, SPEED(arg1), TICS(arg3), arg4, 0, 1);
+}
+
+FUNC(LS_Stairs_BuildDownSync)
+// Stairs_BuildDownSync (tag, speed, height, reset)
+{
+	return EV_BuildStairs (arg0, buildDown, ln,
+						   arg2 * FRACUNIT, SPEED(arg1), 0, arg3, 0, 2);
+}
+
+FUNC(LS_Stairs_BuildUpSync)
+// Stairs_BuildUpSync (tag, speed, height, reset)
+{
+	return EV_BuildStairs (arg0, buildUp, ln,
+						   arg2 * FRACUNIT, SPEED(arg1), 0, arg3, 0, 2);
+}
+
+FUNC(LS_Stairs_BuildUpDoom)
+// Stairs_BuildUpDoom (tag, speed, height, delay, reset)
+{
+	return EV_BuildStairs (arg0, buildUp, ln,
+						   arg2 * FRACUNIT, SPEED(arg1), TICS(arg3), arg4, 0, 0);
+}
+
+FUNC(LS_Generic_Stairs)
+// Generic_Stairs (tag, speed, step, dir/igntxt, reset)
+{
+	stair_e type = (arg3 & 1) ? buildUp : buildDown;
+	BOOL res = EV_BuildStairs (arg0, type, ln,
+							   arg2 * FRACUNIT, SPEED(arg1), 0, arg4, arg3 & 2, 0);
+
+	if (res && ln && (ln->flags & ML_REPEATABLE) && ln->special == Generic_Stairs)
+		// Toggle direction of next activation of repeatable stairs
+		ln->args[3] ^= 1;
+
+	return res;
+}
+
+FUNC(LS_Pillar_Build)
+// Pillar_Build (tag, speed, height)
+{
+	return EV_DoPillar (pillarBuild, arg0, SPEED(arg1), arg2*FRACUNIT, 0, -1);
+}
+
+FUNC(LS_Pillar_BuildAndCrush)
+// Pillar_BuildAndCrush (tag, speed, height, crush)
+{
+	return EV_DoPillar (pillarBuild, arg0, SPEED(arg1), arg2*FRACUNIT, 0, arg3);
+}
+
+FUNC(LS_Pillar_Open)
+// Pillar_Open (tag, speed, f_height, c_height)
+{
+	return EV_DoPillar (pillarOpen, arg0, SPEED(arg1), arg2*FRACUNIT, arg3*FRACUNIT, -1);
+}
+
+FUNC(LS_Ceiling_LowerByValue)
+// Ceiling_LowerByValue (tag, speed, height)
+{
+	return EV_DoCeiling (ceilLowerByValue, ln, arg0, SPEED(arg1), 0, arg2*FRACUNIT, 0, 0, 0);
+}
+
+FUNC(LS_Ceiling_RaiseByValue)
+// Ceiling_RaiseByValue (tag, speed, height)
+{
+	return EV_DoCeiling (ceilRaiseByValue, ln, arg0, SPEED(arg1), 0, arg2*FRACUNIT, 0, 0, 0);
+}
+
+FUNC(LS_Ceiling_LowerByValueTimes8)
+// Ceiling_LowerByValueTimes8 (tag, speed, height)
+{
+	return EV_DoCeiling (ceilLowerByValue, ln, arg0, SPEED(arg1), 0, arg2*FRACUNIT*8, 0, 0, 0);
+}
+
+FUNC(LS_Ceiling_RaiseByValueTimes8)
+// Ceiling_RaiseByValueTimes8 (tag, speed, height)
+{
+	return EV_DoCeiling (ceilRaiseByValue, ln, arg0, SPEED(arg1), 0, arg2*FRACUNIT*8, 0, 0, 0);
+}
+
+FUNC(LS_Ceiling_CrushAndRaise)
+// Ceiling_CrushAndRaise (tag, speed, crush)
+{
+	return EV_DoCeiling (ceilCrushAndRaise, ln, arg0, SPEED(arg1), SPEED(arg1)/2, 0, arg2, 0, 0);
+}
+
+FUNC(LS_Ceiling_LowerAndCrush)
+// Ceiling_LowerAndCrush (tag, speed, crush)
+{
+	return EV_DoCeiling (ceilLowerAndCrush, ln, arg0, SPEED(arg1), SPEED(arg1)/2, 0, arg2, 0, 0);
+}
+
+FUNC(LS_Ceiling_CrushStop)
+// Ceiling_CrushStop (tag)
+{
+	return EV_CeilingCrushStop (arg0);
+}
+
+FUNC(LS_Ceiling_CrushRaiseAndStay)
+// Ceiling_CrushRaiseAndStay (tag, speed, crush)
+{
+	return EV_DoCeiling (ceilCrushRaiseAndStay, ln, arg0, SPEED(arg1), SPEED(arg1)/2, 0, arg2, 0, 0);
+}
+
+FUNC(LS_Ceiling_MoveToValueTimes8)
+// Ceiling_MoveToValueTimes8 (tag, speed, height, negative)
+{
+	return EV_DoCeiling (ceilMoveToValue, ln, arg0, SPEED(arg1), 0,
+						 arg2*FRACUNIT*8*((arg3) ? -1 : 1), 0, 0, 0);
+}
+
+FUNC(LS_Ceiling_LowerToHighestFloor)
+// Ceiling_LowerToHighestFloor (tag, speed)
+{
+	return EV_DoCeiling (ceilLowerToHighestFloor, ln, arg0, SPEED(arg1), 0, 0, 0, 0, 0);
+}
+
+FUNC(LS_Ceiling_LowerInstant)
+// Ceiling_LowerInstant (tag, unused, height)
+{
+	return EV_DoCeiling (ceilLowerInstant, ln, arg0, 0, 0, arg2*FRACUNIT*8, 0, 0, 0);
+}
+
+FUNC(LS_Ceiling_RaiseInstant)
+// Ceiling_RaiseInstant (tag, unused, height)
+{
+	return EV_DoCeiling (ceilRaiseInstant, ln, arg0, 0, 0, arg2*FRACUNIT*8, 0, 0, 0);
+}
+
+FUNC(LS_Ceiling_CrushRaiseAndStayA)
+// Ceiling_CrushRaiseAndStayA (tag, dnspeed, upspeed, damage)
+{
+	return EV_DoCeiling (ceilCrushRaiseAndStay, ln, arg0, SPEED(arg1), SPEED(arg2), 0, arg3, 0, 0);
+}
+
+FUNC(LS_Ceiling_CrushRaiseAndStaySilA)
+// Ceiling_CrushRaiseAndStaySilA (tag, dnspeed, upspeed, damage)
+{
+	return EV_DoCeiling (ceilCrushRaiseAndStay, ln, arg0, SPEED(arg1), SPEED(arg2), 0, arg3, 1, 0);
+}
+
+FUNC(LS_Ceiling_CrushAndRaiseA)
+// Ceiling_CrushAndRaiseA (tag, dnspeed, upspeed, damage)
+{
+	return EV_DoCeiling (ceilCrushAndRaise, ln, arg0, SPEED(arg1), SPEED(arg2), 0, arg3, 0, 0);
+}
+
+FUNC(LS_Ceiling_CrushAndRaiseSilentA)
+// Ceiling_CrushAndRaiseSilentA (tag, dnspeed, upspeed, damage)
+{
+	return EV_DoCeiling (ceilCrushAndRaise, ln, arg0, SPEED(arg1), SPEED(arg2), 0, arg3, 1, 0);
+}
+
+FUNC(LS_Ceiling_RaiseToNearest)
+// Ceiling_RaiseToNearest (tag, speed)
+{
+	return EV_DoCeiling (ceilRaiseToNearest, ln, arg0, SPEED(arg1), 0, 0, 0, 0, 0);
+}
+
+FUNC(LS_Ceiling_LowerToLowest)
+// Ceiling_LowerToLowest (tag, speed)
+{
+	return EV_DoCeiling (ceilLowerToLowest, ln, arg0, SPEED(arg1), 0, 0, 0, 0, 0);
+}
+
+FUNC(LS_Ceiling_LowerToFloor)
+// Ceiling_LowerToFloor (tag, speed)
+{
+	return EV_DoCeiling (ceilLowerToFloor, ln, arg0, SPEED(arg1), 0, 0, 0, 0, 0);
+}
+
+FUNC(LS_Generic_Ceiling)
+// Generic_Ceiling (tag, speed, height, target, change/model/direct/crush)
+{
+	ceiling_e type;
+
+	if (arg4 & 8) {
+		switch (arg3) {
+			case 1:  type = ceilRaiseToHighest;			break;
+			case 2:  type = ceilRaiseToLowest;			break;
+			case 3:  type = ceilRaiseToNearest;			break;
+			case 4:  type = ceilRaiseToHighestFloor;	break;
+			case 5:  type = ceilRaiseToFloor;			break;
+			case 6:  type = ceilRaiseByTexture;			break;
+			default: type = ceilRaiseByValue;			break;
+		}
+	} else {
+		switch (arg3) {
+			case 1:  type = ceilLowerToHighest;			break;
+			case 2:  type = ceilLowerToLowest;			break;
+			case 3:  type = ceilLowerToNearest;			break;
+			case 4:  type = ceilLowerToHighestFloor;	break;
+			case 5:  type = ceilLowerToFloor;			break;
+			case 6:  type = ceilLowerByTexture;			break;
+			default: type = ceilLowerByValue;			break;
+		}
+	}
+
+	return EV_DoCeiling (type, ln, arg0, SPEED(arg1), SPEED(arg1), arg2*FRACUNIT,
+						 (arg4 & 16) ? 20 : -1, 0, arg4 & 7);
+	return false;
+}
+
+FUNC(LS_Generic_Crusher)
+// Generic_Crusher (tag, dnspeed, upspeed, silent, damage)
+{
+	return EV_DoCeiling (ceilCrushAndRaise, ln, arg0, SPEED(arg1),
+						 SPEED(arg2), 0, arg4, arg3 ? 2 : 0, 0);
+}
+
+FUNC(LS_Plat_PerpetualRaise)
+// Plat_PerpetualRaise (tag, speed, delay)
+{
+	return EV_DoPlat (arg0, ln, platPerpetualRaise, 0, SPEED(arg1), TICS(arg2), 8, 0);
+}
+
+FUNC(LS_Plat_PerpetualRaiseLip)
+// Plat_PerpetualRaiseLip (tag, speed, delay, lip)
+{
+	return EV_DoPlat (arg0, ln, platPerpetualRaise, 0, SPEED(arg1), TICS(arg2), arg3, 0);
+}
+
+FUNC(LS_Plat_Stop)
+// Plat_Stop (tag)
+{
+	EV_StopPlat (arg0);
+	return true;
+}
+
+FUNC(LS_Plat_DownWaitUpStay)
+// Plat_DownWaitUpStay (tag, speed, delay)
+{
+	return EV_DoPlat (arg0, ln, platDownWaitUpStay, 0, SPEED(arg1), TICS(arg2), 8, 0);
+}
+
+FUNC(LS_Plat_DownWaitUpStayLip)
+// Plat_DownWaitUpStayLip (tag, speed, delay, lip)
+{
+	return EV_DoPlat (arg0, ln, platDownWaitUpStay, 0, SPEED(arg1), TICS(arg2), arg3, 0);
+}
+
+FUNC(LS_Plat_DownByValue)
+// Plat_DownByValue (tag, speed, delay, height)
+{
+	return EV_DoPlat (arg0, ln, platDownByValue, FRACUNIT*arg3*8, SPEED(arg1), TICS(arg2), 0, 0);
+}
+
+FUNC(LS_Plat_UpByValue)
+// Plat_UpByValue (tag, speed, delay, height)
+{
+	return EV_DoPlat (arg0, ln, platUpByValue, FRACUNIT*arg3*8, SPEED(arg1), TICS(arg2), 0, 0);
+}
+
+FUNC(LS_Plat_UpWaitDownStay)
+// Plat_UpWaitDownStay (tag, speed, delay)
+{
+	return EV_DoPlat (arg0, ln, platUpWaitDownStay, 0, SPEED(arg1), TICS(arg2), 0, 0);
+}
+
+FUNC(LS_Plat_RaiseAndStayTx0)
+// Plat_RaiseAndStayTx0 (tag, speed)
+{
+	return EV_DoPlat (arg0, ln, platRaiseAndStay, 0, SPEED(arg1), 0, 0, 1);
+}
+
+FUNC(LS_Plat_UpByValueStayTx)
+// Plat_UpByValueStayTx (tag, speed, height)
+{
+	return EV_DoPlat (arg0, ln, platUpByValueStay, FRACUNIT*arg2*8, SPEED(arg1), 0, 0, 2);
+}
+
+FUNC(LS_Plat_ToggleCeiling)
+// Plat_ToggleCeiling (tag)
+{
+	return EV_DoPlat (arg0, ln, platToggle, 0, 0, 0, 0, 0);
+}
+
+FUNC(LS_Generic_Lift)
+// Generic_Lift (tag, speed, delay, target, height)
+{
+	plattype_e type;
+
+	switch (arg3) {
+		case 1:
+			type = platDownWaitUpStay;
+			break;
+		case 2:
+			type = platDownToNearestFloor;
+			break;
+		case 3:
+			type = platDownToLowestCeiling;
+			break;
+		case 4:
+			type = platPerpetualRaise;
+			break;
+		default:
+			type = platUpByValue;
+			break;
+	}
+
+	return EV_DoPlat (arg0, ln, type, arg4*8*FRACUNIT, SPEED(arg1), OCTICS(arg2), 0, 0);
+}
+
+FUNC(LS_Exit_Normal)
+// Exit_Normal (position)
+{
+	if (CheckIfExitIsGood (it)) {
+		G_ExitLevel (0);
+		return true;
+	}
+	return false;
+}
+
+FUNC(LS_Exit_Secret)
+// Exit_Secret (position)
+{
+	if (CheckIfExitIsGood (it)) {
+		G_SecretExitLevel (0);
+		return true;
+	}
+	return false;
+}
+
+FUNC(LS_Teleport_NewMap)
+// Teleport_NewMap (map, position)
+{
+	if (!TeleportSide) {
+		level_info_t *info = FindLevelByNum (arg0);
+
+		if (info && CheckIfExitIsGood (it)) {
+			strncpy (level.nextmap, info->mapname, 8);
+			G_ExitLevel (arg1);
+			return true;
+		}
+	}
+	return false;
+}
+
+FUNC(LS_Teleport)
+// Teleport (tid)
+{
+	return EV_Teleport (arg0, TeleportSide, it);
+}
+
+FUNC(LS_Teleport_NoFog)
+// Teleport_NoFog (tid)
+{
+	return EV_SilentTeleport (arg0, ln, TeleportSide, it);
+}
+
+FUNC(LS_Teleport_EndGame)
+// Teleport_EndGame ()
+{
+	if (!TeleportSide) {
+		if (gamemode == commercial && CheckIfExitIsGood (it)) {
+			strncpy (level.nextmap, "EndGameC", 8);
+			G_ExitLevel (0);
+			return true;
+		}
+	}
+	return false;
+}
+
+FUNC(LS_Teleport_Line)
+// Teleport_Line (thisid, destid, reversed)
+{
+	return EV_SilentLineTeleport (ln, TeleportSide, it, arg1, arg2);
+}
+
+FUNC(LS_ThrustThing)
+// ThrustThing (angle, force)
+{
+	if (it) {
+		angle_t angle = BYTEANGLE(arg0) >> ANGLETOFINESHIFT;
+
+		it->momx = arg1 * finecosine[angle];
+		it->momy = arg1 * finesine[angle];
+		return true;
+	}
+	return false;
+}
+
+FUNC(LS_DamageThing)
+// DamageThing (damage)
+{
+	if (it)
+		P_DamageMobj (it, NULL, NULL, arg0, MOD_UNKNOWN);
+
+	return it ? true : false;
+}
+
+BOOL P_GiveBody (player_t *, int);
+
+FUNC(LS_HealThing)
+// HealThing (amount)
+{
+	if (it) {
+		if (it->player) {
+			P_GiveBody (it->player, arg0);
+		} else {
+			it->health += arg0;
+			if (mobjinfo[it->type].spawnhealth > it->health)
+				it->health = mobjinfo[it->type].spawnhealth;
+		}
+	}
+
+	return it ? true : false;
+}
+
+FUNC(LS_Thing_Activate)
+// Thing_Activate (tid)
+{
+	mobj_t *mobj = P_FindMobjByTid (NULL, arg0);
+
+	while (mobj) {
+		mobj_t *temp = P_FindMobjByTid (mobj, arg0);
+
+		P_ActivateMobj (mobj);
+		mobj = temp;
+	}
+
+	return true;
+}
+
+FUNC(LS_Thing_Deactivate)
+// Thing_Deactivate (tid)
+{
+	mobj_t *mobj = P_FindMobjByTid (NULL, arg0);
+
+	while (mobj) {
+		mobj_t *temp = P_FindMobjByTid (mobj, arg0);
+
+		P_DeactivateMobj (mobj);
+		mobj = temp;
+	}
+
+	return true;
+}
+
+FUNC(LS_Thing_Remove)
+// Thing_Remove (tid)
+{
+	mobj_t *mobj = P_FindMobjByTid (NULL, arg0);
+
+	while (mobj) {
+		mobj_t *temp = P_FindMobjByTid (mobj, arg0);
+
+		P_RemoveMobj (mobj);
+		mobj = temp;
+	}
+
+	return true;
+}
+
+FUNC(LS_Thing_Destroy)
+// Thing_Destroy (tid)
+{
+	mobj_t *mobj = P_FindMobjByTid (NULL, arg0);
+
+	while (mobj) {
+		mobj_t *temp = P_FindMobjByTid (mobj, arg0);
+
+		if (mobj->flags & MF_SHOOTABLE)
+			P_DamageMobj (mobj, NULL, it, mobj->health, MOD_UNKNOWN);
+
+		mobj = temp;
+	}
+
+	return true;
+}
+
+FUNC(LS_Thing_Projectile)
+// Thing_Projectile (tid, type, angle, speed, vspeed)
+{
+	return P_Thing_Projectile (arg0, arg1, BYTEANGLE(arg2), arg3<<(FRACBITS-3),
+		arg4<<(FRACBITS-3), false);
+}
+
+FUNC(LS_Thing_ProjectileGravity)
+// Thing_ProjectileGravity (tid, type, angle, speed, vspeed)
+{
+	return P_Thing_Projectile (arg0, arg1, BYTEANGLE(arg2), arg3<<(FRACBITS-3),
+		arg4<<(FRACBITS-3), true);
+}
+
+FUNC(LS_Thing_Spawn)
+// Thing_Spawn (tid, type, angle)
+{
+	return P_Thing_Spawn (arg0, arg1, BYTEANGLE(arg2), true);
+}
+
+FUNC(LS_Thing_SpawnNoFog)
+// Thing_SpawnNoFog (tid, type, angle)
+{
+	return P_Thing_Spawn (arg0, arg1, BYTEANGLE(arg2), false);
+}
+
+FUNC(LS_Thing_SetGoal)
+// Thing_SetGoal (tid, goal, delay)
+{
+	mobj_t *self = P_FindMobjByTid (NULL, arg0);
+	mobj_t *goal = P_FindGoal (NULL, arg1, MT_PATHNODE);
+
+	while (self) {
+		if (self->flags & MF_SHOOTABLE) {
+			self->goal = goal;
+			if (!self->target)
+				self->reactiontime = arg2 * TICRATE;
+		}
+		self = P_FindMobjByTid (self, arg0);
+	}
+
+	return true;
+}
+
+FUNC(LS_ACS_Execute)
+// ACS_Execute (script, map, s_arg1, s_arg2, s_arg3)
+{
+	level_info_t *info;
+
+	if ( (arg1 == 0) || !(info = FindLevelByNum (arg1)) ) {
+		return P_StartScript (it, ln, arg0, level.mapname, TeleportSide, arg2, arg3, arg4, 0);
+	} else {
+		return P_StartScript (it, ln, arg0, info->mapname, TeleportSide, arg2, arg3, arg4, 0);
+	}
+}
+
+FUNC(LS_ACS_ExecuteAlways)
+// ACS_ExecuteAlways (script, map, s_arg1, s_arg2, s_arg3)
+{
+	level_info_t *info;
+
+	if ( (arg1 == 0) || !(info = FindLevelByNum (arg1)) ) {
+		return P_StartScript (it, ln, arg0, level.mapname, TeleportSide, arg2, arg3, arg4, 1);
+	} else {
+		return P_StartScript (it, ln, arg0, info->mapname, TeleportSide, arg2, arg3, arg4, 1);
+	}
+}
+
+FUNC(LS_ACS_LockedExecute)
+// ACS_LockedExecute (script, map, s_arg1, s_arg2, lock)
+{
+	if (arg4 && !P_CheckKeys (it->player, arg4, 2))
+		return false;
+	else
+		LS_ACS_Execute (ln, it, arg0, arg1, arg2, arg3, 0);
+}
+
+FUNC(LS_ACS_Suspend)
+// ACS_Suspend (script, map)
+{
+	level_info_t *info;
+
+	if ( (arg1 == 0) || !(info = FindLevelByNum (arg1)) ) {
+		P_SuspendScript (arg0, level.mapname);
+	} else {
+		P_SuspendScript (arg0, info->mapname);
+	}
+
+	return true;
+}
+
+FUNC(LS_ACS_Terminate)
+// ACS_Terminate (script, map)
+{
+	level_info_t *info;
+
+	if ( (arg1 == 0) || !(info = FindLevelByNum (arg1)) ) {
+		P_TerminateScript (arg0, level.mapname);
+	} else {
+		P_TerminateScript (arg0, info->mapname);
+	}
+
+	return true;
+}
+
+FUNC(LS_Polyobj_OR_RotateLeft)
+// Polyobj_OR_RotateLeft (po, speed, angle)
+{
+	return false;
+}
+
+FUNC(LS_Polyobj_OR_RotateRight)
+// Polyobj_OR_RotateRight (po, speed, angle)
+{
+	return false;
+}
+
+FUNC(LS_Polyobj_OR_Move)
+// Polyobj_OR_Move (po, speed, angle, distance)
+{
+	return false;
+}
+
+FUNC(LS_Polyobj_OR_MoveTimes8)
+// Polyobj_OR_MoveTimes8 (po, speed, angle, distance)
+{
+	return false;
+}
+
+FUNC(LS_FloorAndCeiling_LowerByValue)
+// FloorAndCeiling_LowerByValue (tag, speed, height)
+{
+	return EV_DoElevator (ln, elevateLower, SPEED(arg1), arg2*8*FRACUNIT, arg0);
+}
+
+FUNC(LS_FloorAndCeiling_RaiseByValue)
+// FloorAndCelinig_RaiseByValue (tag, speed, height)
+{
+	return EV_DoElevator (ln, elevateRaise, SPEED(arg1), arg2*8*FRACUNIT, arg0);
+}
+
+FUNC(LS_FloorAndCeiling_LowerRaise)
+// FloorAndCeiling_LowerRaise (tag, fspeed, cspeed)
+{
+	return EV_DoCeiling (ceilRaiseToHighest, ln, arg0, SPEED(arg2), 0, 0, 0, 0, 0) ||
+		   EV_DoFloor (floorLowerToLowest, ln, arg0, SPEED(arg1), 0, 0, 0);
+}
+
+FUNC(LS_Elevator_MoveToFloor)
+// Elevator_MoveToFloor (tag, speed)
+{
+	return EV_DoElevator (ln, elevateCurrent, SPEED(arg1), 0, arg0);
+}
+
+FUNC(LS_Elevator_RaiseToNearest)
+// Elevator_RaiseToNearest (tag, speed)
+{
+	return EV_DoElevator (ln, elevateUp, SPEED(arg1), 0, arg0);
+}
+
+FUNC(LS_Elevator_LowerToNearest)
+// Elevator_LowerToNearest (tag, speed)
+{
+	return EV_DoElevator (ln, elevateDown, SPEED(arg1), 0, arg0);
+}
+
+FUNC(LS_Light_ForceLightning)
+// Light_ForceLightning (tag)
+{
+	return false;
+}
+
+FUNC(LS_Light_RaiseByValue)
+// Light_RaiseByValue (tag, value)
+{
+	EV_LightChange (arg0, arg1);
+	return true;
+}
+
+FUNC(LS_Light_LowerByValue)
+// Light_LowerByValue (tag, value)
+{
+	EV_LightChange (arg0, -arg1);
+	return true;
+}
+
+FUNC(LS_Light_ChangeToValue)
+// Light_ChangeToValue (tag, value)
+{
+	EV_LightTurnOn (arg0, arg1);
+	return true;
+}
+
+FUNC(LS_Light_Fade)
+// Light_Fade (tag, value, tics);
+{
+	EV_StartLightFading (arg0, arg1, TICS(arg2));
+	return true;
+}
+
+FUNC(LS_Light_Glow)
+// Light_Glow (tag, upper, lower, tics)
+{
+	EV_StartLightGlowing (arg0, arg1, arg2, TICS(arg3));
+	return true;
+}
+
+FUNC(LS_Light_Flicker)
+// Light_Flicker (tag, upper, lower)
+{
+	EV_StartLightFlashing (arg0, arg1, arg2);
+	return true;
+}
+
+FUNC(LS_Light_Strobe)
+// Light_Strobe (tag, upper, lower, u-tics, l-tics)
+{
+	EV_StartLightStrobing (arg0, arg1, arg2, TICS(arg3), TICS(arg4));
+	return true;
+}
+
+FUNC(LS_Light_StrobeDoom)
+// Light_StrobeDoom (tag, u-tics, l-tics)
+{
+	EV_StartLightStrobing (arg0, -1, -1, TICS(arg1), TICS(arg2));
+	return true;
+}
+
+FUNC(LS_Light_MinNeighbor)
+// Light_MinNeighbor (tag)
+{
+	EV_TurnTagLightsOff (arg0);
+	return true;
+}
+
+FUNC(LS_Light_MaxNeighbor)
+// Light_MaxNeighbor (tag)
+{
+	EV_LightTurnOn (arg0, -1);
+	return true;
+}
+
+FUNC(LS_Radius_Quake)
+// Radius_Quake (intensity, duration, damrad, tremrad, tid)
+{
+	return P_StartQuake (arg4, arg0, arg1, arg2, arg3);
+}
+
+FUNC(LS_UsePuzzleItem)
+// UsePuzzleItem (item, script)
+{
+	return false;
+}
+
+FUNC(LS_Sector_ChangeSound)
+// Sector_ChangeSound (tag, sound)
+{
+	return false;
+}
+
+FUNC(LS_Sector_SetWind)
+// Sector_SetWind ()
+{
+	return false;
+}
+
+FUNC(LS_Sector_SetFriction)
+// Sector_SetFriction ()
+{
+	return false;
+}
+
+FUNC(LS_Sector_SetCurrent)
+// Sector_SetCurrent ()
+{
+	return false;
+}
+
+FUNC(LS_Scroll_Texture_Both)
+{
+	return false;
+}
+
+FUNC(LS_Scroll_Floor)
+{
+	return false;
+}
+
+FUNC(LS_Scroll_Ceiling)
+{
+	return false;
+}
+
+FUNC(LS_PointPush_SetForce)
+// PointPush_SetForce ()
+{
+	return false;
+}
+
+FUNC(LS_Sector_SetDamage)
+// Sector_SetDamage (tag, amount, mod)
+{
+	int secnum = -1;
+	while ((secnum = P_FindSectorFromTag (arg0, secnum)) >= 0) {
+		sectors[secnum].damage = arg1;
+		sectors[secnum].mod = arg2;
+	}
+	return true;
+}
+
+FUNC(LS_Sector_SetGravity)
+// Sector_SetGravity (tag, intpart, fracpart)
+{
+	int secnum = -1;
+	float gravity;
+
+	if (arg2 > 99)
+		arg2 = 99;
+	gravity = (float)arg1 + (float)arg2 * 0.01f;
+
+	while ((secnum = P_FindSectorFromTag (arg0, secnum)) >= 0)
+		sectors[secnum].gravity = gravity;
+
+	return true;
+}
+
+FUNC(LS_Sector_SetColor)
+// Sector_SetColor (tag, r, g, b)
+{
+	int secnum = -1;
+	
+	while ((secnum = P_FindSectorFromTag (arg0, secnum)) >= 0)
+		sectors[secnum].colormap = GetSpecialLights (arg1, arg2, arg3,
+			RPART(sectors[secnum].colormap->fade),
+			GPART(sectors[secnum].colormap->fade),
+			BPART(sectors[secnum].colormap->fade));
+
+	return true;
+}
+
+FUNC(LS_Sector_SetFade)
+// Sector_SetFade (tag, r, g, b)
+{
+	int secnum = -1;
+	
+	while ((secnum = P_FindSectorFromTag (arg0, secnum)) >= 0)
+		sectors[secnum].colormap = GetSpecialLights (
+			RPART(sectors[secnum].colormap->color),
+			GPART(sectors[secnum].colormap->color),
+			BPART(sectors[secnum].colormap->color),
+			arg1, arg2, arg3);
+
+	return true;
+}
+
+FUNC(LS_ChangeCamera)
+// ChangeCamera (tid, who)
+{
+	mobj_t *camera = P_FindGoal (NULL, arg0, MT_CAMERA);
+
+	if (!it->player || arg1) {
+		int i;
+
+		for (i = 0; i < MAXPLAYERS; i++) {
+			if (!playeringame[i])
+				continue;
+
+			if (camera)
+				players[i].camera = camera;
+			else
+				players[i].camera = players[i].mo;
+		}
+	} else
+		it->player->camera = camera ? camera : it->player->mo;
+
+	return true;
+}
+
+lnSpecFunc LineSpecials[256] =
+{
+	LS_NOP,
+	LS_NOP,		// Polyobj_StartLine
+	LS_NOP,		// Polyobj_RotateLeft
+	LS_NOP,		// Polyobj_RotateRight
+	LS_NOP,		// Polyobj_Move
+	LS_NOP,		// Polyobj_ExplicitLine
+	LS_NOP,		// Polyobj_MoveTimes8
+	LS_NOP,		// Polyobj_DoorSwing
+	LS_NOP,		// Polyobj_DoorSlide
+	LS_NOP,		// 9
+	LS_Door_Close,
+	LS_Door_Open,
+	LS_Door_Raise,
+	LS_Door_LockedRaise,
+	LS_NOP,		// 14
+	LS_NOP,		// 15
+	LS_NOP,		// 16
+	LS_NOP,		// 17
+	LS_NOP,		// 18
+	LS_NOP,		// 19
+	LS_Floor_LowerByValue,
+	LS_Floor_LowerToLowest,
+	LS_Floor_LowerToNearest,
+	LS_Floor_RaiseByValue,
+	LS_Floor_RaiseToHighest,
+	LS_Floor_RaiseToNearest,
+	LS_Stairs_BuildDown,
+	LS_Stairs_BuildUp,
+	LS_Floor_RaiseAndCrush,
+	LS_Pillar_Build,
+	LS_Pillar_Open,
+	LS_Stairs_BuildDownSync,
+	LS_Stairs_BuildUpSync,
+	LS_NOP,		// 33
+	LS_NOP,		// 34
+	LS_Floor_RaiseByValueTimes8,
+	LS_Floor_LowerByValueTimes8,
+	LS_NOP,		// 37
+	LS_NOP,		// 38
+	LS_NOP,		// 39
+	LS_Ceiling_LowerByValue,
+	LS_Ceiling_RaiseByValue,
+	LS_Ceiling_CrushAndRaise,
+	LS_Ceiling_LowerAndCrush,
+	LS_Ceiling_CrushStop,
+	LS_Ceiling_CrushRaiseAndStay,
+	LS_Floor_CrushStop,
+	LS_NOP,		// 47
+	LS_NOP,		// 48
+	LS_NOP,		// 49
+	LS_NOP,		// 50
+	LS_NOP,		// 51
+	LS_NOP,		// 52
+	LS_NOP,		// 53
+	LS_NOP,		// 54
+	LS_NOP,		// 55
+	LS_NOP,		// 56
+	LS_NOP,		// 57
+	LS_NOP,		// 58
+	LS_NOP,		// 59
+	LS_Plat_PerpetualRaise,
+	LS_Plat_Stop,
+	LS_Plat_DownWaitUpStay,
+	LS_Plat_DownByValue,
+	LS_Plat_UpWaitDownStay,
+	LS_Plat_UpByValue,
+	LS_Floor_LowerInstant,
+	LS_Floor_RaiseInstant,
+	LS_Floor_MoveToValueTimes8,
+	LS_Ceiling_MoveToValueTimes8,
+	LS_Teleport,
+	LS_Teleport_NoFog,
+	LS_ThrustThing,
+	LS_DamageThing,
+	LS_Teleport_NewMap,
+	LS_Teleport_EndGame,
+	LS_NOP,		// 76
+	LS_NOP,		// 77
+	LS_NOP,		// 78
+	LS_NOP,		// 79
+	LS_ACS_Execute,
+	LS_ACS_Suspend,
+	LS_ACS_Terminate,
+	LS_ACS_LockedExecute,
+	LS_NOP,		// 84
+	LS_NOP,		// 85
+	LS_NOP,		// 86
+	LS_NOP,		// 87
+	LS_NOP,		// 88
+	LS_NOP,		// 89
+	LS_Polyobj_OR_RotateLeft,
+	LS_Polyobj_OR_RotateRight,
+	LS_Polyobj_OR_Move,
+	LS_Polyobj_OR_MoveTimes8,
+	LS_Pillar_BuildAndCrush,
+	LS_FloorAndCeiling_LowerByValue,
+	LS_FloorAndCeiling_RaiseByValue,
+	LS_NOP,		// 97
+	LS_NOP,		// 98
+	LS_NOP,		// 99
+	LS_NOP,		// Scroll_Texture_Left
+	LS_NOP,		// Scroll_Texture_Right
+	LS_NOP,		// Scroll_Texture_Up
+	LS_NOP,		// Scroll_Texture_Down
+	LS_NOP,		// 104
+	LS_NOP,		// 105
+	LS_NOP,		// 106
+	LS_NOP,		// 107
+	LS_NOP,		// 108
+	LS_Light_ForceLightning,
+	LS_Light_RaiseByValue,
+	LS_Light_LowerByValue,
+	LS_Light_ChangeToValue,
+	LS_Light_Fade,
+	LS_Light_Glow,
+	LS_Light_Flicker,
+	LS_Light_Strobe,
+	LS_NOP,		// 117
+	LS_NOP,		// 118
+	LS_NOP,		// 119
+	LS_Radius_Quake,
+	LS_NOP,		// Line_SetIdentification
+	LS_NOP,		// 122
+	LS_NOP,		// 123
+	LS_NOP,		// 124
+	LS_NOP,		// 125
+	LS_NOP,		// 126
+	LS_NOP,		// 127
+	LS_NOP,		// 128
+	LS_UsePuzzleItem,
+	LS_Thing_Activate,
+	LS_Thing_Deactivate,
+	LS_Thing_Remove,
+	LS_Thing_Destroy,
+	LS_Thing_Projectile,
+	LS_Thing_Spawn,
+	LS_Thing_ProjectileGravity,
+	LS_Thing_SpawnNoFog,
+	LS_Floor_Waggle,
+	LS_NOP,		// 139
+	LS_Sector_ChangeSound,
+	LS_NOP,		// 141
+	LS_NOP,		// 142
+	LS_NOP,		// 143
+	LS_NOP,		// 144
+	LS_NOP,		// 145
+	LS_NOP,		// 146
+	LS_NOP,		// 147
+	LS_NOP,		// 148
+	LS_NOP,		// 149
+	LS_NOP,		// 150
+	LS_NOP,		// 151
+	LS_NOP,		// 152
+	LS_NOP,		// 153
+	LS_NOP,		// 154
+	LS_NOP,		// 155
+	LS_NOP,		// 156
+	LS_NOP,		// 157
+	LS_NOP,		// 158
+	LS_NOP,		// 159
+	LS_NOP,		// 160
+	LS_NOP,		// 161
+	LS_NOP,		// 162
+	LS_NOP,		// 163
+	LS_NOP,		// 164
+	LS_NOP,		// 165
+	LS_NOP,		// 166
+	LS_NOP,		// 167
+	LS_NOP,		// 168
+	LS_NOP,		// 169
+	LS_NOP,		// 170
+	LS_NOP,		// 171
+	LS_NOP,		// 172
+	LS_NOP,		// 173
+	LS_NOP,		// 174
+	LS_NOP,		// 175
+	LS_NOP,		// 176
+	LS_NOP,		// 177
+	LS_NOP,		// 178
+	LS_NOP,		// 179
+	LS_NOP,		// 180
+	LS_NOP,		// 181
+	LS_NOP,		// 182
+	LS_NOP,		// 183
+	LS_NOP,		// 184
+	LS_NOP,		// 185
+	LS_NOP,		// 186
+	LS_NOP,		// 187
+	LS_NOP,		// 188
+	LS_NOP,		// 189
+	LS_NOP,		// 190
+	LS_NOP,		// 191
+	LS_Ceiling_LowerToHighestFloor,
+	LS_Ceiling_LowerInstant,
+	LS_Ceiling_RaiseInstant,
+	LS_Ceiling_CrushRaiseAndStayA,
+	LS_Ceiling_CrushAndRaiseA,
+	LS_Ceiling_CrushAndRaiseSilentA,
+	LS_Ceiling_RaiseByValueTimes8,
+	LS_Ceiling_LowerByValueTimes8,
+	LS_Generic_Floor,
+	LS_Generic_Ceiling,
+	LS_Generic_Door,
+	LS_Generic_Lift,
+	LS_Generic_Stairs,
+	LS_Generic_Crusher,
+	LS_Plat_DownWaitUpStayLip,
+	LS_Plat_PerpetualRaiseLip,
+	LS_NOP,		// TranslucentLine
+	LS_NOP,		// Transfer_Heights
+	LS_NOP,		// Transfer_FloorLight
+	LS_NOP,		// Transfer_CeilingLight
+	LS_Sector_SetColor,
+	LS_Sector_SetFade,
+	LS_Sector_SetDamage,
+	LS_Teleport_Line,
+	LS_Sector_SetGravity,
+	LS_Stairs_BuildUpDoom,
+	LS_Sector_SetWind,
+	LS_Sector_SetFriction,
+	LS_Sector_SetCurrent,
+	LS_Scroll_Texture_Both,
+	LS_NOP,		// Scroll_Texture_Model
+	LS_Scroll_Floor,
+	LS_Scroll_Ceiling,
+	LS_NOP,		// Scroll_Texture_Offsets
+	LS_ACS_ExecuteAlways,
+	LS_PointPush_SetForce,
+	LS_Plat_RaiseAndStayTx0,
+	LS_Thing_SetGoal,
+	LS_Plat_UpByValueStayTx,
+	LS_Plat_ToggleCeiling,
+	LS_Light_StrobeDoom,
+	LS_Light_MinNeighbor,
+	LS_Light_MaxNeighbor,
+	LS_Floor_TransferTrigger,
+	LS_Floor_TransferNumeric,
+	LS_ChangeCamera,
+	LS_Floor_RaiseToLowestCeiling,
+	LS_Floor_RaiseByValueTxTy,
+	LS_Floor_RaiseByTexture,
+	LS_Floor_LowerToLowestTxTy,
+	LS_Floor_LowerToHighest,
+	LS_Exit_Normal,
+	LS_Exit_Secret,
+	LS_Elevator_RaiseToNearest,
+	LS_Elevator_MoveToFloor,
+	LS_Elevator_LowerToNearest,
+	LS_HealThing,
+	LS_Door_CloseWaitOpen,
+	LS_Floor_Donut,
+	LS_FloorAndCeiling_LowerRaise,
+	LS_Ceiling_RaiseToNearest,
+	LS_Ceiling_LowerToLowest,
+	LS_Ceiling_LowerToFloor,
+	LS_Ceiling_CrushRaiseAndStaySilA
+};
diff --git a/code/P_lnspec.h b/code/P_lnspec.h
new file mode 100644
index 0000000000..cf7b494856
--- /dev/null
+++ b/code/P_lnspec.h
@@ -0,0 +1,293 @@
+// p_lnspec.h: New line and sector specials (Using Hexen as a base.)
+
+#ifndef __P_LNSPEC_H__
+#define __P_LNSPEC_H__
+
+#include "doomtype.h"
+
+typedef enum {
+	Polyobj_StartLine = 1,
+	Polyobj_RotateLeft = 2,
+	Polyobj_RotateRight = 3,
+	Polyobj_Move = 4,
+	Polyobj_ExplicitLine = 5,
+	Polyobj_MoveTimes8 = 6,
+	Polyobj_DoorSwing = 7,
+	Polyobj_DoorSlide = 8,
+
+	Door_Close = 10,
+	Door_Open = 11,
+	Door_Raise = 12,
+	Door_LockedRaise = 13,
+
+	Floor_LowerByValue = 20,
+	Floor_LowerToLowest = 21,
+	Floor_LowerToNearest = 22,
+	Floor_RaiseByValue = 23,
+	Floor_RaiseToHighest = 24,
+	Floor_RaiseToNearest = 25,
+
+	Stairs_BuildDown = 26,
+	Stairs_BuildUp = 27,
+
+	Floor_RaiseAndCrush = 28,
+
+	Pillar_Build = 29,
+	Pillar_Open = 30,
+
+	Stairs_BuildDownSync = 31,
+	Stairs_BuildUpSync = 32,
+
+	Floor_RaiseByValueTimes8 = 35,
+	Floor_LowerByValueTimes8 = 36,
+
+	Ceiling_LowerByValue = 40,
+	Ceiling_RaiseByValue = 41,
+	Ceiling_CrushAndRaise = 42,
+	Ceiling_LowerAndCrush = 43,
+	Ceiling_CrushStop = 44,
+	Ceiling_CrushRaiseAndStay = 45,
+
+	Floor_CrushStop = 46,
+
+	Plat_PerpetualRaise = 60,
+	Plat_Stop = 61,
+	Plat_DownWaitUpStay = 62,
+	Plat_DownByValue = 63,
+	Plat_UpWaitDownStay = 64,
+	Plat_UpByValue = 65,
+
+	Floor_LowerInstant = 66,
+	Floor_RaiseInstant = 67,
+	Floor_MoveToValueTimes8 = 68,
+
+	Ceiling_MoveToValueTimes8 = 69,
+
+	Teleport = 70,
+	Teleport_NoFog = 71,
+
+	ThrustThing = 72,
+	DamageThing = 73,
+
+	Teleport_NewMap = 74,
+	Teleport_EndGame = 75,
+
+	ACS_Execute = 80,
+	ACS_Suspend = 81,
+	ACS_Terminate = 82,
+	ACS_LockedExecute = 83,
+
+	Polyobj_OR_RotateLeft = 90,
+	Polyobj_OR_RotateRight = 91,
+	Polyobj_OR_Move = 92,
+	Polyobj_OR_MoveTimes8 = 93,
+
+	Pillar_BuildAndCrush = 94,
+
+	FloorAndCeiling_LowerByValue = 95,
+	FloorAndCeiling_RaiseByValue = 96,
+
+	Scroll_Texture_Left = 100,
+	Scroll_Texture_Right = 101,
+	Scroll_Texture_Up = 102,
+	Scroll_Texture_Down = 103,
+
+	Light_ForceLightning = 109,
+	Light_RaiseByValue = 110,
+	Light_LowerByValue = 111,
+	Light_ChangeToValue = 112,
+	Light_Fade = 113,
+	Light_Glow = 114,
+	Light_Flicker = 115,
+	Light_Strobe = 116,
+
+	Radius_Quake = 120,	// Earthquake
+
+	Line_SetIdentification = 121,
+
+	UsePuzzleItem = 129,
+
+	Thing_Activate = 130,
+	Thing_Deactivate = 131,
+	Thing_Remove = 132,
+	Thing_Destroy = 133,
+	Thing_Projectile = 134,
+	Thing_Spawn = 135,
+	Thing_ProjectileGravity = 136,
+	Thing_SpawnNoFog = 137,
+
+	Floor_Waggle = 138,
+
+	Sector_ChangeSound = 140,
+
+// [RH] Begin new specials for ZDoom
+
+	Ceiling_LowerToHighestFloor = 192,
+	Ceiling_LowerInstant = 193,
+	Ceiling_RaiseInstant = 194,
+	Ceiling_CrushRaiseAndStayA = 195,
+	Ceiling_CrushAndRaiseA = 196,
+	Ceiling_CrushAndRaiseSilentA = 197,
+	Ceiling_RaiseByValueTimes8 = 198,
+	Ceiling_LowerByValueTimes8 = 199,
+
+	Generic_Floor = 200,
+	Generic_Ceiling = 201,
+	Generic_Door = 202,
+	Generic_Lift = 203,
+	Generic_Stairs = 204,
+	Generic_Crusher = 205,
+
+	Plat_DownWaitUpStayLip = 206,
+	Plat_PerpetualRaiseLip = 207,
+
+	TranslucentLine = 208,
+	Transfer_Heights = 209,
+	Transfer_FloorLight = 210,
+	Transfer_CeilingLight = 211,
+
+	Sector_SetColor = 212,
+	Sector_SetFade = 213,
+	Sector_SetDamage = 214,
+
+	Teleport_Line = 215,
+
+	Sector_SetGravity = 216,
+
+	Stairs_BuildUpDoom = 217,
+
+	Sector_SetWind = 218,
+	Sector_SetFriction = 219,
+	Sector_SetCurrent = 220,
+
+	Scroll_Texture_Both = 221,
+	Scroll_Texture_Model = 222,
+	Scroll_Floor = 223,
+	Scroll_Ceiling = 224,
+	Scroll_Texture_Offsets = 225,
+
+	ACS_ExecuteAlways = 226,
+
+	PointPush_SetForce = 227,
+
+	Plat_RaiseAndStayTx0 = 228,
+
+	Thing_SetGoal = 229,
+
+	Plat_UpByValueStayTx = 230,
+	Plat_ToggleCeiling = 231,
+
+	Light_StrobeDoom = 232,
+	Light_MinNeighbor = 233,
+	Light_MaxNeighbor = 234,
+
+	Floor_TransferTrigger = 235,
+	Floor_TransferNumeric = 236,
+
+	ChangeCamera = 237,
+
+	Floor_RaiseToLowestCeiling = 238,
+	Floor_RaiseByValueTxTy = 239,
+	Floor_RaiseByTexture = 240,
+	Floor_LowerToLowestTxTy = 241,
+	Floor_LowerToHighest = 242,
+
+	Exit_Normal = 243,
+	Exit_Secret = 244,
+
+	Elevator_RaiseToNearest = 245,
+	Elevator_MoveToFloor = 246,
+	Elevator_LowerToNearest = 247,
+
+	HealThing = 248,
+	Door_CloseWaitOpen = 249,
+
+	Floor_Donut = 250,
+
+	FloorAndCeiling_LowerRaise = 251,
+
+	Ceiling_RaiseToNearest = 252,
+	Ceiling_LowerToLowest = 253,
+	Ceiling_LowerToFloor = 254,
+	Ceiling_CrushRaiseAndStaySilA = 255
+} linespecial_t;
+
+typedef enum {
+	Light_Phased = 1,
+	LightSequenceStart = 2,
+	LightSequenceSpecial1 = 3,
+	LightSequenceSpecial2 = 4,
+
+	Stairs_Special1 = 26,
+	Stairs_Special2 = 27,
+
+	// [RH] Equivalents for DOOM's sector specials
+	dLight_Flicker = 65,
+	dLight_StrobeFast = 66,
+	dLight_StrobeSlow = 67,
+	dLight_Strobe_Hurt = 68,
+	dDamage_Hellslime = 69,
+	dDamage_Nukage = 71,
+	dLight_Glow = 72,
+	dSector_DoorCloseIn30 = 74,
+	dDamage_End = 75,
+	dLight_StrobeSlowSync = 76,
+	dLight_StrobeFastSync = 77,
+	dSector_DoorRaiseIn5Mins = 78,
+	dDamage_SuperHellslime = 80,
+	dLight_FireFlicker = 81,
+
+	Light_IndoorLightning2 = 198,
+	Light_IndoorLightning1 = 199,
+
+	Sky2 = 200,
+
+	Scroll_North_Slow = 201,
+	Scroll_North_Medium = 202,
+	Scroll_North_Fast = 203,
+	Scroll_East_Slow = 204,
+	Scroll_East_Medium = 205,
+	Scroll_East_Fast = 206,
+	Scroll_South_Slow = 207,
+	Scroll_South_Medium = 208,
+	Scroll_South_Fast = 209,
+	Scroll_West_Slow = 210,
+	Scroll_West_Medium = 211,
+	Scroll_West_Fast = 212,
+	Scroll_NorthWest_Slow = 213,
+	Scroll_NorthWest_Medium = 214,
+	Scroll_NorthWest_Fast = 215,
+	Scroll_NorthEast_Slow = 216,
+	Scroll_NorthEast_Medium = 217,
+	Scroll_NorthEast_Fast = 218,
+	Scroll_SouthEast_Slow = 219,
+	Scroll_SouthEast_Medium = 220,
+	Scroll_SouthEast_Fast = 221,
+	Scroll_SouthWest_Slow = 222,
+	Scroll_SouthWest_Medium = 223,
+	Scroll_SouthWest_Fast = 224,
+} sectorspecial_t;
+
+// [RH] Equivalents for BOOM's generalized sector types
+
+#define DAMAGE_MASK		0x0300
+#define SECRET_MASK		0x0400
+#define FRICTION_MASK	0x0800
+#define PUSH_MASK		0x1000
+
+struct line_s;
+struct mobj_s;
+
+typedef BOOL (*lnSpecFunc)(struct line_s   *line,
+						   struct mobj_s   *activator,
+						   int				arg1,
+						   int				arg2,
+						   int				arg3,
+						   int				arg4,
+						   int				arg5);
+
+extern lnSpecFunc LineSpecials[256];
+
+extern int TeleportSide;
+
+#endif //__P_LNSPEC_H__
\ No newline at end of file
diff --git a/code/P_local.h b/code/P_local.h
index 9d7ff57fd6..421cba2bbe 100644
--- a/code/P_local.h
+++ b/code/P_local.h
@@ -91,7 +91,8 @@ void P_DropWeapon (player_t* player);
 //
 // P_USER
 //
-void	P_PlayerThink (player_t* player);
+void	P_FallingDamage (mobj_t *ent);
+void	P_PlayerThink (player_t *player);
 
 
 //
@@ -109,7 +110,15 @@ extern int				iquehead;
 extern int				iquetail;
 
 
-void P_RespawnSpecials (void);
+// [RH] Functions to work with ThingIDs.
+void	P_ClearTidHashes (void);
+void	P_AddMobjToHash (mobj_t *mobj);
+void	P_RemoveMobjFromHash (mobj_t *mobj);
+mobj_t *P_FindMobjByTid (mobj_t *mobj, int tid);
+mobj_t *P_FindGoal (mobj_t *mobj, int tid, int type);
+
+
+void	P_RespawnSpecials (void);
 
 mobj_t *P_SpawnMobj (fixed_t x, fixed_t y, fixed_t z, mobjtype_t type, int onfloor);
 
@@ -126,10 +135,28 @@ void	P_SpawnPlayerMissile (mobj_t* source, mobjtype_t type);
 void	ThrowGib (mobj_t *self, mobjtype_t gibtype, int damage);
 
 
+//
+// [RH] P_THINGS
+//
+extern int SpawnableThings[];
+extern const int NumSpawnableThings;
+
+BOOL	P_Thing_Spawn (int tid, int type, angle_t angle, BOOL fog);
+BOOL	P_Thing_Projectile (int tid, int type, angle_t angle,
+							fixed_t speed, fixed_t vspeed, BOOL gravity);
+BOOL	P_ActivateMobj (mobj_t *mobj);
+BOOL	P_DeactivateMobj (mobj_t *mobj);
+
+
 //
 // P_ENEMY
 //
 void	P_NoiseAlert (mobj_t* target, mobj_t* emmiter);
+void	P_SpawnBrainTargets(void);	// killough 3/26/98: spawn icon landings
+
+extern struct brain_s {				// killough 3/26/98: global state of boss brain
+	int easy, targeton;
+} brain;
 
 // [RH] Andy Baker's stealth monsters
 void	 P_BecomeVisible (mobj_t *actor);
@@ -212,17 +239,18 @@ extern BOOL				floatok;
 extern fixed_t			tmfloorz;
 extern fixed_t			tmceilingz;
 extern msecnode_t		*sector_list;		// phares 3/16/98
+extern BOOL				oldshootactivation;	// [RH]
 
 extern	line_t* 		ceilingline;
 
 BOOL	P_CheckPosition (mobj_t *thing, fixed_t x, fixed_t y);
-BOOL	P_TryMove (mobj_t* thing, fixed_t x, fixed_t y);
+BOOL	P_TryMove (mobj_t* thing, fixed_t x, fixed_t y, BOOL dropoff);
 BOOL	P_TeleportMove (mobj_t* thing, fixed_t x, fixed_t y, fixed_t z, BOOL telefrag);	// [RH] Added z and telefrag parameters
 void	P_SlideMove (mobj_t* mo);
-BOOL	P_CheckSight (const mobj_t* t1, const mobj_t* t2);
+BOOL	P_CheckSight (const mobj_t* t1, const mobj_t* t2, BOOL ignoreInvisibility);
 void	P_UseLines (player_t* player);
 
-BOOL	P_ChangeSector (sector_t* sector, BOOL crunch);
+BOOL	P_ChangeSector (sector_t* sector, int crunch);
 
 extern	mobj_t*	linetarget; 	// who got hit (or NULL)
 
@@ -234,7 +262,7 @@ void	P_LineAttack (mobj_t *t1, angle_t angle, fixed_t distance, fixed_t slope, i
 void	P_RadiusAttack (mobj_t *spot, mobj_t *source, int damage, int mod);
 
 //jff 3/19/98 P_CheckSector(): new routine to replace P_ChangeSector()
-BOOL	P_CheckSector(sector_t *sector, BOOL crunch);
+BOOL	P_CheckSector(sector_t *sector, int crunch);
 void	P_DelSeclist(msecnode_t *);							// phares 3/16/98
 void	P_CreateSecNodeList(mobj_t*,fixed_t,fixed_t);		// phares 3/14/98
 int		P_GetMoveFactor(mobj_t* mo);						// phares  3/6/98
@@ -306,7 +334,6 @@ void P_DamageMobj (mobj_t *target, mobj_t *inflictor, mobj_t *source, int damage
 #define MOD_EXIT			20
 #define MOD_SPLASH			21
 #define MOD_HIT				22
-#define MOD_FALLXFER		23
 #define MOD_FRIENDLY_FIRE	0x80000000
 
 extern	int MeansOfDeath;
diff --git a/code/P_map.c b/code/P_map.c
index cd8c09437b..4714df6ddd 100644
--- a/code/P_map.c
+++ b/code/P_map.c
@@ -41,22 +41,26 @@
 // State.
 #include "doomstat.h"
 #include "r_state.h"
-// Data.
-#include "sounds.h"
 
 #include "z_zone.h"
 
 fixed_t 		tmbbox[4];
-mobj_t* 		tmthing;
-int 			tmflags;
-fixed_t 		tmx;
-fixed_t 		tmy;
-fixed_t			tmz;	// [RH] Needed for third dimension of teleporters
+static mobj_t  *tmthing;
+static int 		tmflags;
+static fixed_t	tmx;
+static fixed_t	tmy;
+static fixed_t	tmz;	// [RH] Needed for third dimension of teleporters
+static int		pe_x;	// Pain Elemental position for Lost Soul checks	// phares
+static int		pe_y;	// Pain Elemental position for Lost Soul checks	// phares
+static int		ls_x;	// Lost Soul position for Lost Soul checks		// phares
+static int		ls_y;	// Lost Soul position for Lost Soul checks		// phares
 
+BOOL oldshootactivation;	// [RH] True if no distinction is made between
+							//		projectile cross and projectile hit
 
 // If "floatok" true, move would be ok
 // if within "tmfloorz - tmceilingz".
-BOOL 		floatok;
+BOOL 			floatok;
 
 fixed_t 		tmfloorz;
 fixed_t 		tmceilingz;
@@ -68,7 +72,7 @@ line_t* 		ceilingline;
 
 // keep track of special lines as they are hit,
 // but don't process them until the move is proven valid
-// [RH] MaxSpecialCross	grows as needed in increments of 8
+// [RH] MaxSpecialCross	grows as needed
 int				MaxSpecialCross = 0;
 
 line_t** 		spechit;
@@ -90,19 +94,18 @@ static BOOL StompAlwaysFrags;
 
 BOOL PIT_StompThing (mobj_t* thing)
 {
-	fixed_t 	blockdist;
-				
-	if (!(thing->flags & MF_SHOOTABLE) )
+	fixed_t blockdist;
+
+	if (!(thing->flags & MF_SHOOTABLE))
 		return true;
-				
+
 	// don't clip against self
 	if (thing == tmthing)
 		return true;
-	
+
 	blockdist = thing->radius + tmthing->radius;
 	
-	if ( abs(thing->x - tmx) >= blockdist
-		 || abs(thing->y - tmy) >= blockdist )
+	if (abs(thing->x - tmx) >= blockdist || abs(thing->y - tmy) >= blockdist)
 	{
 		// didn't hit it
 		return true;
@@ -193,25 +196,117 @@ BOOL P_TeleportMove (mobj_t *thing, fixed_t x, fixed_t y, fixed_t z, BOOL telefr
 	thing->ceilingz = tmceilingz;		
 	thing->x = x;
 	thing->y = y;
+	thing->z = z;
 
 	P_SetThingPosition (thing);
 
-	thing->z = z;
-	
 	return true;
 }
 
+// P_GetMoveFactor() returns the value by which the x,y		// phares 3/19/98
+// movements are multiplied to add to player movement.		//     |
+															//     V
+int P_GetMoveFactor(mobj_t* mo)
+{
+	int movefactor = ORIG_FRICTION_FACTOR;
+
+	// If the floor is icy or muddy, it's harder to get moving. This is where
+	// the different friction factors are applied to 'trying to move'. In
+	// p_mobj.c, the friction factors are applied as you coast and slow down.
+
+	int momentum, friction;
+
+	if (!olddemo && boom_friction->value &&
+		!(mo->flags & (MF_NOGRAVITY | MF_NOCLIP)))
+	{
+		friction = mo->friction;
+		if (friction == ORIG_FRICTION)				// normal floor
+			;
+		else if (friction > ORIG_FRICTION)			// ice
+		{
+			movefactor = mo->movefactor;
+			mo->movefactor = ORIG_FRICTION_FACTOR;	// reset
+		}
+		else										// sludge
+		{
+
+			// phares 3/11/98: you start off slowly, then increase as
+			// you get better footing
+
+			momentum = (P_AproxDistance (mo->momx, mo->momy));
+			movefactor = mo->movefactor;
+			if (momentum > MORE_FRICTION_MOMENTUM<<2)
+				movefactor <<= 3;
+
+			else if (momentum > MORE_FRICTION_MOMENTUM<<1)
+				movefactor <<= 2;
+
+			else if (momentum > MORE_FRICTION_MOMENTUM)
+				movefactor <<= 1;
+
+			mo->movefactor = ORIG_FRICTION_FACTOR;	// reset
+		}
+	}														//     ^
+	return (movefactor);									//     |
+}															// phares 3/19/98
 
 //
 // MOVEMENT ITERATOR FUNCTIONS
 //
 
+//																	// phares
+// PIT_CrossLine													//   |
+// Checks to see if a PE->LS trajectory line crosses a blocking		//   V
+// line. Returns false if it does.
+//
+// tmbbox holds the bounding box of the trajectory. If that box
+// does not touch the bounding box of the line in question,
+// then the trajectory is not blocked. If the PE is on one side
+// of the line and the LS is on the other side, then the
+// trajectory is blocked.
+//
+// Currently this assumes an infinite line, which is not quite
+// correct. A more correct solution would be to check for an
+// intersection of the trajectory and the line, but that takes
+// longer and probably really isn't worth the effort.
+//
+
+static // killough 3/26/98: make static
+BOOL PIT_CrossLine (line_t* ld)
+{
+	if (!(ld->flags & ML_TWOSIDED) ||
+		(ld->flags & (ML_BLOCKING|ML_BLOCKMONSTERS|ML_BLOCKEVERYTHING)))
+		if (!(tmbbox[BOXLEFT]   > ld->bbox[BOXRIGHT]  ||
+			  tmbbox[BOXRIGHT]  < ld->bbox[BOXLEFT]   ||
+			  tmbbox[BOXTOP]    < ld->bbox[BOXBOTTOM] ||
+			  tmbbox[BOXBOTTOM] > ld->bbox[BOXTOP]))
+			if (P_PointOnLineSide(pe_x,pe_y,ld) != P_PointOnLineSide(ls_x,ls_y,ld))
+				return(false);  // line blocks trajectory				//   ^
+	return(true); // line doesn't block trajectory					//   |
+}																	// phares
 
 //
 // PIT_CheckLine
 // Adjusts tmfloorz and tmceilingz as lines are contacted
 //
-BOOL PIT_CheckLine (line_t* ld)
+
+// [RH] Moved this out of PIT_CheckLine()
+static void AddSpecialLine (line_t *ld)
+{
+	if (ld->special)
+	{
+		// [RH] Grow the spechit array as needed
+		if (numspechit >= MaxSpecialCross) {
+			MaxSpecialCross = MaxSpecialCross ? MaxSpecialCross * 2 : 8;
+			spechit = Realloc (spechit, MaxSpecialCross * sizeof(*spechit));
+			DPrintf ("MaxSpecialCross increased to %d\n", MaxSpecialCross);
+		}
+		spechit[numspechit++] = ld;
+	}
+}
+
+static // killough 3/26/98: make static
+BOOL PIT_CheckLine (line_t *ld)
 {
 	if (tmbbox[BOXRIGHT] <= ld->bbox[BOXLEFT]
 		|| tmbbox[BOXLEFT] >= ld->bbox[BOXRIGHT]
@@ -233,16 +328,22 @@ BOOL PIT_CheckLine (line_t* ld)
 	// so two special lines that are only 8 pixels apart
 	// could be crossed in either order.
 	
-	if (!ld->backsector)
+	if (!ld->backsector) {
+		// [RH] Let somebody push it if they want to
+		if ((ld->flags & ML_ACTIVATIONMASK) == ML_ACTIVATEPUSH)
+			AddSpecialLine (ld);
 		return false;			// one sided line
+	}
 				
-	if (!(tmthing->flags & MF_MISSILE) )
+	if (!(tmthing->flags & MF_MISSILE) || (ld->flags & ML_BLOCKEVERYTHING))
 	{
-		if ( ld->flags & ML_BLOCKING )
-			return false;		// explicitly blocking everything
-
-		if ( !tmthing->player && ld->flags & ML_BLOCKMONSTERS )
-			return false;		// block monsters only
+		if ((ld->flags & (ML_BLOCKING|ML_BLOCKEVERYTHING)) || 	// explicitly blocking everything
+			(!tmthing->player && ld->flags & ML_BLOCKMONSTERS)) {	// block monsters only
+				// [RH] Add pushable lines to the special list
+				if ((ld->flags & ML_ACTIVATIONMASK) == ML_ACTIVATEPUSH)
+					AddSpecialLine (ld);
+				return false;
+		}
 	}
 
 	// set openrange, opentop, openbottom
@@ -262,17 +363,7 @@ BOOL PIT_CheckLine (line_t* ld)
 		tmdropoffz = lowfloor;
 				
 	// if contacted a special line, add it to the list
-	if (ld->special)
-	{
-		// [RH] Grow the spechit array as needed
-		if (numspechit >= MaxSpecialCross) {
-			MaxSpecialCross += 8;
-			spechit = Realloc (spechit, MaxSpecialCross * sizeof(line_t *));
-			DPrintf ("MaxSpecialCross increased to %d\n", MaxSpecialCross);
-		}
-		spechit[numspechit] = ld;
-		numspechit++;
-	}
+	AddSpecialLine (ld);
 
 	return true;
 }
@@ -280,23 +371,23 @@ BOOL PIT_CheckLine (line_t* ld)
 //
 // PIT_CheckThing
 //
+static // killough 3/26/98: make static
 BOOL PIT_CheckThing (mobj_t *thing)
 {
 	fixed_t blockdist;
 	BOOL 	solid;
 	int 	damage;
 				
-	if (!(thing->flags & (MF_SOLID|MF_SPECIAL|MF_SHOOTABLE) ))
-		return true;
-	
 	// don't clip against self
 	if (thing == tmthing)
 		return true;
 	
+	if (!(thing->flags & (MF_SOLID|MF_SPECIAL|MF_SHOOTABLE)) )
+		return true;
+	
 	blockdist = thing->radius + tmthing->radius;
 
-	if ( abs(thing->x - tmx) >= blockdist
-		 || abs(thing->y - tmy) >= blockdist )
+	if (abs(thing->x - tmx) >= blockdist || abs(thing->y - tmy) >= blockdist)
 	{
 		// didn't hit it
 		return true;	
@@ -348,7 +439,7 @@ BOOL PIT_CheckThing (mobj_t *thing)
 				return true;
 
 			// [RH] DeHackEd infighting is here.
-			if (!deh_Infight && thing->type != MT_PLAYER)
+			if (!deh.Infight && thing->type != MT_PLAYER)
 			{
 				// Explode, but do no damage.
 				// Let players missile other players.
@@ -400,10 +491,77 @@ BOOL PIT_CheckThing (mobj_t *thing)
 		}
 		return !solid;
 	}
-		
-	return !(thing->flags & MF_SOLID);
+
+	// [RH] Allow step up on top of things up to 24 units (like stairs)
+	//		The movement code will automatically place the moving object
+	//		on top of the other one.
+	if (!olddemo
+		&& !(tmthing->z & MF2_JUMPING)
+		&& tmthing->z < thing->z + thing->height
+		&& thing->z + thing->height - tmthing->z <= 24 * FRACUNIT
+		&& thing->z + thing->height + tmthing->height < thing->subsector->sector->ceilingheight
+	   ) {
+		tmthing->z = thing->z;
+		tmthing->momz = 1;
+		return true;
+	}
+
+	// killough 3/16/98: Allow non-solid moving objects to move through solid
+	// ones, by allowing the moving thing (tmthing) to move if it's non-solid,
+	// despite another solid thing being in the way.
+	// killough 4/11/98: Treat no-clipping things as not blocking
+
+	return !((thing->flags & MF_SOLID && !(thing->flags & MF_NOCLIP))
+			 && (tmthing->flags & MF_SOLID || olddemo));
+
+	// return !(thing->flags & MF_SOLID);	// old code -- killough
 }
 
+// This routine checks for Lost Souls trying to be spawned		// phares
+// across 1-sided lines, impassible lines, or "monsters can't	//   |
+// cross" lines. Draw an imaginary line between the PE			//   V
+// and the new Lost Soul spawn spot. If that line crosses
+// a 'blocking' line, then disallow the spawn. Only search
+// lines in the blocks of the blockmap where the bounding box
+// of the trajectory line resides. Then check bounding box
+// of the trajectory vs. the bounding box of each blocking
+// line to see if the trajectory and the blocking line cross.
+// Then check the PE and LS to see if they're on different
+// sides of the blocking line. If so, return true, otherwise
+// false.
+
+BOOL Check_Sides(mobj_t* actor, int x, int y)
+{
+	int bx,by,xl,xh,yl,yh;
+
+	pe_x = actor->x;
+	pe_y = actor->y;
+	ls_x = x;
+	ls_y = y;
+
+	// Here is the bounding box of the trajectory
+
+	tmbbox[BOXLEFT]   = pe_x < x ? pe_x : x;
+	tmbbox[BOXRIGHT]  = pe_x > x ? pe_x : x;
+	tmbbox[BOXTOP]    = pe_y > y ? pe_y : y;
+	tmbbox[BOXBOTTOM] = pe_y < y ? pe_y : y;
+
+	// Determine which blocks to look in for blocking lines
+
+	xl = (tmbbox[BOXLEFT]   - bmaporgx)>>MAPBLOCKSHIFT;
+	xh = (tmbbox[BOXRIGHT]  - bmaporgx)>>MAPBLOCKSHIFT;
+	yl = (tmbbox[BOXBOTTOM] - bmaporgy)>>MAPBLOCKSHIFT;
+	yh = (tmbbox[BOXTOP]    - bmaporgy)>>MAPBLOCKSHIFT;
+
+	// xl->xh, yl->yh determine the mapblock set to search
+
+	validcount++; // prevents checking same line twice
+	for (bx = xl ; bx <= xh ; bx++)
+		for (by = yl ; by <= yh ; by++)
+		if (!P_BlockLinesIterator(bx,by,PIT_CrossLine))
+			return true;										//   ^
+	return(false);												//   |
+}																// phares
 
 //
 // MOVEMENT CLIPPING
@@ -435,13 +593,10 @@ BOOL PIT_CheckThing (mobj_t *thing)
 //
 BOOL P_CheckPosition (mobj_t *thing, fixed_t x, fixed_t y)
 {
-	int 				xl;
-	int 				xh;
-	int 				yl;
-	int 				yh;
-	int 				bx;
-	int 				by;
-	subsector_t*		newsubsec;
+	int xl, xh;
+	int yl, yh;
+	int bx, by;
+	subsector_t *newsubsec;
 
 	tmthing = thing;
 	tmflags = thing->flags;
@@ -505,7 +660,8 @@ BOOL P_CheckPosition (mobj_t *thing, fixed_t x, fixed_t y)
 // Attempt to move to a new position,
 // crossing special lines unless MF_TELEPORT is set.
 //
-BOOL P_TryMove (mobj_t *thing, fixed_t x, fixed_t y)
+BOOL P_TryMove (mobj_t *thing, fixed_t x, fixed_t y,
+				BOOL dropoff) // killough 3/15/98: allow dropoff as option
 {
 	fixed_t 	oldx;
 	fixed_t 	oldy;
@@ -519,6 +675,13 @@ BOOL P_TryMove (mobj_t *thing, fixed_t x, fixed_t y)
 	
 	if ( !(thing->flags & MF_NOCLIP) )
 	{
+#ifdef CEILCARRY
+		// killough 4/11/98: if the thing hangs from
+		// a ceiling, don't worry about it fitting
+
+		if (!(thing->flags & MF_SPAWNCEILING) || demo_compatibility)
+#endif
+
 		if (tmceilingz - tmfloorz < thing->height)
 			return false;		// doesn't fit
 
@@ -530,8 +693,12 @@ BOOL P_TryMove (mobj_t *thing, fixed_t x, fixed_t y)
 		if ( !(thing->flags&MF_TELEPORT) && tmfloorz - thing->z > 24*FRACUNIT )
 			return false;		// too big a step up
 
-		if ( !(thing->flags&(MF_DROPOFF|MF_FLOAT)) && tmfloorz - tmdropoffz > 24*FRACUNIT )
-			return false;		// don't stand over a dropoff
+		// killough 3/15/98: Allow certain objects to drop off
+
+		if (olddemo || !dropoff)
+			if ( !(thing->flags&(MF_DROPOFF|MF_FLOAT))
+				&& tmfloorz - tmdropoffz > 24*FRACUNIT )
+				return false;	// don't stand over a dropoff
 	}
 	
 	// the move is ok,
@@ -556,11 +723,8 @@ BOOL P_TryMove (mobj_t *thing, fixed_t x, fixed_t y)
 			ld = spechit[numspechit];
 			side = P_PointOnLineSide (thing->x, thing->y, ld);
 			oldside = P_PointOnLineSide (oldx, oldy, ld);
-			if (side != oldside)
-			{
-				if (ld->special)
-					P_CrossSpecialLine (ld-lines, oldside, thing);
-			}
+			if (side != oldside && ld->special)
+				P_CrossSpecialLine (ld-lines, oldside, thing);
 		}
 	}
 
@@ -628,59 +792,111 @@ mobj_t* 		slidemo;
 fixed_t 		tmxmove;
 fixed_t 		tmymove;
 
+extern mobj_t *onground;
 
 
 //
 // P_HitSlideLine
 // Adjusts the xmove / ymove
 // so that the next move will slide along the wall.
+// If the floor is icy, then you can bounce off a wall.				// phares
 //
 void P_HitSlideLine (line_t* ld)
 {
-	int 				side;
+	int 	side;
 
-	angle_t 			lineangle;
-	angle_t 			moveangle;
-	angle_t 			deltaangle;
+	angle_t lineangle;
+	angle_t moveangle;
+	angle_t deltaangle;
 	
-	fixed_t 			movelen;
-	fixed_t 			newlen;
-		
-		
+	fixed_t movelen;
+	fixed_t newlen;
+	BOOL	icyfloor;	// is floor icy?							// phares
+																	//   |
+	// Under icy conditions, if the angle of approach to the wall	//   V
+	// is more than 45 degrees, then you'll bounce and lose half
+	// your momentum. If less than 45 degrees, you'll slide along
+	// the wall. 45 is arbitrary and is believable.
+
+	// Check for the special cases of horz or vert walls.
+
+	if (!olddemo && boom_friction->value && slidemo->player)
+		// player must be on ground
+		icyfloor = ((onground == (mobj_t *)-1) && (slidemo->friction > ORIG_FRICTION));
+	else
+		icyfloor = false;
+
 	if (ld->slopetype == ST_HORIZONTAL)
 	{
-		tmymove = 0;
+		if (icyfloor && (abs(tmymove) > abs(tmxmove)))
+		{
+			tmxmove /= 2; // absorb half the momentum
+			tmymove = -tmymove/2;
+			S_StartSound (slidemo, "*grunt1", 78); // oooff!
+		}
+		else
+			tmymove = 0; // no more movement in the Y direction
 		return;
 	}
-	
+
 	if (ld->slopetype == ST_VERTICAL)
 	{
-		tmxmove = 0;
+		if (icyfloor && (abs(tmxmove) > abs(tmymove)))
+		{
+			tmxmove = -tmxmove/2; // absorb half the momentum
+			tmymove /= 2;
+			S_StartSound (slidemo, "*grunt1", 78); // oooff!	//   ^
+		}																//   |
+		else															// phares
+			tmxmove = 0; // no more movement in the X direction
 		return;
 	}
-		
+
+	// The wall is angled. Bounce if the angle of approach is		// phares
+	// less than 45 degrees.										// phares
+
 	side = P_PointOnLineSide (slidemo->x, slidemo->y, ld);
-		
+
 	lineangle = R_PointToAngle2 (0,0, ld->dx, ld->dy);
 
 	if (side == 1)
 		lineangle += ANG180;
 
 	moveangle = R_PointToAngle2 (0,0, tmxmove, tmymove);
-	deltaangle = moveangle-lineangle;
 
-	if (deltaangle > ANG180)
-		deltaangle += ANG180;
-	//	I_Error ("SlideLine: ang>ANG180");
+	// killough 3/2/98:
+	// The moveangle+=10 breaks v1.9 demo compatibility in
+	// some demos, so it needs demo_compatibility switch.
 
-	lineangle >>= ANGLETOFINESHIFT;
-	deltaangle >>= ANGLETOFINESHIFT;
-		
+	if (!olddemo)
+		moveangle += 10;	// prevents sudden path reversal due to	// phares
+							// rounding error						//   |
+	deltaangle = moveangle-lineangle;								//   V
 	movelen = P_AproxDistance (tmxmove, tmymove);
-	newlen = FixedMul (movelen, finecosine[deltaangle]);
+	if (icyfloor && (deltaangle > ANG45) && (deltaangle < ANG90+ANG45))
+	{
+		moveangle = lineangle - deltaangle;
+		movelen /= 2; // absorb
+		S_StartSound (slidemo, "*grunt1", 78); // oooff!
+		moveangle >>= ANGLETOFINESHIFT;
+		tmxmove = FixedMul (movelen, finecosine[moveangle]);
+		tmymove = FixedMul (movelen, finesine[moveangle]);
+	}																//   ^
+	else															//   |
+	{																// phares
+		if (deltaangle > ANG180)
+			deltaangle += ANG180;
+		//	I_Error ("SlideLine: ang>ANG180");
 
-	tmxmove = FixedMul (newlen, finecosine[lineangle]); 
-	tmymove = FixedMul (newlen, finesine[lineangle]);	
+		lineangle >>= ANGLETOFINESHIFT;
+		deltaangle >>= ANGLETOFINESHIFT;
+
+		movelen = P_AproxDistance (tmxmove, tmymove);
+		newlen = FixedMul (movelen, finecosine[deltaangle]);
+
+		tmxmove = FixedMul (newlen, finecosine[lineangle]);
+		tmymove = FixedMul (newlen, finesine[lineangle]);
+	}																// phares
 }
 
 
@@ -801,8 +1017,17 @@ void P_SlideMove (mobj_t* mo)
 	{
 		// the move most have hit the middle, so stairstep
 	  stairstep:
-		if (!P_TryMove (mo, mo->x, mo->y + mo->momy))
-			P_TryMove (mo, mo->x + mo->momx, mo->y);
+		// killough 3/15/98: Allow objects to drop off ledges
+
+		if (!P_TryMove (mo, mo->x, mo->y + mo->momy, true))
+
+			// phares 5/4/98: kill momentum if you can't move at all
+			// This eliminates player bobbing if pressed against a wall
+			// while on ice.
+
+			if (!P_TryMove (mo, mo->x + mo->momx, mo->y, true))
+				if (!olddemo)
+					mo->momx = mo->momy = 0;
 		return;
 	}
 
@@ -813,7 +1038,9 @@ void P_SlideMove (mobj_t* mo)
 		newx = FixedMul (mo->momx, bestslidefrac);
 		newy = FixedMul (mo->momy, bestslidefrac);
 		
-		if (!P_TryMove (mo, mo->x+newx, mo->y+newy))
+		// killough 3/15/98: Allow objects to drop off ledges
+
+		if (!P_TryMove (mo, mo->x+newx, mo->y+newy, true))
 			goto stairstep;
 	}
 	
@@ -835,10 +1062,10 @@ void P_SlideMove (mobj_t* mo)
 	mo->momx = tmxmove;
 	mo->momy = tmymove;
 				
-	if (!P_TryMove (mo, mo->x+tmxmove, mo->y+tmymove))
-	{
+    // killough 3/15/98: Allow objects to drop off ledges
+
+	if (!P_TryMove (mo, mo->x+tmxmove, mo->y+tmymove, true))
 		goto retry;
-	}
 }
 
 
@@ -858,16 +1085,17 @@ fixed_t 		attackrange;
 fixed_t 		aimslope;
 
 // slopes to top and bottom of target
-extern fixed_t	topslope;
-extern fixed_t	bottomslope;	
+// killough 4/20/98: make static instead of using ones in p_sight.c
+
+static fixed_t	topslope;
+static fixed_t	bottomslope;
 
 
 //
 // PTR_AimTraverse
 // Sets linetaget and aimslope when a target is aimed at.
 //
-BOOL
-PTR_AimTraverse (intercept_t* in)
+BOOL PTR_AimTraverse (intercept_t* in)
 {
 	line_t* 			li;
 	mobj_t* 			th;
@@ -970,10 +1198,10 @@ BOOL PTR_ShootTraverse (intercept_t* in)
 	{
 		li = in->d.line;
 		
-		if (li->special)
+		if (oldshootactivation && li->special)
 			P_ShootSpecialLine (shootthing, li);
 
-		if ( !(li->flags & ML_TWOSIDED) )
+		if ( !(li->flags & ML_TWOSIDED) || (li->flags & ML_BLOCKEVERYTHING))
 			goto hitline;
 		
 		// crosses a two sided line
@@ -990,21 +1218,27 @@ BOOL PTR_ShootTraverse (intercept_t* in)
 				
 		if (li->frontsector->ceilingheight != li->backsector->ceilingheight)
 		{
-			slope = FixedDiv (opentop - shootz , dist);
+			slope = FixedDiv (opentop - shootz, dist);
 			if (slope < aimslope)
 				goto hitline;
 		}
 
 		// shot continues
+		// [RH] Possibly trigger activation
+		if (!oldshootactivation && li->special)
+			P_ShotCrossSpecialLine (shootthing, li);
+
 		return true;
 		
 		
 		// hit line
 	  hitline:
+		// [RH] Possibly trigger activation
+		if (!oldshootactivation && li->special)
+			P_ShootSpecialLine (shootthing, li);
+
 		// position a bit closer
 		frac = in->frac - FixedDiv (4*FRACUNIT,attackrange);
-		x = trace.x + FixedMul (trace.dx, frac);
-		y = trace.y + FixedMul (trace.dy, frac);
 		z = shootz + FixedMul (aimslope, FixedMul(frac, attackrange));
 
 		if (li->frontsector->ceilingpic == skyflatnum)
@@ -1015,11 +1249,42 @@ BOOL PTR_ShootTraverse (intercept_t* in)
 			
 			// it's a sky hack wall
 			if	(li->backsector && li->backsector->ceilingpic == skyflatnum)
-				return false;			
+				// fix bullet-eaters -- killough:
+				// WARNING: Almost all demos will lose sync without this
+				// demo_compatibility flag check!!! killough 1/18/98
+				if (olddemo || li->backsector->ceilingheight < z)
+					return false;			
 		}
 
+		// [RH] If the trace went below/above the floor/ceiling, make the puff
+		//		appear in the right place and not on a wall.
+		{
+			fixed_t ceilingheight, floorheight;
+
+			if (!li->backsector || !P_PointOnLineSide (trace.x, trace.y, li)) {
+				ceilingheight = li->frontsector->ceilingheight;
+				floorheight = li->frontsector->floorheight;
+			} else {
+				ceilingheight = li->backsector->ceilingheight;
+				floorheight = li->backsector->floorheight;
+			}
+
+			if (z < floorheight) {
+				frac = FixedDiv (FixedMul (floorheight - shootz, frac), z - shootz);
+				z = floorheight;
+			} else if (z > ceilingheight) {
+				// Puffs on the ceiling need to be lowered to compensate for the height of the puff
+				ceilingheight -= mobjinfo[MT_PUFF].height;
+				frac = FixedDiv (FixedMul (ceilingheight - shootz, frac), z - shootz);
+				z = ceilingheight;
+			}
+		}
+
+		x = trace.x + FixedMul (trace.dx, frac);
+		y = trace.y + FixedMul (trace.dy, frac);
+
 		// Spawn bullet puffs.
-		P_SpawnPuff (x,y,z);
+		P_SpawnPuff (x, y, z);
 		
 		// don't go any farther
 		return false;	
@@ -1056,17 +1321,20 @@ BOOL PTR_ShootTraverse (intercept_t* in)
 
 	// Spawn bullet puffs or blod spots,
 	// depending on target type.
-	if (in->d.thing->flags & MF_NOBLOOD)
+	if ((in->d.thing->flags & MF_NOBLOOD) || (in->d.thing->flags2 & MF2_INVULNERABLE))
 		P_SpawnPuff (x,y,z);
 	else
 		P_SpawnBlood (x,y,z, la_damage);
 
 	if (la_damage) {
-		// [RH] figure out means of death;
+		// [RH] try and figure out means of death;
 		int mod = MOD_UNKNOWN;
 
 		if (shootthing->player) {
 			switch (shootthing->player->readyweapon) {
+				case wp_fist:
+					mod = MOD_FIST;
+					break;
 				case wp_pistol:
 					mod = MOD_PISTOL;
 					break;
@@ -1096,11 +1364,7 @@ BOOL PTR_ShootTraverse (intercept_t* in)
 //
 // P_AimLineAttack
 //
-fixed_t
-P_AimLineAttack
-( mobj_t*		t1,
-  angle_t		angle,
-  fixed_t		distance )
+fixed_t P_AimLineAttack (mobj_t *t1, angle_t angle, fixed_t distance)
 {
 	fixed_t 	x2;
 	fixed_t 	y2;
@@ -1165,7 +1429,7 @@ void P_LineAttack (mobj_t *t1, angle_t angle, fixed_t distance,
 //
 mobj_t *usething;
 
-BOOL PTR_UseTraverse (intercept_t* in)
+BOOL PTR_UseTraverse (intercept_t *in)
 {
 	int side;
 		
@@ -1174,7 +1438,7 @@ BOOL PTR_UseTraverse (intercept_t* in)
 		P_LineOpening (in->d.line);
 		if (openrange <= 0)
 		{
-			S_StartSound (usething, sfx_noway);
+			S_StartSound (usething, "*grunt1", 78);
 			
 			// can't use through a wall
 			return false;		
@@ -1197,6 +1461,29 @@ BOOL PTR_UseTraverse (intercept_t* in)
 	return (!olddemo && (in->d.line->flags & ML_PASSUSE)) ? true : false;
 }
 
+// Returns false if a "oof" sound should be made because of a blocking
+// linedef. Makes 2s middles which are impassable, as well as 2s uppers
+// and lowers which block the player, cause the sound effect when the
+// player tries to activate them. Specials are excluded, although it is
+// assumed that all special linedefs within reach have been considered
+// and rejected already (see P_UseLines).
+//
+// by Lee Killough
+//
+
+BOOL PTR_NoWayTraverse(intercept_t* in)
+{
+	line_t *ld = in->d.line;					// This linedef
+
+	return ld->special || !(					// Ignore specials
+		ld->flags & (ML_BLOCKING|ML_BLOCKEVERYTHING) || (			// Always blocking
+		P_LineOpening(ld),						// Find openings
+		openrange <= 0 ||						// No opening
+		openbottom > usething->z+24*FRACUNIT ||	// Too high it blocks
+		opentop < usething->z+usething->height	// Too low it blocks
+	)
+	);
+}
 
 //
 // P_UseLines
@@ -1218,8 +1505,16 @@ void P_UseLines (player_t*		player)
 	y1 = player->mo->y;
 	x2 = x1 + (USERANGE>>FRACBITS)*finecosine[angle];
 	y2 = y1 + (USERANGE>>FRACBITS)*finesine[angle];
-		
-	P_PathTraverse ( x1, y1, x2, y2, PT_ADDLINES, PTR_UseTraverse );
+
+	// old code:
+	//
+	// P_PathTraverse ( x1, y1, x2, y2, PT_ADDLINES, PTR_UseTraverse );
+	//
+	// This added test makes the "oof" sound work on 2s lines -- killough:
+
+	if (P_PathTraverse ( x1, y1, x2, y2, PT_ADDLINES, PTR_UseTraverse ))
+		if (!P_PathTraverse ( x1, y1, x2, y2, PT_ADDLINES, PTR_NoWayTraverse ))
+			S_StartSound (usething, "*grunt1", 78);
 }
 
 
@@ -1389,6 +1684,9 @@ void P_StandOnThing (mobj_t *thing, mobj_t *spot)
 		thing->z = spot->z + spot->height;
 	else
 		thing->z = thing->floorz;
+
+	if (thing->flags2 & MF2_JUMPING)
+	thing->flags2 &= ~MF2_JUMPING;
 }
 // [RH] Z-Check <-
 
@@ -1411,6 +1709,19 @@ vec3_t			bombvec;
 // [RH] Now it knows about vertical distances and
 //      can thrust things vertically, too.
 //
+
+// [RH] Damage scale to apply to thing that shot the missile.
+cvar_t *splashfactor;
+static float selfthrustscale;
+
+void SplashFactorCallback (cvar_t *var) {
+	if (var->value <= 0.0f) {
+		SetCVarFloat (var, 1.0f);
+	} else {
+		selfthrustscale = 1.0f / var->value;
+	}
+}
+
 BOOL PIT_RadiusAttack (mobj_t *thing)
 {
 	if (!(thing->flags & MF_SHOOTABLE) )
@@ -1439,9 +1750,9 @@ BOOL PIT_RadiusAttack (mobj_t *thing)
 			points = bombdamagefloat - len;
 		}
 		if (thing == bombsource)
-			points = points * 0.5f;
+			points = points * splashfactor->value;
 		if (points > 0) {
-			if (P_CheckSight (thing, bombspot)) {
+			if (P_CheckSight (thing, bombspot, true)) {
 				vec3_t dir;
 				float thrust;
 				fixed_t momx = thing->momx;
@@ -1449,11 +1760,16 @@ BOOL PIT_RadiusAttack (mobj_t *thing)
 
 				P_DamageMobj (thing, bombspot, bombsource, (int)points, bombmod);
 				
-				thrust = points * 70000.0f / (float)thing->info->mass;
+				thrust = points * 35000.0f / (float)thing->info->mass;
 				VectorSubtract (thingvec, bombvec, dir);
 				VectorScale (dir, thrust, dir);
-				if (bombsource != thing)
+				if (bombsource != thing) {
 					dir[2] *= 0.5f;
+				} else if (splashfactor->value) {
+					dir[0] *= selfthrustscale;
+					dir[1] *= selfthrustscale;
+					dir[2] *= selfthrustscale;
+				}
 				thing->momx = momx + (fixed_t)(dir[0]);
 				thing->momy = momy + (fixed_t)(dir[1]);
 				thing->momz += (fixed_t)(dir[2]);
@@ -1477,7 +1793,7 @@ BOOL PIT_RadiusAttack (mobj_t *thing)
 		if (dist < 0)
 			dist = 0;
 
-		if ( P_CheckSight (thing, bombspot) )
+		if ( P_CheckSight (thing, bombspot, true) )
 		{
 			// must be in direct path
 			P_DamageMobj (thing, bombspot, bombsource, bombdamage - dist, bombmod);
@@ -1530,14 +1846,19 @@ void P_RadiusAttack (mobj_t *spot, mobj_t *source, int damage, int mod)
 // of all things that touch the sector.
 //
 // If anything doesn't fit anymore, true will be returned.
-// If crunch is true, they will take damage
-//	as they are being crushed.
-// If Crunch is false, you should set the sector height back
-//	the way it was and call P_ChangeSector again
-//	to undo the changes.
 //
-BOOL 		crushchange;
-BOOL 		nofit;
+// [RH] If crushchange is non-negative, they will take the
+//		specified amount of damage as they are being crushed.
+//		If crushchange is negative, you should set the sector
+//		height back the way it was and call P_ChangeSector
+//		again to undo the changes.
+//		Note that this is very different from the original
+//		true/false usage of crushchange! If you want regular
+//		DOOM crushing behavior set crushchange to 10 or -1
+//		if no crushing is desired.
+//
+int		crushchange;
+BOOL 	nofit;
 
 
 //
@@ -1585,9 +1906,9 @@ BOOL PIT_ChangeSector (mobj_t *thing)
 	
 	nofit = true;
 
-	if (crushchange && !(level.time&3) )
+	if ((crushchange >= 0) && !(level.time&3) )
 	{
-		P_DamageMobj(thing,NULL,NULL,10,MOD_CRUSH);
+		P_DamageMobj (thing, NULL, NULL, crushchange, MOD_CRUSH);
 
 		// spray blood in a random direction
 		mo = P_SpawnMobj (thing->x,
@@ -1609,14 +1930,18 @@ BOOL PIT_ChangeSector (mobj_t *thing)
 //
 // P_ChangeSector
 //
-BOOL P_ChangeSector (sector_t *sector, BOOL crunch)
+BOOL P_ChangeSector (sector_t *sector, int crunch)
 {
 	int x;
 	int y;
 		
 	nofit = false;
 	crushchange = crunch;
-		
+
+	// ARRGGHHH!!!!
+	// This is horrendously slow!!!
+	// killough 3/14/98
+
 	// re-check heights for all things near the moving sector
 	for (x=sector->blockbox[BOXLEFT] ; x<= sector->blockbox[BOXRIGHT] ; x++)
 		for (y=sector->blockbox[BOXBOTTOM];y<= sector->blockbox[BOXTOP] ; y++)
@@ -1632,12 +1957,12 @@ BOOL P_ChangeSector (sector_t *sector, BOOL crunch)
 // sector. Both more accurate and faster.
 //
 
-BOOL P_CheckSector (sector_t *sector, BOOL crunch)
+BOOL P_CheckSector (sector_t *sector, int crunch)
 {
 	msecnode_t *n;
 
 	if (olddemo) // use the old routine for old demos though
-		return P_ChangeSector(sector,crunch);
+		return P_ChangeSector (sector, crunch);
 
 	nofit = false;
 	crushchange = crunch;
diff --git a/code/P_maputl.c b/code/P_maputl.c
index 1ff37783fb..b8b809c765 100644
--- a/code/P_maputl.c
+++ b/code/P_maputl.c
@@ -67,14 +67,14 @@ int P_PointOnLineSide (fixed_t x, fixed_t y, const line_t *line)
 		
 		return line->dy < 0;
 	}
-	if (!line->dy)
+	else if (!line->dy)
 	{
 		if (y <= line->v1->y)
 			return line->dx < 0;
 		
 		return line->dx > 0;
 	}
-	
+	else
 	{
 		fixed_t left = FixedMul ( line->dy>>FRACBITS , (x - line->v1->x) );
 		fixed_t right = FixedMul ( (y - line->v1->y) , line->dx>>FRACBITS );
@@ -142,11 +142,6 @@ int P_BoxOnLineSide (const fixed_t *tmbox, const line_t *ld)
 //
 int P_PointOnDivlineSide (fixed_t x, fixed_t y, const divline_t *line)
 {
-	fixed_t dx;
-	fixed_t dy;
-	fixed_t left;
-	fixed_t right;
-		
 	if (!line->dx)
 	{
 		if (x <= line->x)
@@ -154,31 +149,35 @@ int P_PointOnDivlineSide (fixed_t x, fixed_t y, const divline_t *line)
 		
 		return line->dy < 0;
 	}
-	if (!line->dy)
+	else if (!line->dy)
 	{
 		if (y <= line->y)
 			return line->dx < 0;
 
 		return line->dx > 0;
 	}
-		
-	dx = (x - line->x);
-	dy = (y - line->y);
-		
-	// try to quickly decide by looking at sign bits
-	if ( (line->dy ^ line->dx ^ dx ^ dy)&0x80000000 )
+	else
 	{
-		if ( (line->dy ^ dx) & 0x80000000 )
-			return 1;			// (left is negative)
-		return 0;
+		fixed_t dx = (x - line->x);
+		fixed_t dy = (y - line->y);
+		
+		// try to quickly decide by looking at sign bits
+		if ( (line->dy ^ line->dx ^ dx ^ dy)&0x80000000 )
+		{
+			if ( (line->dy ^ dx) & 0x80000000 )
+				return 1;			// (left is negative)
+			return 0;
+		}
+		else
+		{
+			fixed_t left = FixedMul ( line->dy>>8, dx>>8 );
+			fixed_t right = FixedMul ( dy>>8 , line->dx>>8 );
+				
+			if (right < left)
+				return 0;				// front side
+			return 1;					// back side
+		}
 	}
-		
-	left = FixedMul ( line->dy>>8, dx>>8 );
-	right = FixedMul ( dy>>8 , line->dx>>8 );
-		
-	if (right < left)
-		return 0;				// front side
-	return 1;					// back side
 }
 
 
@@ -198,10 +197,8 @@ void P_MakeDivline (const line_t *li, divline_t *dl)
 
 //
 // P_InterceptVector
-// Returns the fractional intercept point
-// along the first divline.
-// This is only called by the addthings
-// and addlines traversers.
+// Returns the fractional intercept point along the first divline.
+// This is only called by the addthings and addlines traversers.
 //
 fixed_t P_InterceptVector (const divline_t *v2, const divline_t *v1)
 {
@@ -284,10 +281,9 @@ void P_LineOpening (const line_t *linedef)
 	front = linedef->frontsector;
 	back = linedef->backsector;
 		
-	if (front->ceilingheight < back->ceilingheight)
-		opentop = front->ceilingheight;
-	else
-		opentop = back->ceilingheight;
+	opentop = (front->ceilingheight < back->ceilingheight) ?
+		opentop = front->ceilingheight :
+		back->ceilingheight;
 
 	if (front->floorheight > back->floorheight)
 	{
@@ -313,14 +309,11 @@ void P_LineOpening (const line_t *linedef)
 // P_UnsetThingPosition
 // Unlinks a thing from block map and sectors.
 // On each position change, BLOCKMAP and other
-// lookups maintaining lists ot things inside
+// lookups maintaining lists of things inside
 // these structures need to be updated.
 //
 void P_UnsetThingPosition (mobj_t *thing)
 {
-	int 		blockx;
-	int 		blocky;
-
 	if (!(thing->flags & MF_NOSECTOR))
 	{
 		// inert things don't need to be in blockmap?
@@ -361,8 +354,8 @@ void P_UnsetThingPosition (mobj_t *thing)
 			thing->bprev->bnext = thing->bnext;
 		else
 		{
-			blockx = (thing->x - bmaporgx)>>MAPBLOCKSHIFT;
-			blocky = (thing->y - bmaporgy)>>MAPBLOCKSHIFT;
+			int blockx = (thing->x - bmaporgx)>>MAPBLOCKSHIFT;
+			int blocky = (thing->y - bmaporgy)>>MAPBLOCKSHIFT;
 
 			if (blockx>=0 && blockx < bmapwidth
 				&& blocky>=0 && blocky <bmapheight)
@@ -476,7 +469,7 @@ BOOL P_BlockLinesIterator (int x, int y, BOOL(*func)(line_t*))
 {
 	if (x<0 || y<0 || x>=bmapwidth || y>=bmapheight)
 		return true;
-
+	else
 	{
 		int	offset = *(blockmap+(y*bmapwidth+x));
 		int *list = blockmaplump + offset;
@@ -490,13 +483,12 @@ BOOL P_BlockLinesIterator (int x, int y, BOOL(*func)(line_t*))
 		{
 			line_t *ld = &lines[*list];
 
-			if (ld->validcount == validcount)
-				continue;	// line has already been checked
-
-			ld->validcount = validcount;
+			if (ld->validcount != validcount) {
+				ld->validcount = validcount;
 					
-			if ( !func(ld) )
-				return false;
+				if ( !func(ld) )
+					return false;
+			}
 		}
 	}
 	return true;		// everything was checked
@@ -510,7 +502,7 @@ BOOL P_BlockThingsIterator (int x, int y, BOOL(*func)(mobj_t*))
 {
 	if (x<0 || y<0 || x>=bmapwidth || y>=bmapheight)
 		return true;
-
+	else
 	{
 		mobj_t *mobj;
 			
@@ -603,19 +595,19 @@ BOOL PIT_AddLineIntercepts (line_t *ld)
 //
 BOOL PIT_AddThingIntercepts (mobj_t* thing)
 {
-	fixed_t 			x1;
-	fixed_t 			y1;
-	fixed_t 			x2;
-	fixed_t 			y2;
+	fixed_t 		x1;
+	fixed_t 		y1;
+	fixed_t 		x2;
+	fixed_t 		y2;
 	
-	int 				s1;
-	int 				s2;
+	int 			s1;
+	int 			s2;
 	
 	BOOL 			tracepositive;
 
-	divline_t			dl;
+	divline_t		dl;
 	
-	fixed_t 			frac;
+	fixed_t 		frac;
 		
 	tracepositive = (trace.dx ^ trace.dy)>0;
 				
@@ -834,8 +826,7 @@ BOOL P_PathTraverse (fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2, int flags,
 				return false;	// early out
 		}
 				
-		if (mapx == xt2
-			&& mapy == yt2)
+		if (mapx == xt2 && mapy == yt2)
 		{
 			break;
 		}
diff --git a/code/P_mobj.c b/code/P_mobj.c
index 55b6587b01..fcb8174354 100644
--- a/code/P_mobj.c
+++ b/code/P_mobj.c
@@ -30,7 +30,7 @@
 
 #include "doomdef.h"
 #include "p_local.h"
-#include "sounds.h"
+#include "p_lnspec.h"
 
 #include "st_stuff.h"
 #include "hu_stuff.h"
@@ -47,7 +47,6 @@ cvar_t *sv_friction;
 
 
 void G_PlayerReborn (int player);
-void P_SpawnMapThing (mapthing2_t *mthing);
 
 
 //
@@ -83,7 +82,8 @@ BOOL P_SetMobjState (mobj_t *mobj, statenum_t state)
 		st = &states[state];
 		mobj->state = st;
 		mobj->tics = st->tics;
-		mobj->sprite = st->sprite;
+		if (!mobj->player)			// [RH] Only change sprite if not a player
+			mobj->sprite = st->sprite;
 		mobj->frame = st->frame;
 
 		// Modified handling.
@@ -129,13 +129,16 @@ void P_ExplodeMissile (mobj_t* mo)
 	mo->flags &= ~MF_MISSILE;
 
 	if (mo->info->deathsound)
-		S_StartSound (mo, mo->info->deathsound);
+		S_StartSound (mo, mo->info->deathsound, 70);
 }
 
 
 //
 // P_XYMovement  
 //
+extern int numspechit;
+extern line_t **spechit;
+
 #define STOPSPEED				0x1000
 #define FRICTION				0xe800
 
@@ -146,7 +149,9 @@ void P_XYMovement (mobj_t* mo)
 	player_t*	player;
 	fixed_t 	xmove;
 	fixed_t 	ymove;
-						
+	fixed_t   oldx,oldy;	// phares 9/10/98: reducing bobbing/momentum on ice
+							// when up against walls
+					
 	if (!mo->momx && !mo->momy)
 	{
 		if (mo->flags & MF_SKULLFLY)
@@ -175,6 +180,9 @@ void P_XYMovement (mobj_t* mo)
 	xmove = mo->momx;
 	ymove = mo->momy;
 		
+	oldx = mo->x;	// phares 9/10/98: new code to reduce bobbing/momentum
+	oldy = mo->y;	// when on ice & up against wall. These will be compared
+					// to your x,y values later to see if you were able to move
 	do
 	{
 		if (xmove > MAXMOVE/2 || ymove > MAXMOVE/2)
@@ -191,15 +199,28 @@ void P_XYMovement (mobj_t* mo)
 			xmove = ymove = 0;
 		}
 				
-		if (!P_TryMove (mo, ptryx, ptryy))
+		// killough 3/15/98: Allow objects to drop off
+
+		if (!P_TryMove (mo, ptryx, ptryy, true))
 		{
 			// blocked move
 			if (mo->player)
-			{	// try to slide along it
+			{
+				// [RH] Activate any potential special lines
+				while (numspechit-- > 0)
+					P_PushSpecialLine (mo,
+					   P_PointOnLineSide (mo->x, mo->y, spechit[numspechit]),
+					   spechit[numspechit]);
+		
+				// try to slide along it
 				P_SlideMove (mo);
 			}
 			else if (mo->flags & MF_MISSILE)
 			{
+				// [RH] missiles can activate projectile hit lines, too
+				if (!olddemo)
+					while (numspechit > 0)
+						P_ShootSpecialLine (mo, spechit[--numspechit]);
 				// explode a missile
 				if (ceilingline &&
 					ceilingline->backsector &&
@@ -269,20 +290,42 @@ void P_XYMovement (mobj_t* mo)
 	}
 	else
 	{
-		mo->momx = FixedMul (mo->momx, FRICTION);
-		mo->momy = FixedMul (mo->momy, FRICTION);
+		// phares 3/17/98
+		// Friction will have been adjusted by friction thinkers for icy
+		// or muddy floors. Otherwise it was never touched and
+		// remained set at ORIG_FRICTION
+
+		// phares 9/10/98: reduce bobbing/momentum when on ice & up against wall
+
+		if ((oldx == mo->x) && (oldy == mo->y)) // Did you go anywhere?
+		{	// No. Use original friction. This allows you to not bob so much
+			// if you're on ice, but keeps enough momentum around to break free
+			// when you're mildly stuck in a wall.
+			mo->momx = FixedMul(mo->momx,ORIG_FRICTION);
+			mo->momy = FixedMul(mo->momy,ORIG_FRICTION);
+		}
+		else
+		{	// Yes. Use stored friction.
+			mo->momx = FixedMul(mo->momx,mo->friction);
+			mo->momy = FixedMul(mo->momy,mo->friction);
+		}
+		mo->friction = ORIG_FRICTION;	// reset to normal for next tic
 	}
 }
 
 //
 // P_ZMovement
 //
-void P_ZMovement (mobj_t* mo)
+void P_ZMovement (mobj_t *mo)
 {
 	fixed_t 	dist;
 	fixed_t 	delta;
 	mobj_t		*other;
+	fixed_t		movez;
 	
+	if (mo->flags2 & MF2_NOADJUST)
+		return;
+
 	// check for smooth step up
 	if (mo->player && mo->z < mo->floorz)
 	{
@@ -293,14 +336,13 @@ void P_ZMovement (mobj_t* mo)
 	}
 
 	// adjust height
-	mo->z += mo->momz;
+	mo->z += (movez = mo->momz);
 		
 	if ( mo->flags & MF_FLOAT
 		 && mo->target)
 	{
 		// float down towards target if too close
-		if ( !(mo->flags & MF_SKULLFLY)
-			 && !(mo->flags & MF_INFLOAT) )
+		if ( !(mo->flags & MF_SKULLFLY) && !(mo->flags & MF_INFLOAT) )
 		{
 			dist = P_AproxDistance (mo->x - mo->target->x,
 									mo->y - mo->target->y);
@@ -323,7 +365,7 @@ void P_ZMovement (mobj_t* mo)
 			other = NULL;
 	} else {
 		other = P_FindFloor (mo);			// [RH] Z-Check
-		if ((mo->flags & MF_MISSILE) && (other == mo->target) && (gametic < (signed)mo->targettic))
+		if ((mo->flags & MF_MISSILE) && (other == mo->target) && mo->targettic)
 			other = NULL;
 	}
 
@@ -342,48 +384,14 @@ void P_ZMovement (mobj_t* mo)
 		if (mo->momz < 0)
 		{
 			if (mo->player
-				&& mo->momz < (fixed_t)(sv_gravity->value * -655.36))		
+				&& mo->momz < (fixed_t)(sv_gravity->value * mo->subsector->sector->gravity * -655.36f))		
 			{
-				// [RH] Andy Kempling's fall damage mod.
-				//		(adapted to work with ZDoom)
-				// calculate the number of broken bones... (joke)
-				// damage player according to the height fallen.
-				//
-				if (dmflags & (DF_YES_FALLING|DF_YES_FALLING_LOTS)) {
-					fixed_t minvelocity;
-					fixed_t damage;
-					float divisor;
-
-					if (dmflags & DF_YES_FALLING_LOTS) {
-						// Original values
-						minvelocity = -741455*4/3;
-						divisor = -26214400.0f;
-					} else {
-						// Not-quite-so-damaging values
-						minvelocity = -741455*5/3;
-						divisor = -39321600.0f;
-					}
-
-					if (mo->momz < minvelocity) {
-						damage = (fixed_t)((float)(mo->momz) * sv_gravity->value / divisor);
-						if (other != (mobj_t *)-1) {
-							// [RH] We landed on another thing. Give half the damage to it.
-							damage >>= 1;
-							P_DamageMobj (other, mo, mo, damage, MOD_FALLXFER);
-						}
-						if (mo->player)	{
-							// Monsters don't take falling damage
-							P_DamageMobj(mo, mo, mo, damage, MOD_FALLING);
-						}
-					}
-				}
-
 				// Squat down.
 				// Decrease viewheight for a moment
 				// after hitting the ground (hard),
 				// and utter appropriate sound.
 				mo->player->deltaviewheight = mo->momz>>3;
-				S_StartSound (mo, sfx_oof);
+				S_StartSound (mo, "*land1", 96);
 			}
 			mo->momz = 0;
 		}
@@ -401,15 +409,14 @@ void P_ZMovement (mobj_t* mo)
 			P_ExplodeMissile (mo);
 			return;
 		}
-
 		P_StandOnThing (mo, other);
 	}
 	else if (! (mo->flags & MF_NOGRAVITY) )
 	{
 		if (mo->momz == 0)
-			mo->momz = (fixed_t)(sv_gravity->value * -163.84);
+			mo->momz = (fixed_t)(sv_gravity->value * mo->subsector->sector->gravity * -163.84);
 		else
-			mo->momz -= (fixed_t)(sv_gravity->value * 81.92);
+			mo->momz -= (fixed_t)(sv_gravity->value * mo->subsector->sector->gravity * 81.92);
 	}
 
 	if (olddemo) {
@@ -419,7 +426,7 @@ void P_ZMovement (mobj_t* mo)
 			other = NULL;
 	} else {
 		other = P_FindCeiling (mo);			// [RH] Z-Check
-		if ((mo->flags & MF_MISSILE) && (other == mo->target) && (gametic < (signed)mo->targettic))
+		if ((mo->flags & MF_MISSILE) && (other == mo->target) && mo->targettic)
 			other = NULL;
 	}
 
@@ -464,7 +471,7 @@ void P_ZMovement (mobj_t* mo)
 //
 // P_NightmareRespawn
 //
-void P_NightmareRespawn (mobj_t* mobj)
+void P_NightmareRespawn (mobj_t *mobj)
 {
 	fixed_t 			x;
 	fixed_t 			y;
@@ -488,7 +495,7 @@ void P_NightmareRespawn (mobj_t* mobj)
 					  mobj->y,
 					  0, MT_TFOG, ONFLOORZ);
 	// initiate teleport sound
-	S_StartSound (mo, sfx_telept);
+	S_StartSound (mo, "misc/teleport", 32);
 
 	ss = R_PointInSubsector (x,y);
 
@@ -500,7 +507,7 @@ void P_NightmareRespawn (mobj_t* mobj)
 
 	mo = P_SpawnMobj (x, y, z, MT_TFOG, onfloor);
 
-	S_StartSound (mo, sfx_telept);
+	S_StartSound (mo, "misc/teleport", 32);
 
 	// spawn the new monster
 	mthing = &mobj->spawnpoint;
@@ -521,15 +528,134 @@ void P_NightmareRespawn (mobj_t* mobj)
 }
 
 
+//
+// [RH] Some new functions to work with Thing IDs. ------->
+//
+static mobj_t *tidhash[128];
+#define TIDHASH(i) ((i)&127)
+
+//
+// P_ClearTidHashes
+//
+// Clears the tid hashtable.
+//
+void P_ClearTidHashes (void)
+{
+	int i;
+
+	for (i = 0; i < 128; i++)
+		tidhash[i] = NULL;
+}
+
+//
+// P_AddMobjToHash
+//
+// Inserts an mobj into the correct chain based on its tid.
+// If its tid is 0, this function does nothing.
+//
+void P_AddMobjToHash (mobj_t *mobj)
+{
+	if (mobj->tid == 0) {
+		mobj->inext = mobj->iprev = NULL;
+		return;
+	} else {
+		int hash = TIDHASH(mobj->tid);
+
+		mobj->inext = tidhash[hash];
+		mobj->iprev = NULL;
+		tidhash[hash] = mobj;
+	}
+}
+
+//
+// P_RemoveMobjFromHash
+//
+// Removes an mobj from its hash chain.
+//
+void P_RemoveMobjFromHash (mobj_t *mobj)
+{
+	if (mobj->tid == 0)
+		return;
+	else {
+		if (mobj->iprev == NULL) {
+			// First mobj in the chain (probably)
+			int hash = TIDHASH(mobj->tid);
+
+			if (tidhash[hash] == mobj)
+				tidhash[hash] = mobj->inext;
+			if (mobj->inext) {
+				mobj->inext->iprev = NULL;
+				mobj->inext = NULL;
+			}
+		} else {
+			// Not the first mobj in the chain
+			mobj->iprev->inext = mobj->inext;
+			if (mobj->inext) {
+				mobj->inext->iprev = mobj->iprev;
+				mobj->inext = NULL;
+			}
+			mobj->iprev = NULL;
+		}
+	}
+}
+
+//
+// P_FindMobjByTid
+//
+// Returns the next mobj with the tid after the one given,
+// or the first with that tid if no mobj is passed. Returns
+// NULL if there are no more.
+//
+mobj_t *P_FindMobjByTid (mobj_t *mobj, int tid)
+{
+	// Mobjs without tid are never stored.
+	if (tid == 0)
+		return NULL;
+
+	if (!mobj)
+		mobj = tidhash[TIDHASH(tid)];
+	else
+		mobj = mobj->inext;
+
+	while (mobj && mobj->tid != tid)
+		mobj = mobj->inext;
+
+	return mobj;
+}
+
+//
+// P_FindGoal
+//
+// Like P_FindMobjByTid except it also matcheds on type.
+//
+mobj_t *P_FindGoal (mobj_t *mobj, int tid, int kind)
+{
+	mobj_t *goal;
+	
+	do {
+		goal = P_FindMobjByTid (mobj, tid);
+	} while (goal && goal->type != kind);
+
+	return goal;
+}
+
+// <------- [RH] End new functions
+
+
 //
 // P_MobjThinker
 //
-void P_MobjThinker (mobj_t* mobj)
+void P_MobjThinker (mobj_t *mobj)
 {
+	if (mobj == (mobj_t *)0x0131E0D8) {
+		int foo = 50;
+	}
+	// [RH] Decrement targettic
+	if (mobj->targettic)
+		mobj->targettic--;
+
 	// momentum movement
-	if (mobj->momx
-		|| mobj->momy
-		|| (mobj->flags&MF_SKULLFLY) )
+	if (mobj->momx || mobj->momy || (mobj->flags&MF_SKULLFLY) )
 	{
 		P_XYMovement (mobj);
 
@@ -537,8 +663,7 @@ void P_MobjThinker (mobj_t* mobj)
 		if (mobj->thinker.function.acv == (actionf_v) (-1))
 			return; 			// mobj was removed
 	}
-	if ( (mobj->z != mobj->floorz)
-		 || mobj->momz )
+	if ( (mobj->z != mobj->floorz) || mobj->momz )
 	{
 		P_ZMovement (mobj);
 		
@@ -547,6 +672,9 @@ void P_MobjThinker (mobj_t* mobj)
 			return; 			// mobj was removed
 	}
 
+	// [RH] Dormant things do no state changes
+	if (mobj->flags2 & MF2_DORMANT)
+		return;
 	
 	// cycle through states,
 	// calling action functions at transitions
@@ -581,7 +709,6 @@ void P_MobjThinker (mobj_t* mobj)
 
 		P_NightmareRespawn (mobj);
 	}
-
 }
 
 
@@ -609,6 +736,10 @@ mobj_t *P_SpawnMobj (fixed_t x, fixed_t y, fixed_t z, mobjtype_t type, int onflo
 	mobj->height = info->height;
 	mobj->flags = info->flags;
 	mobj->health = info->spawnhealth;
+	if (type == MT_BRIDGE)	// [RH] Floating bridge never adjusts its Z-position
+		mobj->flags2 |= MF2_NOADJUST;
+	if (mobj->flags & MF_STEALTH)	// [RH] Stealth monsters start out invisible
+		mobj->flags2 |= MF2_INVISIBLE;
 
 	if (gameskill->value != sk_nightmare)
 		mobj->reactiontime = info->reactiontime;
@@ -637,13 +768,10 @@ mobj_t *P_SpawnMobj (fixed_t x, fixed_t y, fixed_t z, mobjtype_t type, int onflo
 	else 
 		mobj->z = z;
 
-	mobj->thinker.function.acp1 = (actionf_p1)P_MobjThinker;
-		
-	P_AddThinker (&mobj->thinker);
+	mobj->friction = ORIG_FRICTION;		// phares 3/17/98
 
-	// [RH] If it's an ambient sound, activate it
-	if (type >= MT_AMBIENT0 && type <= MT_AMBIENT63)
-		S_ActivateAmbient (mobj, type - MT_AMBIENT0);
+	mobj->thinker.function.acp1 = (actionf_p1)P_MobjThinker;
+	P_AddThinker (&mobj->thinker);
 
 	return mobj;
 }
@@ -677,6 +805,9 @@ void P_RemoveMobj (mobj_t* mobj)
 	// unlink from sector and block lists
 	P_UnsetThingPosition (mobj);
 
+	// [RH] Unlink from tid chain
+	P_RemoveMobjFromHash (mobj);
+
 	// Delete all nodes on the current sector_list			phares 3/16/98
 
 	if (sector_list)
@@ -744,7 +875,7 @@ void P_RespawnSpecials (void)
 	// spawn a teleport fog at the new spot
 	ss = R_PointInSubsector (x,y); 
 	mo = P_SpawnMobj (x, y, z, MT_IFOG, onfloor);
-	S_StartSound (mo, sfx_itmbk);
+	S_StartSound (mo, "misc/spawn", 100);
 
 	// spawn it
 	mo = P_SpawnMobj (x,y,z, i, onfloor);
@@ -766,50 +897,39 @@ void P_RespawnSpecials (void)
 //
 void P_SpawnPlayer (mapthing2_t *mthing)
 {
+	int		  playernum;
 	player_t *p;
-	fixed_t   x;
-	fixed_t   y;
-	fixed_t   z;
-
 	mobj_t	 *mobj;
-
 	int 	  i;
 
-	// not playing?
-	// [RH] Things 4001-? are also multiplayer starts.
-	if (mthing->type > 4000) {
-		if (!playeringame[mthing->type - 4001 + 4])
-			return;
-		else {
-			p = &players[mthing->type - 4001 + 4];
-			if (p->playerstate == PST_REBORN)
-				G_PlayerReborn (mthing->type - 4001 + 4);
-		}
-	} else {
-		if (!playeringame[mthing->type-1])
-			return;
-		else {
-			p = &players[mthing->type-1];
-			if (p->playerstate == PST_REBORN)
-				G_PlayerReborn (mthing->type - 1);
-		}
-	}
+	// [RH] Things 4001-? are also multiplayer starts. Just like 1-4.
+	//		To make things simpler, figure out which player is being
+	//		spawned here.
+	playernum = (mthing->type > 4000) ? mthing->type - 4001 + 4 : mthing->type - 1;
 
-	x	 = mthing->x << FRACBITS;
-	y	 = mthing->y << FRACBITS;
-	z	 = mthing->z << FRACBITS;
-	mobj = P_SpawnMobj (x,y,z, MT_PLAYER, ONFLOORZ);
+	// not playing?
+	if (playernum >= MAXPLAYERS || !playeringame[playernum])
+		return;
+
+	p = &players[playernum];
+	if (p->playerstate == PST_REBORN)
+		G_PlayerReborn (playernum);
+
+	mobj = P_SpawnMobj (mthing->x << FRACBITS, mthing->y << FRACBITS, 0, MT_PLAYER, ONFLOORZ);
 
 	// set color translations for player sprites
 	// [RH] Different now: MF_TRANSLATION is not used.
-	mobj->palette = (struct palette_s *)(translationtables + (mthing->type-1)*256);
+	mobj->palette = (struct palette_s *)(translationtables + 256*playernum);
 
 	mobj->angle = ANG45 * (mthing->angle/45);
 	mobj->pitch = mobj->roll = 0;
 	mobj->player = p;
 	mobj->health = p->health;
 
-	p->mo = mobj;
+	// [RH] Set player sprite based on skin
+	mobj->sprite = skins[p->userinfo.skin].sprite;
+
+	p->camera = p->mo = mobj;	// [RH]
 	p->playerstate = PST_LIVE;
 	p->refire = 0;
 	p->message = NULL;
@@ -827,14 +947,17 @@ void P_SpawnPlayer (mapthing2_t *mthing)
 		for (i=0 ; i<NUMCARDS ; i++)
 			p->cards[i] = true;
 
-	if (consoleplayer ==
-		(mthing->type > 4000 ? mthing->type - 4001 + 4 : mthing->type - 1))
+	if (consoleplayer == playernum)
 	{
 		// wake up the status bar
 		ST_Start ();
 		// wake up the heads up text
 		HU_Start ();
 	}
+
+	// [RH] If someone is in the way, kill them
+	if (!olddemo)
+		P_TeleportMove (mobj, mobj->x, mobj->y, mobj->z, true);
 }
 
 
@@ -843,7 +966,8 @@ void P_SpawnPlayer (mapthing2_t *mthing)
 // The fields of the mapthing should
 // already be in host byte order.
 //
-void P_SpawnMapThing (mapthing2_t *mthing)
+// [RH] position is used to weed out unwanted start spots
+void P_SpawnMapThing (mapthing2_t *mthing, int position)
 {
 	int 				i;
 	int 				bit;
@@ -858,7 +982,7 @@ void P_SpawnMapThing (mapthing2_t *mthing)
 	{
 		if (deathmatch_p == &deathmatchstarts[MaxDeathmatchStarts]) {
 			// [RH] Get more deathmatchstarts
-			MaxDeathmatchStarts += 8;
+			MaxDeathmatchStarts *= 2;
 			deathmatchstarts = Realloc (deathmatchstarts, MaxDeathmatchStarts * sizeof(mapthing2_t));
 			deathmatch_p = &deathmatchstarts[MaxDeathmatchStarts - 8];
 		}
@@ -870,6 +994,10 @@ void P_SpawnMapThing (mapthing2_t *mthing)
 	// check for players specially
 	if (mthing->type <= 4 && mthing->type > 0)
 	{
+		// [RH] Only spawn spots that match position.
+		if (mthing->args[0] != position)
+			return;
+
 		// save spots for respawning in network games
 		playerstarts[mthing->type-1] = *mthing;
 		if (!deathmatch->value)
@@ -878,6 +1006,11 @@ void P_SpawnMapThing (mapthing2_t *mthing)
 		return;
 	} else if (mthing->type >= 4001 && mthing->type <= 4001 + MAXPLAYERS - 4) {
 		// [RH] Multiplayer starts for players 5-?
+
+		// [RH] Only spawn spots that match position.
+		if (mthing->args[0] != position)
+			return;
+
 		playerstarts[mthing->type - 4001 + 4] = *mthing;
 		if (!deathmatch->value)
 			P_SpawnPlayer (mthing);
@@ -892,8 +1025,10 @@ void P_SpawnMapThing (mapthing2_t *mthing)
 			if (!(mthing->flags & MTF_COOPERATIVE))
 				return;
 		}
-	} else if (!(mthing->flags & MTF_SINGLE))
-		return;
+	} else {
+		if (!(mthing->flags & MTF_SINGLE))
+			return;
+	}
 				
 	// check for apropriate skill level
 	if (gameskill->value == sk_baby)
@@ -906,10 +1041,18 @@ void P_SpawnMapThing (mapthing2_t *mthing)
 	if (!(mthing->flags & bit) )
 		return;
 		
-	// find which type to spawn
-	for (i=0 ; i< NUMMOBJTYPES ; i++)
-		if (mthing->type == mobjinfo[i].doomednum)
-			break;
+	// [RH] Determine if it is an old ambient thing, and if so,
+	//		map it to MT_AMBIENT with the proper parameter.
+	if (mthing->type >= 14001 && mthing->type <= 14064) {
+		mthing->args[0] = mthing->type - 14000;
+		mthing->type = 14065;
+		i = MT_AMBIENT;
+	} else {
+		// find which type to spawn
+		for (i=0 ; i< NUMMOBJTYPES ; i++)
+			if (mthing->type == mobjinfo[i].doomednum)
+				break;
+	}
 		
 	if (i==NUMMOBJTYPES) {
 		// [RH] Don't die if the map tries to spawn an unknown thing
@@ -994,6 +1137,14 @@ void P_SpawnMapThing (mapthing2_t *mthing)
 	mobj = P_SpawnMobj (x,y,z, i, onfloor);
 	mobj->spawnpoint = *mthing;
 
+	// [RH] Set the thing's special
+	mobj->special = mthing->special;
+	memcpy (mobj->args, mthing->args, sizeof(mobj->args));
+
+	// [RH] If it's an ambient sound, activate it
+	if (i == MT_AMBIENT)
+		S_ActivateAmbient (mobj, mobj->args[0]);
+
 	if (mobj->tics > 0)
 		mobj->tics = 1 + (P_Random (pr_spawnmapthing) % mobj->tics);
 	if (mobj->flags & MF_COUNTKILL)
@@ -1004,6 +1155,14 @@ void P_SpawnMapThing (mapthing2_t *mthing)
 	mobj->angle = ANG45 * (mthing->angle/45);
 	if (mthing->flags & MTF_AMBUSH)
 		mobj->flags |= MF_AMBUSH;
+
+	// [RH] Add ThingID to mobj and link it in with the others
+	mobj->tid = mthing->thingid;
+	P_AddMobjToHash (mobj);
+
+	// [RH] Go dormant as needed
+	if (mthing->flags & MTF_DORMANT)
+		P_DeactivateMobj (mobj);
 }
 
 
@@ -1043,8 +1202,7 @@ void P_SpawnPuff (fixed_t x, fixed_t y, fixed_t z)
 //
 // P_SpawnBlood
 // 
-void
-P_SpawnBlood (fixed_t x, fixed_t y, fixed_t z, int damage)
+void P_SpawnBlood (fixed_t x, fixed_t y, fixed_t z, int damage)
 {
 	mobj_t *th;
 	int t;
@@ -1077,8 +1235,9 @@ void P_CheckMissileSpawn (mobj_t* th)
 	if (th->tics < 1)
 		th->tics = 1;
 
-	// Give the missile time to get away from the shooter
-	th->targettic = gametic + 10;
+	// [RH] Give the missile time to get away from the shooter
+	if (!olddemo)
+		th->targettic = 10;
 	
 	// move a little forward so an angle can
 	// be computed if it immediately explodes
@@ -1086,9 +1245,10 @@ void P_CheckMissileSpawn (mobj_t* th)
 	th->y += th->momy>>1;
 	th->z += th->momz>>1;
 
-	if (!P_TryMove (th, th->x, th->y)) {
+	// killough 3/15/98: no dropoff (really = don't care for missiles)
+
+	if (!P_TryMove (th, th->x, th->y, false))
 		P_ExplodeMissile (th);
-	}
 }
 
 
@@ -1106,7 +1266,7 @@ mobj_t *P_SpawnMissile (mobj_t *source, mobj_t *dest, mobjtype_t type)
 					  source->z + 4*8*FRACUNIT, type, 0);
 	
 	if (th->info->seesound)
-		S_StartSound (th, th->info->seesound);
+		S_StartSound (th, th->info->seesound, 70);
 
 	th->target = source;		// where it came from
 	an = R_PointToAngle2 (source->x, source->y, dest->x, dest->y);		
@@ -1178,7 +1338,7 @@ void P_SpawnPlayerMissile (mobj_t *source, mobjtype_t type)
 
 	if (linetarget && source->player)
 		if (!(dmflags & DF_NO_FREELOOK)
-			&& abs(slope - pitchslope) > source->player->userinfo->aimdist) {
+			&& abs(slope - pitchslope) > source->player->userinfo.aimdist) {
 			an = source->angle;
 			slope = pitchslope;
 		}
@@ -1190,7 +1350,7 @@ void P_SpawnPlayerMissile (mobj_t *source, mobjtype_t type)
 	th = P_SpawnMobj (x,y,z, type, 0);
 
 	if (th->info->seesound)
-		S_StartSound (th, th->info->seesound);
+		S_StartSound (th, th->info->seesound, 70);
 
 	th->target = source;
 	th->angle = an;
diff --git a/code/P_mobj.h b/code/P_mobj.h
index f214ca3718..fe6c457f82 100644
--- a/code/P_mobj.h
+++ b/code/P_mobj.h
@@ -207,6 +207,40 @@ typedef enum
 	MF_TRANSLUC50		= 0x40000000,
 	MF_TRANSLUC75		= 0x60000000,
 
+	// [RH] These are all based on Hexen's. Very few are used.
+	MF2_LOWGRAVITY		= 0x00000001,
+	MF2_BLOWN			= 0x00000002,
+	MF2_BOUNCES			= 0x00000004,
+	MF2_PROJECTILEPUSH	= 0x00000008,
+	MF2_DROPUP			= 0x00000010,
+	MF2_INLIQUID		= 0x00000020,
+	MF2_STARTONFLOOR	= 0x00000040,
+	MF2_NOTELEPORT		= 0x00000080,
+	MF2_PIERCING		= 0x00000100,
+	MF2_PUSHABLE		= 0x00000200,
+	MF2_DONTHURTPLAYERS = 0x00000400,
+	MF2_NOADJUST		= 0x00000800,
+	MF2_POTSOMETHING	= 0x00001000,
+	MF2_PARTICLE		= 0x00002000,
+	MF2_DORMANT			= 0x00004000,
+	MF2_BOSS			= 0x00008000,
+	MF2_XDEATHONLY		= 0x00010000,
+	MF2_DOESNOTPUSH		= 0x00020000,
+	MF2_TELEFRAGS		= 0x00040000,
+	MF2_BOB				= 0x00080000,
+	MF2_INVISIBLE		= 0x00100000,
+	MF2_ACTIVATEIMPACT	= 0x00200000,
+	MF2_JUMPING			= 0x00400000,
+	MF2_ACTIVATEMCROSS	= 0x00800000,
+	MF2_ACTIVATEPCROSS	= 0x01000000,
+	MF2_PASSPROJECTILES	= 0x02000000,
+	MF2_STALKERSOMETHING= 0x04000000,
+	MF2_INVULNERABLE	= 0x08000000,
+	MF2_INDESTRUCTABLE	= 0x10000000,
+	MF2_ICYDEATH		= 0x20000000,
+	MF2_HOMINGSOMETHING	= 0x40000000,
+	MF2_REFLECTIVE		= 0x80000000
+
 } mobjflag_t;
 
 
@@ -221,6 +255,10 @@ typedef struct mobj_s
 	fixed_t	 			y;
 	fixed_t	 			z;
 
+	int					tid;	// [RH] Thing ID
+	struct mobj_s*		inext;	// [RH] links to other mobjs whose
+	struct mobj_s*		iprev;	//		tid hash to the same value.
+
 	// More list: links in sector (if needed)
 	struct mobj_s*		snext;
 	struct mobj_s*		sprev;
@@ -261,6 +299,7 @@ typedef struct mobj_s
 	int 				tics;	// state tic counter
 	state_t*			state;
 	int 				flags;
+	int					flags2;	// [RH] more flags
 	int 				health;
 
 	// Movement direction, movement generation (zig-zagging).
@@ -273,7 +312,7 @@ typedef struct mobj_s
 
 	// Reaction time: if non 0, don't attack yet.
 	// Used by player to freeze a bit after teleporting.
-	int 				reactiontime;	
+	int 				reactiontime;
 
 	// If >0, the target will be chased
 	// no matter what (even if shot)
@@ -292,11 +331,14 @@ typedef struct mobj_s
 	// Thing being chased/attacked for tracers.
 	struct mobj_s*		tracer; 
 
-	// [RH] Andy Baker's stealth monsters
-	BOOL				invisible;
+	// new field: last known enemy -- killough 2/15/98
+	struct mobj_s*      lastenemy;
+
+	// [RH] The goal this monster is moving toward (if target is NULL)
+	struct mobj_s*		goal;
 
 	// [RH] Z-Check
-	// Gametic when a missile will be able to impact
+	// Time until a missile will be able to impact
 	// whoever shot it. Used to prevent the missile
 	// from blowing up in the shooter's face before
 	// it gets anywhere.
@@ -308,8 +350,16 @@ typedef struct mobj_s
 	// than a full-fledged palette.
 	struct palette_s	*palette;
 
-    // a linked list of sectors where this object appears
-    struct msecnode_s	*touching_sectorlist;				// phares 3/14/98
+	// Friction values for the sector the object is in
+	int friction;											// phares 3/17/98
+	int movefactor;
+
+	// a linked list of sectors where this object appears
+	struct msecnode_s	*touching_sectorlist;				// phares 3/14/98
+
+	// [RH] Thing special
+	byte				special;
+	byte				args[5];
 
 } mobj_t;
 
diff --git a/code/P_plats.c b/code/P_plats.c
new file mode 100644
index 0000000000..17784eb4ed
--- /dev/null
+++ b/code/P_plats.c
@@ -0,0 +1,399 @@
+// Emacs style mode select	 -*- C++ -*- 
+//-----------------------------------------------------------------------------
+//
+// $Id:$
+//
+// Copyright (C) 1993-1996 by id Software, Inc.
+//
+// This source is available for distribution and/or modification
+// only under the terms of the DOOM Source Code License as
+// published by id Software. All rights reserved.
+//
+// The source is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// FITNESS FOR A PARTICULAR PURPOSE. See the DOOM Source Code License
+// for more details.
+//
+// $Log:$
+//
+// DESCRIPTION:
+//		Plats (i.e. elevator platforms) code, raising/lowering.
+//
+//-----------------------------------------------------------------------------
+
+
+
+#include "m_alloc.h"
+
+#include "i_system.h"
+#include "z_zone.h"
+#include "m_random.h"
+
+#include "doomdef.h"
+#include "p_local.h"
+
+#include "s_sound.h"
+
+// State.
+#include "doomstat.h"
+#include "r_state.h"
+
+
+// [RH] Active plats are now linked together in a list instead of
+//		stored in an array. Similar to what Lee Killough did with
+//		BOOM except I link the plats themselves together.
+plat_t *activeplats;
+
+
+
+//
+// Move a plat up and down
+//
+void T_PlatRaise(plat_t* plat)
+{
+	result_e res;
+		
+	switch (plat->status)
+	{
+	  case up:
+		res = T_MovePlane(plat->sector,
+						  plat->speed,
+						  plat->high,
+						  plat->crush,0,1);
+										
+		if (plat->type == platUpByValueStay
+			|| plat->type == platRaiseAndStay)
+		{
+			if (!(level.time&7))
+				S_StartSound((mobj_t *)&plat->sector->soundorg, "plats/pt1_mid", 119);
+		}
+		
+								
+		if (res == crushed && (!plat->crush))
+		{
+			plat->count = plat->wait;
+			plat->status = down;
+			S_StartSound((mobj_t *)&plat->sector->soundorg, "plats/pt1_strt", 100);
+		}
+		else
+		{
+			if (res == pastdest)
+			{
+				if (plat->type != platToggle) {
+					plat->count = plat->wait;
+					plat->status = waiting;
+					S_StartSound((mobj_t *)&plat->sector->soundorg, "plats/pt1_stop", 100);
+
+					switch(plat->type)
+					{
+						case platDownWaitUpStay:
+						case platRaiseAndStay:
+						case platUpByValueStay:
+						case platDownToNearestFloor:
+						case platDownToLowestCeiling:
+							P_RemoveActivePlat(plat);
+							break;
+						default:
+							break;
+					}
+				} else {
+					plat->oldstatus = plat->status;//jff 3/14/98 after action wait  
+					plat->status = in_stasis;      //for reactivation of toggle
+				}
+			}
+		}
+		break;
+		
+	  case down:
+		res = T_MovePlane (plat->sector, plat->speed, plat->low, -1, 0, -1);
+
+		if (res == pastdest)
+		{
+			// if not an instant toggle, start waiting, make plat stop sound
+			if (plat->type != platToggle)	//jff 3/14/98 toggle up down
+			{								// is silent, instant, no waiting
+				plat->count = plat->wait;
+				plat->status = waiting;
+				S_StartSound((mobj_t *)&plat->sector->soundorg, "plats/pt1_stop", 100);
+
+				switch (plat->type) {
+					case platUpWaitDownStay:
+					case platUpByValue:
+						P_RemoveActivePlat (plat);
+						break;
+					default:
+						break;
+				}
+			} else {	// instant toggles go into stasis awaiting next activation
+				plat->oldstatus = plat->status;	//jff 3/14/98 after action wait  
+				plat->status = in_stasis;		//for reactivation of toggle
+			}
+		}
+
+		//jff 1/26/98 remove the plat if it bounced so it can be tried again
+		//only affects plats that raise and bounce
+		//killough 1/31/98: relax compatibility to demo_compatibility
+
+		// remove the plat if it's a pure raise type
+		if (!olddemo)
+		{
+			switch (plat->type)
+			{
+				case platUpByValueStay:
+				case platRaiseAndStay:
+					P_RemoveActivePlat(plat);
+				default:
+					break;
+			}
+		}
+
+		break;
+		
+	  case waiting:
+		if (!--plat->count)
+		{
+			if (plat->sector->floorheight == plat->low)
+				plat->status = up;
+			else
+				plat->status = down;
+			S_StartSound((mobj_t *)&plat->sector->soundorg, "plats/pt1_strt", 100);
+		}
+		break;
+
+	  case in_stasis:
+		break;
+	}
+}
+
+
+//
+// Do Platforms
+//	[RH] Changed amount to height and added delay,
+//		 lip, change, tag, and speed parameters.
+//
+BOOL EV_DoPlat (int tag, line_t *line, plattype_e type, int height,
+				int speed, int delay, int lip, int change)
+{
+	plat_t* 	plat;
+	int 		secnum;
+	sector_t	*sec;
+	int 		rtn = false;
+	BOOL		manual = false;
+
+	// [RH] If tag is zero, use the sector on the back side
+	//		of the activating line (if any).
+	if (!tag && !olddemo) {
+		if (!line || !(sec = line->backsector))
+			return false;
+		secnum = sec - sectors;
+		manual = true;
+		goto manual_plat;
+	}
+
+	//	Activate all <type> plats that are in_stasis
+	switch (type)
+	{
+	  case platToggle:
+		rtn = true;
+	  case platPerpetualRaise:
+		P_ActivateInStasis (tag);
+		break;
+	
+	  default:
+		break;
+	}
+		
+	secnum = -1;
+	while ((secnum = P_FindSectorFromTag (tag, secnum)) >= 0)
+	{
+		sec = &sectors[secnum];
+
+manual_plat:
+		if (P_SectorActive (floor_special, sec))	//jff 2/23/98 multiple thinkers
+			continue;
+		
+		// Find lowest & highest floors around sector
+		rtn = true;
+		plat = Z_Malloc( sizeof(*plat), PU_LEVSPEC, 0);
+		P_AddThinker(&plat->thinker);
+				
+		plat->type = type;
+		plat->sector = sec;
+		plat->sector->floordata = plat;	//jff 2/23/98 multiple thinkers
+		plat->thinker.function.acp1 = (actionf_p1) T_PlatRaise;
+		plat->crush = -1;
+		plat->tag = tag;
+		plat->speed = speed;
+		plat->wait = delay;
+
+		//jff 1/26/98 Avoid raise plat bouncing a head off a ceiling and then
+		//going down forever -- default low to plat height when triggered
+		plat->low = sec->floorheight;
+
+		if (change) {
+			if (line)
+				sec->floorpic = sides[line->sidenum[0]].sector->floorpic;
+			if (change == 1)
+				sec->special = 0;	// Stop damage and other stuff, if any
+		}
+
+		switch (type)
+		{
+			case platRaiseAndStay:
+				plat->high = P_FindNextHighestFloor (sec, sec->floorheight);
+				plat->status = up;
+				S_StartSound ((mobj_t *)&sec->soundorg, "plats/pt1_mid", 119);
+				break;
+
+			case platUpByValue:
+			case platUpByValueStay:
+				plat->high = sec->floorheight + height;
+				plat->status = up;
+				S_StartSound ((mobj_t *)&sec->soundorg, "plats/pt1_mid", 119);
+				break;
+			
+			case platDownByValue:
+				plat->low = sec->floorheight - height;
+				plat->status = down;
+				S_StartSound ((mobj_t *)&sec->soundorg, "plats/pt1_mid", 119);
+				break;
+
+			case platDownWaitUpStay:
+				plat->low = P_FindLowestFloorSurrounding (sec) + lip*FRACUNIT;
+
+				if (plat->low > sec->floorheight)
+					plat->low = sec->floorheight;
+
+				plat->high = sec->floorheight;
+				plat->status = down;
+				S_StartSound ((mobj_t *)&sec->soundorg, "plats/pt1_strt", 100);
+				break;
+			
+			case platUpWaitDownStay:
+				plat->high = P_FindHighestFloorSurrounding (sec);
+
+				if (plat->high < sec->floorheight)
+					plat->high = sec->floorheight;
+
+				plat->status = up;
+				S_StartSound ((mobj_t *)&sec->soundorg, "plats/pt1_strt", 100);
+				break;
+
+			case platPerpetualRaise:
+				plat->low = P_FindLowestFloorSurrounding (sec) + lip*FRACUNIT;
+
+				if (plat->low > sec->floorheight)
+					plat->low = sec->floorheight;
+
+				plat->high = P_FindHighestFloorSurrounding (sec);
+
+				if (plat->high < sec->floorheight)
+					plat->high = sec->floorheight;
+
+				plat->status = P_Random (pr_doplat) & 1;
+
+				S_StartSound((mobj_t *)&sec->soundorg, "plats/pt1_strt", 100);
+				break;
+
+			case platToggle:	//jff 3/14/98 add new type to support instant toggle
+				plat->crush = 10;	//jff 3/14/98 crush anything in the way
+
+				// set up toggling between ceiling, floor inclusive
+				plat->low = sec->ceilingheight;
+				plat->high = sec->floorheight;
+				plat->status = down;
+				break;
+
+			case platDownToNearestFloor:
+				plat->low = P_FindNextLowestFloor (sec, sec->floorheight) + lip*FRACUNIT;
+				plat->status = down;
+				plat->high = sec->floorheight;
+				S_StartSound((mobj_t *)&sec->soundorg, "plats/pt1_strt", 100);
+				break;
+
+			case platDownToLowestCeiling:
+		        plat->low = P_FindLowestCeilingSurrounding(sec);
+				plat->high = sec->floorheight;
+
+				if (plat->low > sec->floorheight)
+					plat->low = sec->floorheight;
+
+				plat->status = down;
+				S_StartSound((mobj_t *)&sec->soundorg, "plats/pt1_strt", 100);
+				break;
+
+			default:
+				break;
+		}
+		P_AddActivePlat (plat);
+		if (manual)
+			return rtn;
+	}
+	return rtn;
+}
+
+
+// [RH] Rewritten to use list
+void P_ActivateInStasis (int tag)
+{
+	plat_t *scan = activeplats;
+
+	while (scan) {
+		if (scan->tag == tag && scan->status == in_stasis) {
+			if (scan->type == platToggle)	//jff 3/14/98 reactivate toggle type
+				scan->status = scan->oldstatus == up ? down : up;
+			else
+				scan->status = scan->oldstatus;
+			scan->thinker.function.acp1 = (actionf_p1) T_PlatRaise;
+		}
+		scan = scan->next;
+	}
+}
+
+// [RH] Passed a tag instead of a line and rewritten to use list
+void EV_StopPlat (int tag)
+{
+	plat_t *scan = activeplats;
+
+	while (scan) {
+		if (scan->status != in_stasis && scan->tag == tag) {
+			scan->oldstatus = scan->status;
+			scan->status = in_stasis;
+			scan->thinker.function.acv = (actionf_v)NULL;
+		}
+	}
+}
+
+// [RH] Rewritten to use list
+void P_AddActivePlat (plat_t *plat)
+{
+	if (activeplats)
+		activeplats->prev = plat;
+	plat->next = activeplats;
+	plat->prev = NULL;
+	activeplats = plat;
+}
+
+// [RH] Rewritten to use list
+void P_RemoveActivePlat (plat_t *plat)
+{
+	plat_t *scan = activeplats;
+
+	while (scan) {
+		if (scan == plat) {
+			scan->sector->floordata = NULL;
+			if (scan == activeplats) {
+				activeplats = scan->next;
+			} else {
+				if (scan->prev)
+					scan->prev->next = scan->next;
+				if (scan->next)
+					scan->next->prev = scan->prev;
+			}
+			P_RemoveThinker (&scan->thinker);
+			break;
+		}
+		scan = scan->next;
+	}
+}
+
diff --git a/code/P_pspr.c b/code/P_pspr.c
index d123632b6b..a3a9487d6a 100644
--- a/code/P_pspr.c
+++ b/code/P_pspr.c
@@ -37,9 +37,6 @@
 // State.
 #include "doomstat.h"
 
-// Data.
-#include "sounds.h"
-
 #include "p_pspr.h"
 
 #define LOWERSPEED				FRACUNIT*6
@@ -137,7 +134,7 @@ void P_BringUpWeapon (player_t *player)
 		player->pendingweapon = player->readyweapon;
 				
 	if (player->pendingweapon == wp_chainsaw)
-		S_StartSound (player->mo, sfx_sawup);
+		S_StartSound (player->mo, "weapons/sawup", 64);
 				
 	newstate = weaponinfo[player->pendingweapon].upstate;
 
@@ -161,7 +158,7 @@ BOOL P_CheckAmmo (player_t *player)
 
 	// Minimal amount for one shot varies.
 	if (player->readyweapon == wp_bfg)
-		count = deh_BFGCells;
+		count = deh.BFGCells;
 	else if (player->readyweapon == wp_supershotgun)
 		count = 2;		// Double barrel.
 	else
@@ -287,7 +284,7 @@ void A_WeaponReady (player_t *player, pspdef_t *psp)
 	if (player->readyweapon == wp_chainsaw
 		&& psp->state == &states[S_SAW])
 	{
-		S_StartSound (player->mo, sfx_sawidl);
+		S_StartSound (player->mo, "weapons/sawidle", 118);
 	}
 	
 	// check for change
@@ -463,7 +460,7 @@ void A_Punch (player_t *player, pspdef_t *psp)
 	// turn to face target
 	if (linetarget)
 	{
-		S_StartSound (player->mo, sfx_punch);
+		S_StartSound (player->mo, "*fist", 64);
 		player->mo->angle = R_PointToAngle2 (player->mo->x,
 											 player->mo->y,
 											 linetarget->x,
@@ -493,10 +490,10 @@ void A_Saw (player_t *player, pspdef_t *psp)
 
 	if (!linetarget)
 	{
-		S_StartSound (player->mo, sfx_sawful);
+		S_StartSound (player->mo, "weapons/sawfull", 64);
 		return;
 	}
-	S_StartSound (player->mo, sfx_sawhit);
+	S_StartSound (player->mo, "weapons/sawhit", 64);
 		
 	// turn to face target
 	angle = R_PointToAngle2 (player->mo->x, player->mo->y,
@@ -534,11 +531,24 @@ void A_FireMissile (player_t *player, pspdef_t *psp)
 //
 // A_FireBFG
 //
+cvar_t *nobfgaim;
+
 void A_FireBFG (player_t *player, pspdef_t *psp)
 {
+	// [RH] bfg can be forced to not use freeaim
+	fixed_t storedpitch = player->mo->pitch;
+	int storedaimdist = player->userinfo.aimdist;
+
 	if (!(dmflags & DF_INFINITE_AMMO))
-		player->ammo[weaponinfo[player->readyweapon].ammo] -= deh_BFGCells;
+		player->ammo[weaponinfo[player->readyweapon].ammo] -= deh.BFGCells;
+
+	if (nobfgaim->value) {
+		player->mo->pitch = 0;
+		player->userinfo.aimdist = 81920000;
+	}
 	P_SpawnPlayerMissile (player->mo, MT_BFG);
+	player->mo->pitch = storedpitch;
+	player->userinfo.aimdist = storedaimdist;
 }
 
 
@@ -596,7 +606,7 @@ void P_BulletSlope (mobj_t *mo)
 	}
 	if (linetarget && mo->player)
 		if (!(dmflags & DF_NO_FREELOOK)
-			&& abs(bulletslope - pitchslope) > mo->player->userinfo->aimdist) {
+			&& abs(bulletslope - pitchslope) > mo->player->userinfo.aimdist) {
 			bulletslope = pitchslope;
 			an = mo->angle;
 		}
@@ -626,12 +636,9 @@ void P_GunShot (mobj_t *mo, BOOL accurate)
 //
 // A_FirePistol
 //
-void
-A_FirePistol
-( player_t* 	player,
-  pspdef_t* 	psp ) 
+void A_FirePistol (player_t *player, pspdef_t *psp)
 {
-	S_StartSound (player->mo, sfx_pistol);
+	S_StartSound (player->mo, "weapons/pistol", 64);
 
 	P_SetMobjState (player->mo, S_PLAY_ATK2);
 	if (!(dmflags & DF_INFINITE_AMMO))
@@ -649,14 +656,11 @@ A_FirePistol
 //
 // A_FireShotgun
 //
-void
-A_FireShotgun
-( player_t* 	player,
-  pspdef_t* 	psp ) 
+void A_FireShotgun (player_t *player, pspdef_t *psp)
 {
-	int 		i;
+	int i;
 		
-	S_StartSound (player->mo, sfx_shotgn);
+	S_StartSound (player->mo, "weapons/shotgf", 64);
 	P_SetMobjState (player->mo, S_PLAY_ATK2);
 
 	if (!(dmflags & DF_INFINITE_AMMO))
@@ -677,10 +681,7 @@ A_FireShotgun
 //
 // A_FireShotgun2
 //
-void
-A_FireShotgun2
-( player_t* 	player,
-  pspdef_t* 	psp ) 
+void A_FireShotgun2 (player_t *player, pspdef_t *psp)
 {
 	int 		i;
 	angle_t 	angle;
@@ -688,7 +689,7 @@ A_FireShotgun2
 	int			t;
 				
 		
-	S_StartSound (player->mo, sfx_dshtgn);
+	S_StartSound (player->mo, "weapons/sshotf", 64);
 	P_SetMobjState (player->mo, S_PLAY_ATK2);
 
 	if (!(dmflags & DF_INFINITE_AMMO))
@@ -718,12 +719,9 @@ A_FireShotgun2
 //
 // A_FireCGun
 //
-void
-A_FireCGun
-( player_t* 	player,
-  pspdef_t* 	psp ) 
+void A_FireCGun (player_t *player, pspdef_t *psp)
 {
-	S_StartSound (player->mo, sfx_pistol);
+	S_StartSound (player->mo, "weapons/chngun", 64);
 
 	if (!player->ammo[weaponinfo[player->readyweapon].ammo])
 		return;
@@ -768,14 +766,14 @@ void A_Light2 (player_t *player, pspdef_t *psp)
 // A_BFGSpray
 // Spawn a BFG explosion on every monster in view
 //
-void A_BFGSpray (mobj_t* mo) 
+void A_BFGSpray (mobj_t *mo) 
 {
 	int 				i;
 	int 				j;
 	int 				damage;
 	angle_t 			an;
 
-	// [RH] Needed for The New Breed
+	// [RH] Don't crash if no target
 	if (!mo->target)
 		return;
 
@@ -809,12 +807,9 @@ void A_BFGSpray (mobj_t* mo)
 //
 // A_BFGsound
 //
-void
-A_BFGsound
-( player_t* 	player,
-  pspdef_t* 	psp )
+void A_BFGsound (player_t *player, pspdef_t *psp)
 {
-	S_StartSound (player->mo, sfx_bfg);
+	S_StartSound (player->mo, "weapons/bfgf", 64);
 }
 
 
diff --git a/code/P_saveg.c b/code/P_saveg.c
index 18d1550ceb..5a38b7c3ec 100644
--- a/code/P_saveg.c
+++ b/code/P_saveg.c
@@ -30,28 +30,27 @@
 #include "doomstat.h"
 #include "r_state.h"
 #include "m_random.h"
+#include "p_saveg.h"
+#include "p_acs.h"
 
 #include "v_palett.h"
 
+extern button_t *buttonlist;
+
 byte *save_p;
 
 
-// Pads save_p to a 4-byte boundary
-//	so that the load/save works on SGI&Gecko.
-#define PADSAVEP()		save_p += (4 - ((int) save_p & 3)) & 3
-
-
 
 //
 // P_ArchivePlayers
 //
 void P_ArchivePlayers (void)
 {
-	int 		i;
-	int 		j;
-	player_t*	dest;
+	int i, j;
+	player_t *dest;
 				
-	for (i=0 ; i<MAXPLAYERS ; i++)
+	CheckSaveGame (sizeof(player_t) * MAXPLAYERS); // killough
+	for (i = 0; i < MAXPLAYERS; i++)
 	{
 		if (!playeringame[i])
 			continue;
@@ -61,7 +60,7 @@ void P_ArchivePlayers (void)
 		dest = (player_t *)save_p;
 		memcpy (dest,&players[i],sizeof(player_t));
 		save_p += sizeof(player_t);
-		for (j=0 ; j<NUMPSPRITES ; j++)
+		for (j = 0; j < NUMPSPRITES; j++)
 		{
 			if (dest->psprites[j].state)
 			{
@@ -79,25 +78,27 @@ void P_ArchivePlayers (void)
 //
 void P_UnArchivePlayers (void)
 {
-	int 		i;
-	int 		j;
+	int i, j;
+	userinfo_t userinfo;
 		
-	for (i=0 ; i<MAXPLAYERS ; i++)
+	for (i = 0; i < MAXPLAYERS; i++)
 	{
 		if (!playeringame[i])
 			continue;
 		
 		PADSAVEP();
 
-		memcpy (&players[i],save_p, sizeof(player_t));
+		memcpy (&userinfo, &players[i].userinfo, sizeof(userinfo));	// [RH] remember userinfo
+
+		memcpy (&players[i], save_p, sizeof(player_t));
 		save_p += sizeof(player_t);
 		
-		// will be set when unarc thinker
-		players[i].mo = NULL;	
+		memcpy (&players[i].userinfo, &userinfo, sizeof(userinfo));
+		players[i].mo = NULL;			// will be set when unarc thinker
 		players[i].message = NULL;
 		players[i].attacker = NULL;
 
-		for (j=0 ; j<NUMPSPRITES ; j++)
+		for (j = 0; j < NUMPSPRITES; j++)
 		{
 			if (players[i]. psprites[j].state)
 			{
@@ -114,35 +115,62 @@ void P_UnArchivePlayers (void)
 //
 void P_ArchiveWorld (void)
 {
-	int 				i;
-	int 				j;
-	sector_t*			sec;
-	line_t* 			li;
-	side_t* 			si;
-	short*				put;
-		
-	put = (short *)save_p;
-	
-	// do sectors
-	for (i=0, sec = sectors ; i<numsectors ; i++,sec++)
+	int 		i;
+	int 		j;
+	sector_t*	sec;
+	line_t* 	li;
+	side_t* 	si;
+	short*		put;
+
+	// killough 3/22/98: fix bug caused by hoisting save_p too early
+
+	size_t size = (sizeof(unsigned int)*2+sizeof(float)+sizeof(short)*9)*numsectors
+				  + (sizeof(short)*8)*numlines + 4;
+
+	for (i = 0; i < numlines; i++)
 	{
-		*put++ = (short)(sec->floorheight >> FRACBITS);
-		*put++ = (short)(sec->ceilingheight >> FRACBITS);
-		*put++ = sec->floorpic;
-		*put++ = sec->ceilingpic;
-		*put++ = sec->lightlevel;
-		*put++ = sec->special;			// needed?
-		*put++ = sec->tag;				// needed?
+		if (lines[i].sidenum[0] != -1)
+			size += sizeof(short)*5;
+		if (lines[i].sidenum[1] != -1)
+			size += sizeof(short)*5;
 	}
 
-	
-	// do lines
-	for (i=0, li = lines ; i<numlines ; i++,li++)
+	CheckSaveGame (size);	// killough
+
+	PADSAVEP();				// killough 3/22/98
+
+	// do sectors
+	for (i = 0, sec = sectors; i < numsectors; i++, sec++)
 	{
-		*put++ = li->flags;
-		*put++ = li->special;
-		*put++ = li->tag;
-		for (j=0 ; j<2 ; j++)
+		put = (short *)save_p;
+		put[0] = (short)(sec->floorheight >> FRACBITS);
+		put[1] = (short)(sec->ceilingheight >> FRACBITS);
+		put[2] = sec->floorpic;
+		put[3] = sec->ceilingpic;
+		put[4] = sec->lightlevel;
+		put[5] = sec->special;
+		put[6] = sec->tag;
+		put[7] = sec->damage;	// [RH]
+		put[8] = sec->mod;	// [RH]
+		save_p = (byte *)(put + 9);	// [RH]
+		PADSAVEP();	// [RH]
+		*((float *)save_p)++ = sec->gravity;	// [RH]
+		*((unsigned int *)save_p)++ = sec->colormap->color;	// [RH]
+		*((unsigned int *)save_p)++ = sec->colormap->fade;	// [RH];
+	}
+
+	put = (short *)save_p;	// [RH]
+
+	// do lines
+	for (i = 0, li = lines; i < numlines; i++, li++)
+	{
+		put[0] = li->flags;
+		put[1] = (li->special << 8) | li->lucency;	// [RH]
+		put[2] = li->id;		// [RH]
+		memcpy (put + 3, li->args, sizeof(li->args)); // [RH]
+		put += 3 + sizeof(li->args)/sizeof(*put);
+
+		for (j = 0; j < 2; j++)
 		{
 			if (li->sidenum[j] == -1)
 				continue;
@@ -173,31 +201,52 @@ void P_UnArchiveWorld (void)
 	line_t* 			li;
 	side_t* 			si;
 	short*				get;
-		
-	get = (short *)save_p;
+
+	PADSAVEP();					// killough 3/22/98
 	
 	// do sectors
 	for (i=0, sec = sectors ; i<numsectors ; i++,sec++)
 	{
-		sec->floorheight = *get++ << FRACBITS;
-		sec->ceilingheight = *get++ << FRACBITS;
-		sec->floorpic = *get++;
-		sec->ceilingpic = *get++;
-		sec->lightlevel = *get++;
-		sec->special = *get++;
-		sec->tag = *get++;
+		unsigned int color, fade;
+
+		get = (short *)save_p;
+		sec->floorheight = get[0] << FRACBITS;
+		sec->ceilingheight = get[1] << FRACBITS;
+		sec->floorpic = get[2];
+		sec->ceilingpic = get[3];
+		sec->lightlevel = get[4];
+		sec->special = get[5];
+		sec->tag = get[6];
+		sec->damage = get[7];	// [RH]
+		sec->mod = get[8];	// [RH]
+		save_p = (byte *)(get + 9);	// [RH]
+		PADSAVEP();
+		sec->gravity = *((float *)save_p)++;	// [RH]
+		color = *((unsigned int *)save_p)++;	// [RH]
+		fade = *((unsigned int *)save_p)++;	// [RH]
+
+		sec->colormap = GetSpecialLights (
+			RPART(color), GPART(color), BPART(color),
+			RPART(fade), GPART(fade), BPART(fade));	// [RH]
+
 		sec->ceilingdata = 0;	//jff 2/22/98 now three thinker fields not two
 		sec->floordata = 0;
 		sec->lightingdata = 0;
 		sec->soundtarget = 0;
 	}
-	
+
+	get = (short *)save_p;	// [RH]
+
 	// do lines
 	for (i=0, li = lines ; i<numlines ; i++,li++)
 	{
 		li->flags = *get++;
-		li->special = *get++;
-		li->tag = *get++;
+		li->special = *get >> 8;	// [RH]
+		li->lucency = (*get++) & 255;	// [RH]
+		li->id = *get++;	// [RH]
+		memcpy (li->args, get, sizeof(li->args));	// [RH]
+		get += sizeof(li->args) / sizeof(*get);
+
 		for (j=0 ; j<2 ; j++)
 		{
 			if (li->sidenum[j] == -1)
@@ -210,7 +259,7 @@ void P_UnArchiveWorld (void)
 			si->midtexture = *get++;
 		}
 	}
-	save_p = (byte *)get;		
+	save_p = (byte *)get;
 }
 
 
@@ -232,33 +281,85 @@ typedef enum
 //
 // P_ArchiveThinkers
 //
+// 2/14/98 killough: substantially modified to fix savegame bugs
+
 void P_ArchiveThinkers (void)
 {
-	thinker_t*			th;
-	mobj_t* 			mobj;
-		
+	thinker_t  *th;
+	size_t		size = 0;
+
+	CheckSaveGame (sizeof brain);	// killough 3/26/98: Save boss brain state
+	memcpy (save_p, &brain, sizeof brain);
+	save_p += sizeof brain;
+
+	// killough 2/14/98:
+	// count the number of thinkers, and mark each one with its index, using
+	// the prev field as a placeholder, since it can be restored later.
+
+	for (th = thinkercap.next ; th != &thinkercap ; th=th->next)
+		if (th->function.acp1 == (actionf_p1) P_MobjThinker)
+			th->prev = (thinker_t *) ++size;
+
+	// check that enough room is available in savegame buffer
+	CheckSaveGame (size*(sizeof(mobj_t)+4));	// killough 2/14/98
+
 	// save off the current thinkers
 	for (th = thinkercap.next ; th != &thinkercap ; th=th->next)
-	{
-		if (th->function.acp1 == (actionf_p1)P_MobjThinker)
+		if (th->function.acp1 == (actionf_p1) P_MobjThinker)
 		{
+			mobj_t *mobj;
+
 			*save_p++ = tc_mobj;
 			PADSAVEP();
 			mobj = (mobj_t *)save_p;
 			memcpy (mobj, th, sizeof(*mobj));
 			save_p += sizeof(*mobj);
 			mobj->state = (state_t *)(mobj->state - states);
-			
+
+			// killough 2/14/98: convert pointers into indices.
+			// Fixes many savegame problems, by properly saving
+			// target and tracer fields. Note: we store NULL if
+			// the thinker pointed to by these fields is not a
+			// mobj thinker.
+
+			if (mobj->target)
+				mobj->target = mobj->target->thinker.function.acp1 ==
+					(actionf_p1) P_MobjThinker ?
+					(mobj_t *) mobj->target->thinker.prev : NULL;
+
+			if (mobj->tracer)
+				mobj->tracer = mobj->tracer->thinker.function.acp1 ==
+					(actionf_p1) P_MobjThinker ?
+					(mobj_t *) mobj->tracer->thinker.prev : NULL;
+
+			if (mobj->goal)		// [RH] Save goal properly
+				mobj->goal = mobj->goal->thinker.function.acp1 ==
+					(actionf_p1) P_MobjThinker ?
+					(mobj_t *) mobj->goal->thinker.prev : NULL;
+
+			// killough 2/14/98: new field: save last known enemy. Prevents
+			// monsters from going to sleep after killing monsters and not
+			// seeing player anymore.
+
+			if (mobj->lastenemy)
+				mobj->lastenemy = mobj->lastenemy->thinker.function.acp1 ==
+					(actionf_p1) P_MobjThinker ?
+					(mobj_t *) mobj->lastenemy->thinker.prev : NULL;
+
+			// killough 2/14/98: end changes
+
 			if (mobj->player)
 				mobj->player = (player_t *)((mobj->player-players) + 1);
-			continue;
 		}
-				
-		// I_Error ("P_ArchiveThinkers: Unknown thinker function");
-	}
 
 	// add a terminating marker
 	*save_p++ = tc_end; 
+
+	// [RH] Don't restore mobj prev fields until the end of
+	//		P_ArchiveThinkers() since we need the indices for
+	//		archiving ACS scripts, too.
+
+	// killough 2/14/98: end changes
 }
 
 
@@ -266,63 +367,131 @@ void P_ArchiveThinkers (void)
 //
 // P_UnArchiveThinkers
 //
-void P_UnArchiveThinkers (void)
+// 2/14/98 killough: substantially modified to fix savegame bugs
+
+// [RH] Moved this out of P_UnArchiveThinkers so that it's visible
+//		within P_UnArchiveScripts() and P_UnArchiveSpecials().
+static mobj_t    **mobj_p;		// killough 2/14/98: Translation table
+
+// [RH] Added keepPlayers. When true, the player mobjs that were
+//		spawned during level initialization are kept instead of
+//		being replaced by the ones in the snapshot.
+void P_UnArchiveThinkers (BOOL keepPlayers)
 {
-	byte				tclass;
-	thinker_t*			currentthinker;
-	thinker_t*			next;
-	mobj_t* 			mobj;
-	
+	thinker_t *th;
+	size_t    size;			// killough 2/14/98: size of or index into table
+
+	// killough 3/26/98: Load boss brain state
+	memcpy (&brain, save_p, sizeof brain);
+	save_p += sizeof brain;
+
 	// remove all the current thinkers
-	currentthinker = thinkercap.next;
-	while (currentthinker != &thinkercap)
-	{
-		next = currentthinker->next;
-		
-		if (currentthinker->function.acp1 == (actionf_p1)P_MobjThinker)
-			P_RemoveMobj ((mobj_t *)currentthinker);
-		else
-			Z_Free (currentthinker);
+	P_ClearTidHashes ();	// [RH] Clear the tid hash table
 
-		currentthinker = next;
-	}
-	P_InitThinkers ();
-		
-	// read in saved thinkers
-	while (1)
+	for (th = thinkercap.next; th != &thinkercap; )
 	{
-		tclass = *save_p++;
-		switch (tclass)
-		{
-		  case tc_end:
-			return; 	// end of list
-						
-		  case tc_mobj:
-			PADSAVEP();
-			mobj = Z_Malloc (sizeof(*mobj), PU_LEVEL, NULL);
-			memcpy (mobj, save_p, sizeof(*mobj));
-			save_p += sizeof(*mobj);
-			mobj->state = &states[(int)mobj->state];
-			mobj->target = NULL;
-			if (mobj->player)
-			{
-				mobj->player = &players[(int)mobj->player-1];
-				mobj->player->mo = mobj;
-			}
-			P_SetThingPosition (mobj);
-			mobj->info = &mobjinfo[mobj->type];
-			mobj->floorz = mobj->subsector->sector->floorheight;
-			mobj->ceilingz = mobj->subsector->sector->ceilingheight;
-			mobj->thinker.function.acp1 = (actionf_p1)P_MobjThinker;
-			P_AddThinker (&mobj->thinker);
-			break;
-						
-		  default:
-			I_Error ("Unknown tclass %i in savegame",tclass);
+		thinker_t *next = th->next;
+		if (th->function.acp1 == (actionf_p1) P_MobjThinker) {
+			if (!keepPlayers || !(((mobj_t *)th)->player))
+				P_RemoveMobj ((mobj_t *) th);
+		} else {
+			// time to remove it
+			th->next->prev = th->prev;
+			th->prev->next = th->next;
+			Z_Free (th);
 		}
-		
+		th = next;
 	}
 
+//	if (!keepPlayers)
+//		P_InitThinkers ();
+
+	// killough 2/14/98: count number of thinkers by skipping through them
+	{
+		byte *sp = save_p;	// save pointer and skip header
+		for (size = 1; *save_p++ == tc_mobj; size++)	// killough 2/14/98
+		{					// skip all entries, adding up count
+			PADSAVEP();
+			save_p += sizeof(mobj_t);
+		}
+
+		if (*--save_p != tc_end)
+			I_Error ("Unknown tclass %i in snapshot", *save_p);
+
+		// first table entry special: 0 maps to NULL
+		*(mobj_p = Z_Malloc(size * sizeof *mobj_p, PU_STATIC, 0)) = 0;	// table of pointers
+		save_p = sp;		// restore save pointer
+	}
+
+	// read in saved thinkers
+	for (size = 1; *save_p++ == tc_mobj; size++)		// killough 2/14/98
+	{
+		mobj_t *mobj = Z_Malloc(sizeof(mobj_t), PU_LEVEL, NULL);
+
+		// killough 2/14/98 -- insert pointers to thinkers into table, in order:
+		mobj_p[size] = mobj;
+
+		PADSAVEP();
+		memcpy (mobj, save_p, sizeof(mobj_t));
+		save_p += sizeof(mobj_t);
+		mobj->state = states + (int) mobj->state;
+
+		if (mobj->player) {
+			// [RH] If we're re-entering a level as part of movement in a hub,
+			//		use the currently existing player mobj instead of the one
+			//		in the snapshot. Note that this doesn't work with voodoo
+			//		dolls, and fixing that isn't worth the trouble since
+			//		scripting offers everything voodoo dolls did and more.
+			if (keepPlayers) {
+				Z_Free (mobj);
+				mobj_p[size] = players[(int)mobj->player - 1].mo;
+				continue;
+			}
+			(mobj->player = &players[(int) mobj->player - 1]) -> mo = mobj;
+			mobj->player->camera = mobj;	// [RH] Reset the camera to the player's viewpoint
+		}
+
+		P_SetThingPosition (mobj);
+		mobj->info = &mobjinfo[mobj->type];
+
+		// killough 2/28/98:
+		// Fix for falling down into a wall after savegame loaded:
+		//      mobj->floorz = mobj->subsector->sector->floorheight;
+		//      mobj->ceilingz = mobj->subsector->sector->ceilingheight;
+
+		mobj->thinker.function.acp1 = (actionf_p1) P_MobjThinker;
+		P_AddThinker (&mobj->thinker);
+
+		P_AddMobjToHash (mobj);	// [RH] Add mobj to tid hash table
+	}
+
+	// killough 2/14/98: adjust target and tracer fields, plus
+	// lastenemy field, to correctly point to mobj thinkers.
+	// NULL entries automatically handled by first table entry.
+
+	for (th = thinkercap.next ; th != &thinkercap ; th=th->next)
+	{
+		if (th->function.acp1 != (actionf_p1) P_MobjThinker)
+			continue;
+
+		if (!keepPlayers || !((mobj_t *)th)->player) {
+			((mobj_t *) th)->target =
+			  mobj_p[(size_t)((mobj_t *)th)->target];
+
+			((mobj_t *) th)->tracer =
+			  mobj_p[(size_t)((mobj_t *)th)->tracer];
+
+			((mobj_t *) th)->lastenemy =
+			  mobj_p[(size_t)((mobj_t *)th)->lastenemy];
+
+			((mobj_t *) th)->goal =		// [RH] restore goal
+			  mobj_p[(size_t)((mobj_t *)th)->goal];
+		}
+	}
+
+	// killough 3/26/98: Spawn icon landings:
+	if (gamemode == commercial)
+		P_SpawnBrainTargets();
 }
 
 
@@ -339,8 +508,14 @@ enum
 	tc_strobe,
 	tc_glow,
 	tc_fireflicker,
-	tc_elevator,
-	tc_scroll,
+	tc_elevator,	//jff 2/22/98 new elevator type thinker
+	tc_scroll,		// killough 3/7/98: new scroll effect thinker
+	tc_glow2,
+	tc_waggle,
+	tc_phased,
+	tc_pillar,
+	tc_friction,	// phares 3/18/98:  new friction effect thinker
+	tc_pusher,		// phares 3/22/98:  new push/pull effect thinker
 	tc_endspecials
 } specials_e;	
 
@@ -356,9 +531,15 @@ enum
 // T_StrobeFlash, (strobe_t: sector_t *),
 // T_Glow, (glow_t: sector_t *),
 // T_PlatRaise, (plat_t: sector_t *), - active list
-// T_FireFlicker (fireflicker_t: sector_t * swizze),	[RH] Was missed in original code
+// T_FireFlicker (fireflicker_t: sector_t * swizze),	// [RH] Was missed in original code
 // T_MoveElevator, (plat_t: sector_t *), - active list	// jff 2/22/98
 // T_Scroll												// killough 3/7/98
+// T_Glow2, (glow2_t: sector_t *)						// [RH]
+// T_Waggle, (waggle_t: sector_t *)						// [RH]
+// T_PhasedLight, (phased_t: sector_t *)				// [RH]
+// T_Pillar (pillar_t: sector_t *)						// [RH]
+// T_Friction											// phares 3/18/98
+// T_Pusher	(pusher_t: mobj_t *)						// phares 3/22/98
 //
 void P_ArchiveSpecials (void)
 {
@@ -370,31 +551,129 @@ void P_ArchiveSpecials (void)
 	lightflash_t*		flash;
 	strobe_t*			strobe;
 	glow_t* 			glow;
-	int 				i;
+	button_t*			button;
+	quake_t*			quake;
 		
+	size_t				size = 0;			// killough
+
+	// save off the current thinkers (memory size calculation -- killough)
+
+	// [RH] save buttonlist, too
+	button = buttonlist;
+	while (button) {
+		size += sizeof(*button);
+		button = button->next;
+	}
+	size++;
+
+	// [RH] Also save earthquakes
+	quake = ActiveQuakes;
+	while (quake) {
+		size += sizeof(*quake);
+		quake = quake->next;
+	}
+	size++;
+
+	for (th = thinkercap.next ; th != &thinkercap ; th=th->next)
+		if (th->function.acv == (actionf_v)NULL)
+		{
+			// [RH] Search for active plat or ceiling list that's in-stasis
+			for (ceiling = activeceilings; ceiling; ceiling = ceiling->next)
+				if (ceiling == (ceiling_t *)th)
+					break;
+
+			if (ceiling) {
+				size += 4+sizeof(ceiling_t);
+				goto end;
+			}
+
+			for (plat = activeplats; plat; plat = plat->next)
+				if (plat == (plat_t *)th)
+					break;
+
+			if (plat) {
+				size += 4+sizeof(plat_t);
+				goto end;
+			}
+			end:;
+		}
+		else
+			size +=
+				th->function.acp1==(actionf_p1)T_MoveCeiling  ? 4+sizeof(ceiling_t)	:
+				th->function.acp1==(actionf_p1)T_VerticalDoor ? 4+sizeof(vldoor_t)	:
+				th->function.acp1==(actionf_p1)T_MoveFloor    ? 4+sizeof(floormove_t):
+				th->function.acp1==(actionf_p1)T_PlatRaise    ? 4+sizeof(plat_t)	:
+				th->function.acp1==(actionf_p1)T_LightFlash   ? 4+sizeof(lightflash_t):
+				th->function.acp1==(actionf_p1)T_StrobeFlash  ? 4+sizeof(strobe_t)	:
+				th->function.acp1==(actionf_p1)T_Glow		  ? 4+sizeof(glow_t)	:
+				th->function.acp1==(actionf_p1)T_Glow2		  ? 4+sizeof(glow2_t)	:
+				th->function.acp1==(actionf_p1)T_FireFlicker  ? 4+sizeof(fireflicker_t):
+				th->function.acp1==(actionf_p1)T_PhasedLight  ? 4+sizeof(phased_t)	:
+				th->function.acp1==(actionf_p1)T_MoveElevator ? 4+sizeof(elevator_t):
+				th->function.acp1==(actionf_p1)T_Scroll		  ? 4+sizeof(scroll_t)	:
+				th->function.acp1==(actionf_p1)T_Waggle		  ? 4+sizeof(waggle_t)	:
+				th->function.acp1==(actionf_p1)T_Pillar		  ? 4+sizeof(pillar_t)	:
+				th->function.acp1==(actionf_p1)T_Friction	  ? 4+sizeof(friction_t):
+				th->function.acp1==(actionf_p1)T_Pusher		  ? 4+sizeof(pusher_t)	:
+				0;
+
+	CheckSaveGame(size);		// killough
+
+	// [RH] save the active buttons
+	button = buttonlist;
+	if (button) {
+		*save_p++ = 1;
+		while (button) {
+			button_t *but;
+			PADSAVEP();
+			memcpy (save_p, button, sizeof(*button));
+			but = (button_t *)save_p;
+			save_p += sizeof(*button);
+			but->line = (line_t *)(but->line ? but->line - lines : -1);
+			but->soundorg = (mobj_t *)but->soundorg->thinker.prev;
+			button = button->next;
+		}
+	} else {
+		*save_p++ = 0;
+	}
+
+	// [RH] save the active quakes
+	quake = ActiveQuakes;
+	if (quake) {
+		*save_p++ = 1;
+		while (quake) {
+			quake_t *q;
+			PADSAVEP();
+			memcpy (save_p, quake, sizeof(*quake));
+			q = (quake_t *)save_p;
+			q->quakespot = (mobj_t *)q->quakespot->thinker.prev;
+			save_p += sizeof(*quake);
+			quake = quake->next;
+		}
+	} else {
+		*save_p++ = 0;
+	}
+
 	// save off the current thinkers
 	for (th = thinkercap.next ; th != &thinkercap ; th=th->next)
 	{
 		if (th->function.acv == (actionf_v)NULL)
 		{
-			for (i = 0; i < MaxCeilings;i++)
-				if (activeceilings[i] == (ceiling_t *)th)
-					break;
-			
-			if (i<MaxCeilings)
-			{
-				*save_p++ = tc_ceiling;
-				PADSAVEP();
-				ceiling = (ceiling_t *)save_p;
-				memcpy (ceiling, th, sizeof(*ceiling));
-				save_p += sizeof(*ceiling);
-				ceiling->sector = (sector_t *)(ceiling->sector - sectors);
-			}
+			// [RH] Use the linked list for both plats and ceilings
+			for (ceiling = activeceilings; ceiling; ceiling = ceiling->next)
+				if (ceiling == (ceiling_t *)th)
+					goto ceiling;
+
+			for (plat = activeplats; plat; plat = plat->next)
+				if (plat == (plat_t *)th)
+					goto plat;
+
 			continue;
 		}
 
 		if (th->function.acp1 == (actionf_p1)T_MoveCeiling)
 		{
+		ceiling:
 			*save_p++ = tc_ceiling;
 			PADSAVEP();
 			ceiling = (ceiling_t *)save_p;
@@ -422,6 +701,7 @@ void P_ArchiveSpecials (void)
 		}
 		else if (th->function.acp1 == (actionf_p1)T_PlatRaise)
 		{
+		plat:
 			*save_p++ = tc_plat;
 			PADSAVEP();
 			plat = (plat_t *)save_p;
@@ -468,7 +748,7 @@ void P_ArchiveSpecials (void)
 			save_p += sizeof(*flick);
 			flick->sector = (sector_t *)(flick->sector - sectors);
 		}
-		else if (th->function.acp1 == (actionf_p1) T_MoveElevator)
+		else if (th->function.acp1 == (actionf_p1)T_MoveElevator)
 		{		//jff 2/22/98 new case for elevators
 
 			elevator_t *elevator;		//jff 2/22/98
@@ -488,12 +768,72 @@ void P_ArchiveSpecials (void)
 			save_p += sizeof(scroll_t);
 			continue;
 		}
+		else if (th->function.acp1 == (actionf_p1) T_Glow2)
+		{		// [RH] Second type of glowing sectors
+			glow2_t *glow;
 
+			*save_p++ = tc_glow2;
+			PADSAVEP();
+			glow = (glow2_t *)save_p;
+			memcpy (glow, th, sizeof(*glow));
+			save_p += sizeof(*glow);
+			glow->sector = (sector_t *)(glow->sector - sectors);
+		}
+		else if (th->function.acp1 == (actionf_p1) T_Waggle)
+		{		// [RH] Waggling floors
+			waggle_t *waggle;
+
+			*save_p++ = tc_waggle;
+			PADSAVEP();
+			waggle = (waggle_t *)save_p;
+			memcpy (waggle, th, sizeof(*waggle));
+			save_p += sizeof(*waggle);
+			waggle->sector = (sector_t *)(waggle->sector - sectors);
+		}
+		else if (th->function.acp1 == (actionf_p1) T_PhasedLight)
+		{		// [RH] Phased lighting
+			phased_t *phased;
+
+			*save_p++ = tc_phased;
+			PADSAVEP();
+			phased = (phased_t *)save_p;
+			memcpy (phased, th, sizeof(*phased));
+			save_p += sizeof(*phased);
+			phased->sector = (sector_t *)(phased->sector - sectors);
+		}
+		else if (th->function.acp1 == (actionf_p1) T_Pillar)
+		{		// [RH] Pillar builders
+			pillar_t *pillar;
+
+			*save_p++ = tc_pillar;
+			PADSAVEP();
+			pillar = (pillar_t *)save_p;
+			memcpy (pillar, th, sizeof(*pillar));
+			save_p += sizeof(*pillar);
+			pillar->sector = (sector_t *)(pillar->sector - sectors);
+		}
+		else if (th->function.acp1 == (actionf_p1) T_Friction)
+		{		// phares 3/18/98: Friction effect thinkers
+			*save_p++ = tc_friction;
+			memcpy (save_p, th, sizeof(friction_t));
+			save_p += sizeof(friction_t);
+			continue;
+		}
+		else if (th->function.acp1 == (actionf_p1) T_Pusher)
+		{		// phares 3/22/98: Push/Pull effect thinkers
+			pusher_t *pusher;
+			*save_p++ = tc_pusher;
+			PADSAVEP();
+			pusher = (pusher_t *)save_p;
+			memcpy (save_p, th, sizeof(*pusher));
+			save_p += sizeof(*pusher);
+			pusher->source = (mobj_t *) pusher->source->thinker.prev;	// [RH] remember source
+			continue;
+		}
 	}
 
 	// add a terminating marker
-	*save_p++ = tc_endspecials; 
-
+	*save_p++ = tc_endspecials;
 }
 
 
@@ -512,7 +852,37 @@ void P_UnArchiveSpecials (void)
 	glow_t* 			glow;
 	fireflicker_t*		flick;
 		
-		
+	// [RH] read the active buttons
+	if (*save_p++) {
+		button_t *button, **buttonptr;
+		buttonptr = &buttonlist;
+		do {
+			button = Z_Malloc (sizeof(*button), PU_LEVEL, 0);
+			PADSAVEP();
+			memcpy (button, save_p, sizeof(*button));
+			button->line = (((int)button->line) == -1) ? NULL : &lines[(int)button->line];
+			button->soundorg = (mobj_t *)mobj_p[(size_t)(button->soundorg)];
+			*buttonptr = button;
+			buttonptr = &button->next;
+			save_p += sizeof(*button);
+		} while (*buttonptr);
+	}
+
+	// [RH] read the active quakes
+	if (*save_p++) {
+		quake_t *quake, **quakeptr;
+		quakeptr = &ActiveQuakes;
+		do {
+			quake = Z_Malloc (sizeof(*quake), PU_LEVEL, 0);
+			PADSAVEP();
+			memcpy (quake, save_p, sizeof(*quake));
+			*quakeptr = quake;
+			quake->quakespot = (mobj_t *)mobj_p[(size_t)(quake->quakespot)];
+			quakeptr = &quake->next;
+			save_p += sizeof(*quake);
+		} while (*quakeptr);
+	}
+
 	// read in saved thinkers
 	while (1)
 	{
@@ -639,19 +1009,87 @@ void P_UnArchiveSpecials (void)
 			  break;
 			}
 
-		  default:
-			I_Error ("P_UnarchiveSpecials:Unknown tclass %i "
-					 "in savegame",tclass);
-		}
-		
-	}
+		  case tc_glow2:		// [RH] Another style of glowing light
+			{
+			  glow2_t *glow2 = Z_Malloc (sizeof(*glow2), PU_LEVEL, NULL);
+			  PADSAVEP();
+			  memcpy (glow2, save_p, sizeof(*glow2));
+			  save_p += sizeof(*glow2);
+			  glow2->sector = &sectors[(int)glow2->sector];
+			  glow2->thinker.function.acp1 = (actionf_p1)T_Glow2;
+			  P_AddThinker (&glow2->thinker);
+			  break;
+			}
+			
+		  case tc_waggle:		// [RH] Waggling floors
+			{
+			  waggle_t *waggle = Z_Malloc (sizeof(*waggle), PU_LEVEL, NULL);
+			  PADSAVEP();
+			  memcpy (waggle, save_p, sizeof(*waggle));
+			  save_p += sizeof(*waggle);
+			  waggle->sector = &sectors[(int)waggle->sector];
+			  waggle->sector->floordata = waggle;
+			  waggle->thinker.function.acp1 = (actionf_p1)T_Waggle;
+			  P_AddThinker (&waggle->thinker);
+			  break;
+			}
 
+		  case tc_phased:		// [RH] Phased lighting
+			{
+			  phased_t *phased = Z_Malloc (sizeof(*phased), PU_LEVEL, NULL);
+			  PADSAVEP();
+			  memcpy (phased, save_p, sizeof(*phased));
+			  save_p += sizeof(*phased);
+			  phased->sector = &sectors[(int)phased->sector];
+			  phased->thinker.function.acp1 = (actionf_p1)T_PhasedLight;
+			  P_AddThinker (&phased->thinker);
+			  break;
+			}
+
+		  case tc_pillar:		// [RH] Pillar builders
+			{
+			  pillar_t *pillar = Z_Malloc (sizeof(*pillar), PU_LEVEL, NULL);
+			  PADSAVEP();
+			  memcpy (pillar, save_p, sizeof(*pillar));
+			  save_p += sizeof(*pillar);
+			  pillar->sector = &sectors[(int)pillar->sector];
+			  pillar->thinker.function.acp1 = (actionf_p1)T_Pillar;
+			  P_AddThinker (&pillar->thinker);
+			  break;
+			}
+
+		  case tc_friction:		// phares 3/18/98: new friction effect thinkers
+			{
+			  friction_t *friction = Z_Malloc (sizeof(friction_t), PU_LEVEL, NULL);
+			  memcpy (friction, save_p, sizeof(friction_t));
+			  save_p += sizeof(friction_t);
+			  friction->thinker.function.acp1 = (actionf_p1) T_Friction;
+			  P_AddThinker(&friction->thinker);
+			  break;
+			}
+
+		  case tc_pusher:		// phares 3/22/98: new Push/Pull effect thinkers
+			{
+			  pusher_t *pusher = Z_Malloc (sizeof(pusher_t), PU_LEVEL, NULL);
+			  PADSAVEP();
+			  memcpy (pusher, save_p, sizeof(pusher_t));
+			  save_p += sizeof(pusher_t);
+			  pusher->thinker.function.acp1 = (actionf_p1) T_Pusher;
+			  pusher->source = mobj_p[(size_t)pusher->source];	// [RH] remember source
+			  P_AddThinker (&pusher->thinker);
+			  break;
+			}
+
+		  default:
+			I_Error ("P_UnarchiveSpecials: Unknown tclass %i in snapshot", tclass);
+		}
+	}
 }
 
 // [RH] Save the state of the random number generator
 void P_ArchiveRNGState (void)
 {
-	PADSAVEP();
+	CheckSaveGame (sizeof(rng));
 	memcpy (save_p, &rng, sizeof(rng));
 	save_p += sizeof(rng);
 }
@@ -659,61 +1097,84 @@ void P_ArchiveRNGState (void)
 // [RH] Load the state of the random number generator
 void P_UnArchiveRNGState (void)
 {
-	PADSAVEP();
 	memcpy (&rng, save_p, sizeof(rng));
 	save_p += sizeof(rng);
 }
 
-// [RH] Save level local info
-void P_ArchiveLevelLocals (void)
+
+typedef enum
 {
-	PADSAVEP();
-	memcpy (save_p, &level, sizeof(level));
-	save_p += sizeof(level);
+	tc_script = 98,
+	tc_scrend
+};
 
-	if (gamemode != commercial) {
-		// Also save list of visited levels
-		int epsd, map;
-		char name[8] = "E M ";
-		level_info_t *info;
+// [RH] Store state of all running scripts
+void P_ArchiveScripts (void)
+{
+	script_t *scr = Scripts, *script;
 
-		for (epsd = '1'; epsd <= '3'; epsd++) {
-			for (map = '1'; map <= '9'; map++) {
-				name[1] = epsd;
-				name[3] = map;
-				if ( (info = FindLevelInfo (name)) ) {
-					if (info->level_name && info->flags & LEVEL_VISITED) {
-						memcpy (save_p, info->mapname, 8);
-						save_p += 8;
-					}
-				}
-			}
-		}
+	while (scr) {
+		CheckSaveGame (sizeof(*scr));
+		*save_p++ = tc_script;
+		PADSAVEP();
+
+		script = (script_t *)save_p;
+		memcpy (script, scr, sizeof(*script));
+		save_p += sizeof(*script);
+		script->pc = (int *)(script->pc - (int *)level.behavior);
+		script->activationline = (line_t *)
+			(script->activationline ? script->activationline - lines : -1);
+		if (script->activator)
+			script->activator = script->activator->thinker.function.acp1 ==
+				(actionf_p1) P_MobjThinker ?
+				(mobj_t *) script->activator->thinker.prev : NULL;
+		if (RunningScripts[script->script] != scr)
+			script->script += 2000;	// ACS_ExecuteAlways script
+		scr = script->next;
+	}
+	*save_p++ = tc_scrend;
+
+	// killough 2/14/98: restore prev pointers
+	{
+		thinker_t *prev = &thinkercap, *th;
+		for (th = thinkercap.next ; th != &thinkercap ; prev=th, th=th->next)
+			th->prev = prev;
 	}
-	*save_p++ = 0;
 }
 
-// [RH] Restore the level local info
-void P_UnArchiveLevelLocals (void)
+// [RH] Restore state of all running scripts
+void P_UnArchiveScripts (void)
 {
-	level_info_t *info = level.info;
+	script_t **scripttail = &Scripts, *scriptprev = NULL;
 
-	PADSAVEP();
-	memcpy (&level, save_p, sizeof(level));
-	save_p += sizeof(level);
-	level.info = info;
+	P_ClearScripts ();
+	Z_FreeTags (PU_LEVACS, PU_LEVACS);
 
-	while (*save_p) {
-		level_info_t *info;
+	while (*save_p++ == tc_script) {
+		script_t *script = Z_Malloc (sizeof(*script), PU_LEVACS, NULL);
+		PADSAVEP();
+		memcpy (script, save_p, sizeof(*script));
+		save_p += sizeof(*script);
+		script->pc = ((int)script->pc) + (int *)level.behavior;
+		script->activationline = (((int)script->activationline) == -1) ? NULL :
+								 &lines[(int)script->activationline];
+		script->activator = mobj_p[(size_t)script->activator];
+		if (script->script < 2000)
+			RunningScripts[script->script] = script;
+		else
+			script->script -= 2000;
 
-		if ( (info = FindLevelInfo (save_p)) ) {
-			if (info->level_name)
-				info->flags |= LEVEL_VISITED;
-		}
-		save_p += 8;
+		*scripttail = script;
+		scripttail = &script->next;
+		script->prev = scriptprev;
+		scriptprev = script;
 	}
-	save_p++;
 
-	// In case testfade was used, we need to rebuild the colormaps
-	RefreshPalettes();
+	*scripttail = NULL;
+	LastScript = scriptprev;
+
+	Z_Free (mobj_p);	// free translation table
+
+	if (*(save_p - 1) != tc_scrend)
+		I_Error ("Unknown sclass %d in snapshot", *(save_p - 1));
 }
\ No newline at end of file
diff --git a/code/P_saveg.h b/code/P_saveg.h
index ba4ea5c6ba..6326d52af3 100644
--- a/code/P_saveg.h
+++ b/code/P_saveg.h
@@ -32,15 +32,24 @@ void P_UnArchivePlayers (void);
 void P_ArchiveWorld (void);
 void P_UnArchiveWorld (void);
 void P_ArchiveThinkers (void);
-void P_UnArchiveThinkers (void);
+void P_UnArchiveThinkers (BOOL keepPlayers);	// [RH] added parameter
 void P_ArchiveSpecials (void);
 void P_UnArchiveSpecials (void);
 void P_ArchiveRNGState (void);		// [RH]
 void P_UnArchiveRNGState (void);	// [RH]
-void P_ArchiveLevelLocals (void);	// [RH]
-void P_UnArchiveLevelLocals (void);	// [RH]
+void P_ArchiveScripts (void);		// [RH]
+void P_UnArchiveScripts (void);		// [RH]
+void P_ArchiveACSDefereds (void);	// [RH]
+void P_UnArchiveACSDefereds (void);	// [RH]
 
-extern byte *save_p; 
+extern byte *save_p, *savebuffer;
+extern size_t savegamesize;
+void CheckSaveGame (size_t);		// killough
+
+
+// Pads save_p to a 4-byte boundary
+//	so that the load/save works on SGI&Gecko.
+#define PADSAVEP()		save_p += (4 - ((int) save_p & 3)) & 3
 
 
 #endif
diff --git a/code/P_setup.c b/code/P_setup.c
index 29dd2f6b67..8741f796cb 100644
--- a/code/P_setup.c
+++ b/code/P_setup.c
@@ -26,6 +26,7 @@
 #include <math.h>
 
 #include "m_alloc.h"
+#include "m_argv.h"
 
 #include "z_zone.h"
 
@@ -43,9 +44,15 @@
 #include "s_sound.h"
 
 #include "doomstat.h"
+#include "p_lnspec.h"
+#include "v_palett.h"
 
 
-void	P_SpawnMapThing (mapthing2_t *mthing);
+extern void P_SpawnMapThing (mapthing2_t *mthing, int position);
+
+extern void P_TranslateLineDef (line_t *ld, maplinedef_t *mld);
+extern void P_TranslateTeleportThings (void);
+extern int	P_TranslateSectorSpecial (int);
 
 
 //
@@ -74,7 +81,8 @@ int 			numsides;
 side_t* 		sides;
 
 // [RH] Set true if the map contains a BEHAVIOR lump
-static	BOOL	HasBehavior;
+BOOL			HasBehavior;
+
 
 // BLOCKMAP
 // Created from axis aligned bounding box
@@ -122,30 +130,25 @@ mapthing2_t		playerstarts[MAXPLAYERS];
 //
 void P_LoadVertexes (int lump)
 {
-	byte*				data;
-	int 				i;
-	mapvertex_t*		ml;
-	vertex_t*			li;
+	byte *data;
+	int i;
 
-	// Determine number of lumps:
+	// Determine number of vertices:
 	//	total lump length / vertex record length.
 	numvertexes = W_LumpLength (lump) / sizeof(mapvertex_t);
 
 	// Allocate zone memory for buffer.
-	vertexes = Z_Malloc (numvertexes*sizeof(vertex_t),PU_LEVEL,0);		
+	vertexes = Z_Malloc (numvertexes*sizeof(vertex_t), PU_LEVEL, 0);		
 
 	// Load data into cache.
-	data = W_CacheLumpNum (lump,PU_STATIC);
+	data = W_CacheLumpNum (lump, PU_STATIC);
 		
-	ml = (mapvertex_t *)data;
-	li = vertexes;
-
 	// Copy and convert vertex coordinates,
 	// internal representation as fixed.
-	for (i=0 ; i<numvertexes ; i++, li++, ml++)
+	for (i = 0; i < numvertexes; i++)
 	{
-		li->x = SHORT(ml->x)<<FRACBITS;
-		li->y = SHORT(ml->y)<<FRACBITS;
+		vertexes[i].x = SHORT(((mapvertex_t *)data)[i].x)<<FRACBITS;
+		vertexes[i].y = SHORT(((mapvertex_t *)data)[i].y)<<FRACBITS;
 	}
 
 	// Free buffer memory.
@@ -157,29 +160,107 @@ void P_LoadVertexes (int lump)
 //
 // P_LoadSegs
 //
+// killough 5/3/98: reformatted, cleaned up
+
 void P_LoadSegs (int lump)
 {
-	byte*				data;
-	int 				i;
-	mapseg_t*			ml;
-	seg_t*				li;
-	line_t* 			ldef;
-	int 				linedef;
-	int 				side;
-		
-	numsegs = W_LumpLength (lump) / sizeof(mapseg_t);
-	segs = Z_Malloc (numsegs*sizeof(seg_t),PU_LEVEL,0); 
-	memset (segs, 0, numsegs*sizeof(seg_t));
-	data = W_CacheLumpNum (lump,PU_STATIC);
-		
-	ml = (mapseg_t *)data;
-	li = segs;
-	for (i=0 ; i<numsegs ; i++, li++, ml++)
+	int  i;
+	byte *data;
+	byte *vertchanged = Z_Malloc(numvertexes,PU_LEVEL,0);	// phares 10/4/98
+	line_t* line;		// phares 10/4/98
+	int ptp_angle;		// phares 10/4/98
+	int delta_angle;	// phares 10/4/98
+	int dis;			// phares 10/4/98
+	int dx,dy;			// phares 10/4/98
+	int vnum1,vnum2;	// phares 10/4/98
+
+	memset(vertchanged,0,numvertexes); // phares 10/4/98
+
+	numsegs = W_LumpLength(lump) / sizeof(mapseg_t);
+	segs = Z_Malloc(numsegs*sizeof(seg_t),PU_LEVEL,0);
+	memset(segs, 0, numsegs*sizeof(seg_t));
+	data = W_CacheLumpNum(lump,PU_STATIC);
+
+	// phares: 10/4/98: Vertchanged is an array that represents the vertices.
+	// Mark those used by linedefs. A marked vertex is one that is not a
+	// candidate for movement further down.
+
+	line = lines;
+	for (i = 0; i < numlines ; i++,line++)
 	{
+		vertchanged[line->v1 - vertexes] = vertchanged[line->v2 - vertexes] = 1;
+	}
+
+	for (i = 0; i < numsegs; i++)
+	{
+		seg_t *li = segs+i;
+		mapseg_t *ml = (mapseg_t *) data + i;
+
+		int side, linedef;
+		line_t *ldef;
+
 		li->v1 = &vertexes[SHORT(ml->v1)];
 		li->v2 = &vertexes[SHORT(ml->v2)];
-										
+
 		li->angle = (SHORT(ml->angle))<<16;
+
+// phares 10/4/98: In the case of a lineseg that was created by splitting
+// another line, it appears that the line angle is inherited from the
+// father line. Due to roundoff, the new vertex may have been placed 'off
+// the line'. When you get close to such a line, and it is very short,
+// it's possible that the roundoff error causes 'firelines', the thin
+// lines that can draw from screen top to screen bottom occasionally. This
+// is due to all the angle calculations that are done based on the line
+// angle, the angles from the viewer to the vertices, and the viewer's
+// angle in the world. In the case of firelines, the rounded-off position
+// of one of the vertices determines one of these angles, and introduces
+// an error in the scaling factor for mapping textures and determining
+// where on the screen the ceiling and floor spans should be shown. For a
+// fireline, the engine thinks the ceiling bottom and floor top are at the
+// midpoint of the screen. So you get ceilings drawn all the way down to the
+// screen midpoint, and floors drawn all the way up. Thus 'firelines'. The
+// name comes from the original sighting, which involved a fire texture.
+//
+// To correct this, reset the vertex that was added so that it sits ON the
+// split line.
+//
+// To know which of the two vertices was added, its number is greater than
+// that of the last of the author-created vertices. If both vertices of the
+// line were added by splitting, pick the higher-numbered one. Once you've
+// changed a vertex, don't change it again if it shows up in another seg.
+//
+// To determine if there's an error in the first place, find the
+// angle of the line between the two seg vertices. If it's one degree or more
+// off, then move one vertex. This may seem insignificant, but one degree
+// errors _can_ cause firelines.
+
+		ptp_angle = R_PointToAngle2(li->v1->x,li->v1->y,li->v2->x,li->v2->y);
+		dis = 0;
+		delta_angle = (abs(ptp_angle-li->angle)>>ANGLETOFINESHIFT)*360/8192;
+
+		if (delta_angle != 0)
+		{
+			dx = (li->v1->x - li->v2->x)>>FRACBITS;
+			dy = (li->v1->y - li->v2->y)>>FRACBITS;
+			dis = ((int) sqrt(dx*dx + dy*dy))<<FRACBITS;
+			dx = finecosine[li->angle>>ANGLETOFINESHIFT];
+			dy = finesine[li->angle>>ANGLETOFINESHIFT];
+			vnum1 = li->v1 - vertexes; 
+			vnum2 = li->v2 - vertexes; 
+			if ((vnum2 > vnum1) && (vertchanged[vnum2] == 0))
+			{
+				li->v2->x = li->v1->x + FixedMul(dis,dx);
+				li->v2->y = li->v1->y + FixedMul(dis,dy);
+				vertchanged[vnum2] = 1; // this was changed
+			}
+			else if (vertchanged[vnum1] == 0)
+			{
+				li->v1->x = li->v2->x - FixedMul(dis,dx);
+				li->v1->y = li->v2->y - FixedMul(dis,dy);
+				vertchanged[vnum1] = 1; // this was changed
+			}
+		}
+
 		li->offset = (SHORT(ml->offset))<<16;
 		linedef = SHORT(ml->linedef);
 		ldef = &lines[linedef];
@@ -187,13 +268,19 @@ void P_LoadSegs (int lump)
 		side = SHORT(ml->side);
 		li->sidedef = &sides[ldef->sidenum[side]];
 		li->frontsector = sides[ldef->sidenum[side]].sector;
-		if (ldef-> flags & ML_TWOSIDED)
+
+		// killough 5/3/98: ignore 2s flag if second sidedef missing:
+		if (ldef->flags & ML_TWOSIDED && ldef->sidenum[side^1]!=-1)
 			li->backsector = sides[ldef->sidenum[side^1]].sector;
-		else
+		else {
 			li->backsector = 0;
+			// [RH] And clear it, since it will crash in p_sight.c if the line comes into view
+			ldef->flags &= ~ML_TWOSIDED;
+		}
 	}
-		
+
 	Z_Free (data);
+	Z_Free(vertchanged); // phares 10/4/98
 }
 
 
@@ -202,23 +289,19 @@ void P_LoadSegs (int lump)
 //
 void P_LoadSubsectors (int lump)
 {
-	byte*				data;
-	int 				i;
-	mapsubsector_t* 	ms;
-	subsector_t*		ss;
+	byte *data;
+	int i;
 		
 	numsubsectors = W_LumpLength (lump) / sizeof(mapsubsector_t);
 	subsectors = Z_Malloc (numsubsectors*sizeof(subsector_t),PU_LEVEL,0);		
 	data = W_CacheLumpNum (lump,PU_STATIC);
 		
-	ms = (mapsubsector_t *)data;
-	memset (subsectors,0, numsubsectors*sizeof(subsector_t));
-	ss = subsectors;
+	memset (subsectors, 0, numsubsectors*sizeof(subsector_t));
 	
-	for (i=0 ; i<numsubsectors ; i++, ss++, ms++)
+	for (i = 0; i < numsubsectors; i++)
 	{
-		ss->numlines = SHORT(ms->numsegs);
-		ss->firstline = SHORT(ms->firstseg);
+		subsectors[i].numlines = SHORT(((mapsubsector_t *)data)[i].numsegs);
+		subsectors[i].firstline = SHORT(((mapsubsector_t *)data)[i].firstseg);
 	}
 		
 	Z_Free (data);
@@ -237,20 +320,23 @@ void P_LoadSectors (int lump)
 	sector_t*			ss;
 		
 	numsectors = W_LumpLength (lump) / sizeof(mapsector_t);
-	sectors = Z_Malloc (numsectors*sizeof(sector_t),PU_LEVEL,0);		
+	sectors = Z_Malloc (numsectors*sizeof(sector_t), PU_LEVEL, 0);		
 	memset (sectors, 0, numsectors*sizeof(sector_t));
-	data = W_CacheLumpNum (lump,PU_STATIC);
-		
+	data = W_CacheLumpNum (lump, PU_STATIC);
+
 	ms = (mapsector_t *)data;
 	ss = sectors;
-	for (i=0 ; i<numsectors ; i++, ss++, ms++)
+	for (i = 0; i < numsectors; i++, ss++, ms++)
 	{
 		ss->floorheight = SHORT(ms->floorheight)<<FRACBITS;
 		ss->ceilingheight = SHORT(ms->ceilingheight)<<FRACBITS;
 		ss->floorpic = (short)R_FlatNumForName(ms->floorpic);
 		ss->ceilingpic = (short)R_FlatNumForName(ms->ceilingpic);
 		ss->lightlevel = SHORT(ms->lightlevel);
-		ss->special = SHORT(ms->special);
+		if (HasBehavior)
+			ss->special = SHORT(ms->special);
+		else	// [RH] Translate to new sector special
+			ss->special = P_TranslateSectorSpecial (SHORT(ms->special));
 		ss->tag = SHORT(ms->tag);
 		ss->thinglist = NULL;
 		ss->touching_thinglist = NULL;		// phares 3/14/98
@@ -269,6 +355,17 @@ void P_LoadSectors (int lump)
 
 		// killough 4/11/98 sector used to get ceiling lighting:
 		ss->ceilinglightsec = -1;
+
+		ss->gravity = 1.0f;	// [RH] Default sector gravity of 1.0
+
+		// [RH] Sectors default to white light with the default fade.
+		//		If they are outside (have a sky ceiling), they use the outside fog.
+		if (level.outsidefog != 0xff000000 && ss->ceilingpic == skyflatnum)
+			ss->colormap = GetSpecialLights (255,255,255,
+				RPART(level.outsidefog),GPART(level.outsidefog),BPART(level.outsidefog));
+		else
+			ss->colormap = GetSpecialLights (255,255,255,
+				RPART(level.fadeto),GPART(level.fadeto),BPART(level.fadeto));
 	}
 		
 	Z_Free (data);
@@ -294,16 +391,16 @@ void P_LoadNodes (int lump)
 	mn = (mapnode_t *)data;
 	no = nodes;
 	
-	for (i=0 ; i<numnodes ; i++, no++, mn++)
+	for (i = 0; i < numnodes; i++, no++, mn++)
 	{
 		no->x = SHORT(mn->x)<<FRACBITS;
 		no->y = SHORT(mn->y)<<FRACBITS;
 		no->dx = SHORT(mn->dx)<<FRACBITS;
 		no->dy = SHORT(mn->dy)<<FRACBITS;
-		for (j=0 ; j<2 ; j++)
+		for (j = 0; j < 2; j++)
 		{
 			no->children[j] = SHORT(mn->children[j]);
-			for (k=0 ; k<4 ; k++)
+			for (k = 0; k < 4; k++)
 				no->bbox[j][k] = SHORT(mn->bbox[j][k])<<FRACBITS;
 		}
 	}
@@ -318,17 +415,13 @@ void P_LoadNodes (int lump)
 void P_LoadThings (int lump)
 {
 	mapthing2_t mt2;		// [RH] for translation
-	byte *data = W_CacheLumpNum (lump,PU_STATIC);
+	byte *data = W_CacheLumpNum (lump, PU_STATIC);
 	mapthing_t *mt = (mapthing_t *)data;
 	mapthing_t *lastmt = (mapthing_t *)(data + W_LumpLength (lump));
 
-	// [RH] I'm (considering) moving toward Hexen-style maps
-	//		as the native format for ZDoom. This is the only
-	//		place where Doom-style Things are ever referenced,
-	//		and we translate them into a Hexen-style thing.
-	//		Thanks to recent talks with Ty Halderman, I may
-	//		not actually complete this, although the process
-	//		has been started.
+	// [RH] ZDoom now uses Hexen-style maps as its native format.
+	//		Since this is the only place where Doom-style Things are ever
+	//		referenced, we translate them into a Hexen-style thing.
 	memset (&mt2, 0, sizeof(mt2));
 
 	for ( ; mt < lastmt; mt++)
@@ -340,7 +433,7 @@ void P_LoadThings (int lump)
 
 		// [RH] Need to translate the spawn flags to Hexen format.
 		short flags = SHORT(mt->options);
-		mt2.flags = (short)((flags & 0xf) | 0x700);
+		mt2.flags = (short)((flags & 0xf) | 0x7e0);
 		if (flags & BTF_NOTSINGLE)			mt2.flags &= ~MTF_SINGLE;
 		if (flags & BTF_NOTDEATHMATCH)		mt2.flags &= ~MTF_DEATHMATCH;
 		if (flags & BTF_NOTCOOPERATIVE)		mt2.flags &= ~MTF_COOPERATIVE;
@@ -350,7 +443,7 @@ void P_LoadThings (int lump)
 		mt2.angle = SHORT(mt->angle);
 		mt2.type = SHORT(mt->type);
 		
-		P_SpawnMapThing (&mt2);
+		P_SpawnMapThing (&mt2, 0);
 	}
 		
 	Z_Free (data);
@@ -360,9 +453,11 @@ void P_LoadThings (int lump)
 // P_LoadThings2
 //
 // Same as P_LoadThings() except it assumes Things are
-// saved Hexen-style.
+// saved Hexen-style. Position also controls which single-
+// player start spots are spawned by filtering out those
+// whose first parameter don't match position.
 //
-void P_LoadThings2 (int lump)
+void P_LoadThings2 (int lump, int position)
 {
 	byte *data = W_CacheLumpNum (lump, PU_STATIC);
 	mapthing2_t *mt = (mapthing2_t *)data;
@@ -383,7 +478,7 @@ void P_LoadThings2 (int lump)
 		mt->type = SHORT(mt->type);
 		mt->flags = SHORT(mt->flags);
 
-		P_SpawnMapThing (mt);
+		P_SpawnMapThing (mt, position);
 	}
 
 	Z_Free (data);
@@ -392,29 +487,29 @@ void P_LoadThings2 (int lump)
 
 //
 // P_LoadLineDefs
-// Also counts secret lines for intermissions.
 //
-static void P_AdjustLine (line_t *ld)
+// killough 4/4/98: split into two functions, to allow sidedef overloading
+//
+// [RH] Actually split into four functions to allow for Hexen and Doom
+//		linedefs.
+void P_AdjustLine (line_t *ld)
 {
 	vertex_t *v1, *v2;
 
+	ld->lucency = 255;	// [RH] Opaque by default
+
 	v1 = ld->v1;
 	v2 = ld->v2;
 
 	ld->dx = v2->x - v1->x;
 	ld->dy = v2->y - v1->y;
 	
-	if (!ld->dx)
+	if (ld->dx == 0)
 		ld->slopetype = ST_VERTICAL;
-	else if (!ld->dy)
+	else if (ld->dy == 0)
 		ld->slopetype = ST_HORIZONTAL;
 	else
-	{
-		if (FixedDiv (ld->dy , ld->dx) > 0)
-			ld->slopetype = ST_POSITIVE;
-		else
-			ld->slopetype = ST_NEGATIVE;
-	}
+		ld->slopetype = (FixedDiv (ld->dy , ld->dx) > 0) ? ST_POSITIVE : ST_NEGATIVE;
 			
 	if (v1->x < v2->x)
 	{
@@ -438,39 +533,75 @@ static void P_AdjustLine (line_t *ld)
 		ld->bbox[BOXTOP] = v1->y;
 	}
 
-	if (ld->sidenum[0] != -1)
-		ld->frontsector = sides[ld->sidenum[0]].sector;
-	else
-		ld->frontsector = 0;
+	// [RH] Set line id (as appropriate) here
+	if (ld->special == Line_SetIdentification ||
+		ld->special == Teleport_Line ||
+		ld->special == TranslucentLine ||
+		ld->special == Scroll_Texture_Model) {
+		ld->id = ld->args[0];
+	}
+	// killough 4/4/98: support special sidedef interpretation below
+	if (ld->sidenum[0] != -1 && ld->special)
+		sides[*ld->sidenum].special = ld->special;
+}
 
-	if (ld->sidenum[1] != -1)
-		ld->backsector = sides[ld->sidenum[1]].sector;
-	else
-		ld->backsector = 0;
+// killough 4/4/98: delay using sidedefs until they are loaded
+void P_FinishLoadingLineDefs (void)
+{
+	int i = numlines;
+	register line_t *ld = lines;
+
+	for (; i--; ld++) {
+		ld->frontsector = ld->sidenum[0]!=-1 ? sides[ld->sidenum[0]].sector : 0;
+		ld->backsector  = ld->sidenum[1]!=-1 ? sides[ld->sidenum[1]].sector : 0;
+
+		switch (ld->special)
+		{						// killough 4/11/98: handle special types
+			int j;
+
+			case TranslucentLine:			// killough 4/11/98: translucent 2s textures
+#if 0
+				lump = sides[*ld->sidenum].special;		// translucency from sidedef
+				if (!ld->tag)							// if tag==0,
+					ld->tranlump = lump;				// affect this linedef only
+				else
+					for (j=0;j<numlines;j++)			// if tag!=0,
+						if (lines[j].tag == ld->tag)	// affect all matching linedefs
+							lines[j].tranlump = lump;
+#else
+				// [RH] Second arg controls how opaque it is.
+				if (!ld->args[0])
+					ld->lucency = (byte)ld->args[1];
+				else
+					for (j = 0; j < numlines; j++)
+						if (lines[j].id == ld->args[0])
+							lines[j].lucency = (byte)ld->args[1];
+#endif
+				break;
+		}
+	}
 }
 
 void P_LoadLineDefs (int lump)
 {
-	byte*				data;
-	int 				i;
-	maplinedef_t*		mld;
-	line_t* 			ld;
+	byte *data;
+	int i;
+	line_t *ld;
 		
 	numlines = W_LumpLength (lump) / sizeof(maplinedef_t);
 	lines = Z_Malloc (numlines*sizeof(line_t),PU_LEVEL,0);		
 	memset (lines, 0, numlines*sizeof(line_t));
 	data = W_CacheLumpNum (lump,PU_STATIC);
 		
-	mld = (maplinedef_t *)data;
 	ld = lines;
-	for (i=0 ; i<numlines ; i++, mld++, ld++)
+	for (i=0 ; i<numlines ; i++, ld++)
 	{
-		ld->flags = SHORT(mld->flags);
-		// [RH] Remap ML_PASSUSE flag from BOOM.
-		if (ld->flags & ML_PASSUSEORG)
-			ld->flags = (ld->flags & ~ML_PASSUSEORG) | ML_PASSUSE;
-		ld->special = SHORT(mld->special);
-		ld->tag = SHORT(mld->tag);
+		maplinedef_t *mld = ((maplinedef_t *)data) + i;
+
+		// [RH] Translate old linedef special and flags to be
+		//		compatible with the new format.
+		P_TranslateLineDef (ld, mld);
+
 		ld->v1 = &vertexes[SHORT(mld->v1)];
 		ld->v2 = &vertexes[SHORT(mld->v2)];
 
@@ -492,18 +623,22 @@ void P_LoadLineDefs2 (int lump)
 	line_t* 			ld;
 		
 	numlines = W_LumpLength (lump) / sizeof(maplinedef2_t);
-	lines = Z_Malloc (numlines*sizeof(line_t),PU_LEVEL,0);		
+	lines = Z_Malloc (numlines*sizeof(line_t), PU_LEVEL,0 );		
 	memset (lines, 0, numlines*sizeof(line_t));
-	data = W_CacheLumpNum (lump,PU_STATIC);
+	data = W_CacheLumpNum (lump, PU_STATIC);
 		
 	mld = (maplinedef2_t *)data;
 	ld = lines;
 	for (i=0 ; i<numlines ; i++, mld++, ld++)
 	{
+		int j;
+
+		for (j = 0; j < 5; j++)
+			ld->args[j] = mld->args[j];
+
 		ld->flags = SHORT(mld->flags);
 		ld->special = mld->special;
-		memcpy (ld->args, mld->args, 5);
-		ld->tag = ld->args[0];
+
 		ld->v1 = &vertexes[SHORT(mld->v1)];
 		ld->v2 = &vertexes[SHORT(mld->v2)];
 
@@ -520,34 +655,404 @@ void P_LoadLineDefs2 (int lump)
 //
 // P_LoadSideDefs
 //
+// killough 4/4/98: split into two functions
 void P_LoadSideDefs (int lump)
 {
-	byte*				data;
-	int 				i;
-	mapsidedef_t*		msd;
-	side_t* 			sd;
-		
 	numsides = W_LumpLength (lump) / sizeof(mapsidedef_t);
-	sides = Z_Malloc (numsides*sizeof(side_t),PU_LEVEL,0);		
+	sides = Z_Malloc (numsides*sizeof(side_t), PU_LEVEL, 0);
 	memset (sides, 0, numsides*sizeof(side_t));
-	data = W_CacheLumpNum (lump,PU_STATIC);
-		
-	msd = (mapsidedef_t *)data;
-	sd = sides;
-	for (i=0 ; i<numsides ; i++, msd++, sd++)
+}
+
+// [RH] Figure out blends for deep water sectors
+static void SetTexture (short *texture, unsigned int *blend, char *name)
+{
+	if ((*blend = R_ColormapNumForName (name)) == 0) {
+		if ((*texture = R_CheckTextureNumForName (name)) == -1) {
+			char name2[9];
+			char *stop;
+			strncpy (name2, name, 8);
+			name2[8] = 0;
+			*blend = strtoul (name2, &stop, 16);
+			*texture = 0;
+		} else {
+			*blend = 0;
+		}
+	} else {
+		*texture = 0;
+	}
+}
+
+// killough 4/4/98: delay using texture names until
+// after linedefs are loaded, to allow overloading.
+// killough 5/3/98: reformatted, cleaned up
+
+void P_LoadSideDefs2 (int lump)
+{
+	byte *data = W_CacheLumpNum(lump,PU_STATIC);
+	int  i;
+
+	for (i=0; i<numsides; i++)
 	{
+		register mapsidedef_t *msd = (mapsidedef_t *) data + i;
+		register side_t *sd = sides + i;
+		register sector_t *sec;
+
 		sd->textureoffset = SHORT(msd->textureoffset)<<FRACBITS;
 		sd->rowoffset = SHORT(msd->rowoffset)<<FRACBITS;
-		sd->toptexture = (short)R_TextureNumForName(msd->toptexture);
-		sd->bottomtexture = (short)R_TextureNumForName(msd->bottomtexture);
-		sd->midtexture = (short)R_TextureNumForName(msd->midtexture);
-		sd->sector = &sectors[SHORT(msd->sector)];
+
+		// killough 4/4/98: allow sidedef texture names to be overloaded
+		// killough 4/11/98: refined to allow colormaps to work as wall
+		// textures if invalid as colormaps but valid as textures.
+
+		sd->sector = sec = &sectors[SHORT(msd->sector)];
+		switch (sd->special)
+		{
+		  case Transfer_Heights:	// variable colormap via 242 linedef
+			  // [RH] The colormap num we get here isn't really a colormap,
+			  //	  but a packed ARGB word for blending, so we also allow
+			  //	  the blend to be specified directly by the texture names
+			  //	  instead of figuring something out from the colormap.
+			SetTexture (&sd->bottomtexture, &sec->bottommap, msd->bottomtexture);
+			SetTexture (&sd->midtexture, &sec->midmap, msd->midtexture);
+			SetTexture (&sd->toptexture, &sec->topmap, msd->toptexture);
+			break;
+/*
+		  case TranslucentLine:	// killough 4/11/98: apply translucency to 2s normal texture
+			sd->midtexture = strncasecmp("TRANMAP", msd->midtexture, 8) ?
+				(sd->special = W_CheckNumForName(msd->midtexture)) < 0 ||
+				W_LumpLength(sd->special) != 65536 ?
+				sd->special=0, R_TextureNumForName(msd->midtexture) :
+					(sd->special++, 0) : (sd->special=0);
+			sd->toptexture = R_TextureNumForName(msd->toptexture);
+			sd->bottomtexture = R_TextureNumForName(msd->bottomtexture);
+			break;
+*/
+		  default:			// normal cases
+			sd->midtexture = R_TextureNumForName(msd->midtexture);
+			sd->toptexture = R_TextureNumForName(msd->toptexture);
+			sd->bottomtexture = R_TextureNumForName(msd->bottomtexture);
+			break;
+		}
 	}
-		
 	Z_Free (data);
 }
 
 
+//
+// jff 10/6/98
+// New code added to speed up calculation of internal blockmap
+// Algorithm is order of nlines*(ncols+nrows) not nlines*ncols*nrows
+// 
+
+#define blkshift 7               /* places to shift rel position for cell num */
+#define blkmask ((1<<blkshift)-1)/* mask for rel position within cell */
+#define blkmargin 0              /* size guardband around map used */
+                                 // jff 10/8/98 use guardband>0 
+                                 // jff 10/12/98 0 ok with + 1 in rows,cols
+
+typedef struct linelist_t        // type used to list lines in each block
+{
+  long num;
+  struct linelist_t *next;
+} linelist_t;
+
+//
+// Subroutine to add a line number to a block list
+// It simply returns if the line is already in the block
+//
+
+static void AddBlockLine
+(
+	linelist_t **lists,
+	int *count,
+	int *done,
+	int blockno,
+	long lineno
+)
+{
+	linelist_t *l;
+
+	if (done[blockno])
+		return;
+
+	l = Malloc (sizeof(linelist_t));
+	l->num = lineno;
+	l->next = lists[blockno];
+	lists[blockno] = l;
+	count[blockno]++;
+	done[blockno] = 1;
+}
+
+//
+// Actually construct the blockmap lump from the level data
+//
+// This finds the intersection of each linedef with the column and
+// row lines at the left and bottom of each blockmap cell. It then
+// adds the line to all block lists touching the intersection.
+//
+
+void P_CreateBlockMap()
+{
+	int xorg,yorg;					// blockmap origin (lower left)
+	int nrows,ncols;				// blockmap dimensions
+	linelist_t **blocklists=NULL;	// array of pointers to lists of lines
+	int *blockcount=NULL;			// array of counters of line lists
+	int *blockdone=NULL;			// array keeping track of blocks/line
+	int NBlocks;					// number of cells = nrows*ncols
+	long linetotal=0;				// total length of all blocklists
+	int i,j;
+	int map_minx=MAXINT;			// init for map limits search
+	int map_miny=MAXINT;
+	int map_maxx=MININT;
+	int map_maxy=MININT;
+
+	// scan for map limits, which the blockmap must enclose
+
+	for (i = 0; i < numvertexes; i++)
+	{
+		fixed_t t;
+
+		if ((t=vertexes[i].x) < map_minx)
+			map_minx = t;
+		else if (t > map_maxx)
+			map_maxx = t;
+		if ((t=vertexes[i].y) < map_miny)
+			map_miny = t;
+		else if (t > map_maxy)
+			map_maxy = t;
+	}
+	map_minx >>= FRACBITS;    // work in map coords, not fixed_t
+	map_maxx >>= FRACBITS;
+	map_miny >>= FRACBITS;
+	map_maxy >>= FRACBITS;
+
+	// set up blockmap area to enclose level plus margin
+
+	xorg = map_minx-blkmargin;
+	yorg = map_miny-blkmargin;
+	ncols = (map_maxx+blkmargin-xorg+1+blkmask)>>blkshift;	//jff 10/12/98
+	nrows = (map_maxy+blkmargin-yorg+1+blkmask)>>blkshift;	//+1 needed for
+	NBlocks = ncols*nrows;									//map exactly 1 cell
+
+	// create the array of pointers on NBlocks to blocklists
+	// also create an array of linelist counts on NBlocks
+	// finally make an array in which we can mark blocks done per line
+
+	blocklists = Malloc (NBlocks*sizeof(linelist_t *));
+	memset (blocklists, 0, NBlocks*sizeof(linelist_t *));
+	blockcount = Malloc (NBlocks*sizeof(int));
+	memset (blockcount, 0, NBlocks*sizeof(int));
+	blockdone = Malloc (NBlocks*sizeof(int));
+
+	// initialize each blocklist, and enter the trailing -1 in all blocklists
+	// note the linked list of lines grows backwards
+
+	for (i = 0; i < NBlocks; i++)
+	{
+		blocklists[i] = Malloc(sizeof(linelist_t));
+		blocklists[i]->num = -1;
+		blocklists[i]->next = NULL;
+		blockcount[i]++;
+	}
+
+	// For each linedef in the wad, determine all blockmap blocks it touches,
+	// and add the linedef number to the blocklists for those blocks
+
+	for (i = 0; i < numlines; i++)
+	{
+		int x1 = lines[i].v1->x>>FRACBITS;		// lines[i] map coords
+		int y1 = lines[i].v1->y>>FRACBITS;
+		int x2 = lines[i].v2->x>>FRACBITS;
+		int y2 = lines[i].v2->y>>FRACBITS;
+		int dx = x2-x1;
+		int dy = y2-y1;
+		int vert = !dx;							// lines[i] slopetype
+		int horiz = !dy;
+		int spos = (dx^dy) > 0;
+		int sneg = (dx^dy) < 0;
+		int bx,by;								// block cell coords
+		int minx = x1>x2? x2 : x1;				// extremal lines[i] coords
+		int maxx = x1>x2? x1 : x2;
+		int miny = y1>y2? y2 : y1;
+		int maxy = y1>y2? y1 : y2;
+
+		// no blocks done for this linedef yet
+
+		memset (blockdone, 0, NBlocks*sizeof(int));
+
+		// The line always belongs to the blocks containing its endpoints
+
+		bx = (x1-xorg) >> blkshift;
+		by = (y1-yorg) >> blkshift;
+		AddBlockLine (blocklists, blockcount, blockdone, by*ncols+bx, i);
+		bx = (x2-xorg) >> blkshift;
+		by = (y2-yorg) >> blkshift;
+		AddBlockLine (blocklists, blockcount, blockdone, by*ncols+bx, i);
+
+		// For each column, see where the line along its left edge, which 
+		// it contains, intersects the Linedef i. Add i to each corresponding
+		// blocklist.
+
+		if (!vert)    // don't interesect vertical lines with columns
+		{
+			for (j=0;j<ncols;j++)
+			{
+				// intersection of Linedef with x=xorg+(j<<blkshift)
+				// (y-y1)*dx = dy*(x-x1)
+				// y = dy*(x-x1)+y1*dx;
+
+				int x = xorg+(j<<blkshift);		// (x,y) is intersection
+				int y = (dy*(x-x1))/dx+y1;
+				int yb = (y-yorg)>>blkshift;	// block row number
+				int yp = (y-yorg)&blkmask;		// y position within block
+
+				if (yb<0 || yb>nrows-1)			// outside blockmap, continue
+					continue;
+
+				if (x<minx || x>maxx)			// line doesn't touch column
+					continue;
+
+				// The cell that contains the intersection point is always added
+
+				AddBlockLine(blocklists,blockcount,blockdone,ncols*yb+j,i);
+
+				// if the intersection is at a corner it depends on the slope
+				// (and whether the line extends past the intersection) which 
+				// blocks are hit
+
+				if (yp==0)			// intersection at a corner
+				{
+					if (sneg)		//   \ - blocks x,y-, x-,y
+					{
+						if (yb>0 && miny<y)
+							AddBlockLine(blocklists, blockcount, blockdone, ncols*(yb-1)+j, i);
+						if (j>0 && minx<x)
+							AddBlockLine(blocklists, blockcount, blockdone, ncols*yb+j-1, i);
+					}
+					else if (spos)	//   / - block x-,y-
+					{
+						if (yb>0 && j>0 && minx<x)
+							AddBlockLine(blocklists,blockcount,blockdone,ncols*(yb-1)+j-1,i);
+					}
+					else if (horiz)	//   - - block x-,y
+					{
+						if (j>0 && minx<x)
+							AddBlockLine(blocklists,blockcount,blockdone,ncols*yb+j-1,i);
+					}
+				}
+				else if (j>0 && minx<x)	// else not at corner: x-,y
+					AddBlockLine(blocklists,blockcount,blockdone,ncols*yb+j-1,i);
+			}
+		}
+
+		// For each row, see where the line along its bottom edge, which 
+		// it contains, intersects the Linedef i. Add i to all the corresponding
+		// blocklists.
+
+		if (!horiz)
+		{
+			for (j=0;j<nrows;j++)
+			{
+				// intersection of Linedef with y=yorg+(j<<blkshift)
+				// (x,y) on Linedef i satisfies: (y-y1)*dx = dy*(x-x1)
+				// x = dx*(y-y1)/dy+x1;
+
+				int y = yorg+(j<<blkshift);		// (x,y) is intersection
+				int x = (dx*(y-y1))/dy+x1;
+				int xb = (x-xorg)>>blkshift;	// block column number
+				int xp = (x-xorg)&blkmask;		// x position within block
+
+				if (xb<0 || xb>ncols-1)			// outside blockmap, continue
+					continue;
+
+				if (y<miny || y>maxy)			 // line doesn't touch row
+					continue;
+
+				// The cell that contains the intersection point is always added
+
+				AddBlockLine (blocklists, blockcount, blockdone, ncols*j+xb, i);
+
+				// if the intersection is at a corner it depends on the slope
+				// (and whether the line extends past the intersection) which 
+				// blocks are hit
+
+				if (xp==0)			// intersection at a corner
+				{
+					if (sneg)       //   \ - blocks x,y-, x-,y
+					{
+						if (j>0 && miny<y)
+							AddBlockLine (blocklists, blockcount, blockdone, ncols*(j-1)+xb, i);
+						if (xb>0 && minx<x)
+							AddBlockLine (blocklists, blockcount, blockdone, ncols*j+xb-1, i);
+					}
+					else if (vert)  //   | - block x,y-
+					{
+						if (j>0 && miny<y)
+							AddBlockLine (blocklists, blockcount, blockdone, ncols*(j-1)+xb, i);
+					}
+					else if (spos)  //   / - block x-,y-
+					{
+						if (xb>0 && j>0 && miny<y)
+							AddBlockLine (blocklists, blockcount, blockdone, ncols*(j-1)+xb-1, i);
+					}
+				}
+				else if (j>0 && miny<y) // else not on a corner: x,y-
+					AddBlockLine (blocklists, blockcount, blockdone, ncols*(j-1)+xb, i);
+			}
+		}
+	}
+
+	// Add initial 0 to all blocklists
+	// count the total number of lines (and 0's and -1's)
+
+	memset (blockdone, 0, NBlocks*sizeof(int));
+	for (i = 0, linetotal = 0; i < NBlocks; i++)
+	{
+		AddBlockLine (blocklists, blockcount, blockdone, i, 0);
+		linetotal += blockcount[i];
+	}
+
+	// Create the blockmap lump
+
+	blockmaplump = Z_Malloc(sizeof(*blockmaplump) * (4+NBlocks+linetotal),
+							PU_LEVEL, 0);
+	// blockmap header
+
+	blockmaplump[0] = bmaporgx = xorg << FRACBITS;
+	blockmaplump[1] = bmaporgy = yorg << FRACBITS;
+	blockmaplump[2] = bmapwidth  = ncols;
+	blockmaplump[3] = bmapheight = nrows;
+
+	// offsets to lists and block lists
+
+	for (i = 0; i < NBlocks; i++)
+	{
+		linelist_t *bl = blocklists[i];
+		long offs = blockmaplump[4+i] =   // set offset to block's list
+			(i? blockmaplump[4+i-1] : 4+NBlocks) + (i? blockcount[i-1] : 0);
+
+		// add the lines in each block's list to the blockmaplump
+		// delete each list node as we go
+
+		while (bl)
+		{
+			linelist_t *tmp = bl->next;
+			blockmaplump[offs++] = bl->num;
+			free(bl);
+			bl = tmp;
+		}
+	}
+
+	// free all temporary storage
+
+	free (blocklists);
+	free (blockcount);
+	free (blockdone);
+}
+
+// jff 10/6/98
+// End new code added to speed up calculation of internal blockmap
+
 //
 // P_LoadBlockMap
 //
@@ -555,31 +1060,34 @@ void P_LoadSideDefs (int lump)
 //
 void P_LoadBlockMap (int lump)
 {
-	int i, count;
-	short *wadblockmaplump;
+	int count;
 	
-	count = W_LumpLength (lump) >> 1;
-	wadblockmaplump = W_CacheLumpNum (lump, PU_LEVEL);
-	blockmaplump = Z_Malloc(sizeof(*blockmaplump) * count, PU_LEVEL, 0);
+	if (M_CheckParm("-blockmap") || (count = W_LumpLength(lump)/2) >= 0x10000)
+		P_CreateBlockMap();
+	else {
+		short *wadblockmaplump = W_CacheLumpNum (lump, PU_LEVEL);
+		int i;
+		blockmaplump = Z_Malloc(sizeof(*blockmaplump) * count, PU_LEVEL, 0);
 
-	// killough 3/1/98: Expand wad blockmap into larger internal one,
-	// by treating all offsets except -1 as unsigned and zero-extending
-	// them. This potentially doubles the size of blockmaps allowed,
-	// because Doom originally considered the offsets as always signed.
+		// killough 3/1/98: Expand wad blockmap into larger internal one,
+		// by treating all offsets except -1 as unsigned and zero-extending
+		// them. This potentially doubles the size of blockmaps allowed,
+		// because Doom originally considered the offsets as always signed.
 
-	blockmaplump[0] = SHORT(wadblockmaplump[0]);
-	blockmaplump[1] = SHORT(wadblockmaplump[1]);
-	blockmaplump[2] = (long)(SHORT(wadblockmaplump[2])) & 0xffff;
-	blockmaplump[3] = (long)(SHORT(wadblockmaplump[3])) & 0xffff;
+		blockmaplump[0] = SHORT(wadblockmaplump[0]);
+		blockmaplump[1] = SHORT(wadblockmaplump[1]);
+		blockmaplump[2] = (long)(SHORT(wadblockmaplump[2])) & 0xffff;
+		blockmaplump[3] = (long)(SHORT(wadblockmaplump[3])) & 0xffff;
 
-	for (i=4 ; i<count ; i++)
-	{
-		short t = SHORT(wadblockmaplump[i]);          // killough 3/1/98
-		blockmaplump[i] = t == -1 ? -1l : (long) t & 0xffff;
+		for (i=4 ; i<count ; i++)
+		{
+			short t = SHORT(wadblockmaplump[i]);          // killough 3/1/98
+			blockmaplump[i] = t == -1 ? -1l : (long) t & 0xffff;
+		}
+
+		Z_Free (wadblockmaplump);
 	}
 
-	Z_Free(wadblockmaplump);
-
 	bmaporgx = blockmaplump[0]<<FRACBITS;
 	bmaporgy = blockmaplump[1]<<FRACBITS;
 	bmapwidth = blockmaplump[2];
@@ -587,7 +1095,7 @@ void P_LoadBlockMap (int lump)
 
 	// clear out mobj chains
 	count = sizeof(*blocklinks) * bmapwidth*bmapheight;
-	blocklinks = Z_Malloc (count,PU_LEVEL, 0);
+	blocklinks = Z_Malloc (count, PU_LEVEL, 0);
 	memset (blocklinks, 0, count);
 	blockmap = blockmaplump+4;
 }
@@ -607,23 +1115,17 @@ void P_GroupLines (void)
 	int 				total;
 	line_t* 			li;
 	sector_t*			sector;
-	subsector_t*		ss;
-	seg_t*				seg;
 	fixed_t 			bbox[4];
 	int 				block;
 		
 	// look up sector number for each subsector
-	ss = subsectors;
-	for (i=0 ; i<numsubsectors ; i++, ss++)
-	{
-		seg = &segs[ss->firstline];
-		ss->sector = seg->sidedef->sector;
-	}
+	for (i = 0; i < numsubsectors; i++)
+		subsectors[i].sector = segs[subsectors[i].firstline].sidedef->sector;
 
 	// count number of lines in each sector
 	li = lines;
 	total = 0;
-	for (i=0 ; i<numlines ; i++, li++)
+	for (i = 0; i < numlines; i++, li++)
 	{
 		total++;
 		li->frontsector->linecount++;
@@ -679,14 +1181,43 @@ void P_GroupLines (void)
 		
 }
 
+//
+// [RH] P_LoadBehavior
+//
+static int sortscripts (const void *a, const void *b)
+{
+	return ((*(int *)a)%1000 - (*(int *)b)%1000);
+}
+
+void P_LoadBehavior (int lumpnum)
+{
+	byte *behavior = W_CacheLumpNum (lumpnum, PU_LEVEL);
+
+	if (strncmp (behavior, "ACS", 4)) {
+		Z_Free (behavior);
+		return;
+	}
+
+	level.behavior = behavior;
+	level.scripts = (int *)(behavior + ((int *)behavior)[1]);
+	level.strings = &level.scripts[level.scripts[0]*3+1];
+
+	// Make sure scripts are listed in order (to make finding them quicker)
+	qsort (&level.scripts[1], level.scripts[0], 3*sizeof(int), sortscripts);
+
+	DPrintf ("Loaded %d scripts, %d strings\n", level.scripts[0], level.strings[0]);
+}
 
 //
 // P_SetupLevel
 //
-void P_SetupLevel (char *lumpname)
+extern dyncolormap_t NormalLight;
+extern mobj_t *bodyquesize[];
+
+// [RH] position indicates the start spot to spawn at
+void P_SetupLevel (char *lumpname, int position)
 {
-	int		i;
-	int 	lumpnum;
+	int i, lumpnum;
 		
 	level.total_monsters = level.total_items = level.total_secrets =
 		level.killed_monsters = level.found_items = level.found_secrets =
@@ -703,7 +1234,10 @@ void P_SetupLevel (char *lumpname)
 
 	// Make sure all sounds are stopped before Z_FreeTags.
 	S_Start (); 				
-	
+
+	// [RH] Clear all ThingID hash chains.
+	P_ClearTidHashes ();
+
 #if 0 // UNUSED
 	if (debugfile)
 	{
@@ -713,6 +1247,7 @@ void P_SetupLevel (char *lumpname)
 	else
 #endif
 	Z_FreeTags (PU_LEVEL, PU_PURGELEVEL-1);
+	NormalLight.next = NULL;	// [RH] Z_FreeTags frees all the custom colormaps
 
 	// UNUSED W_Profile ();
 	P_InitThinkers ();
@@ -726,27 +1261,38 @@ void P_SetupLevel (char *lumpname)
 
 	// [RH] Check if this map is Hexen-style.
 	//		LINEDEFS and THINGS need to be handled accordingly.
+	//		If it is, we also need to distinguish between projectile cross and hit
 	HasBehavior = W_CheckLumpName (lumpnum+ML_BEHAVIOR, "BEHAVIOR");
+	oldshootactivation = !HasBehavior;
 
 	// note: most of this ordering is important 
-	P_LoadBlockMap (lumpnum+ML_BLOCKMAP);
-
 	P_LoadVertexes (lumpnum+ML_VERTEXES);
 	P_LoadSectors (lumpnum+ML_SECTORS);
 	P_LoadSideDefs (lumpnum+ML_SIDEDEFS);
-
 	if (!HasBehavior)
 		P_LoadLineDefs (lumpnum+ML_LINEDEFS);
 	else
 		P_LoadLineDefs2 (lumpnum+ML_LINEDEFS);	// [RH] Load Hexen-style linedefs
+	P_LoadSideDefs2 (lumpnum+ML_SIDEDEFS);
+	P_FinishLoadingLineDefs ();
+	P_LoadBlockMap (lumpnum+ML_BLOCKMAP);
 	P_LoadSubsectors (lumpnum+ML_SSECTORS);
 	P_LoadNodes (lumpnum+ML_NODES);
 	P_LoadSegs (lumpnum+ML_SEGS);
 		
-	rejectmatrix = W_CacheLumpNum (lumpnum+ML_REJECT,PU_LEVEL);
+	rejectmatrix = W_CacheLumpNum (lumpnum+ML_REJECT, PU_LEVEL);
 	P_GroupLines ();
 
 	bodyqueslot = 0;
+// phares 8/10/98: Clear body queue so the corpses from previous games are
+// not assumed to be from this one. The mobj_t's belonging to these corpses
+// are cleared in the normal freeing of zoned memory between maps, so all
+// we have to do here is clear the pointers to them.
+
+	if (bodyque)
+		for (i = 0; i < BODYQUESIZE; i++)
+			bodyque[i] = 0;
+
 	if (!deathmatchstarts) {
 		MaxDeathmatchStarts = 10;	// [RH] Default. Increased as needed.
 		deathmatchstarts = Malloc (MaxDeathmatchStarts * sizeof(mapthing2_t));
@@ -756,8 +1302,18 @@ void P_SetupLevel (char *lumpname)
 	if (!HasBehavior)
 		P_LoadThings (lumpnum+ML_THINGS);
 	else
-		P_LoadThings2 (lumpnum+ML_THINGS);	// [RH] Load Hexen-style things
+		P_LoadThings2 (lumpnum+ML_THINGS, position);	// [RH] Load Hexen-style things
 	
+	if (!HasBehavior)
+		P_TranslateTeleportThings();	// [RH] Assign teleport destination TIDs
+
+	// [RH] Load in the BEHAVIOR lump
+	level.behavior = NULL;
+	level.scripts = level.strings = NULL;
+	P_ClearScripts ();
+	if (HasBehavior)
+		P_LoadBehavior (lumpnum+ML_BEHAVIOR);
+
 	// if deathmatch, randomly spawn the active players
 	if (deathmatch->value)
 	{
@@ -770,12 +1326,16 @@ void P_SetupLevel (char *lumpname)
 						
 	}
 
+	// killough 3/26/98: Spawn icon landings:
+	if (gamemode == commercial)
+		P_SpawnBrainTargets();
+
 	// clear special respawning que
 	iquehead = iquetail = 0;			
 		
 	// set up world state
 	P_SpawnSpecials ();
-		
+
 	// build subsector connect matrix
 	//	UNUSED P_ConnectSubsectors ();
 
@@ -784,8 +1344,6 @@ void P_SetupLevel (char *lumpname)
 		R_PrecacheLevel ();
 
 	//Printf ("free memory: 0x%x\n", Z_FreeMemory());
-		
-	level.time = 0;
 }
 
 
@@ -793,8 +1351,15 @@ void P_SetupLevel (char *lumpname)
 //
 // P_Init
 //
+extern void SplashFactorCallback (cvar_t *);
+extern cvar_t *splashfactor;
+
 void P_Init (void)
 {
+	// [RH] Set callback for splashfactor cvar.
+	splashfactor->u.callback = SplashFactorCallback;
+	SplashFactorCallback (splashfactor);
+
 	P_InitSwitchList ();
 	P_InitPicAnims ();
 	R_InitSprites (sprnames);
diff --git a/code/P_sight.c b/code/P_sight.c
index 97c9d41e9b..53124ffb20 100644
--- a/code/P_sight.c
+++ b/code/P_sight.c
@@ -27,6 +27,7 @@
 #include "i_system.h"
 #include "p_local.h"
 #include "m_random.h"
+#include "m_bbox.h"
 
 // State.
 #include "r_state.h"
@@ -34,63 +35,41 @@
 //
 // P_CheckSight
 //
-fixed_t 		sightzstart;			// eye z of looker
-fixed_t 		topslope;
-fixed_t 		bottomslope;			// slopes to top and bottom of target
+// killough 4/19/98:
+// Convert LOS info to struct for reentrancy and efficiency of data locality
 
-divline_t		strace; 				// from t1 to t2
-fixed_t 		t2x;
-fixed_t 		t2y;
-
-int 			sightcounts[2];
+typedef struct {
+	fixed_t sightzstart;			// eye z of looker
+	fixed_t t2x, t2y;
+	divline_t strace;				// from t1 to t2
+	fixed_t topslope, bottomslope;	// slopes to top and bottom of target
+	fixed_t bbox[4];
+} los_t;
 
 
 //
 // P_DivlineSide
 // Returns side 0 (front), 1 (back), or 2 (on).
 //
-int P_DivlineSide (const fixed_t x, const fixed_t y, const divline_t *node)
+static int P_DivlineSide (const fixed_t x, const fixed_t y, const divline_t *node)
 {
-	fixed_t 	dx;
-	fixed_t 	dy;
-	fixed_t 	left;
-	fixed_t 	right;
-
 	if (!node->dx)
 	{
-		if (x==node->x)
-			return 2;
-		
-		if (x <= node->x)
-			return node->dy > 0;
-
-		return node->dy < 0;
+		return (x==node->x) ? 2 : ((x < node->x) ? node->dy > 0 : node->dy < 0);
 	}
-	
-	if (!node->dy)
+	else if (!node->dy)
 	{
+		return (y==node->y) ? 2 : ((y < node->y) ? node->dx < 0 : node->dx > 0);
+		//	   ^^^^^^^^^^^^
 		// [RH] Original code was (x==node->y), but that's obviously not right.
-		if (y==node->y)
-			return 2;
-
-		if (y <= node->y)
-			return node->dx < 0;
-
-		return node->dx > 0;
 	}
-		
-	dx = (x - node->x);
-	dy = (y - node->y);
+	else
+	{
+		fixed_t left =	(node->dy>>FRACBITS) * ((x - node->x)>>FRACBITS);
+		fixed_t right = ((y - node->y)>>FRACBITS) * (node->dx>>FRACBITS);
 
-	left =	(node->dy>>FRACBITS) * (dx>>FRACBITS);
-	right = (dy>>FRACBITS) * (node->dx>>FRACBITS);
-		
-	if (right < left)
-		return 0;		// front side
-	
-	if (left == right)
-		return 2;
-	return 1;			// back side
+		return (right < left) ? 0 : ((left == right) ? 2 : 1);
+	}
 }
 
 
@@ -100,23 +79,15 @@ int P_DivlineSide (const fixed_t x, const fixed_t y, const divline_t *node)
 // along the first divline.
 // This is only called by the addthings and addlines traversers.
 //
-fixed_t P_InterceptVector2 (const divline_t *v2, const divline_t *v1)
+//
+// killough 4/19/98: made static, cleaned up
+
+static fixed_t P_InterceptVector2(const divline_t *v2, const divline_t *v1)
 {
-	fixed_t 	frac;
-	fixed_t 	num;
-	fixed_t 	den;
-		
-	den = FixedMul (v1->dy>>8,v2->dx) - FixedMul(v1->dx>>8,v2->dy);
-
-	if (den == 0)
-		return 0;
-	//	I_Error ("P_InterceptVector: parallel");
-	
-	num = FixedMul ( (v1->x - v2->x)>>8 ,v1->dy) + 
-		FixedMul ( (v2->y - v1->y)>>8 , v1->dx);
-	frac = FixedDiv (num , den);
-
-	return frac;
+	fixed_t den;
+	return (den = FixedMul(v1->dy>>8, v2->dx) - FixedMul(v1->dx>>8, v2->dy)) ?
+			FixedDiv(FixedMul((v1->x - v2->x)>>8, v1->dy) +
+					 FixedMul((v2->y - v1->y)>>8, v1->dx), den) : 0;
 }
 
 //
@@ -124,122 +95,103 @@ fixed_t P_InterceptVector2 (const divline_t *v2, const divline_t *v1)
 // Returns true
 //	if strace crosses the given subsector successfully.
 //
-BOOL P_CrossSubsector (const int num)
+//
+// killough 4/19/98: made static and cleaned up
+
+static BOOL P_CrossSubsector(int num, register los_t *los)
 {
-	seg_t*				seg;
-	line_t* 			line;
-	int 				s1;
-	int 				s2;
-	int 				count;
-	subsector_t*		sub;
-	sector_t*			front;
-	sector_t*			back;
-	fixed_t 			opentop;
-	fixed_t 			openbottom;
-	divline_t			divl;
-	vertex_t*			v1;
-	vertex_t*			v2;
-	fixed_t 			frac;
-	fixed_t 			slope;
-		
+	seg_t *seg = segs + subsectors[num].firstline;
+	int count;
+
 #ifdef RANGECHECK
-	if (num>=numsubsectors)
-		I_Error ("P_CrossSubsector: ss %i with numss = %i",
-				 num,
-				 numsubsectors);
+	if (num >= numsubsectors)
+		I_Error("P_CrossSubsector: ss %i with numss = %i", num, numsubsectors);
 #endif
 
-	sub = &subsectors[num];
-
-	// check lines
-	count = sub->numlines;
-	seg = &segs[sub->firstline];
-
-	for ( ; count ; seg++, count--)
+	for (count = subsectors[num].numlines; --count >= 0; seg++)	// check lines
 	{
-		line = seg->linedef;
+		line_t *line = seg->linedef;
+		divline_t divl;
+		fixed_t opentop, openbottom;
+		const sector_t *front, *back;
+		const vertex_t *v1,*v2;
+		fixed_t frac;
 
-		// allready checked other side?
+		// already checked other side?
 		if (line->validcount == validcount)
 			continue;
-		
+
 		line->validcount = validcount;
-				
+
+		// OPTIMIZE: killough 4/20/98: Added quick bounding-box rejection test
+
+		if (line->bbox[BOXLEFT  ] > los->bbox[BOXRIGHT ] ||
+			line->bbox[BOXRIGHT ] < los->bbox[BOXLEFT  ] ||
+			line->bbox[BOXBOTTOM] > los->bbox[BOXTOP   ] ||
+			line->bbox[BOXTOP]    < los->bbox[BOXBOTTOM])
+			continue;
+
 		v1 = line->v1;
 		v2 = line->v2;
-		s1 = P_DivlineSide (v1->x,v1->y, &strace);
-		s2 = P_DivlineSide (v2->x, v2->y, &strace);
 
 		// line isn't crossed?
-		if (s1 == s2)
+		if (P_DivlineSide(v1->x, v1->y, &los->strace) ==
+			P_DivlineSide(v2->x, v2->y, &los->strace))
 			continue;
-		
-		divl.x = v1->x;
-		divl.y = v1->y;
-		// [RH] This is already calculated. Why calculate it again?
-		divl.dx = line->dx;
-		divl.dy = line->dy;
-	/*	divl.dx = v2->x - v1->x;
-		divl.dy = v2->y - v1->y;	*/
-		s1 = P_DivlineSide (strace.x, strace.y, &divl);
-		s2 = P_DivlineSide (t2x, t2y, &divl);
+
+		divl.dx = v2->x - (divl.x = v1->x);
+		divl.dy = v2->y - (divl.y = v1->y);
 
 		// line isn't crossed?
-		if (s1 == s2)
-			continue;	
+		if (P_DivlineSide(los->strace.x, los->strace.y, &divl) ==
+			P_DivlineSide(los->t2x, los->t2y, &divl))
+			continue;
 
 		// stop because it is not two sided anyway
-		// might do this after updating validcount?
-		if ( !(line->flags & ML_TWOSIDED) )
+		if (!(line->flags & ML_TWOSIDED) || (line->flags & ML_BLOCKEVERYTHING))
 			return false;
-		
-		// crosses a two sided line
-		front = seg->frontsector;
-		back = seg->backsector;
 
+		// crosses a two sided line
 		// no wall to block sight with?
-		if (front->floorheight == back->floorheight
-			&& front->ceilingheight == back->ceilingheight)
-			continue;	
+		if ((front = seg->frontsector)->floorheight ==
+			(back = seg->backsector)->floorheight &&
+			front->ceilingheight == back->ceilingheight)
+			continue;
 
 		// possible occluder
 		// because of ceiling height differences
-		if (front->ceilingheight < back->ceilingheight)
-			opentop = front->ceilingheight;
-		else
-			opentop = back->ceilingheight;
+		opentop = front->ceilingheight < back->ceilingheight ?
+				  front->ceilingheight : back->ceilingheight ;
 
 		// because of floor height differences
-		if (front->floorheight > back->floorheight)
-			openbottom = front->floorheight;
-		else
-			openbottom = back->floorheight;
-				
+		openbottom = front->floorheight > back->floorheight ?
+					 front->floorheight : back->floorheight ;
+
 		// quick test for totally closed doors
-		if (openbottom >= opentop)		
+		if (openbottom >= opentop)
 			return false;				// stop
-		
-		frac = P_InterceptVector2 (&strace, &divl);
+
+		frac = P_InterceptVector2(&los->strace, &divl);
 
 		if (front->floorheight != back->floorheight)
 		{
-			slope = FixedDiv (openbottom - sightzstart , frac);
-			if (slope > bottomslope)
-				bottomslope = slope;
-		}
-				
-		if (front->ceilingheight != back->ceilingheight)
-		{
-			slope = FixedDiv (opentop - sightzstart , frac);
-			if (slope < topslope)
-				topslope = slope;
+			fixed_t slope = FixedDiv(openbottom - los->sightzstart , frac);
+			if (slope > los->bottomslope)
+				los->bottomslope = slope;
 		}
 
-		if (topslope <= bottomslope)
-			return false;				// stop 						
+		if (front->ceilingheight != back->ceilingheight)
+		{
+			fixed_t slope = FixedDiv(opentop - los->sightzstart , frac);
+			if (slope < los->topslope)
+				los->topslope = slope;
+		}
+
+		if (los->topslope <= los->bottomslope)
+			return false;				// stop
 	}
 	// passed the subsector ok
-	return true;				
+	return true;
 }
 
 
@@ -249,39 +201,24 @@ BOOL P_CrossSubsector (const int num)
 // Returns true
 //	if strace crosses the given node successfully.
 //
-BOOL P_CrossBSPNode (const int bspnum)
+// killough 4/20/98: rewritten to remove tail recursion, clean up, and optimize
+
+static BOOL P_CrossBSPNode(int bspnum, register los_t *los)
 {
-	node_t* 	bsp;
-	int 		side;
-
-	if (bspnum & NF_SUBSECTOR)
+	while (!(bspnum & NF_SUBSECTOR))
 	{
-		if (bspnum == -1)
-			return P_CrossSubsector (0);
-		else
-			return P_CrossSubsector (bspnum&(~NF_SUBSECTOR));
+		register const node_t *bsp = nodes + bspnum;
+		int side = P_DivlineSide(los->strace.x,los->strace.y,(divline_t *)bsp)&1;
+		if (side == P_DivlineSide(los->t2x, los->t2y, (divline_t *) bsp))
+			bspnum = bsp->children[side]; // doesn't touch the other side
+		else {				// the partition plane is crossed here
+			if (!P_CrossBSPNode(bsp->children[side], los))
+				return 0;	// cross the starting side
+			else
+				bspnum = bsp->children[side^1];	// cross the ending side
+		}
 	}
-				
-	bsp = &nodes[bspnum];
-	
-	// decide which side the start point is on
-	side = P_DivlineSide (strace.x, strace.y, (divline_t *)bsp);
-	if (side == 2)
-		side = 0;		// an "on" should cross both sides
-
-	// cross the starting side
-	if (!P_CrossBSPNode (bsp->children[side]) )
-		return false;
-		
-	// the partition plane is crossed here
-	if (side == P_DivlineSide (t2x, t2y,(divline_t *)bsp))
-	{
-		// the line doesn't touch the other side
-		return true;
-	}
-	
-	// cross the ending side			
-	return P_CrossBSPNode (bsp->children[side^1]);
+	return P_CrossSubsector(bspnum == -1 ? 0 : bspnum & ~NF_SUBSECTOR, los);
 }
 
 
@@ -291,57 +228,64 @@ BOOL P_CrossBSPNode (const int bspnum)
 //	if a straight line between t1 and t2 is unobstructed.
 // Uses REJECT.
 //
-BOOL P_CheckSight (const mobj_t *t1, const mobj_t *t2)
+// killough 4/20/98: cleaned up, made to use new LOS struct
+
+BOOL P_CheckSight (const mobj_t *t1, const mobj_t *t2, BOOL ignoreInvisibility)
 {
-	int 		s1;
-	int 		s2;
-	int 		pnum;
-	int 		bytenum;
-	int 		bitnum;
+	const sector_t *s1 = t1->subsector->sector;
+	const sector_t *s2 = t2->subsector->sector;
+	int pnum = (s1-sectors)*numsectors + (s2-sectors);
+	los_t los;
+
+	// First check for trivial rejection.
+	// Determine subsector entries in REJECT table.
+	// Check in REJECT table.
+
+	if (rejectmatrix[pnum>>3] & (1 << (pnum&7)))	// can't possibly be connected
+		return false;
 
 	// [RH] Andy Baker's stealth monsters
 	// Cannot see an invisible object
-	if (t2->invisible)
-	{
-		if (P_Random (pr_checksight) > 50)	// small chance of an attack being made anyway
-			return false;
-	}
+	if (!ignoreInvisibility && (t2->flags2 & MF2_INVISIBLE)
+		&& P_Random (pr_checksight) > 50)	//^^^^^^^^ small chance of an attack being made anyway
+		return false;
 
-	// First check for trivial rejection.
+	// killough 4/19/98: make fake floors and ceilings block monster view
 
-	// Determine subsector entries in REJECT table.
-	s1 = (t1->subsector->sector - sectors);
-	s2 = (t2->subsector->sector - sectors);
-	pnum = s1*numsectors + s2;
-	bytenum = pnum>>3;
-	bitnum = 1 << (pnum&7);
-
-	// Check in REJECT table.
-	if (rejectmatrix[bytenum]&bitnum)
-	{
-		sightcounts[0]++;
-
-		// can't possibly be connected
-		return false;	
-	}
+	if ((s1->heightsec != -1 &&
+		((t1->z + t1->height <= sectors[s1->heightsec].floorheight &&
+		  t2->z >= sectors[s1->heightsec].floorheight) ||
+		 (t1->z >= sectors[s1->heightsec].ceilingheight &&
+		  t2->z + t1->height <= sectors[s1->heightsec].ceilingheight)))
+		||
+		(s2->heightsec != -1 &&
+		 ((t2->z + t2->height <= sectors[s2->heightsec].floorheight &&
+		   t1->z >= sectors[s2->heightsec].floorheight) ||
+		  (t2->z >= sectors[s2->heightsec].ceilingheight &&
+		   t1->z + t2->height <= sectors[s2->heightsec].ceilingheight))))
+		return false;
 
 	// An unobstructed LOS is possible.
 	// Now look from eyes of t1 to any part of t2.
-	sightcounts[1]++;
 
 	validcount++;
 		
-	sightzstart = t1->z + t1->height - (t1->height>>2);
-	topslope = (t2->z+t2->height) - sightzstart;
-	bottomslope = (t2->z) - sightzstart;
-		
-	strace.x = t1->x;
-	strace.y = t1->y;
-	t2x = t2->x;
-	t2y = t2->y;
-	strace.dx = t2->x - t1->x;
-	strace.dy = t2->y - t1->y;
+	los.topslope = (los.bottomslope = t2->z - (los.sightzstart =
+											   t1->z + t1->height -
+											   (t1->height>>2))) + t2->height;
+	los.strace.dx = (los.t2x = t2->x) - (los.strace.x = t1->x);
+	los.strace.dy = (los.t2y = t2->y) - (los.strace.y = t1->y);
+
+	if (t1->x > t2->x)
+		los.bbox[BOXRIGHT] = t1->x, los.bbox[BOXLEFT] = t2->x;
+	else
+		los.bbox[BOXRIGHT] = t2->x, los.bbox[BOXLEFT] = t1->x;
+
+	if (t1->y > t2->y)
+		los.bbox[BOXTOP] = t1->y, los.bbox[BOXBOTTOM] = t2->y;
+	else
+		los.bbox[BOXTOP] = t2->y, los.bbox[BOXBOTTOM] = t1->y;
 
 	// the head node is the last node output
-	return P_CrossBSPNode (numnodes-1); 
+	return P_CrossBSPNode (numnodes-1, &los); 
 }
diff --git a/code/P_spec.c b/code/P_spec.c
index edfd2f1fb6..c78258bf2d 100644
--- a/code/P_spec.c
+++ b/code/P_spec.c
@@ -22,6 +22,11 @@
 //		 according to adjacent sectors, respective
 //		 utility functions, etc.
 //		Line Tag handling. Line and Sector triggers.
+//		Implements donut linedef triggers
+//		Initializes and implements BOOM linedef triggers for
+//			Scrollers/Conveyors
+//			Friction
+//			Wind/Current
 //
 //-----------------------------------------------------------------------------
 
@@ -32,15 +37,18 @@
 
 #include "doomdef.h"
 #include "doomstat.h"
+#include "dstrings.h"
 
 #include "i_system.h"
 #include "z_zone.h"
 #include "m_argv.h"
 #include "m_random.h"
+#include "m_bbox.h"
 #include "w_wad.h"
 
 #include "r_local.h"
 #include "p_local.h"
+#include "p_lnspec.h"
 
 #include "g_game.h"
 
@@ -49,9 +57,6 @@
 // State.
 #include "r_state.h"
 
-// Data.
-#include "sounds.h"
-
 #include "c_consol.h"
 
 // [RH] Needed for sky scrolling
@@ -61,37 +66,44 @@
 // Animating textures and planes
 // There is another anim_t used in wi_stuff, unrelated.
 //
+// [RH] Expanded to work with a Hexen ANIMDEFS lump
+//
+#define MAX_ANIM_FRAMES	32
+
 typedef struct
 {
-	BOOL 	istexture;
-	int 	picnum;
-	int 	basepic;
-	int 	numpics;
-	int 	speed;
+	short 	basepic;
+	short	numframes;
+	byte 	istexture;
+	byte	uniqueframes;
+	byte	countdown;
+	byte	curframe;
+	byte 	speedmin[MAX_ANIM_FRAMES];
+	byte	speedmax[MAX_ANIM_FRAMES];
+	short	framepic[MAX_ANIM_FRAMES];
 } anim_t;
 
-//
-// source animation definition
-//
-// [RH] Note that in BOOM's ANIMATED lump, this is an array packed to
-//		byte boundaries. Total size: 23 bytes per entry.
-//
-typedef struct
-{
-	byte 	istexture;		// if false, it is a flat
-	char	endname[9];
-	char	startname[9];
-	int 	speed;
-} animdef_t;
 
 
+#define MAXANIMS	32		// Really just a starting point
 
 static anim_t*  lastanim;
 static anim_t*  anims;
+static size_t	maxanims;
 
+
+// Factor to scale scrolling effect into mobj-carrying properties = 3/32.
+// (This is so scrolling floors and objects on them can move at same speed.)
+#define CARRYFACTOR ((fixed_t)(FRACUNIT*.09375))
+
+static void Add_Scroller(int type, fixed_t dx, fixed_t dy,
+						 int control, int affectee, int accel);
 // killough 3/7/98: Initialize generalized scrolling
 static void P_SpawnScrollers(void);
 
+static void P_SpawnFriction(void);		// phares 3/16/98
+static void P_SpawnPushers(void);		// phares 3/20/98
+
 //
 //		Animating line specials
 //
@@ -100,6 +112,111 @@ static void P_SpawnScrollers(void);
 //extern	short	numlinespecials;
 //extern	line_t* linespeciallist[MAXLINEANIMS];
 
+//
+// [RH] P_InitAnimDefs
+//
+// This uses a Hexen ANIMDEFS lump to define the animation sequences
+//
+static void P_InitAnimDefs (void)
+{
+	int lump = W_CheckNumForName ("ANIMDEFS");
+	enum {
+		limbo,
+		newflat,
+		readingflat,
+		newtexture,
+		readingtexture
+	} state = limbo, newstate = limbo;
+	int frame, min, max;
+	char name[9];
+
+	if (lump >= 0) {
+		byte *animdefs = W_CacheLumpNum (lump, PU_CACHE);
+		byte *data;
+
+		while (data = COM_Parse (animdefs)) {
+			if (com_token[0] == ';') {
+				// Handle comments from Hexen ANIMDEFS lumps
+				while (*animdefs && *animdefs != ';')
+					animdefs++;
+				while (*animdefs && *animdefs != '\n')
+					animdefs++;
+				continue;
+			}
+			animdefs = data;
+
+			if (!stricmp (com_token, "flat")) {
+				newstate = newflat;
+			} else if (!stricmp (com_token, "texture")) {
+				newstate = newtexture;
+			} else if (!stricmp (com_token, "pic")) {
+				animdefs = COM_Parse (animdefs);
+				frame = atoi (com_token);
+				animdefs = COM_Parse (animdefs);
+				if (!stricmp (com_token, "tics")) {
+					animdefs = COM_Parse (animdefs);
+					min = max = atoi (com_token);
+				} else if (!stricmp (com_token, "rand")) {
+					animdefs = COM_Parse (animdefs);
+					min = atoi (com_token);
+					animdefs = COM_Parse (animdefs);
+					max = atoi (com_token);
+				}
+			}
+
+			if (newstate == newtexture || newstate == newflat) {
+				if (state != limbo) {
+					if (lastanim->numframes < 2)
+						I_FatalError ("P_InitAnimDefs: %s needs at least 2 frames", name);
+
+					lastanim->countdown = lastanim->speedmin[0];
+					lastanim++;
+				}
+
+				// 1/11/98 killough -- removed limit by array-doubling
+				if (lastanim >= anims + maxanims)
+				{
+					size_t newmax = maxanims ? maxanims*2 : MAXANIMS;
+					anims = Realloc(anims, newmax*sizeof(*anims));   // killough
+					lastanim = anims + maxanims;
+					maxanims = newmax;
+				}
+
+				lastanim->uniqueframes = 1;
+				lastanim->curframe = 0;
+				lastanim->numframes = 0;
+				lastanim->istexture = (newstate == newtexture);
+				memset (lastanim->speedmin, 1, MAX_ANIM_FRAMES * sizeof(*lastanim->speedmin));
+				memset (lastanim->speedmax, 1, MAX_ANIM_FRAMES * sizeof(*lastanim->speedmax));
+
+				animdefs = COM_Parse (animdefs);
+
+				if (lastanim->istexture)
+					lastanim->basepic = R_TextureNumForName (com_token);
+				else
+					lastanim->basepic = R_FlatNumForName (com_token);
+
+				strncpy (name, com_token, 8);
+				name[8] = 0;
+
+				state = (newstate == newflat) ? readingflat : readingtexture;
+				newstate = limbo;
+			} else if (state == readingflat || state == readingtexture) {
+				if (lastanim->numframes < MAX_ANIM_FRAMES) {
+					lastanim->speedmin[lastanim->numframes] = min;
+					lastanim->speedmax[lastanim->numframes] = max;
+					lastanim->framepic[lastanim->numframes] = frame + lastanim->basepic - 1;
+					lastanim->numframes++;
+				}
+			}
+		}
+		if (state == readingflat || state == readingtexture) {
+			lastanim->countdown = lastanim->speedmin[0];
+			lastanim++;
+		}
+	}
+}
+
 
 //
 // P_InitPicAnims
@@ -127,61 +244,67 @@ static void P_SpawnScrollers(void);
 //
 void P_InitPicAnims (void)
 {
-	byte *animdefs = W_CacheLumpName ("ANIMATED", PU_STATIC);
-	byte *anim_p;
+	byte *animdefs, *anim_p;
+
+	// [RH] Load an ANIMDEFS lump first
+	P_InitAnimDefs ();
+	
+	if (W_CheckNumForName ("ANIMATED") == -1)
+		return;
+
+	animdefs = W_CacheLumpName ("ANIMATED", PU_STATIC);
 
 	// Init animation
 
-	// [RH] Figure out maximum size of anims array
-	{
-		int i;
-
-		for (i = 0, anim_p = animdefs; *anim_p != 255; anim_p += 23, i++)
-			;
-
-		if (i == 0) {
-			// No animdefs
-			anims = lastanim = NULL;
-			Z_Free (animdefs);
-			return;
-		}
-
-		lastanim = anims = Z_Malloc (i*sizeof(*anims), PU_STATIC, 0);
-	}
-
 	for (anim_p = animdefs; *anim_p != 255; anim_p += 23)
 	{
+		// 1/11/98 killough -- removed limit by array-doubling
+		if (lastanim >= anims + maxanims)
+		{
+			size_t newmax = maxanims ? maxanims*2 : MAXANIMS;
+			anims = Realloc(anims, newmax*sizeof(*anims));   // killough
+			lastanim = anims + maxanims;
+			maxanims = newmax;
+		}
+
 		if (*anim_p /* .istexture */)
 		{
 			// different episode ?
 			if (R_CheckTextureNumForName (anim_p + 10 /* .startname */) == -1)
 				continue;		
 
-			lastanim->picnum = R_TextureNumForName (anim_p + 1 /* .endname */);
 			lastanim->basepic = R_TextureNumForName (anim_p + 10 /* .startname */);
+			lastanim->numframes = R_TextureNumForName (anim_p + 1 /* .endname */)
+								  - lastanim->basepic + 1;
 		}
 		else
 		{
 			if ((W_CheckNumForName)(anim_p + 10 /* .startname */, ns_flats) == -1)
 				continue;
 
-			lastanim->picnum = R_FlatNumForName (anim_p + 1 /* .endname */);
 			lastanim->basepic = R_FlatNumForName (anim_p + 10 /* .startname */);
+			lastanim->numframes = R_FlatNumForName (anim_p + 1 /* .endname */)
+								  - lastanim->basepic + 1;
 		}
 
 		lastanim->istexture = *anim_p /* .istexture */;
-		lastanim->numpics = lastanim->picnum - lastanim->basepic + 1;
+		lastanim->uniqueframes = 0;
+		lastanim->curframe = 0;
 
-		if (lastanim->numpics < 2)
-			I_Error ("P_InitPicAnims: bad cycle from %s to %s",
+		if (lastanim->numframes < 2)
+			I_FatalError ("P_InitPicAnims: bad cycle from %s to %s",
 					 anim_p + 10 /* .startname */,
 					 anim_p + 1 /* .endname */);
 		
-		lastanim->speed = /* .speed */
-						  (anim_p[19] << 0) |
-						  (anim_p[20] << 8) |
-						  (anim_p[21] << 16) |
-						  (anim_p[22] << 24);
+		lastanim->speedmin[0] = lastanim->speedmax[0] = lastanim->countdown =
+					/* .speed */
+					(anim_p[19] << 0) |
+					(anim_p[20] << 8) |
+					(anim_p[21] << 16) |
+					(anim_p[22] << 24);
+
+		lastanim->countdown--;
+
 		lastanim++;
 	}
 	Z_Free (animdefs);
@@ -191,12 +314,16 @@ void P_InitPicAnims (void)
 // [RH] Check dmflags for noexit and respond accordingly
 BOOL CheckIfExitIsGood (mobj_t *self)
 {
+	if (self == NULL)
+		return false;
+
 	if (deathmatch->value && dmflags & DF_NO_EXIT && self) {
 		while (self->health > 0)
 			P_DamageMobj (self, self, self, 10000, MOD_EXIT);
 		return false;
 	}
-	Printf ("%s exited the level.\n", self->player->userinfo->netname);
+	if (deathmatch->value)
+		Printf ("%s exited the level.\n", self->player->userinfo.netname);
 	return true;
 }
 
@@ -241,9 +368,6 @@ int twoSided (int sector, int line)
 	return (sectors[sector].lines[line])->flags & ML_TWOSIDED;
 }
 
-
-
-
 //
 // getNextSector()
 // Return sector_t * of sector next to current.
@@ -253,13 +377,45 @@ sector_t *getNextSector (line_t *line, sector_t *sec)
 {
 	if (!(line->flags & ML_TWOSIDED))
 		return NULL;
-				
-	if (line->frontsector == sec)
-		return line->backsector;
+	
+	return (line->frontsector == sec) ? line->backsector : line->frontsector;
 		
 	return line->frontsector;
 }
 
+// [RH]
+// P_NextSpecialSector()
+//
+// Returns the next special sector attached to this sector
+// with a certain special.
+sector_t *P_NextSpecialSector (sector_t *sec, int type, sector_t *nogood)
+{
+	sector_t *tsec;
+	int i;
+
+	for (i = 0; i < sec->linecount; i++) {
+		line_t *ln = sec->lines[i];
+
+		if (!(ln->flags & ML_TWOSIDED) ||
+			!(tsec = ln->frontsector))
+			continue;
+
+		if (sec == tsec) {
+			tsec = ln->backsector;
+			if (sec == tsec)
+				continue;
+		}
+
+		if (tsec == nogood)
+			continue;
+
+		if ((tsec->special & 0x00ff) == type) {
+			return tsec;
+		}
+	}
+	return NULL;
+}
+
 //
 // P_SectorActive()
 //
@@ -410,17 +566,78 @@ fixed_t P_FindNextLowestFloor(sector_t *sec, int currentheight)
 	return currentheight;
 }
 
+//
+// P_FindNextLowestCeiling()
+//
+// Passed a sector and a ceiling height, returns the fixed point value
+// of the largest ceiling height in a surrounding sector smaller than
+// the ceiling height passed. If no such height exists the ceiling height
+// passed is returned.
+//
+// jff 02/03/98 Twiddled Lee's P_FindNextHighestFloor to make this
+//
+fixed_t P_FindNextLowestCeiling (sector_t *sec, int currentheight)
+{
+	sector_t *other;
+	int i;
+
+	for (i = 0; i < sec->linecount; i++)
+		if ((other = getNextSector(sec->lines[i],sec)) &&
+			other->ceilingheight < currentheight)
+		{
+			int height = other->ceilingheight;
+			while (++i < sec->linecount)
+				if ((other = getNextSector(sec->lines[i],sec)) &&
+					 other->ceilingheight > height &&
+					 other->ceilingheight < currentheight)
+					height = other->ceilingheight;
+			return height;
+		}
+	return currentheight;
+}
+
+
+//
+// P_FindNextHighestCeiling()
+//
+// Passed a sector and a ceiling height, returns the fixed point value
+// of the smallest ceiling height in a surrounding sector larger than
+// the ceiling height passed. If no such height exists the ceiling height
+// passed is returned.
+//
+// jff 02/03/98 Twiddled Lee's P_FindNextHighestFloor to make this
+//
+fixed_t P_FindNextHighestCeiling (sector_t *sec, int currentheight)
+{
+	sector_t *other;
+	int i;
+
+	for (i = 0; i < sec->linecount; i++)
+		if ((other = getNextSector(sec->lines[i],sec)) &&
+			 other->ceilingheight > currentheight)
+		{
+			int height = other->ceilingheight;
+			while (++i < sec->linecount)
+				if ((other = getNextSector(sec->lines[i],sec)) &&
+					 other->ceilingheight < height &&
+					 other->ceilingheight > currentheight)
+					height = other->ceilingheight;
+			return height;
+		}
+	return currentheight;
+}
+
 //
 // FIND LOWEST CEILING IN THE SURROUNDING SECTORS
 //
 fixed_t P_FindLowestCeilingSurrounding (sector_t *sec)
 {
-	int 				i;
-	line_t* 			check;
-	sector_t*			other;
-	fixed_t 			height = MAXINT;
+	int 		i;
+	line_t* 	check;
+	sector_t*	other;
+	fixed_t 	height = MAXINT;
 		
-	for (i=0 ;i < sec->linecount ; i++)
+	for (i = 0; i < sec->linecount; i++)
 	{
 		check = sec->lines[i];
 		other = getNextSector(check,sec);
@@ -445,7 +662,7 @@ fixed_t P_FindHighestCeilingSurrounding (sector_t *sec)
 	sector_t*	other;
 	fixed_t 	height = MININT;
 		
-	for (i=0 ;i < sec->linecount ; i++)
+	for (i = 0; i < sec->linecount; i++)
 	{
 		check = sec->lines[i];
 		other = getNextSector(check,sec);
@@ -460,30 +677,209 @@ fixed_t P_FindHighestCeilingSurrounding (sector_t *sec)
 }
 
 
+//
+// P_FindShortestTextureAround()
+//
+// Passed a sector number, returns the shortest lower texture on a
+// linedef bounding the sector.
+//
+// jff 02/03/98 Add routine to find shortest lower texture
+//
+fixed_t P_FindShortestTextureAround (int secnum)
+{
+	int minsize = MAXINT;
+	side_t *side;
+	int i;
+	sector_t *sec = &sectors[secnum];
+
+	for (i = 0; i < sec->linecount; i++)
+	{
+		if (twoSided(secnum, i))
+		{
+			side = getSide(secnum,i,0);
+			if (side->bottomtexture >= 0)
+				if (textureheight[side->bottomtexture] < minsize)
+					minsize = textureheight[side->bottomtexture];
+			side = getSide(secnum,i,1);
+			if (side->bottomtexture >= 0)
+				if (textureheight[side->bottomtexture] < minsize)
+					minsize = textureheight[side->bottomtexture];
+		}
+	}
+	return minsize;
+}
+
+
+//
+// P_FindShortestUpperAround()
+//
+// Passed a sector number, returns the shortest upper texture on a
+// linedef bounding the sector.
+//
+// Note: If no upper texture exists 32000*FRACUNIT is returned.
+//       but if compatibility then MAXINT is returned
+//
+// jff 03/20/98 Add routine to find shortest upper texture
+//
+fixed_t P_FindShortestUpperAround (int secnum)
+{
+	int minsize = MAXINT;
+	side_t *side;
+	int i;
+	sector_t *sec = &sectors[secnum];
+
+	for (i = 0; i < sec->linecount; i++)
+	{
+		if (twoSided(secnum, i))
+		{
+			side = getSide(secnum,i,0);
+			if (side->toptexture >= 0)
+				if (textureheight[side->toptexture] < minsize)
+					minsize = textureheight[side->toptexture];
+			side = getSide(secnum,i,1);
+			if (side->toptexture >= 0)
+				if (textureheight[side->toptexture] < minsize)
+					minsize = textureheight[side->toptexture];
+		}
+	}
+	return minsize;
+}
+
+
+//
+// P_FindModelFloorSector()
+//
+// Passed a floor height and a sector number, return a pointer to a
+// a sector with that floor height across the lowest numbered two sided
+// line surrounding the sector.
+//
+// Note: If no sector at that height bounds the sector passed, return NULL
+//
+// jff 02/03/98 Add routine to find numeric model floor
+//  around a sector specified by sector number
+// jff 3/14/98 change first parameter to plain height to allow call
+//  from routine not using floormove_t
+//
+sector_t *P_FindModelFloorSector (fixed_t floordestheight, int secnum)
+{
+	int i;
+	sector_t *sec = &sectors[secnum];
+	int linecount;
+
+	//jff 5/23/98 don't disturb sec->linecount while searching
+	// but allow early exit in old demos
+	linecount = sec->linecount;
+	for (i = 0; i < (olddemo && sec->linecount < linecount ?
+					sec->linecount : linecount); i++)
+	{
+		if (twoSided(secnum, i))
+		{
+			if (getSide (secnum,i,0)->sector-sectors == secnum)
+				sec = getSector(secnum,i,1);
+			else
+				sec = getSector(secnum,i,0);
+
+			if (sec->floorheight == floordestheight)
+				return sec;
+		}
+	}
+	return NULL;
+}
+
+
+//
+// P_FindModelCeilingSector()
+//
+// Passed a ceiling height and a sector number, return a pointer to a
+// a sector with that ceiling height across the lowest numbered two sided
+// line surrounding the sector.
+//
+// Note: If no sector at that height bounds the sector passed, return NULL
+//
+// jff 02/03/98 Add routine to find numeric model ceiling
+//  around a sector specified by sector number
+//  used only from generalized ceiling types
+// jff 3/14/98 change first parameter to plain height to allow call
+//  from routine not using ceiling_t
+//
+sector_t *P_FindModelCeilingSector (fixed_t ceildestheight, int secnum)
+{
+	int i;
+	sector_t *sec = &sectors[secnum];
+	int linecount;
+
+	//jff 5/23/98 don't disturb sec->linecount while searching
+	// but allow early exit in old demos
+	linecount = sec->linecount;
+	for (i = 0; i < (olddemo && sec->linecount < linecount ?
+					 sec->linecount : linecount); i++)
+	{
+		if (twoSided (secnum, i))
+		{
+			if (getSide (secnum,i,0)->sector-sectors == secnum)
+				sec = getSector (secnum,i,1);
+			else
+				sec = getSector (secnum,i,0);
+
+			if (sec->ceilingheight == ceildestheight)
+				return sec;
+		}
+	}
+	return NULL;
+}
+
 
 //
 // RETURN NEXT SECTOR # THAT LINE TAG REFERS TO
 //
-int P_FindSectorFromLineTag (line_t *line, int start)
+
+// Find the next sector with a specified tag.
+// Rewritten by Lee Killough to use chained hashing to improve speed
+
+int P_FindSectorFromTag (int tag, int start)
 {
-	int i;
-		
-	for (i=start+1;i<numsectors;i++)
-		if (sectors[i].tag == line->tag)
-			return i;
-	
-	return -1;
+	start = start >= 0 ? sectors[start].nexttag :
+		sectors[(unsigned) tag % (unsigned) numsectors].firsttag;
+	while (start >= 0 && sectors[start].tag != tag)
+		start = sectors[start].nexttag;
+	return start;
 }
 
-int P_FindLineFromLineTag (line_t *line, int start)
+// killough 4/16/98: Same thing, only for linedefs
+
+int P_FindLineFromID (int id, int start)
 {
-	int i;
+  start = start >= 0 ? lines[start].nextid :
+    lines[(unsigned) id % (unsigned) numlines].firstid;
+  while (start >= 0 && lines[start].id != id)
+    start = lines[start].nextid;
+  return start;
+}
 
-	for (i = start+1; i < numlines; i++)
-		if (lines[i].tag == line->tag)
-			return i;
+// Hash the sector tags across the sectors and linedefs.
+static void P_InitTagLists (void)
+{
+	register int i;
 
-	return -1;
+	for (i=numsectors; --i>=0; )		// Initially make all slots empty.
+		sectors[i].firsttag = -1;
+	for (i=numsectors; --i>=0; )		// Proceed from last to first sector
+	{									// so that lower sectors appear first
+		int j = (unsigned) sectors[i].tag % (unsigned) numsectors;	// Hash func
+		sectors[i].nexttag = sectors[j].firsttag;	// Prepend sector to chain
+		sectors[j].firsttag = i;
+	}
+
+	// killough 4/17/98: same thing, only for linedefs
+
+	for (i=numlines; --i>=0; )			// Initially make all slots empty.
+		lines[i].firstid = -1;
+	for (i=numlines; --i>=0; )        // Proceed from last to first linedef
+	{									// so that lower linedefs appear first
+		int j = (unsigned) lines[i].id % (unsigned) numlines;	// Hash func
+		lines[i].nextid = lines[j].firstid;	// Prepend linedef to chain
+		lines[j].firstid = i;
+	}
 }
 
 
@@ -512,6 +908,99 @@ int P_FindMinSurroundingLight (sector_t *sector, int max)
 	return min;
 }
 
+// [RH] P_CheckKeys
+//
+//	Returns true if the player has the desired key,
+//	false otherwise.
+
+BOOL P_CheckKeys (player_t *p, keytype_t lock, BOOL remote)
+{
+	if (lock & 0x7f == NoKey)
+		return true;
+
+	if (!p)
+		return false;
+
+	{
+		char *msg;
+		BOOL bc, rc, yc, bs, rs, ys;
+		BOOL equiv = lock & 0x80;
+
+		lock = lock & 0x7f;
+
+		bc = p->cards[it_bluecard];
+		rc = p->cards[it_redcard];
+		yc = p->cards[it_yellowcard];
+		bs = p->cards[it_blueskull];
+		rs = p->cards[it_redskull];
+		ys = p->cards[it_yellowskull];
+
+		if (equiv) {
+			bc = bs = (bc || bs);
+			rc = rs = (rc || rs);
+			yc = yc = (yc || ys);
+		}
+
+		switch (lock) {
+			default:		// Unknown key; assume we have it
+				return true;
+
+			case AnyKey:
+				if (bc || bs || rc || rs || yc || ys)
+					return true;
+				msg = PD_ANY;
+				break;
+
+			case AllKeys:
+				if (bc && bs && rc && rs && yc && ys)
+					return true;
+				msg = equiv ? PD_ALL3 : PD_ALL6;
+				break;
+
+			case RCard:
+				if (rc)
+					return true;
+				msg = equiv ? (remote ? PD_REDO : PD_REDK) : PD_REDC;
+				break;
+
+			case BCard:
+				if (bc)
+					return true;
+				msg = equiv ? (remote ? PD_BLUEO : PD_BLUEK) : PD_BLUEC;
+				break;
+
+			case YCard:
+				if (yc)
+					return true;
+				msg = equiv ? (remote ? PD_YELLOWO : PD_YELLOWK) : PD_YELLOWC;
+				break;
+
+			case RSkull:
+				if (rs)
+					return true;
+				msg = equiv ? (remote ? PD_REDO : PD_REDK) : PD_REDS;
+				break;
+
+			case BSkull:
+				if (bs)
+					return true;
+				msg = equiv ? (remote ? PD_BLUEO : PD_BLUEK) : PD_BLUES;
+				break;
+
+			case YSkull:
+				if (ys)
+					return true;
+				msg = equiv ? (remote ? PD_YELLOWO : PD_YELLOWK) : PD_YELLOWS;
+				break;
+		}
+
+		// If we get here, we don't have the right key,
+		// so print an appropriate message and grunt.
+		C_MidPrint (msg);
+		S_StartSound (ORIGIN_AMBIENT, "misc/keytry", 96);
+	}
+	return false;
+}
 
 
 //
@@ -523,19 +1012,23 @@ int P_FindMinSurroundingLight (sector_t *sector, int max)
 //
 // P_CrossSpecialLine - TRIGGER
 // Called every time a thing origin is about
-//	to cross a line with a non 0 special.
+//	to cross a line with a non 0 special that has
+//	ML_ACTIVATECROSS or ML_ACTIVATEMONSTERCROSS set.
 //
 void P_CrossSpecialLine (int linenum, int side, mobj_t *thing)
 {
-	line_t* 	line;
-	int 		ok;
+	line_t *line = &lines[linenum];
+	int		activate = line->flags & ML_ACTIVATIONMASK;
+
+	// [RH] Leave if player crossed an ML_ACTIVATEMONSTERCROSS line.
+	if (thing->player && (activate == ML_ACTIVATEMONSTERCROSS))
+		return;
 
-	line = &lines[linenum];
-	
 	//	Triggers that other things can activate
 	if (!thing->player)
 	{
 		// Things that should NOT trigger specials...
+		// [RH] ...unless the line says they can
 		switch(thing->type)
 		{
 		  case MT_ROCKET:
@@ -544,444 +1037,52 @@ void P_CrossSpecialLine (int linenum, int side, mobj_t *thing)
 		  case MT_TROOPSHOT:
 		  case MT_HEADSHOT:
 		  case MT_BRUISERSHOT:
+			if (!olddemo) {
+				TeleportSide = side;
+				P_ShotCrossSpecialLine (thing, lines + linenum);
+			}
 			return;
 			break;
 			
 		  default: break;
 		}
-				
-		ok = 0;
-		switch(line->special)
-		{
-		  case 39:		// TELEPORT TRIGGER
-		  case 97:		// TELEPORT RETRIGGER
-		  case 125: 	// TELEPORT MONSTERONLY TRIGGER
-		  case 126: 	// TELEPORT MONSTERONLY RETRIGGER
-		  case 4:		// RAISE DOOR
-		  case 10:		// PLAT DOWN-WAIT-UP-STAY TRIGGER
-		  case 88:		// PLAT DOWN-WAIT-UP-STAY RETRIGGER
-			ok = 1;
-			break;
-		}
-		if (!ok)
+
+		// [RH] Leave if this line says monsters can't activate it.
+		//		(Some specials imply ML_MONSTERSCANACTIVATE)
+		if (line->flags & ML_SECRET)
+			return;
+		if (activate == ML_ACTIVATECROSS &&
+			!(line->flags & ML_MONSTERSCANACTIVATE) &&
+			line->special != Teleport &&
+			line->special != Door_Raise &&
+			line->special != Plat_DownWaitUpStayLip &&
+			line->special != Plat_DownWaitUpStay &&
+			line->special != Teleport_NoFog &&
+			line->special != Teleport_Line)
 			return;
 	}
-
 	
-	// Note: could use some const's here.
-	switch (line->special)
+	// [RH] Leave if line is not triggered when crossed
+	if (activate != ML_ACTIVATEMONSTERCROSS &&
+		activate != ML_ACTIVATECROSS)
+		return;
+
+	TeleportSide = side;
+
+	// [RH] Use LineSpecials[] dispatcher table
 	{
-		// TRIGGERS.
-		// All from here to RETRIGGERS.
-	  case 2:
-		// Open Door
-		EV_DoDoor(line,open);
-		line->special = 0;
-		break;
+		BOOL success = LineSpecials[line->special]
+							(line, thing, line->args[0],
+							 line->args[1], line->args[2],
+							 line->args[3], line->args[4]);
 
-	  case 3:
-		// Close Door
-		EV_DoDoor(line,close);
-		line->special = 0;
-		break;
-
-	  case 4:
-		// Raise Door
-		EV_DoDoor(line,normal);
-		line->special = 0;
-		break;
-		
-	  case 5:
-		// Raise Floor
-		EV_DoFloor(line,raiseFloor);
-		line->special = 0;
-		break;
-		
-	  case 6:
-		// Fast Ceiling Crush & Raise
-		EV_DoCeiling(line,fastCrushAndRaise);
-		line->special = 0;
-		break;
-		
-	  case 8:
-		// Build Stairs
-		EV_BuildStairs(line,build8);
-		line->special = 0;
-		break;
-		
-	  case 10:
-		// PlatDownWaitUp
-		EV_DoPlat(line,downWaitUpStay,0);
-		line->special = 0;
-		break;
-		
-	  case 12:
-		// Light Turn On - brightest near
-		EV_LightTurnOn(line,0);
-		line->special = 0;
-		break;
-		
-	  case 13:
-		// Light Turn On 255
-		EV_LightTurnOn(line,255);
-		line->special = 0;
-		break;
-		
-	  case 16:
-		// Close Door 30
-		EV_DoDoor(line,close30ThenOpen);
-		line->special = 0;
-		break;
-		
-	  case 17:
-		// Start Light Strobing
-		EV_StartLightStrobing(line);
-		line->special = 0;
-		break;
-		
-	  case 19:
-		// Lower Floor
-		EV_DoFloor(line,lowerFloor);
-		line->special = 0;
-		break;
-		
-	  case 22:
-		// Raise floor to nearest height and change texture
-		EV_DoPlat(line,raiseToNearestAndChange,0);
-		line->special = 0;
-		break;
-		
-	  case 25:
-		// Ceiling Crush and Raise
-		EV_DoCeiling(line,crushAndRaise);
-		line->special = 0;
-		break;
-		
-	  case 30:
-		// Raise floor to shortest texture height
-		//	on either side of lines.
-		EV_DoFloor(line,raiseToTexture);
-		line->special = 0;
-		break;
-		
-	  case 35:
-		// Lights Very Dark
-		EV_LightTurnOn(line,35);
-		line->special = 0;
-		break;
-		
-	  case 36:
-		// Lower Floor (TURBO)
-		EV_DoFloor(line,turboLower);
-		line->special = 0;
-		break;
-		
-	  case 37:
-		// LowerAndChange
-		EV_DoFloor(line,lowerAndChange);
-		line->special = 0;
-		break;
-		
-	  case 38:
-		// Lower Floor To Lowest
-		EV_DoFloor( line, lowerFloorToLowest );
-		line->special = 0;
-		break;
-		
-	  case 39:
-		// TELEPORT!
-		EV_Teleport( line, side, thing );
-		line->special = 0;
-		break;
-
-	  case 40:
-		// RaiseCeilingLowerFloor
-		EV_DoCeiling( line, raiseToHighest );
-		EV_DoFloor( line, lowerFloorToLowest );
-		line->special = 0;
-		break;
-		
-	  case 44:
-		// Ceiling Crush
-		EV_DoCeiling( line, lowerAndCrush );
-		line->special = 0;
-		break;
-		
-	  case 52:
-		// EXIT!
-		if (CheckIfExitIsGood (thing))
-			G_ExitLevel ();
-		break;
-		
-	  case 53:
-		// Perpetual Platform Raise
-		EV_DoPlat(line,perpetualRaise,0);
-		line->special = 0;
-		break;
-		
-	  case 54:
-		// Platform Stop
-		EV_StopPlat(line);
-		line->special = 0;
-		break;
-
-	  case 56:
-		// Raise Floor Crush
-		EV_DoFloor(line,raiseFloorCrush);
-		line->special = 0;
-		break;
-
-	  case 57:
-		// Ceiling Crush Stop
-		EV_CeilingCrushStop(line);
-		line->special = 0;
-		break;
-		
-	  case 58:
-		// Raise Floor 24
-		EV_DoFloor(line,raiseFloor24);
-		line->special = 0;
-		break;
-
-	  case 59:
-		// Raise Floor 24 And Change
-		EV_DoFloor(line,raiseFloor24AndChange);
-		line->special = 0;
-		break;
-		
-	  case 104:
-		// Turn lights off in sector(tag)
-		EV_TurnTagLightsOff(line);
-		line->special = 0;
-		break;
-		
-	  case 108:
-		// Blazing Door Raise (faster than TURBO!)
-		EV_DoDoor (line,blazeRaise);
-		line->special = 0;
-		break;
-		
-	  case 109:
-		// Blazing Door Open (faster than TURBO!)
-		EV_DoDoor (line,blazeOpen);
-		line->special = 0;
-		break;
-		
-	  case 100:
-		// Build Stairs Turbo 16
-		EV_BuildStairs(line,turbo16);
-		line->special = 0;
-		break;
-		
-	  case 110:
-		// Blazing Door Close (faster than TURBO!)
-		EV_DoDoor (line,blazeClose);
-		line->special = 0;
-		break;
-
-	  case 119:
-		// Raise floor to nearest surr. floor
-		EV_DoFloor(line,raiseFloorToNearest);
-		line->special = 0;
-		break;
-		
-	  case 121:
-		// Blazing PlatDownWaitUpStay
-		EV_DoPlat(line,blazeDWUS,0);
-		line->special = 0;
-		break;
-		
-	  case 124:
-		// Secret EXIT
-		if (CheckIfExitIsGood (thing))
-			G_SecretExitLevel ();
-		break;
-				
-	  case 125:
-		// TELEPORT MonsterONLY
-		if (!thing->player)
-		{
-			EV_Teleport( line, side, thing );
+		// Erase the line special if this special isn't repeatable.
+		// DOOM always cleared the special whether it succeded or not.
+		if (!(line->flags & ML_REPEATABLE) && (success || olddemo))
 			line->special = 0;
-		}
-		break;
-		
-	  case 130:
-		// Raise Floor Turbo
-		EV_DoFloor(line,raiseFloorTurbo);
-		line->special = 0;
-		break;
-		
-	  case 141:
-		// Silent Ceiling Crush & Raise
-		EV_DoCeiling(line,silentCrushAndRaise);
-		line->special = 0;
-		break;
-		
-		// RETRIGGERS.	All from here till end.
-	  case 72:
-		// Ceiling Crush
-		EV_DoCeiling( line, lowerAndCrush );
-		break;
-
-	  case 73:
-		// Ceiling Crush and Raise
-		EV_DoCeiling(line,crushAndRaise);
-		break;
-
-	  case 74:
-		// Ceiling Crush Stop
-		EV_CeilingCrushStop(line);
-		break;
-		
-	  case 75:
-		// Close Door
-		EV_DoDoor(line,close);
-		break;
-		
-	  case 76:
-		// Close Door 30
-		EV_DoDoor(line,close30ThenOpen);
-		break;
-		
-	  case 77:
-		// Fast Ceiling Crush & Raise
-		EV_DoCeiling(line,fastCrushAndRaise);
-		break;
-		
-	  case 79:
-		// Lights Very Dark
-		EV_LightTurnOn(line,35);
-		break;
-		
-	  case 80:
-		// Light Turn On - brightest near
-		EV_LightTurnOn(line,0);
-		break;
-		
-	  case 81:
-		// Light Turn On 255
-		EV_LightTurnOn(line,255);
-		break;
-		
-	  case 82:
-		// Lower Floor To Lowest
-		EV_DoFloor( line, lowerFloorToLowest );
-		break;
-		
-	  case 83:
-		// Lower Floor
-		EV_DoFloor(line,lowerFloor);
-		break;
-
-	  case 84:
-		// LowerAndChange
-		EV_DoFloor(line,lowerAndChange);
-		break;
-
-	  case 86:
-		// Open Door
-		EV_DoDoor(line,open);
-		break;
-		
-	  case 87:
-		// Perpetual Platform Raise
-		EV_DoPlat(line,perpetualRaise,0);
-		break;
-		
-	  case 88:
-		// PlatDownWaitUp
-		EV_DoPlat(line,downWaitUpStay,0);
-		break;
-		
-	  case 89:
-		// Platform Stop
-		EV_StopPlat(line);
-		break;
-		
-	  case 90:
-		// Raise Door
-		EV_DoDoor(line,normal);
-		break;
-		
-	  case 91:
-		// Raise Floor
-		EV_DoFloor(line,raiseFloor);
-		break;
-		
-	  case 92:
-		// Raise Floor 24
-		EV_DoFloor(line,raiseFloor24);
-		break;
-		
-	  case 93:
-		// Raise Floor 24 And Change
-		EV_DoFloor(line,raiseFloor24AndChange);
-		break;
-		
-	  case 94:
-		// Raise Floor Crush
-		EV_DoFloor(line,raiseFloorCrush);
-		break;
-		
-	  case 95:
-		// Raise floor to nearest height
-		// and change texture.
-		EV_DoPlat(line,raiseToNearestAndChange,0);
-		break;
-		
-	  case 96:
-		// Raise floor to shortest texture height
-		// on either side of lines.
-		EV_DoFloor(line,raiseToTexture);
-		break;
-		
-	  case 97:
-		// TELEPORT!
-		EV_Teleport( line, side, thing );
-		break;
-		
-	  case 98:
-		// Lower Floor (TURBO)
-		EV_DoFloor(line,turboLower);
-		break;
-
-	  case 105:
-		// Blazing Door Raise (faster than TURBO!)
-		EV_DoDoor (line,blazeRaise);
-		break;
-		
-	  case 106:
-		// Blazing Door Open (faster than TURBO!)
-		EV_DoDoor (line,blazeOpen);
-		break;
-
-	  case 107:
-		// Blazing Door Close (faster than TURBO!)
-		EV_DoDoor (line,blazeClose);
-		break;
-
-	  case 120:
-		// Blazing PlatDownWaitUpStay.
-		EV_DoPlat(line,blazeDWUS,0);
-		break;
-		
-	  case 126:
-		// TELEPORT MonsterONLY.
-		if (!thing->player)
-			EV_Teleport( line, side, thing );
-		break;
-		
-	  case 128:
-		// Raise To Nearest Floor
-		EV_DoFloor(line,raiseFloorToNearest);
-		break;
-		
-	  case 129:
-		// Raise Floor Turbo
-		EV_DoFloor(line,raiseFloorTurbo);
-		break;
 	}
+
+	TeleportSide = 0;
 }
 
 
@@ -992,45 +1093,89 @@ void P_CrossSpecialLine (int linenum, int side, mobj_t *thing)
 //
 void P_ShootSpecialLine (mobj_t *thing, line_t *line)
 {
-	int ok;
-	
-	//	Impacts that other things can activate.
-	if (!thing->player)
-	{
-		ok = 0;
-		switch(line->special)
-		{
-		  case 46:
-			// OPEN DOOR IMPACT
-			ok = 1;
-			break;
-		}
-		if (!ok)
-			return;
-	}
+	// [RH] Rewritten to use LineSpecials[] dispatcher.
+
+	if ((line->flags & ML_ACTIVATIONMASK) != ML_ACTIVATEPROJECTILEHIT)
+		return;
+	
+	if (!thing->player &&
+		!(thing->flags & MF_MISSILE) &&
+		!(line->flags & ML_MONSTERSCANACTIVATE) &&
+		line->special != Door_Open)
+		return;
 
-	switch(line->special)
 	{
-	  case 24:
-		// RAISE FLOOR
-		EV_DoFloor(line,raiseFloor);
-		P_ChangeSwitchTexture(line,0);
-		break;
-		
-	  case 46:
-		// OPEN DOOR
-		EV_DoDoor(line,open);
-		P_ChangeSwitchTexture(line,1);
-		break;
-		
-	  case 47:
-		// RAISE FLOOR NEAR AND CHANGE
-		EV_DoPlat(line,raiseToNearestAndChange,0);
-		P_ChangeSwitchTexture(line,0);
-		break;
+		BOOL success = LineSpecials[line->special]
+							(line, thing, line->args[0],
+							 line->args[1], line->args[2],
+							 line->args[3], line->args[4]);
+
+		if (success) {
+			P_ChangeSwitchTexture (line, line->flags & ML_REPEATABLE);
+			if (!(line->flags & ML_REPEATABLE))
+				line->special = 0;
+		}
 	}
 }
 
+//
+// [RH] P_ShotCrossSpecialLine
+// Called when a projectile or bullet crosses a special line.
+//
+void P_ShotCrossSpecialLine (mobj_t *thing, line_t *line)
+{
+	if ((line->flags & ML_ACTIVATIONMASK) != ML_ACTIVATEPROJECTILECROSS)
+		return;
+
+	if (LineSpecials[line->special]
+			(line, thing, line->args[0],
+			line->args[1], line->args[2],
+			line->args[3], line->args[4])
+		&& !(line->flags & ML_REPEATABLE))
+		line->special = 0;
+
+	TeleportSide = 0;	// may have been set by P_CrossSecialLine
+}
+
+//
+// [RH] P_PushSpecialLine
+// Called when a player tries to walk into a special line (and fails).
+//
+BOOL P_PushSpecialLine (mobj_t *thing, int side, line_t *line)
+{
+	BOOL result;
+
+	if ((line->flags & ML_ACTIVATIONMASK) != ML_ACTIVATEPUSH)
+		return false;
+
+	// [RH] Don't let monsters activate the special unless the line says they can.
+	//		(Some lines automatically imply ML_MONSTERSCANACTIVATE)
+	if (!thing->player) {
+		if (line->flags & ML_SECRET)
+			return false;	// monsters never activate secrets
+		if (!(line->flags & ML_MONSTERSCANACTIVATE) &&
+			(line->special != Door_Raise || line->args[0] != 0) &&
+			line->special != Teleport &&
+			line->special != Teleport_NoFog)
+			return false;
+	}
+
+	TeleportSide = side;
+
+	if ((result = LineSpecials[line->special]
+					(line, thing, line->args[0],
+					line->args[1], line->args[2],
+					line->args[3], line->args[4]))
+			&& !(line->flags & ML_REPEATABLE))
+		line->special = 0;
+
+	if (result)
+		P_ChangeSwitchTexture (line, line->flags & ML_REPEATABLE);
+
+	TeleportSide = 0;
+
+	return result;
+}
 
 
 //
@@ -1038,71 +1183,110 @@ void P_ShootSpecialLine (mobj_t *thing, line_t *line)
 // Called every tic frame
 //	that the player origin is in a special sector
 //
-void P_PlayerInSpecialSector (player_t* player)
+void P_PlayerInSpecialSector (player_t *player)
 {
-	sector_t*	sector;
-		
-	sector = player->mo->subsector->sector;
+	sector_t *sector = player->mo->subsector->sector;
+	int special = sector->special & ~SECRET_MASK;
 
 	// Falling, not all the way down yet?
 	if (player->mo->z != sector->floorheight)
 		return; 
 
 	// Has hitten ground.
-	switch (sector->special)
-	{
-	  case 5:
-		// HELLSLIME DAMAGE
-		if (!player->powers[pw_ironfeet])
-			if (!(level.time&0x1f))
-				P_DamageMobj (player->mo, NULL, NULL, 10, MOD_SLIME);
-		break;
-		
-	  case 7:
-		// NUKAGE DAMAGE
-		if (!player->powers[pw_ironfeet])
-			if (!(level.time&0x1f))
-				P_DamageMobj (player->mo, NULL, NULL, 5, MOD_LAVA);
-		break;
-		
-	  case 16:
-		// SUPER HELLSLIME DAMAGE
-	  case 4:
-		// STROBE HURT
-		if (!player->powers[pw_ironfeet]
-			|| (P_Random (pr_playerinspecialsector)<5) )
+	// [RH] Normal DOOM special or BOOM specialized?
+	if (special >= dLight_Flicker && special <= dLight_FireFlicker) {
+		switch (special)
 		{
-			if (!(level.time&0x1f))
-				P_DamageMobj (player->mo, NULL, NULL, 20, MOD_SLIME);
-		}
-		break;
-						
-	  case 9:
-		// SECRET SECTOR
-		player->secretcount++;
-		level.found_secrets++;
-		sector->special = 0;
-		if (player == &players[displayplayer]) {
-			C_MidPrint ("You found a secret area!");
-			S_StartSound (ORIGIN_AMBIENT2, sfx_secret);
-		}
-		break;
-						
-	  case 11:
-		// EXIT SUPER DAMAGE! (for E1M8 finale)
-		player->cheats &= ~CF_GODMODE;
+		  case dDamage_Hellslime:
+			// HELLSLIME DAMAGE
+			if (!player->powers[pw_ironfeet])
+				if (!(level.time&0x1f))
+					P_DamageMobj (player->mo, NULL, NULL, 10, MOD_SLIME);
+			break;
+			
+		  case dDamage_Nukage:
+			// NUKAGE DAMAGE
+			if (!player->powers[pw_ironfeet])
+				if (!(level.time&0x1f))
+					P_DamageMobj (player->mo, NULL, NULL, 5, MOD_LAVA);
+			break;
+			
+		  case dDamage_SuperHellslime:
+			// SUPER HELLSLIME DAMAGE
+		  case dLight_Strobe_Hurt:
+			// STROBE HURT
+			if (!player->powers[pw_ironfeet]
+				|| (P_Random (pr_playerinspecialsector)<5) )
+			{
+				if (!(level.time&0x1f))
+					P_DamageMobj (player->mo, NULL, NULL, 20, MOD_SLIME);
+			}
+			break;
+							
+		  case dDamage_End:
+			// EXIT SUPER DAMAGE! (for E1M8 finale)
+			player->cheats &= ~CF_GODMODE;
 
-		if (!(level.time & 0x1f))
-			P_DamageMobj (player->mo, NULL, NULL, 20, MOD_UNKNOWN);
+			if (!(level.time & 0x1f))
+				P_DamageMobj (player->mo, NULL, NULL, 20, MOD_UNKNOWN);
 
-		if (player->health <= 10 && (!deathmatch->value || !(dmflags & DF_NO_EXIT)))
-			G_ExitLevel();
-		break;
-						
-	  default:
-		DPrintf ("P_PlayerInSpecialSector: %i unknown\n", sector->special);
-		break;
-	};
+			if (player->health <= 10 && (!deathmatch->value || !(dmflags & DF_NO_EXIT)))
+				G_ExitLevel(0);
+			break;
+							
+		  default:
+			// [RH] Ignore unknown specials
+			break;
+		}
+	} else {
+		//jff 3/14/98 handle extended sector types for secrets and damage
+		switch (special & DAMAGE_MASK) {
+			case 0x000: // no damage
+				break;
+			case 0x100: // 2/5 damage per 31 ticks
+				if (!player->powers[pw_ironfeet])
+					if (!(level.time&0x1f))
+						P_DamageMobj (player->mo, NULL, NULL, 5, MOD_LAVA);
+				break;
+			case 0x200: // 5/10 damage per 31 ticks
+				if (!player->powers[pw_ironfeet])
+					if (!(level.time&0x1f))
+						P_DamageMobj (player->mo, NULL, NULL, 10, MOD_SLIME);
+				break;
+			case 0x300: // 10/20 damage per 31 ticks
+				if (!player->powers[pw_ironfeet]
+					|| (P_Random(pr_playerinspecialsector)<5))	// take damage even with suit
+				{
+					if (!(level.time&0x1f))
+						P_DamageMobj (player->mo, NULL, NULL, 20, MOD_SLIME);
+				}
+				break;
+		}
+
+		// [RH] Apply any customizable damage
+		if (sector->damage) {
+			if (sector->damage < 20) {
+				if (!player->powers[pw_ironfeet] && !(level.time&0x1f))
+					P_DamageMobj (player->mo, NULL, NULL, sector->damage, sector->mod);
+			} else if (sector->damage < 50) {
+				if ((!player->powers[pw_ironfeet] || (P_Random(pr_playerinspecialsector)<5))
+					 && !(level.time&0x1f))
+					P_DamageMobj (player->mo, NULL, NULL, sector->damage, sector->mod);
+			} else {
+				P_DamageMobj (player->mo, NULL, NULL, sector->damage, sector->mod);
+			}
+		}
+
+		if (sector->special & SECRET_MASK) {
+			player->secretcount++;
+			level.found_secrets++;
+			sector->special &= ~SECRET_MASK;
+			if (player->mo == players[consoleplayer].camera) {
+				C_MidPrint ("You found a secret area!");
+				S_StartSound (ORIGIN_AMBIENT2, "misc/secret", 90);
+			}
+		}
+	}
 }
 
 
@@ -1112,139 +1296,97 @@ void P_PlayerInSpecialSector (player_t* player)
 // P_UpdateSpecials
 // Animate planes, scroll walls, etc.
 //
-extern cvar_t  *timelimit;
+extern cvar_t *timelimit;
 
 void P_UpdateSpecials (void)
 {
-	anim_t* 	anim;
-	int 		pic;
-	int 		i;
-
+	anim_t *anim;
+	button_t *button, **prev;
+	int i;
 	
-	//	LEVEL TIMER
+	// LEVEL TIMER
 	if (timelimit->value)
 	{
 		if (level.time >= (int)(timelimit->value * TICRATE * 60)) {
-			Printf ("Timelimit exceeded\n");
-			G_ExitLevel();
+			Printf ("Timelimit hit.\n");
+			G_ExitLevel(0);
 		}
 	}
 	
-	//	ANIMATE FLATS AND TEXTURES GLOBALLY
-	for (anim = anims ; anim < lastanim ; anim++)
+	// ANIMATE FLATS AND TEXTURES GLOBALLY
+	// [RH] Changed significantly to work with ANIMDEFS lumps
+	for (anim = anims; anim < lastanim; anim++)
 	{
-		for (i=anim->basepic ; i<anim->basepic+anim->numpics ; i++)
-		{
-			pic = anim->basepic + ( (level.time/anim->speed + i)%anim->numpics );
-			if (anim->istexture)
-				texturetranslation[i] = pic;
+		if (--anim->countdown == 0) {
+			int speedframe;
+
+			anim->curframe = (anim->curframe + 1) % anim->numframes;
+			
+			speedframe = (anim->uniqueframes) ? anim->curframe : 0;
+
+			if (anim->speedmin[speedframe] == anim->speedmax[speedframe])
+				anim->countdown = anim->speedmin[speedframe];
 			else
-				flattranslation[i] = pic;
+				anim->countdown = P_Random(pr_animatepictures) %
+					(anim->speedmax[speedframe] - anim->speedmin[speedframe]) +
+					anim->speedmin[speedframe];
+		}
+
+		if (anim->uniqueframes) {
+			int pic = anim->framepic[anim->curframe];
+
+			if (anim->istexture)
+				for (i = 0; i < anim->numframes; i++)
+					texturetranslation[anim->framepic[i]] = pic;
+			else
+				for (i = 0; i < anim->numframes; i++)
+					flattranslation[anim->framepic[i]] = pic;
+		} else {
+			for (i = anim->basepic; i < anim->basepic + anim->numframes; i++) {
+				int pic = anim->basepic + (anim->curframe + i) % anim->numframes;
+
+				if (anim->istexture)
+					texturetranslation[i] = pic;
+				else
+					flattranslation[i] = pic;
+			}
 		}
 	}
 
-	//	[RH] Scroll the sky
+	// [RH] Scroll the sky
 	sky1pos = (sky1pos + level.skyspeed1) & 0xffffff;
 	sky2pos = (sky2pos + level.skyspeed2) & 0xffffff;
 	
+	// DO BUTTONS
+	// [RH] Rewritten to remove MAXBUTTONS limit
+	button = buttonlist;
+	prev = &buttonlist;
 
-	//	DO BUTTONS
-	for (i = 0; i < MAXBUTTONS; i++)
-		if (buttonlist[i].btimer)
-		{
-			buttonlist[i].btimer--;
-			if (!buttonlist[i].btimer)
+	while (button) {
+		if (0 >= --button->btimer) {
+			switch(button->where)
 			{
-				switch(buttonlist[i].where)
-				{
-				  case top:
-					sides[buttonlist[i].line->sidenum[0]].toptexture =
-						buttonlist[i].btexture;
-					break;
-					
-				  case middle:
-					sides[buttonlist[i].line->sidenum[0]].midtexture =
-						buttonlist[i].btexture;
-					break;
-					
-				  case bottom:
-					sides[buttonlist[i].line->sidenum[0]].bottomtexture =
-						buttonlist[i].btexture;
-					break;
-				}
-				S_StartSound((mobj_t *)&buttonlist[i].soundorg,sfx_swtchn);
-				memset(&buttonlist[i],0,sizeof(button_t));
-			}
-		}
-		
-}
-
-
-
-//
-// Special Stuff that can not be categorized
-//
-int EV_DoDonut(line_t*	line)
-{
-	sector_t*			s1;
-	sector_t*			s2;
-	sector_t*			s3;
-	int 				secnum;
-	int 				rtn;
-	int 				i;
-	floormove_t*		floor;
-		
-	secnum = -1;
-	rtn = 0;
-	while ((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
-	{
-		s1 = &sectors[secnum];					// s1 is pillar's sector
+			  case top:
+				sides[button->line->sidenum[0]].toptexture = button->btexture;
+				break;
 				
-		// ALREADY MOVING?	IF SO, KEEP GOING...
-		if (P_SectorActive (floor_special, s1))	//jff 2/22/98
-			continue;
-						
-		rtn = 1;
-		s2 = getNextSector(s1->lines[0],s1);	// s2 is pool's sector
-		if (!s2)								// note lowest numbered line around
-			continue;							// pillar must be two-sided
-
-		for (i = 0;i < s2->linecount;i++)
-		{
-			if ((!s2->lines[i]->flags & ML_TWOSIDED) ||
-				(s2->lines[i]->backsector == s1))
-				continue;
-			s3 = s2->lines[i]->backsector;
-			
-			//	Spawn rising slime
-			floor = Z_Malloc (sizeof(*floor), PU_LEVSPEC, 0);
-			P_AddThinker (&floor->thinker);
-			s2->floordata = floor;	//jff 2/22/98
-			floor->thinker.function.acp1 = (actionf_p1) T_MoveFloor;
-			floor->type = donutRaise;
-			floor->crush = false;
-			floor->direction = 1;
-			floor->sector = s2;
-			floor->speed = FLOORSPEED / 2;
-			floor->texture = s3->floorpic;
-			floor->newspecial = 0;
-			floor->floordestheight = s3->floorheight;
-			
-			//	Spawn lowering donut-hole
-			floor = Z_Malloc (sizeof(*floor), PU_LEVSPEC, 0);
-			P_AddThinker (&floor->thinker);
-			s1->floordata = floor;	//jff 2/22/98
-			floor->thinker.function.acp1 = (actionf_p1) T_MoveFloor;
-			floor->type = lowerFloor;
-			floor->crush = false;
-			floor->direction = -1;
-			floor->sector = s1;
-			floor->speed = FLOORSPEED / 2;
-			floor->floordestheight = s3->floorheight;
-			break;
+			  case middle:
+				sides[button->line->sidenum[0]].midtexture = button->btexture;
+				break;
+				
+			  case bottom:
+				sides[button->line->sidenum[0]].bottomtexture = button->btexture;
+				break;
+			}
+			S_StartSound (button->soundorg, "switches/normbutn", 78);
+			*prev = button->next;
+			Z_Free (button);
+			button = *prev;
+		} else {
+			prev = &button->next;
+			button = button->next;
 		}
 	}
-	return rtn;
 }
 
 
@@ -1272,93 +1414,138 @@ void P_SpawnSpecials (void)
 	
 	//	Init special SECTORs.
 	sector = sectors;
-	for (i=0 ; i<numsectors ; i++, sector++)
+	for (i = 0; i < numsectors; i++, sector++)
 	{
 		if (!sector->special)
 			continue;
-		
-		switch (sector->special)
+
+		// [RH] All secret sectors are marked with a BOOM-ish bitfield
+		if (sector->special & SECRET_MASK)
+			level.total_secrets++;
+
+		switch (sector->special & 0xff)
 		{
-		  case 1:
+		  // [RH] Normal DOOM/Hexen specials. We clear off the special for lights
+		  //	  here instead of inside the spawners.
+
+		  case dLight_Flicker:
 			// FLICKERING LIGHTS
-			P_SpawnLightFlash (sector);
+			P_SpawnLightFlash (sector, -1, -1);
+			sector->special &= 0xff00;
 			break;
 
-		  case 2:
+		  case dLight_StrobeFast:
 			// STROBE FAST
-			P_SpawnStrobeFlash(sector,FASTDARK,0);
+			P_SpawnStrobeFlash (sector, -1, -1, STROBEBRIGHT, FASTDARK, 0);
+			sector->special &= 0xff00;
 			break;
 			
-		  case 3:
+		  case dLight_StrobeSlow:
 			// STROBE SLOW
-			P_SpawnStrobeFlash(sector,SLOWDARK,0);
+			P_SpawnStrobeFlash (sector, -1, -1, STROBEBRIGHT, SLOWDARK, 0);
+			sector->special &= 0xff00;
 			break;
-			
-		  case 4:
+
+		  case dLight_Strobe_Hurt:
 			// STROBE FAST/DEATH SLIME
-			P_SpawnStrobeFlash(sector,FASTDARK,0);
-			sector->special = 4;
+			P_SpawnStrobeFlash (sector, -1, -1, STROBEBRIGHT, FASTDARK, 0);
 			break;
-			
-		  case 8:
+
+		  case dLight_Glow:
 			// GLOWING LIGHT
 			P_SpawnGlowingLight(sector);
-			break;
-		  case 9:
-			// SECRET SECTOR
-			level.total_secrets++;
+			sector->special &= 0xff00;
 			break;
 			
-		  case 10:
+		  case dSector_DoorCloseIn30:
 			// DOOR CLOSE IN 30 SECONDS
 			P_SpawnDoorCloseIn30 (sector);
 			break;
 			
-		  case 12:
+		  case dLight_StrobeSlowSync:
 			// SYNC STROBE SLOW
-			P_SpawnStrobeFlash (sector, SLOWDARK, 1);
+			P_SpawnStrobeFlash (sector, -1, -1, STROBEBRIGHT, SLOWDARK, 1);
+			sector->special &= 0xff00;
 			break;
 
-		  case 13:
+		  case dLight_StrobeFastSync:
 			// SYNC STROBE FAST
-			P_SpawnStrobeFlash (sector, FASTDARK, 1);
+			P_SpawnStrobeFlash (sector, -1, -1, STROBEBRIGHT, FASTDARK, 1);
+			sector->special &= 0xff00;
 			break;
 
-		  case 14:
+		  case dSector_DoorRaiseIn5Mins:
 			// DOOR RAISE IN 5 MINUTES
-			P_SpawnDoorRaiseIn5Mins (sector, i);
+			P_SpawnDoorRaiseIn5Mins (sector);
 			break;
 			
-		  case 17:
+		  case dLight_FireFlicker:
 			// fire flickering
-			P_SpawnFireFlicker(sector);
+			P_SpawnFireFlicker (sector);
+			sector->special &= 0xff00;
+			break;
+
+		  // [RH] Hexen-like phased lighting
+		  case LightSequenceStart:
+			P_SpawnLightSequence (sector);
+			break;
+
+		  case Light_Phased:
+			P_SpawnLightPhased (sector);
+			break;
+
+		  default:
+			  // [RH] Try for normal Hexen scroller
+			if ((sector->special & 0xff) >= Scroll_North_Slow &&
+				(sector->special & 0xff) <= Scroll_SouthWest_Fast) {
+				static char hexenScrollies[24][2] = {
+					{  0,  1 }, {  0,  2 }, {  0,  4 },
+					{ -1,  0 }, { -2,  0 }, { -4,  0 },
+					{  0, -1 }, {  0, -2 }, {  0, -4 },
+					{  1,  0 }, {  2,  0 }, {  4,  0 },
+					{  1,  1 }, {  2,  2 }, {  4,  4 },
+					{ -1,  1 }, { -2,  2 }, { -4,  4 },
+					{ -1, -1 }, { -2, -2 }, { -4, -4 },
+					{  1, -1 }, {  2, -2 }, {  4, -4 }
+				};
+				int i = (sector->special & 0xff) - Scroll_North_Slow;
+				int dx = hexenScrollies[i][0] * (FRACUNIT/2);
+				int dy = hexenScrollies[i][1] * (FRACUNIT/2);
+
+				Add_Scroller (sc_floor, dx, dy, -1, sector-sectors, 0);
+				// Hexen scrolling floors cause the player to move
+				// faster than they scroll. I do this just for compatibility
+				// with Hexen and recommend using Killough's more-versatile
+				// scrollers instead.
+				dx = FixedMul (-dx, CARRYFACTOR*2);
+				dy = FixedMul (dy, CARRYFACTOR*2);
+				Add_Scroller (sc_carry, dx, dy, -1, sector-sectors, 0);
+				sector->special &= 0xff00;
+			}
 			break;
 		}
 	}
 
 	
-	//	Init other misc stuff
-	if (!activeceilings) {
-		MaxCeilings = 30;		// [RH] Default. Increased as needed.
-		activeceilings = Malloc (MaxCeilings * sizeof(ceiling_t *));
-	}
-	for (i = 0;i < MaxCeilings;i++)
-		activeceilings[i] = NULL;
+	// Init other misc stuff
 
-	if (!activeplats) {
-		MaxPlats = 30;			// [RH] Default. Increased as needed.
-		activeplats = Malloc (MaxPlats * sizeof(plat_t *));
-	}
-	for (i = 0;i < MaxPlats;i++)
-		activeplats[i] = NULL;
+	// [RH] Plats and ceilings get stored in doubly-linked lists,
+	//		but not in quite the same way as BOOM.
+
+	activeceilings = NULL;
+	activeplats = NULL;
+
+	buttonlist = NULL;	// [RH] And buttonlist is also a singly-linked list.
 	
-	for (i = 0;i < MAXBUTTONS;i++)
-		memset(&buttonlist[i],0,sizeof(button_t));
+	ActiveQuakes = NULL;	// [RH] Clear out any earthquakes.
 
-	// UNUSED: no horizonal sliders.
-	//	P_InitSlidingDoorFrames();
+	// P_InitTagLists() must be called before P_FindSectorFromTag()
+	// or P_FindLineFromID() can be called.
 
+	P_InitTagLists();   // killough 1/30/98: Create xref tables for tags
 	P_SpawnScrollers(); // killough 3/7/98: Add generalized scrollers
+	P_SpawnFriction();	// phares 3/12/98: New friction model using linedefs
+	P_SpawnPushers();	// phares 3/20/98: New pusher model using linedefs
 
 	for (i=0; i<numlines; i++)
 		switch (lines[i].special)
@@ -1367,28 +1554,31 @@ void P_SpawnSpecials (void)
 
 			// killough 3/7/98:
 			// support for drawn heights coming from different sector
-			case 242:
+			case Transfer_Heights:
 				sec = sides[*lines[i].sidenum].sector-sectors;
-				for (s = -1; (s = P_FindSectorFromLineTag(lines+i,s)) >= 0;)
+				for (s = -1; (s = P_FindSectorFromTag(lines[i].args[0],s)) >= 0;)
 					sectors[s].heightsec = sec;
 				break;
 
 			// killough 3/16/98: Add support for setting
 			// floor lighting independently (e.g. lava)
-			case 213:
+			case Transfer_FloorLight:
 				sec = sides[*lines[i].sidenum].sector-sectors;
-				for (s = -1; (s = P_FindSectorFromLineTag(lines+i,s)) >= 0;)
+				for (s = -1; (s = P_FindSectorFromTag(lines[i].args[0],s)) >= 0;)
 					sectors[s].floorlightsec = sec;
 				break;
 
 			// killough 4/11/98: Add support for setting
 			// ceiling lighting independently
-			case 261:
+			case Transfer_CeilingLight:
 				sec = sides[*lines[i].sidenum].sector-sectors;
-				for (s = -1; (s = P_FindSectorFromLineTag(lines+i,s)) >= 0;)
+				for (s = -1; (s = P_FindSectorFromTag(lines[i].args[0],s)) >= 0;)
 					sectors[s].ceilinglightsec = sec;
 				break;
 		}
+
+	// [RH] Start running any open scripts on this map
+	P_StartOpenScripts ();
 }
 
 // killough 2/28/98:
@@ -1410,7 +1600,7 @@ void P_SpawnSpecials (void)
 // This is the main scrolling code
 // killough 3/7/98
 
-void T_Scroll(scroll_t *s)
+void T_Scroll (scroll_t *s)
 {
 	fixed_t dx = s->dx, dy = s->dy;
 
@@ -1470,8 +1660,8 @@ void T_Scroll(scroll_t *s)
 			sec = sectors + s->affectee;
 			height = sec->floorheight;
 			waterheight = sec->heightsec != -1 &&
-			sectors[sec->heightsec].floorheight > height ?
-			sectors[sec->heightsec].floorheight : MININT;
+				sectors[sec->heightsec].floorheight > height ?
+				sectors[sec->heightsec].floorheight : MININT;
 
 			for (node = sec->touching_thinglist; node; node = node->m_snext)
 				if (!((thing = node->m_thing)->flags & MF_NOCLIP) &&
@@ -1548,90 +1738,596 @@ static void Add_WallScroller(fixed_t dx, fixed_t dy, const line_t *l,
 // Amount (dx,dy) vector linedef is shifted right to get scroll amount
 #define SCROLL_SHIFT 5
 
-// Factor to scale scrolling effect into mobj-carrying properties = 3/32.
-// (This is so scrolling floors and objects on them can move at same speed.)
-#define CARRYFACTOR ((fixed_t)(FRACUNIT*.09375))
-
 // Initialize the scrollers
 static void P_SpawnScrollers(void)
 {
-  int i;
-  line_t *l = lines;
+	int i;
+	line_t *l = lines;
 
-  for (i=0;i<numlines;i++,l++)
+	for (i = 0; i < numlines; i++, l++)
 	{
-	  fixed_t dx = l->dx >> SCROLL_SHIFT;  // direction and speed of scrolling
-	  fixed_t dy = l->dy >> SCROLL_SHIFT;
-	  int control = -1, accel = 0;         // no control sector or acceleration
-	  int special = l->special;
+		fixed_t dx;	// direction and speed of scrolling
+		fixed_t dy;
+		int control = -1, accel = 0;		// no control sector or acceleration
+		int special = l->special;
 
-	  // killough 3/7/98: Types 245-249 are same as 250-254 except that the
-	  // first side's sector's heights cause scrolling when they change, and
-	  // this linedef controls the direction and speed of the scrolling. The
-	  // most complicated linedef since donuts, but powerful :)
-	  //
-	  // killough 3/15/98: Add acceleration. Types 214-218 are the same but
-	  // are accelerative.
+		// killough 3/7/98: Types 245-249 are same as 250-254 except that the
+		// first side's sector's heights cause scrolling when they change, and
+		// this linedef controls the direction and speed of the scrolling. The
+		// most complicated linedef since donuts, but powerful :)
+		//
+		// killough 3/15/98: Add acceleration. Types 214-218 are the same but
+		// are accelerative.
 
-	  if (special >= 245 && special <= 249)         // displacement scrollers
-		{
-		  special += 250-245;
-		  control = sides[*l->sidenum].sector - sectors;
+		// [RH] Assume that it's a scroller and zero the line's special.
+		l->special = 0;
+
+		if (special == Scroll_Ceiling ||
+			special == Scroll_Floor ||
+			special == Scroll_Texture_Model) {
+			if (l->args[1] & 3) {
+				// if 1, then displacement
+				// if 2, then accelerative (also if 3)
+				control = sides[*l->sidenum].sector - sectors;
+				if (l->args[1] & 2)
+					accel = 1;
+			}
+			if (special == Scroll_Texture_Model ||
+				l->args[1] & 4) {
+				// The line housing the special controls the
+				// direction and speed of scrolling.
+				dx = l->dx >> SCROLL_SHIFT;
+				dy = l->dy >> SCROLL_SHIFT;
+			} else {
+				// The speed and direction are parameters to the special.
+				dx = (l->args[3] - 128) * (FRACUNIT / 32);
+				dy = (l->args[4] - 128) * (FRACUNIT / 32);
+			}
 		}
-	  else
-		if (special >= 214 && special <= 218)       // accelerative scrollers
-		  {
-			accel = 1;
-			special += 250-214;
-			control = sides[*l->sidenum].sector - sectors;
-		  }
 
-	  switch (special)
+		switch (special)
 		{
-		  register int s;
+			register int s;
 
-		case 250:   // scroll effect ceiling
-		  for (s=-1; (s = P_FindSectorFromLineTag(l,s)) >= 0;)
-			Add_Scroller(sc_ceiling, -dx, dy, control, s, accel);
-		  break;
+			case Scroll_Ceiling:
+				for (s=-1; (s = P_FindSectorFromTag (l->args[0],s)) >= 0;)
+					Add_Scroller (sc_ceiling, -dx, dy, control, s, accel);
+				break;
 
-		case 251:   // scroll effect floor
-		case 253:   // scroll and carry objects on floor
-		  for (s=-1; (s = P_FindSectorFromLineTag(l,s)) >= 0;)
-			Add_Scroller(sc_floor, -dx, dy, control, s, accel);
-		  if (special != 253)
-			break;
+			case Scroll_Floor:
+				if (l->args[2] != 1)
+					// scroll the floor
+					for (s=-1; (s = P_FindSectorFromTag (l->args[0],s)) >= 0;)
+						Add_Scroller (sc_floor, -dx, dy, control, s, accel);
 
-		case 252: // carry objects on floor
-		  dx = FixedMul(dx,CARRYFACTOR);
-		  dy = FixedMul(dy,CARRYFACTOR);
-		  for (s=-1; (s = P_FindSectorFromLineTag(l,s)) >= 0;)
-			Add_Scroller(sc_carry, dx, dy, control, s, accel);
-		  break;
+				if (l->args[2] > 0) {
+					// carry objects on the floor
+					dx = FixedMul(dx,CARRYFACTOR);
+					dy = FixedMul(dy,CARRYFACTOR);
+					for (s=-1; (s = P_FindSectorFromTag (l->args[0],s)) >= 0;)
+						Add_Scroller (sc_carry, dx, dy, control, s, accel);
+				}
+				break;
 
-		  // killough 3/1/98: scroll wall according to linedef
-		  // (same direction and speed as scrolling floors)
-		case 254:
-		  for (s=-1; (s = P_FindLineFromLineTag(l,s)) >= 0;)
-			if (s != i)
-			  Add_WallScroller(dx, dy, lines+s, control, accel);
-		  break;
+			// killough 3/1/98: scroll wall according to linedef
+			// (same direction and speed as scrolling floors)
+			case Scroll_Texture_Model:
+				for (s=-1; (s = P_FindLineFromID (l->args[0],s)) >= 0;)
+					if (s != i)
+						Add_WallScroller (dx, dy, lines+s, control, accel);
+				break;
 
-		case 255:    // killough 3/2/98: scroll according to sidedef offsets
-		  s = lines[i].sidenum[0];
-		  Add_Scroller(sc_side, -sides[s].textureoffset,
-					   sides[s].rowoffset, -1, s, accel);
-		  break;
+			case Scroll_Texture_Offsets:
+				// killough 3/2/98: scroll according to sidedef offsets
+				s = lines[i].sidenum[0];
+				Add_Scroller (sc_side, -sides[s].textureoffset,
+							  sides[s].rowoffset, -1, s, accel);
+				break;
 
-		case 48:                  // scroll first side
-		  Add_Scroller(sc_side,  FRACUNIT, 0, -1, lines[i].sidenum[0], accel);
-		  break;
+			case Scroll_Texture_Left:
+				Add_Scroller (sc_side, l->args[0] * (FRACUNIT/64), 0,
+							  -1, lines[i].sidenum[0], accel);
+				break;
 
-		case 85:                  // jff 1/30/98 2-way scroll
-		  Add_Scroller(sc_side, -FRACUNIT, 0, -1, lines[i].sidenum[0], accel);
-		  break;
+			case Scroll_Texture_Right:
+				Add_Scroller (sc_side, l->args[0] * (-FRACUNIT/64), 0,
+							  -1, lines[i].sidenum[0], accel);
+				break;
+
+			case Scroll_Texture_Up:
+				Add_Scroller (sc_side, 0, l->args[0] * (FRACUNIT/64),
+							  -1, lines[i].sidenum[0], accel);
+				break;
+
+			case Scroll_Texture_Down:
+				Add_Scroller (sc_side, 0, l->args[0] * (-FRACUNIT/64),
+							  -1, lines[i].sidenum[0], accel);
+				break;
+
+			case Scroll_Texture_Both:
+				if (l->args[0] == 0) {
+					dx = (l->args[1] - l->args[2]) * (FRACUNIT/64);
+					dy = (l->args[4] - l->args[3]) * (FRACUNIT/64);
+					Add_Scroller (sc_side, dx, dy, -1, lines[i].sidenum[0], accel);
+				}
+				break;
+
+			default:
+				// [RH] It wasn't a scroller after all, so restore the special.
+				l->special = special;
+				break;
 		}
 	}
 }
 
 // killough 3/7/98 -- end generalized scroll effects
+
+////////////////////////////////////////////////////////////////////////////
+//
+// FRICTION EFFECTS
+//
+// phares 3/12/98: Start of friction effects
+
+// As the player moves, friction is applied by decreasing the x and y
+// momentum values on each tic. By varying the percentage of decrease,
+// we can simulate muddy or icy conditions. In mud, the player slows
+// down faster. In ice, the player slows down more slowly.
+//
+// The amount of friction change is controlled by the length of a linedef
+// with type 223. A length < 100 gives you mud. A length > 100 gives you ice.
+//
+// Also, each sector where these effects are to take place is given a
+// new special type _______. Changing the type value at runtime allows
+// these effects to be turned on or off.
+//
+// Sector boundaries present problems. The player should experience these
+// friction changes only when his feet are touching the sector floor. At
+// sector boundaries where floor height changes, the player can find
+// himself still 'in' one sector, but with his feet at the floor level
+// of the next sector (steps up or down). To handle this, Thinkers are used
+// in icy/muddy sectors. These thinkers examine each object that is touching
+// their sectors, looking for players whose feet are at the same level as
+// their floors. Players satisfying this condition are given new friction
+// values that are applied by the player movement code later.
+
+/////////////////////////////
+//
+// Add a friction thinker to the thinker list
+//
+// Add_Friction adds a new friction thinker to the list of active thinkers.
+//
+
+static void Add_Friction (int friction, int movefactor, int affectee)
+{
+	friction_t *f = Z_Malloc (sizeof *f, PU_LEVSPEC, 0);
+
+	f->thinker.function.acp1 = (actionf_p1) T_Friction;
+	f->friction = friction;
+	f->movefactor = movefactor;
+	f->affectee = affectee;
+	P_AddThinker (&f->thinker);
+}
+
+/////////////////////////////
+//
+// This is where abnormal friction is applied to objects in the sectors.
+// A friction thinker has been spawned for each sector where less or
+// more friction should be applied. The amount applied is proportional to
+// the length of the controlling linedef.
+
+void T_Friction(friction_t *f)
+{
+	sector_t *sec;
+	msecnode_t* node;
+
+	if (olddemo || !boom_friction)
+		return;
+
+	sec = sectors + f->affectee;
+
+	// Be sure the special sector type is still turned on. If so, proceed.
+	// Else, bail out; the sector type has been changed on us.
+
+	if (!(sec->special & FRICTION_MASK))
+		return;
+
+	// Assign the friction value to players on the floor, non-floating,
+	// and clipped. Normally the object's friction value is kept at
+	// ORIG_FRICTION and this thinker changes it for icy or muddy floors.
+
+	// In Phase II, you can apply friction to Things other than players.
+
+	// When the object is straddling sectors with the same
+	// floorheight that have different frictions, use the lowest
+	// friction value (muddy has precedence over icy).
+
+	node = sec->touching_thinglist; // things touching this sector
+	while (node)
+	{
+		mobj_t *thing = node->m_thing;
+		if (thing->player &&
+			!(thing->flags & (MF_NOGRAVITY | MF_NOCLIP)) &&
+			thing->z <= sec->floorheight)
+		{
+			if ((thing->friction == ORIG_FRICTION) ||	// normal friction?
+				(f->friction < thing->friction))
+			{
+				thing->friction   = f->friction;
+				thing->movefactor = f->movefactor;
+			}
+		}
+		node = node->m_snext;
+	}
+}
+
+/////////////////////////////
+//
+// Initialize the sectors where friction is increased or decreased
+
+static void P_SpawnFriction (void)
+{
+	int i;
+	line_t *l = lines;
+	register int s;
+	int length;     // line length controls magnitude
+	int friction;   // friction value to be applied during movement
+	int movefactor; // applied to each player move to simulate inertia
+
+	for (i = 0 ; i < numlines ; i++,l++)
+		if (l->special == Sector_SetFriction)
+		{
+			if (l->args[1]) {
+				// [RH] Allow setting friction amount from parameter
+				length = l->args[1] <= 200 ? l->args[1] : 200;
+			} else {
+				length = P_AproxDistance (l->dx, l->dy)>>FRACBITS;
+			}
+			friction = (0x1EB8*length)/0x80 + 0xD000;
+
+			// The following check might seem odd. At the time of movement,
+			// the move distance is multiplied by 'friction/0x10000', so a
+			// higher friction value actually means 'less friction'.
+
+			if (friction > ORIG_FRICTION)       // ice
+				movefactor = ((0x10092 - friction)*(0x70))/0x158;
+			else
+				movefactor = ((friction - 0xDB34)*(0xA))/0x80;
+			for (s = -1; (s = P_FindSectorFromTag (l->args[0], s)) >= 0 ; )
+				Add_Friction (friction, movefactor, s);
+		}
+}
+
+//
+// phares 3/12/98: End of friction effects
+//
+////////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////////
+//
+// PUSH/PULL EFFECT
+//
+// phares 3/20/98: Start of push/pull effects
+//
+// This is where push/pull effects are applied to objects in the sectors.
+//
+// There are four kinds of push effects
+//
+// 1) Pushing Away
+//
+//    Pushes you away from a point source defined by the location of an
+//    MT_PUSH Thing. The force decreases linearly with distance from the
+//    source. This force crosses sector boundaries and is felt w/in a circle
+//    whose center is at the MT_PUSH. The force is felt only if the point
+//    MT_PUSH can see the target object.
+//
+// 2) Pulling toward
+//
+//    Same as Pushing Away except you're pulled toward an MT_PULL point
+//    source. This force crosses sector boundaries and is felt w/in a circle
+//    whose center is at the MT_PULL. The force is felt only if the point
+//    MT_PULL can see the target object.
+//
+// 3) Wind
+//
+//    Pushes you in a constant direction. Full force above ground, half
+//    force on the ground, nothing if you're below it (water).
+//
+// 4) Current
+//
+//    Pushes you in a constant direction. No force above ground, full
+//    force if on the ground or below it (water).
+//
+// The magnitude of the force is controlled by the length of a controlling
+// linedef. The force vector for types 3 & 4 is determined by the angle
+// of the linedef, and is constant.
+//
+// For each sector where these effects occur, the sector special type has
+// to have the PUSH_MASK bit set. If this bit is turned off by a switch
+// at run-time, the effect will not occur. The controlling sector for
+// types 1 & 2 is the sector containing the MT_PUSH/MT_PULL Thing.
+
+
+#define PUSH_FACTOR 7
+
+/////////////////////////////
+//
+// Add a push thinker to the thinker list
+
+static void Add_Pusher (int type, line_t *l, int magnitude, int angle,
+						mobj_t *source, int affectee)
+{
+	pusher_t *p = Z_Malloc (sizeof(*p), PU_LEVSPEC, 0);
+
+	p->thinker.function.acp1 = (actionf_p1) T_Pusher;
+	p->source = source;
+	p->type = type;
+	if (l) {
+		p->x_mag = l->dx>>FRACBITS;
+		p->y_mag = l->dy>>FRACBITS;
+		p->magnitude = P_AproxDistance (p->x_mag, p->y_mag);
+	} else {
+		// [RH] Allow setting magnitude and angle with parameters
+		angle_t ang = (angle<<24) >> ANGLETOFINESHIFT;
+		p->x_mag = (magnitude * finecosine[ang]) >> FRACBITS;
+		p->y_mag = (magnitude * finesine[ang]) >> FRACBITS;
+		p->magnitude = magnitude;
+	}
+	if (source) // point source exist?
+	{
+		p->radius = (p->magnitude) << (FRACBITS+1); // where force goes to zero
+		p->x = p->source->x;
+		p->y = p->source->y;
+	}
+	p->affectee = affectee;
+	P_AddThinker (&p->thinker);
+}
+
+/////////////////////////////
+//
+// PIT_PushThing determines the angle and magnitude of the effect.
+// The object's x and y momentum values are changed.
+//
+// tmpusher belongs to the point source (MT_PUSH/MT_PULL).
+//
+
+pusher_t *tmpusher; // pusher structure for blockmap searches
+
+BOOL PIT_PushThing (mobj_t *thing)
+{
+	if (thing->player &&
+		!(thing->flags & (MF_NOGRAVITY | MF_NOCLIP)))
+	{
+		int sx = tmpusher->x;
+		int sy = tmpusher->y;
+		int dist = P_AproxDistance (thing->x - sx,thing->y - sy);
+		int speed = (tmpusher->magnitude -
+					((dist>>FRACBITS)>>1))<<(FRACBITS-PUSH_FACTOR-1);
+
+		// If speed <= 0, you're outside the effective radius. You also have
+		// to be able to see the push/pull source point.
+
+		if ((speed > 0) && (P_CheckSight (thing, tmpusher->source, true)))
+		{
+			angle_t pushangle = R_PointToAngle2 (thing->x, thing->y, sx, sy);
+			if (tmpusher->source->type == MT_PUSH)
+				pushangle += ANG180;    // away
+			pushangle >>= ANGLETOFINESHIFT;
+			thing->momx += FixedMul (speed, finecosine[pushangle]);
+			thing->momy += FixedMul (speed, finesine[pushangle]);
+		}
+	}
+	return true;
+}
+
+/////////////////////////////
+//
+// T_Pusher looks for all objects that are inside the radius of
+// the effect.
+//
+extern fixed_t tmbbox[4];
+
+void T_Pusher (pusher_t *p)
+{
+	sector_t *sec;
+	mobj_t   *thing;
+	msecnode_t *node;
+	int xspeed,yspeed;
+	int xl,xh,yl,yh,bx,by;
+	int radius;
+	int ht = 0;
+
+	if (!boom_pushers->value)
+		return;
+
+	sec = sectors + p->affectee;
+
+	// Be sure the special sector type is still turned on. If so, proceed.
+	// Else, bail out; the sector type has been changed on us.
+
+	if (!(sec->special & PUSH_MASK))
+		return;
+
+	// For constant pushers (wind/current) there are 3 situations:
+	//
+	// 1) Affected Thing is above the floor.
+	//
+	//    Apply the full force if wind, no force if current.
+	//
+	// 2) Affected Thing is on the ground.
+	//
+	//    Apply half force if wind, full force if current.
+	//
+	// 3) Affected Thing is below the ground (underwater effect).
+	//
+	//    Apply no force if wind, full force if current.
+	//
+	// Apply the effect to clipped players only for now.
+	//
+	// In Phase II, you can apply these effects to Things other than players.
+
+	if (p->type == p_push)
+	{
+
+		// Seek out all pushable things within the force radius of this
+		// point pusher. Crosses sectors, so use blockmap.
+
+		tmpusher = p; // MT_PUSH/MT_PULL point source
+		radius = p->radius; // where force goes to zero
+		tmbbox[BOXTOP]    = p->y + radius;
+		tmbbox[BOXBOTTOM] = p->y - radius;
+		tmbbox[BOXRIGHT]  = p->x + radius;
+		tmbbox[BOXLEFT]   = p->x - radius;
+
+		xl = (tmbbox[BOXLEFT] - bmaporgx - MAXRADIUS)>>MAPBLOCKSHIFT;
+		xh = (tmbbox[BOXRIGHT] - bmaporgx + MAXRADIUS)>>MAPBLOCKSHIFT;
+		yl = (tmbbox[BOXBOTTOM] - bmaporgy - MAXRADIUS)>>MAPBLOCKSHIFT;
+		yh = (tmbbox[BOXTOP] - bmaporgy + MAXRADIUS)>>MAPBLOCKSHIFT;
+		for (bx=xl ; bx<=xh ; bx++)
+			for (by=yl ; by<=yh ; by++)
+				P_BlockThingsIterator (bx, by, PIT_PushThing);
+		return;
+	}
+
+	// constant pushers p_wind and p_current
+
+	if (sec->heightsec != -1) // special water sector?
+		ht = sectors[sec->heightsec].floorheight;
+	node = sec->touching_thinglist; // things touching this sector
+	for ( ; node ; node = node->m_snext)
+	{
+		thing = node->m_thing;
+		if (!thing->player || (thing->flags & (MF_NOGRAVITY | MF_NOCLIP)))
+			continue;
+		if (p->type == p_wind)
+		{
+			if (sec->heightsec == -1) // NOT special water sector
+			{
+				if (thing->z > thing->floorz) // above ground
+				{
+					xspeed = p->x_mag; // full force
+					yspeed = p->y_mag;
+				}
+				else // on ground
+				{
+					xspeed = (p->x_mag)>>1; // half force
+					yspeed = (p->y_mag)>>1;
+				}
+			}
+			else // special water sector
+			{
+				if (thing->z > ht) // above ground
+				{
+					xspeed = p->x_mag; // full force
+					yspeed = p->y_mag;
+				}
+				else if (thing->player->viewz < ht) // underwater
+					xspeed = yspeed = 0; // no force
+				else // wading in water
+				{
+					xspeed = (p->x_mag)>>1; // half force
+					yspeed = (p->y_mag)>>1;
+				}
+			}
+		}
+		else // p_current
+		{
+			if (sec->heightsec == -1) // NOT special water sector
+				if (thing->z > sec->floorheight) // above ground
+					xspeed = yspeed = 0; // no force
+				else // on ground
+				{
+					xspeed = p->x_mag; // full force
+					yspeed = p->y_mag;
+				}
+			else // special water sector
+				if (thing->z > ht) // above ground
+					xspeed = yspeed = 0; // no force
+				else // underwater
+				{
+					xspeed = p->x_mag; // full force
+					yspeed = p->y_mag;
+				}
+		}
+		thing->momx += xspeed<<(FRACBITS-PUSH_FACTOR);
+		thing->momy += yspeed<<(FRACBITS-PUSH_FACTOR);
+	}
+}
+
+/////////////////////////////
+//
+// P_GetPushThing() returns a pointer to an MT_PUSH or MT_PULL thing,
+// NULL otherwise.
+
+mobj_t *P_GetPushThing (int s)
+{
+	mobj_t* thing;
+	sector_t* sec;
+
+	sec = sectors + s;
+	thing = sec->thinglist;
+	while (thing)
+	{
+		switch (thing->type)
+		{
+		  case MT_PUSH:
+		  case MT_PULL:
+			return thing;
+		  default:
+			break;
+		}
+		thing = thing->snext;
+	}
+	return NULL;
+}
+
+/////////////////////////////
+//
+// Initialize the sectors where pushers are present
+//
+
+static void P_SpawnPushers(void)
+{
+	int i;
+	line_t *l = lines;
+	register int s;
+
+	for (i = 0; i < numlines; i++, l++)
+		switch (l->special)
+		{
+		  case Sector_SetWind: // wind
+			for (s = -1; (s = P_FindSectorFromTag (l->args[0],s)) >= 0 ; )
+				Add_Pusher (p_wind, l->args[3] ? l : NULL, l->args[1], l->args[2], NULL, s);
+			break;
+		  case Sector_SetCurrent: // current
+			for (s = -1; (s = P_FindSectorFromTag (l->args[0],s)) >= 0 ; )
+				Add_Pusher (p_current, l->args[3] ? l : NULL, l->args[1], l->args[2], NULL, s);
+			break;
+		  case PointPush_SetForce: // push/pull
+			if (l->args[0]) {	// [RH] Find thing by sector
+				for (s = -1; (s = P_FindSectorFromTag (l->args[0], s)) >= 0 ; )
+				{
+					mobj_t *thing = P_GetPushThing (s);
+					if (thing) {	// No MT_P* means no effect
+						// [RH] Allow narrowing it down by tid
+						if (!l->args[1] || l->args[1] == thing->tid)
+							Add_Pusher (p_push, l->args[3] ? l : NULL, l->args[2],
+										0, thing, s);
+					}
+				}
+			} else {	// [RH] Find thing by tid
+				mobj_t *thing = NULL;
+
+				while (thing = P_FindMobjByTid (thing, l->args[1])) {
+					if (thing->type == MT_PUSH || thing->type == MT_PULL)
+						Add_Pusher (p_push, l->args[3] ? l : NULL, l->args[2],
+									0, thing, thing->subsector->sector - sectors);
+				}
+			}
+			break;
+		}
+}
+
+//
+// phares 3/20/98: End of Pusher effects
+//
+////////////////////////////////////////////////////////////////////////////
diff --git a/code/P_spec.h b/code/P_spec.h
index 70873ad445..8a3f88e03e 100644
--- a/code/P_spec.h
+++ b/code/P_spec.h
@@ -56,6 +56,54 @@ typedef struct {
 	} type;					// Type of scroll effect
 } scroll_t;
 
+// phares 3/12/98: added new model of friction for ice/sludge effects
+
+typedef struct {
+	thinker_t thinker;		// Thinker structure for friction
+	int friction;			// friction value (E800 = normal)
+	int movefactor;			// inertia factor when adding to momentum
+	int affectee;			// Number of affected sector
+} friction_t;
+
+// phares 3/20/98: added new model of Pushers for push/pull effects
+
+typedef struct {
+	thinker_t thinker;		// Thinker structure for Pusher
+	enum
+	{
+		p_push,
+		p_pull,
+		p_wind,
+		p_current,
+	} type;
+	mobj_t* source;			// Point source if point pusher
+	int x_mag;				// X Strength
+	int y_mag;				// Y Strength
+	int magnitude;			// Vector strength for point pusher
+	int radius;				// Effective radius for point pusher
+	int x;					// X of point source if point pusher
+	int y;					// Y of point source if point pusher
+	int affectee;			// Number of affected sector
+} pusher_t;
+
+// [RH] Types of keys used by locked doors and scripts
+typedef enum
+{
+	NoKey,
+	RCard,
+	BCard,
+	YCard,
+	RSkull,
+	BSkull,
+	YSkull,
+
+	AnyKey = 100,
+	AllKeys = 101,
+
+	CardIsSkull = 128
+} keytype_t;
+
+BOOL P_CheckKeys (player_t *p, keytype_t lock, BOOL remote);
 
 // Define values for map objects
 #define MO_TELEPORTMAN			14
@@ -77,10 +125,10 @@ void	P_UpdateSpecials (void);
 
 // when needed
 BOOL	P_UseSpecialLine (mobj_t *thing, line_t *line, int side);
-
 void	P_ShootSpecialLine (mobj_t *thing, line_t *line);
-
+void	P_ShotCrossSpecialLine (mobj_t *thing, line_t *line);	// [RH]
 void	P_CrossSpecialLine (int linenum, int side, mobj_t *thing);
+BOOL	P_PushSpecialLine (mobj_t *thing, int side, line_t *line);	// [RH]
 
 void	P_PlayerInSpecialSector (player_t *player);
 
@@ -96,23 +144,35 @@ fixed_t	P_FindHighestFloorSurrounding (sector_t *sec);
 fixed_t	P_FindNextHighestFloor (sector_t *sec, int currentheight);
 fixed_t P_FindNextLowestFloor (sector_t* sec, int currentheight);
 
-fixed_t	P_FindLowestCeilingSurrounding (sector_t *sec);
-fixed_t	P_FindHighestCeilingSurrounding (sector_t *sec);
+fixed_t	P_FindLowestCeilingSurrounding (sector_t *sec);		// jff 2/04/98
+fixed_t	P_FindHighestCeilingSurrounding (sector_t *sec);	// jff 2/04/98
 
-int		P_FindSectorFromLineTag (line_t *line, int start);
+fixed_t P_FindNextLowestCeiling (sector_t *sec, int currentheight);		// jff 2/04/98
+fixed_t P_FindNextHighestCeiling (sector_t *sec, int currentheight);	// jff 2/04/98
+
+fixed_t P_FindShortestTextureAround (int secnum);	// jff 2/04/98
+fixed_t P_FindShortestUpperAround (int secnum);		// jff 2/04/98
+
+sector_t* P_FindModelFloorSector (fixed_t floordestheight, int secnum);	//jff 02/04/98
+sector_t* P_FindModelCeilingSector (fixed_t ceildestheight, int secnum);	//jff 02/04/98 
+
+int		P_FindSectorFromTag (int tag, int start);
+int		P_FindLineFromID (int id, int start);
 
 int		P_FindMinSurroundingLight (sector_t *sector, int max);
 
 sector_t *getNextSector (line_t *line, sector_t *sec);
-
+sector_t *P_NextSpecialSector (sector_t *sec, int type, sector_t *back2);	// [RH]
 
 void	T_Scroll (scroll_t *);		// killough 3/7/98: scroll effect thinker
+void	T_Friction (friction_t *);	// phares 3/12/98: friction thinker
+void	T_Pusher (pusher_t *);		// phares 3/20/98: Push thinker
 
 
 //
 // SPECIAL
 //
-int EV_DoDonut (line_t *line);
+int EV_DoDonut (int tag, fixed_t pillarspeed, fixed_t slimespeed);
 
 
 
@@ -166,29 +226,58 @@ typedef struct
 	int 		direction;
 } glow_t;
 
+// [RH] Glow from Light_Glow and Light_Fade specials
+typedef struct
+{
+	thinker_t	thinker;
+	sector_t	*sector;
+	int			start;
+	int			end;
+	int			maxtics;
+	int			tics;
+	BOOL		oneshot;
+} glow2_t;
 
-#define GLOWSPEED				((TICRATE*8)/35)
-#define STROBEBRIGHT			(TICRATE/7)
-#define FASTDARK				((TICRATE*3)/7)
+// [RH] Phased light thinker
+typedef struct
+{
+	thinker_t	thinker;
+	sector_t	*sector;
+	byte		baselevel;
+	byte		phase;
+} phased_t;
+
+#define GLOWSPEED				8
+#define STROBEBRIGHT			5
+#define FASTDARK				15
 #define SLOWDARK				TICRATE
 
 void	T_FireFlicker (fireflicker_t *flick);
 void	P_SpawnFireFlicker (sector_t *sector);
 void	T_LightFlash (lightflash_t *flash);
-void	P_SpawnLightFlash (sector_t *sector);
+void	P_SpawnLightFlash (sector_t *sector, int min, int max);
 void	T_StrobeFlash (strobe_t *flash);
 
-void	P_SpawnStrobeFlash (sector_t *sector, int fastOrSlow, int inSync);
+void	P_SpawnStrobeFlash (sector_t *sector, int upper, int lower,
+							int utics, int ltics, int inSync);
 
-void	EV_StartLightStrobing(line_t *line);
-void	EV_TurnTagLightsOff(line_t *line);
-
-void	EV_LightTurnOn (line_t *line, int bright);
+void	EV_StartLightFlashing (int tag, int upper, int lower);
+void	EV_StartLightStrobing (int tag, int upper, int lower,
+							   int utics, int ltics);
+void	EV_TurnTagLightsOff (int tag);
+void	EV_LightTurnOn (int tag, int bright);
+void	EV_LightChange (int tag, int value);
 
 void	T_Glow (glow_t *g);
 void	P_SpawnGlowingLight (sector_t *sector);
 
+void	T_Glow2 (glow2_t *g);
+void	EV_StartLightGlowing (int tag, int upper, int lower, int tics);
+void	EV_StartLightFading (int tag, int value, int tics);
 
+void	T_PhasedLight (phased_t *l);
+void	P_SpawnLightSequence (sector_t *sector);
+void	P_SpawnLightPhased (sector_t *sector);
 
 
 //
@@ -212,8 +301,9 @@ typedef enum
 } bwhere_e;
 
 
-typedef struct
+typedef struct button_s
 {
+	struct button_s *next;	// [RH] make buttons a singly-linked list
 	line_t* 	line;
 	bwhere_e	where;
 	int 		btexture;
@@ -225,13 +315,10 @@ typedef struct
 
 
 
- // 4 players, 4 buttons each at once, max.
-#define MAXBUTTONS		(MAXPLAYERS*4)
-
  // 1 second, in ticks. 
 #define BUTTONTIME		TICRATE
 
-extern button_t buttonlist[MAXBUTTONS]; 
+extern button_t *buttonlist; 
 
 void	P_ChangeSwitchTexture (line_t *line, int useAgain);
 
@@ -254,19 +341,29 @@ typedef enum
 
 typedef enum
 {
-	perpetualRaise,
-	downWaitUpStay,
-	raiseAndChange,
-	raiseToNearestAndChange,
-	blazeDWUS
+	// [RH] Changed these
+	platPerpetualRaise,
+	platDownWaitUpStay,
+	platUpWaitDownStay,
+	platDownByValue,
+	platUpByValue,
+	platUpByValueStay,
+	platRaiseAndStay,
+	platToggle,
+	platDownToNearestFloor,
+	platDownToLowestCeiling
 
 } plattype_e;
 
 
 
-typedef struct
+typedef struct plat_s
 {
 	thinker_t	thinker;
+
+	// [RH] Added next and prev links
+	struct plat_s *next, *prev;
+
 	sector_t*	sector;
 	fixed_t 	speed;
 	fixed_t 	low;
@@ -283,40 +380,62 @@ typedef struct
 
 
 
-#define PLATWAIT				3
-#define PLATSPEED				FRACUNIT
-
-extern int		MaxPlats;
-extern plat_t	**activeplats;
+extern plat_t *activeplats;
 
 void	T_PlatRaise(plat_t *plat);
 
-int		EV_DoPlat (line_t *line, plattype_e type, int amount);
+BOOL	EV_DoPlat (int tag, line_t *line, plattype_e type, int height,
+				   int speed, int delay, int lip, int change);
 
 void	P_AddActivePlat (plat_t *plat);
 void	P_RemoveActivePlat (plat_t *plat);
-void	EV_StopPlat (line_t *line);
+void	EV_StopPlat (int tag);
 void	P_ActivateInStasis (int tag);
 
 
+//
+// [RH]
+// P_PILLAR
+//
+typedef enum
+{
+	pillarBuild,
+	pillarOpen
+
+} pillar_e;
+
+typedef struct
+{
+	thinker_t	thinker;
+	sector_t	*sector;
+	pillar_e	type;
+	fixed_t		floorspeed;
+	fixed_t		ceilingspeed;
+	fixed_t		floortarget;
+	fixed_t		ceilingtarget;
+	int			crush;
+
+} pillar_t;
+
+BOOL EV_DoPillar (pillar_e type, int tag, fixed_t speed, fixed_t height,
+				  fixed_t height2, int crush);
+
+void T_Pillar (pillar_t *pillar);
+
 //
 // P_DOORS
 //
 typedef enum
 {
-	normal,
-	close30ThenOpen,
-	close,
-	open,
-	raiseIn5Mins,
-	blazeRaise,
-	blazeOpen,
-	blazeClose
+	// [RH] Changed for new specials
+	doorClose,
+	doorOpen,
+	doorRaise,
+	doorRaiseIn5Mins,
+	doorCloseWaitOpen,
 
 } vldoor_e;
 
-
-
 typedef struct
 {
 	thinker_t	thinker;
@@ -337,133 +456,78 @@ typedef struct
 } vldoor_t;
 
 
-
-#define VDOORSPEED			(FRACUNIT*2)
-#define VDOORWAIT			((TICRATE*30)/7)
-
-void	EV_VerticalDoor (line_t *line, mobj_t *thing);
-
-int		EV_DoDoor (line_t *line, vldoor_e type);
-
-int		EV_DoLockedDoor (line_t *line, vldoor_e type, mobj_t *thing);
+BOOL	EV_DoDoor (vldoor_e type, line_t *line, mobj_t *thing,
+				   int tag, int speed, int delay, keytype_t lock);
 
 void	T_VerticalDoor (vldoor_t *door);
 void	P_SpawnDoorCloseIn30 (sector_t *sec);
 
-void	P_SpawnDoorRaiseIn5Mins (sector_t *sec, int secnum);
-
-
-
-#if 0 // UNUSED
-//
-//		Sliding doors...
-//
-typedef enum
-{
-	sd_opening,
-	sd_waiting,
-	sd_closing
-
-} sd_e;
-
-
-
-typedef enum
-{
-	sdt_openOnly,
-	sdt_closeOnly,
-	sdt_openAndClose
-
-} sdt_e;
-
-
-
-
-typedef struct
-{
-	thinker_t	thinker;
-	sdt_e		type;
-	line_t* 	line;
-	int 		frame;
-	int 		whichDoorIndex;
-	int 		timer;
-	sector_t*	frontsector;
-	sector_t*	backsector;
-	sd_e		 status;
-
-} slidedoor_t;
-
-
-
-typedef struct
-{
-	char		frontFrame1[9];
-	char		frontFrame2[9];
-	char		frontFrame3[9];
-	char		frontFrame4[9];
-	char		backFrame1[9];
-	char		backFrame2[9];
-	char		backFrame3[9];
-	char		backFrame4[9];
-	
-} slidename_t;
-
-
-
-typedef struct
-{
-	int 			frontFrames[4];
-	int 			backFrames[4];
-
-} slideframe_t;
-
-
-
-// how many frames of animation
-#define SNUMFRAMES				4
-
-#define SDOORWAIT				(3*TICRATE)
-#define SWAITTICS				4
-
-// how many diff. types of anims
-#define MAXSLIDEDOORS	5							 
-
-void P_InitSlidingDoorFrames(void);
-
-void	EV_SlidingDoor (line_t *line, mobj_t *thing);
-#endif
+void	P_SpawnDoorRaiseIn5Mins (sector_t *sec);
 
 
 
 //
 // P_CEILNG
 //
+
+// [RH] Changed these
 typedef enum
 {
-	lowerToFloor,
-	raiseToHighest,
-	lowerAndCrush,
-	crushAndRaise,
-	fastCrushAndRaise,
-	silentCrushAndRaise
+	ceilLowerByValue,
+	ceilRaiseByValue,
+	ceilMoveToValue,
+	ceilLowerToHighestFloor,
+	ceilLowerInstant,
+	ceilRaiseInstant,
+	ceilCrushAndRaise,
+	ceilLowerAndCrush,
+	ceilCrushRaiseAndStay,
+	ceilRaiseToNearest,
+	ceilLowerToLowest,
+	ceilLowerToFloor,
+
+	// The following are only used by Generic_Ceiling
+	ceilRaiseToHighest,
+	ceilLowerToHighest,
+	ceilRaiseToLowest,
+	ceilLowerToNearest,
+	ceilRaiseToHighestFloor,
+	ceilRaiseToFloor,
+	ceilRaiseByTexture,
+	ceilLowerByTexture,
+
+	genCeilingChg0,
+	genCeilingChgT,
+	genCeilingChg
 
 } ceiling_e;
 
 
 
-typedef struct
+typedef struct ceiling_s
 {
 	thinker_t	thinker;
+
+	// [RH] Added next and prev links
+	struct ceiling_s *next, *prev;
+
 	ceiling_e	type;
 	sector_t*	sector;
 	fixed_t 	bottomheight;
 	fixed_t 	topheight;
 	fixed_t 	speed;
-	BOOL 	crush;
+	fixed_t		speed1;		// [RH] dnspeed of crushers
+	fixed_t		speed2;		// [RH] upspeed of crushers
+	int 		crush;
+	int			silent;		// [RH] 1=noise at stops, 2=no noise at all
 
 	// 1 = up, 0 = waiting, -1 = down
 	int 		direction;
 
+	// [RH] Need these for BOOM-ish transfering ceilings
+	int			texture;
+	int			newspecial;
+
 	// ID
 	int 		tag;
 	int 		olddirection;
@@ -474,48 +538,74 @@ typedef struct
 
 
 
-#define CEILSPEED		FRACUNIT
-#define CEILWAIT		((TICRATE*30)/7)
+extern ceiling_t *activeceilings;
 
-extern int				MaxCeilings;
-extern ceiling_t		**activeceilings;
-
-int		EV_DoCeiling (line_t *line, ceiling_e type);
+BOOL	EV_DoCeiling (ceiling_e type, line_t *line,
+					  int tag, fixed_t speed, fixed_t speed2, fixed_t height,
+					  int crush, int silent, int change);
 
 void	T_MoveCeiling (ceiling_t *ceiling);
-void	P_AddActiveCeiling(ceiling_t *c);
-void	P_RemoveActiveCeiling(ceiling_t *c);
-int 	EV_CeilingCrushStop(line_t *line);
-void	P_ActivateInStasisCeiling(line_t *line);
+void	P_AddActiveCeiling (ceiling_t *c);
+void	P_RemoveActiveCeiling (ceiling_t *c);
+BOOL 	EV_CeilingCrushStop (int tag);
+void	P_ActivateInStasisCeiling(int tag);
 
 
 //
 // P_FLOOR
 //
+// [RH] Changed these enums
 typedef enum
 {
-	lowerFloor,				// lower floor to highest surrounding floor
-	lowerFloorToLowest,		// lower floor to lowest surrounding floor
-	turboLower,				// lower floor to highest surrounding floor VERY FAST
-	raiseFloor,				// raise floor to lowest surrounding CEILING
-	raiseFloorToNearest,	// raise floor to next highest surrounding floor
-	raiseToTexture,			// raise floor to shortest height texture around it
-	lowerAndChange,			// lower floor to lowest surrounding floor and change floorpic
+	floorLowerToLowest,
+	floorLowerToNearest,
+	floorLowerToHighest,
+	floorLowerByValue,
+	floorRaiseByValue,
+	floorRaiseToHighest,
+	floorRaiseToNearest,
+	floorRaiseAndCrush,
+	floorCrushStop,
+	floorLowerInstant,
+	floorRaiseInstant,
+	floorMoveToValue,
+	floorRaiseToLowestCeiling,
+	floorRaiseByTexture,
 
-	raiseFloor24,
-	raiseFloor24AndChange,
-	raiseFloorCrush,
+	floorLowerAndChange,
+	floorRaiseAndChange,
 
-	raiseFloorTurbo,		// raise to next highest floor, turbo-speed
+	floorRaiseToLowest,
+	floorRaiseToCeiling,
+	floorLowerToLowestCeiling,
+	floorLowerByTexture,
+	floorLowerToCeiling,
+	 
 	donutRaise,
-	raiseFloor512
-	
+
+	buildStair,
+	waitStair,
+	resetStair,
+
+	// Not to be used as parameters to EV_DoFloor()
+	genFloorChg0,
+	genFloorChgT,
+	genFloorChg
+
 } floor_e;
 
+//jff 3/15/98 pure texture/type change for better generalized support
 typedef enum
 {
-	build8, 	// slowly build by 8
-	turbo16 	// quickly build by 16
+	trigChangeOnly,
+	numChangeOnly,
+} change_e;
+
+// [RH] Changed to use Hexen-ish specials
+typedef enum
+{
+	buildUp,
+	buildDown
 	
 } stair_e;
 
@@ -524,36 +614,56 @@ typedef enum
 	elevateUp,
 	elevateDown,
 	elevateCurrent,
+	// [RH] For FloorAndCeiling_Raise/Lower
+	elevateRaise,
+	elevateLower
 } elevator_e;
 
 typedef struct
 {
 	thinker_t	thinker;
 	floor_e 	type;
-	BOOL 	crush;
+	int 		crush;
 	sector_t*	sector;
 	int 		direction;
-	int 		newspecial;
+	short 		newspecial;
 	short		texture;
 	fixed_t 	floordestheight;
 	fixed_t 	speed;
 
+	// [RH] New parameters use to reset and delayed stairs
+	int			resetcount;
+	int			orgheight;
+	int			delay;
+	int			pausetime;
+	int			steptime;
+	int			persteptime;
+
 } floormove_t;
 
 typedef struct
 {
-  thinker_t thinker;
-  elevator_e type;
-  sector_t* sector;
-  int direction;
-  fixed_t floordestheight;
-  fixed_t ceilingdestheight;
-  fixed_t speed;
+	thinker_t	thinker;
+	elevator_e	type;
+	sector_t*	sector;
+	int			direction;
+	fixed_t		floordestheight;
+	fixed_t		ceilingdestheight;
+	fixed_t		speed;
 } elevator_t;
 
+typedef struct {
+	thinker_t   thinker;
+	sector_t   *sector;
+	int			x;
+	int			amp;
+	int			freq;
+	int			timetodie;
+	fixed_t		baseline;
+	int			stage;
+	int			ampfactor;
+} waggle_t;
 
-#define ELEVATORSPEED	(FRACUNIT*4)
-#define FLOORSPEED		FRACUNIT
 
 typedef enum
 {
@@ -564,25 +674,65 @@ typedef enum
 } result_e;
 
 result_e T_MovePlane (sector_t *sector, fixed_t speed, fixed_t dest,
-					  BOOL crush, int floorOrCeiling, int direction);
+					  int crush, int floorOrCeiling, int direction);
 
-int EV_DoElevator (line_t *line, ceiling_e type);
+BOOL EV_DoElevator (line_t *line, ceiling_e type, fixed_t speed, fixed_t height, int tag);
 
-int EV_BuildStairs (line_t *line, stair_e type);
+BOOL EV_BuildStairs (int tag, stair_e type, line_t *line,
+					 fixed_t stairsize, fixed_t speed, int delay, int reset, int igntxt,
+					 int usespecials);
 
-int EV_DoFloor (line_t *line, floor_e floortype);
+BOOL EV_DoFloor (floor_e floortype, line_t *line, int tag,
+				 fixed_t speed, fixed_t height, int crush, int change);
+BOOL EV_FloorCrushStop (int tag);
+BOOL EV_DoChange (line_t *line, change_e changetype, int tag);
+BOOL EV_DoFloorWaggle (int tag, fixed_t amplitude, fixed_t speed, int delay, int count);
 
+void T_Waggle (waggle_t *w);
 void T_MoveFloor (floormove_t *floor);
-
 void T_MoveElevator (elevator_t *elevator);
 
 
 //
 // P_TELEPT
 //
-int		EV_Teleport (line_t *line, int side, mobj_t *thing);
+BOOL EV_Teleport (int tid, int side, mobj_t *thing);
+BOOL EV_SilentTeleport (int tid, line_t *line, int side, mobj_t *thing);
+BOOL EV_SilentLineTeleport (line_t *line, int side, mobj_t *thing, int id,
+							BOOL reverse);
 
 
 int P_SectorActive (special_e t, sector_t *s);	// [RH] from BOOM
 
+
+//
+// [RH] ACS (see also p_acs.h)
+//
+
+void P_ClearScripts (void);
+
+BOOL P_StartScript (mobj_t *who, line_t *where, int script, char *map, int lineSide,
+					int arg0, int arg1, int arg2, int always);
+void P_SuspendScript (int script, char *map);
+void P_TerminateScript (int script, char *map);
+void P_StartOpenScripts (void);
+void P_DoDeferedScripts (void);
+
+//
+// [RH] p_quake.c
+//
+typedef struct quake_s {
+	struct quake_s *next;
+	mobj_t *quakespot;
+	fixed_t tremorbox[4];
+	fixed_t damagebox[4];
+	int intensity;
+	int countdown;
+} quake_t;
+
+extern quake_t *ActiveQuakes;
+
+void P_RunQuakes (void);
+BOOL P_StartQuake (int tid, int intensity, int duration, int damrad, int tremrad);
+
 #endif
diff --git a/code/P_switch.c b/code/P_switch.c
index ba15d9f6b0..44daea3196 100644
--- a/code/P_switch.c
+++ b/code/P_switch.c
@@ -15,8 +15,6 @@
 // for more details.
 //
 //
-// $Log:$
-//
 // DESCRIPTION:
 //		Switches, buttons. Two-state animation. Exits.
 //
@@ -27,14 +25,12 @@
 #include "i_system.h"
 #include "doomdef.h"
 #include "p_local.h"
+#include "p_lnspec.h"
 
 #include "g_game.h"
 
 #include "s_sound.h"
 
-// Data.
-#include "sounds.h"
-
 // State.
 #include "doomstat.h"
 #include "r_state.h"
@@ -49,7 +45,7 @@
 static int *switchlist;
 static int  numswitches;
 
-button_t	buttonlist[MAXBUTTONS];
+button_t   *buttonlist;		// [RH] remove limit on number of buttons
 
 //
 // P_InitSwitchList
@@ -100,58 +96,44 @@ void P_InitSwitchList(void)
 	Z_Free (alphSwitchList);
 }
 
-
 //
 // Start a button counting down till it turns off.
+// [RH] Rewritten to remove MAXBUTTONS limit and use temporary soundorgs.
 //
-void P_StartButton (line_t *line, bwhere_e w, int texture, int time)
+void P_StartButton (line_t *line, bwhere_e w, int texture, int time, mobj_t *soundorg)
 {
-	int i;
+	button_t *button;
 	
 	// See if button is already pressed
-	for (i = 0;i < MAXBUTTONS;i++)
-	{
-		if (buttonlist[i].btimer
-			&& buttonlist[i].line == line)
-		{
-			
+	button = buttonlist;
+	while (button) {
+		if (button->line == line)
 			return;
-		}
+		button = button->next;
 	}
 
+	button = Z_Malloc (sizeof(*button), PU_LEVEL, 0);
 
-
-	for (i = 0;i < MAXBUTTONS;i++)
-	{
-		if (!buttonlist[i].btimer)
-		{
-			buttonlist[i].line = line;
-			buttonlist[i].where = w;
-			buttonlist[i].btexture = texture;
-			buttonlist[i].btimer = time;
-			buttonlist[i].soundorg = (mobj_t *)&line->frontsector->soundorg;
-			return;
-		}
-	}
-
-	I_Error("P_StartButton: no button slots left!");
+	button->line = line;
+	button->where = w;
+	button->btexture = texture;
+	button->btimer = time;
+	button->soundorg = soundorg;
+	button->next = buttonlist;
+	buttonlist = button;
 }
 
-
-
-
-
 //
 // Function that changes wall texture.
 // Tell it if switch is ok to use again (1=yes, it's a button).
 //
 void P_ChangeSwitchTexture (line_t *line, int useAgain)
 {
-	int 	texTop;
-	int 	texMid;
-	int 	texBot;
-	int 	i;
-	int 	sound;
+	int texTop;
+	int texMid;
+	int texBot;
+	int i;
+	char *sound;
 
 	if (!useAgain)
 		line->special = 0;
@@ -160,58 +142,53 @@ void P_ChangeSwitchTexture (line_t *line, int useAgain)
 	texMid = sides[line->sidenum[0]].midtexture;
 	texBot = sides[line->sidenum[0]].bottomtexture;
 
-	sound = sfx_swtchn;
-
 	// EXIT SWITCH?
-	if (line->special == 11)
-		sound = sfx_swtchx;
+	if (line->special == Exit_Normal ||
+		line->special == Exit_Secret ||
+		line->special == Teleport_NewMap ||
+		line->special == Teleport_EndGame)
+		sound = "switches/exitbutn";
+	else
+		sound = "switches/normbutn";
 
-	for (i = 0;i < numswitches*2;i++)
+	for (i = 0; i < numswitches*2; i++)
 	{
-		if (switchlist[i] == texTop)
-		{
-			S_StartSound(buttonlist->soundorg,sound);
-			sides[line->sidenum[0]].toptexture = (short)switchlist[i^1];
+		// [RH] Rewritten slightly to be more compact
+		short *texture = NULL;
+		bwhere_e where;
 
-			if (useAgain)
-				P_StartButton(line,top,switchlist[i],BUTTONTIME);
-
-			return;
+		if (switchlist[i] == texTop) {
+			texture = &sides[line->sidenum[0]].toptexture;
+			where = top;
+		} else if (switchlist[i] == texMid) {
+			texture = &sides[line->sidenum[0]].midtexture;
+			where = middle;
+		} else if (switchlist[i] == texBot) {
+			texture = &sides[line->sidenum[0]].bottomtexture;
+			where = bottom;
 		}
-		else
-		{
-			if (switchlist[i] == texMid)
-			{
-				S_StartSound(buttonlist->soundorg,sound);
-				sides[line->sidenum[0]].midtexture = (short)switchlist[i^1];
 
-				if (useAgain)
-					P_StartButton(line, middle,switchlist[i],BUTTONTIME);
-
-				return;
-			}
-			else
-			{
-				if (switchlist[i] == texBot)
-				{
-					S_StartSound(buttonlist->soundorg,sound);
-					sides[line->sidenum[0]].bottomtexture = (short)switchlist[i^1];
-
-					if (useAgain)
-						P_StartButton(line, bottom,switchlist[i],BUTTONTIME);
-
-					return;
-				}
-			}
+		if (texture) {
+			// [RH] The original code played the sound at buttonlist->soundorg.
+			//		I spawn a temporary mobj on the button's line to play the
+			//		sound. It automatically removes itself after 60 seconds.
+			mobj_t *soundorg = P_SpawnMobj (
+									line->v1->x + (line->dx >> 1),
+									line->v1->y + (line->dy >> 1),
+									0, // z doesn't matter
+									MT_SWITCHTEMP,
+									0);
+			S_StartSound (soundorg, sound, 78);
+			*texture = (short)switchlist[i^1];
+			if (useAgain)
+				P_StartButton (line, where, switchlist[i], BUTTONTIME, soundorg);
+			break;
 		}
 	}
 }
 
 
 
-
-
-
 //
 // P_UseSpecialLine
 // Called when a thing uses a special line.
@@ -219,381 +196,34 @@ void P_ChangeSwitchTexture (line_t *line, int useAgain)
 //
 BOOL P_UseSpecialLine (mobj_t *thing, line_t *line, int side)
 {
+	BOOL result;
 
-	// Err...
-	// Use the back sides of VERY SPECIAL lines...
-	if (side)
-	{
-		switch(line->special)
-		{
-		  case 124:
-			// Sliding door open&close
-			// UNUSED?
-			break;
+	// [RH] Line needs to be setup for use activation
+	if ((line->flags & ML_ACTIVATIONMASK) != ML_ACTIVATEUSE)
+		return false;
 
-		  default:
-			return false;
-			break;
-		}
-	}
-
-
-	// Switches that other things can activate.
-	if (!thing->player)
-	{
-		// never open secret doors
+	// [RH] Don't let monsters activate the special unless the line says they can.
+	//		(Some lines automatically imply ML_MONSTERSCANACTIVATE)
+	if (!thing->player) {
 		if (line->flags & ML_SECRET)
+			return false;	// monsters never activate secrets
+		if (!(line->flags & ML_MONSTERSCANACTIVATE) &&
+			(line->special != Door_Raise || line->args[0] != 0) &&
+			line->special != Teleport &&
+			line->special != Teleport_NoFog)
 			return false;
-		
-		switch(line->special)
-		{
-		  case 1:		// MANUAL DOOR RAISE
-		  case 32:		// MANUAL BLUE
-		  case 33:		// MANUAL RED
-		  case 34:		// MANUAL YELLOW
-			break;
-			
-		  default:
-			return false;
-			break;
-		}
 	}
 
+	// [RH] Use LineSpecials[] dispatcher table.
+	result = LineSpecials[line->special] (line, thing, line->args[0],
+										  line->args[1], line->args[2],
+										  line->args[3], line->args[4]);
 
-	// do something  
-	switch (line->special)
-	{
-		// MANUALS
-	  case 1:			// Vertical Door
-	  case 26:			// Blue Door/Locked
-	  case 27:			// Yellow Door /Locked
-	  case 28:			// Red Door /Locked
+	// [RH] It's possible for a script to render the line unusable even if it has the
+	//		repeatable flag set by calling clearlinespecial().
+	if (result)
+		P_ChangeSwitchTexture (line, (line->flags & ML_REPEATABLE) && line->special);
 
-	  case 31:			// Manual door open
-	  case 32:			// Blue locked door open
-	  case 33:			// Red locked door open
-	  case 34:			// Yellow locked door open
-
-	  case 117: 		// Blazing door raise
-	  case 118: 		// Blazing door open
-		EV_VerticalDoor (line, thing);
-		break;
-		
-		//UNUSED - Door Slide Open&Close
-		// case 124:
-		// EV_SlidingDoor (line, thing);
-		// break;
-
-		// SWITCHES
-	  case 7:
-		// Build Stairs
-		if (EV_BuildStairs(line,build8))
-			P_ChangeSwitchTexture(line,0);
-		break;
-
-	  case 9:
-		// Change Donut
-		if (EV_DoDonut(line))
-			P_ChangeSwitchTexture(line,0);
-		break;
-
-	  case 11:
-		// Exit level
-		if (CheckIfExitIsGood (thing)) {
-			P_ChangeSwitchTexture(line,0);
-			G_ExitLevel ();
-		}
-		break;
-
-	  case 14:
-		// Raise Floor 32 and change texture
-		if (EV_DoPlat(line,raiseAndChange,32))
-			P_ChangeSwitchTexture(line,0);
-		break;
-
-	  case 15:
-		// Raise Floor 24 and change texture
-		if (EV_DoPlat(line,raiseAndChange,24))
-			P_ChangeSwitchTexture(line,0);
-		break;
-
-	  case 18:
-		// Raise Floor to next highest floor
-		if (EV_DoFloor(line, raiseFloorToNearest))
-			P_ChangeSwitchTexture(line,0);
-		break;
-
-	  case 20:
-		// Raise Plat next highest floor and change texture
-		if (EV_DoPlat(line,raiseToNearestAndChange,0))
-			P_ChangeSwitchTexture(line,0);
-		break;
-
-	  case 21:
-		// PlatDownWaitUpStay
-		if (EV_DoPlat(line,downWaitUpStay,0))
-			P_ChangeSwitchTexture(line,0);
-		break;
-
-	  case 23:
-		// Lower Floor to Lowest
-		if (EV_DoFloor(line,lowerFloorToLowest))
-			P_ChangeSwitchTexture(line,0);
-		break;
-
-	  case 29:
-		// Raise Door
-		if (EV_DoDoor(line,normal))
-			P_ChangeSwitchTexture(line,0);
-		break;
-
-	  case 41:
-		// Lower Ceiling to Floor
-		if (EV_DoCeiling(line,lowerToFloor))
-			P_ChangeSwitchTexture(line,0);
-		break;
-
-	  case 71:
-		// Turbo Lower Floor
-		if (EV_DoFloor(line,turboLower))
-			P_ChangeSwitchTexture(line,0);
-		break;
-
-	  case 49:
-		// Ceiling Crush And Raise
-		if (EV_DoCeiling(line,crushAndRaise))
-			P_ChangeSwitchTexture(line,0);
-		break;
-
-	  case 50:
-		// Close Door
-		if (EV_DoDoor(line,close))
-			P_ChangeSwitchTexture(line,0);
-		break;
-
-	  case 51:
-		// Secret EXIT
-		if (CheckIfExitIsGood (thing)) {
-			P_ChangeSwitchTexture(line,0);
-			G_SecretExitLevel ();
-		}
-		break;
-
-	  case 55:
-		// Raise Floor Crush
-		if (EV_DoFloor(line,raiseFloorCrush))
-			P_ChangeSwitchTexture(line,0);
-		break;
-
-	  case 101:
-		// Raise Floor
-		if (EV_DoFloor(line,raiseFloor))
-			P_ChangeSwitchTexture(line,0);
-		break;
-
-	  case 102:
-		// Lower Floor to Surrounding floor height
-		if (EV_DoFloor(line,lowerFloor))
-			P_ChangeSwitchTexture(line,0);
-		break;
-
-	  case 103:
-		// Open Door
-		if (EV_DoDoor(line,open))
-			P_ChangeSwitchTexture(line,0);
-		break;
-
-	  case 111:
-		// Blazing Door Raise (faster than TURBO!)
-		if (EV_DoDoor (line,blazeRaise))
-			P_ChangeSwitchTexture(line,0);
-		break;
-
-	  case 112:
-		// Blazing Door Open (faster than TURBO!)
-		if (EV_DoDoor (line,blazeOpen))
-			P_ChangeSwitchTexture(line,0);
-		break;
-
-	  case 113:
-		// Blazing Door Close (faster than TURBO!)
-		if (EV_DoDoor (line,blazeClose))
-			P_ChangeSwitchTexture(line,0);
-		break;
-
-	  case 122:
-		// Blazing PlatDownWaitUpStay
-		if (EV_DoPlat(line,blazeDWUS,0))
-			P_ChangeSwitchTexture(line,0);
-		break;
-
-	  case 127:
-		// Build Stairs Turbo 16
-		if (EV_BuildStairs(line,turbo16))
-			P_ChangeSwitchTexture(line,0);
-		break;
-
-	  case 131:
-		// Raise Floor Turbo
-		if (EV_DoFloor(line,raiseFloorTurbo))
-			P_ChangeSwitchTexture(line,0);
-		break;
-
-	  case 133:
-		// BlzOpenDoor BLUE
-	  case 135:
-		// BlzOpenDoor RED
-	  case 137:
-		// BlzOpenDoor YELLOW
-		if (EV_DoLockedDoor (line,blazeOpen,thing))
-			P_ChangeSwitchTexture(line,0);
-		break;
-
-	  case 140:
-		// Raise Floor 512
-		if (EV_DoFloor(line,raiseFloor512))
-			P_ChangeSwitchTexture(line,0);
-		break;
-
-		// BUTTONS
-	  case 42:
-		// Close Door
-		if (EV_DoDoor(line,close))
-			P_ChangeSwitchTexture(line,1);
-		break;
-
-	  case 43:
-		// Lower Ceiling to Floor
-		if (EV_DoCeiling(line,lowerToFloor))
-			P_ChangeSwitchTexture(line,1);
-		break;
-
-	  case 45:
-		// Lower Floor to Surrounding floor height
-		if (EV_DoFloor(line,lowerFloor))
-			P_ChangeSwitchTexture(line,1);
-		break;
-
-	  case 60:
-		// Lower Floor to Lowest
-		if (EV_DoFloor(line,lowerFloorToLowest))
-			P_ChangeSwitchTexture(line,1);
-		break;
-
-	  case 61:
-		// Open Door
-		if (EV_DoDoor(line,open))
-			P_ChangeSwitchTexture(line,1);
-		break;
-
-	  case 62:
-		// PlatDownWaitUpStay
-		if (EV_DoPlat(line,downWaitUpStay,1))
-			P_ChangeSwitchTexture(line,1);
-		break;
-
-	  case 63:
-		// Raise Door
-		if (EV_DoDoor(line,normal))
-			P_ChangeSwitchTexture(line,1);
-		break;
-
-	  case 64:
-		// Raise Floor to ceiling
-		if (EV_DoFloor(line,raiseFloor))
-			P_ChangeSwitchTexture(line,1);
-		break;
-
-	  case 66:
-		// Raise Floor 24 and change texture
-		if (EV_DoPlat(line,raiseAndChange,24))
-			P_ChangeSwitchTexture(line,1);
-		break;
-
-	  case 67:
-		// Raise Floor 32 and change texture
-		if (EV_DoPlat(line,raiseAndChange,32))
-			P_ChangeSwitchTexture(line,1);
-		break;
-
-	  case 65:
-		// Raise Floor Crush
-		if (EV_DoFloor(line,raiseFloorCrush))
-			P_ChangeSwitchTexture(line,1);
-		break;
-
-	  case 68:
-		// Raise Plat to next highest floor and change texture
-		if (EV_DoPlat(line,raiseToNearestAndChange,0))
-			P_ChangeSwitchTexture(line,1);
-		break;
-
-	  case 69:
-		// Raise Floor to next highest floor
-		if (EV_DoFloor(line, raiseFloorToNearest))
-			P_ChangeSwitchTexture(line,1);
-		break;
-
-	  case 70:
-		// Turbo Lower Floor
-		if (EV_DoFloor(line,turboLower))
-			P_ChangeSwitchTexture(line,1);
-		break;
-
-	  case 114:
-		// Blazing Door Raise (faster than TURBO!)
-		if (EV_DoDoor (line,blazeRaise))
-			P_ChangeSwitchTexture(line,1);
-		break;
-
-	  case 115:
-		// Blazing Door Open (faster than TURBO!)
-		if (EV_DoDoor (line,blazeOpen))
-			P_ChangeSwitchTexture(line,1);
-		break;
-
-	  case 116:
-		// Blazing Door Close (faster than TURBO!)
-		if (EV_DoDoor (line,blazeClose))
-			P_ChangeSwitchTexture(line,1);
-		break;
-
-	  case 123:
-		// Blazing PlatDownWaitUpStay
-		if (EV_DoPlat(line,blazeDWUS,0))
-			P_ChangeSwitchTexture(line,1);
-		break;
-
-	  case 132:
-		// Raise Floor Turbo
-		if (EV_DoFloor(line,raiseFloorTurbo))
-			P_ChangeSwitchTexture(line,1);
-		break;
-
-	  case 99:
-		// BlzOpenDoor BLUE
-	  case 134:
-		// BlzOpenDoor RED
-	  case 136:
-		// BlzOpenDoor YELLOW
-		if (EV_DoLockedDoor (line,blazeOpen,thing))
-			P_ChangeSwitchTexture(line,1);
-		break;
-
-	  case 138:
-		// Light Turn On
-		EV_LightTurnOn(line,255);
-		P_ChangeSwitchTexture(line,1);
-		break;
-
-	  case 139:
-		// Light Turn Off
-		EV_LightTurnOn(line,35);
-		P_ChangeSwitchTexture(line,1);
-		break;
-
-	}
-
-	return true;
+	return result;
 }
 
diff --git a/code/P_tick.c b/code/P_tick.c
index c56386c5b3..0b24d643c7 100644
--- a/code/P_tick.c
+++ b/code/P_tick.c
@@ -25,10 +25,13 @@
 
 #include "z_zone.h"
 #include "p_local.h"
+#include "p_acs.h"
+#include "c_consol.h"
 
 #include "doomstat.h"
 
-extern int ConsoleState;
+extern constate_e ConsoleState;
+extern gamestate_t wipegamestate;
 
 //
 // THINKERS
@@ -41,7 +44,7 @@ extern int ConsoleState;
 
 
 // Both the head and tail of the thinker list.
-thinker_t		thinkercap;
+thinker_t thinkercap;
 
 
 //
@@ -49,7 +52,7 @@ thinker_t		thinkercap;
 //
 void P_InitThinkers (void)
 {
-	thinkercap.prev = thinkercap.next  = &thinkercap;
+	thinkercap.prev = thinkercap.next = &thinkercap;
 }
 
 
@@ -130,7 +133,7 @@ void P_RunThinkers (void)
 
 void P_Ticker (void)
 {
-	int 		i;
+	int i;
 
 	// run the tic
 	if (paused)
@@ -138,23 +141,36 @@ void P_Ticker (void)
 
 	// pause if in menu or console and at least one tic has been run
 	if ( !netgame
-		 && (menuactive || ConsoleState == 1 || ConsoleState == 2)
+		 && (menuactive || ConsoleState == c_down || ConsoleState == c_falling)
 		 && !demoplayback
 		 && !demorecording
-		 && players[consoleplayer].viewz != 1)
+		 && players[consoleplayer].viewz != 1
+		 && wipegamestate == gamestate)
 	{
 		return;
 	}
 
 
-	for (i=0 ; i<MAXPLAYERS ; i++)
+	for (i = 0; i<MAXPLAYERS; i++)
 		if (playeringame[i])
 			P_PlayerThink (&players[i]);
 
 	P_RunThinkers ();
+	P_RunScripts ();	// [RH] Execute any active scripts
+	P_RunQuakes ();		// [RH] Shake the earth a little
 	P_UpdateSpecials ();
 	P_RespawnSpecials ();
 
+	// [RH] Apply falling damage
+	for (i = 0; i < MAXPLAYERS; i++)
+		if (playeringame[i]) {
+			P_FallingDamage (players[i].mo);
+
+			players[i].oldvelocity[0] = players[i].mo->momx;
+			players[i].oldvelocity[1] = players[i].mo->momy;
+			players[i].oldvelocity[2] = players[i].mo->momz;
+		}
+
 	// for par times
 	level.time++;
 }
diff --git a/code/P_user.c b/code/P_user.c
index 637361e256..0bc7362d5b 100644
--- a/code/P_user.c
+++ b/code/P_user.c
@@ -28,10 +28,9 @@
 
 #include "doomdef.h"
 #include "d_event.h"
-
 #include "p_local.h"
-
 #include "doomstat.h"
+#include "s_sound.h"
 
 
 
@@ -80,14 +79,20 @@ void P_CalcHeight (player_t* player)
 	// OPTIMIZE: tablify angle
 	// Note: a LUT allows for effects
 	//	like a ramp with low health.
-	player->bob =
-		FixedMul (player->mo->momx, player->mo->momx)
-		+ FixedMul (player->mo->momy,player->mo->momy);
-
+	player->bob = FixedMul(player->mo->momx,player->mo->momx)
+				+ FixedMul(player->mo->momy,player->mo->momy);
 	player->bob >>= 2;
 
-	if (player->bob>MAXBOB)
-		player->bob = MAXBOB;
+	// phares 9/9/98: If player is standing on ice, reduce his bobbing.
+
+	if (player->mo->friction > ORIG_FRICTION) // ice?
+	{
+		if (player->bob > (MAXBOB>>2))
+			player->bob = MAXBOB>>2;
+	}
+	else													//   ^
+		if (player->bob > MAXBOB)							//   |
+			player->bob = MAXBOB;							// phares 2/26/98
 
 	if ((player->cheats & CF_NOMOMENTUM) || !onground)
 	{
@@ -96,7 +101,11 @@ void P_CalcHeight (player_t* player)
 		if (player->viewz > player->mo->ceilingz-4*FRACUNIT)
 			player->viewz = player->mo->ceilingz-4*FRACUNIT;
 
-		player->viewz = player->mo->z + player->viewheight;
+// The following line was in the Id source and appears		// phares 2/25/98
+// to be a bug. player->viewz is checked in a similar
+// manner at a different exit below.
+
+//		player->viewz = player->mo->z + player->viewheight;
 		return;
 	}
 				
@@ -143,26 +152,33 @@ void P_CalcHeight (player_t* player)
 void P_MovePlayer (player_t *player)
 {
 	ticcmd_t *cmd = &player->cmd;
-		
+	int		  movefactor;       // movement factor                    // phares
+	fixed_t	  forwardmove;
+	fixed_t	  sidemove;
+
 	player->mo->angle += (cmd->ucmd.yaw<<16);
 
-	// [RH] allow very limited movement if not on ground.
 	onground = P_FindFloor (player->mo);
 
-	if (onground) {
-		if (cmd->ucmd.forwardmove)
-			P_Thrust (player, player->mo->angle, cmd->ucmd.forwardmove*8);
-
-		if (cmd->ucmd.sidemove)
-			P_Thrust (player, player->mo->angle-ANG90, cmd->ucmd.sidemove*8);
-	} else if (!olddemo) {
-		if (cmd->ucmd.forwardmove)
-			P_Thrust (player, player->mo->angle, cmd->ucmd.forwardmove/8);
-
-		if (cmd->ucmd.sidemove)
-			P_Thrust (player, player->mo->angle-ANG90, cmd->ucmd.sidemove/8);
+	movefactor = P_GetMoveFactor (player->mo);
+	if (!onground) {
+		if (!olddemo) {
+			// [RH] allow very limited movement if not on ground.
+			movefactor >>= 8;
+		} else {
+			movefactor = 0;
+		}
 	}
 
+	forwardmove = (cmd->ucmd.forwardmove * movefactor) >> 8;
+	sidemove = (cmd->ucmd.sidemove * movefactor) >> 8;
+
+	if (forwardmove)
+		P_Thrust (player, player->mo->angle, forwardmove);
+
+	if (sidemove)
+		P_Thrust (player, player->mo->angle-ANG90, sidemove);
+
 	if ( (cmd->ucmd.forwardmove || cmd->ucmd.sidemove) 
 		 && player->mo->state == &states[S_PLAY] )
 	{
@@ -170,6 +186,60 @@ void P_MovePlayer (player_t *player)
 	}
 }		
 
+// [RH] (Adapted from Q2)
+// P_FallingDamage
+//
+void P_FallingDamage (mobj_t *ent)
+{
+	mobj_t *groundentity;
+	float	delta;
+	int		damage;
+
+	if (!ent->player)
+		return;		// not a player
+
+	if (ent->flags & MF_NOCLIP)
+		return;
+
+	groundentity = P_FindFloor (ent);
+
+	if ((ent->player->oldvelocity[2] < 0) && (ent->momz > ent->player->oldvelocity[2]) && (!groundentity))
+	{
+		delta = (float)ent->player->oldvelocity[2];
+	}
+	else
+	{
+		if (!groundentity)
+			return;
+		delta = (float)(ent->momz - ent->player->oldvelocity[2]);
+	}
+	delta = delta*delta * 2.03904313e-11f;
+
+	if (delta < 1)
+		return;
+
+	if (delta < 15)
+	{
+		//ent->s.event = EV_FOOTSTEP;
+		return;
+	}
+
+	if (delta > 30)
+	{
+		damage = (int)((delta-30)/2);
+		if (damage < 1)
+			damage = 1;
+
+		if (dmflags & DF_YES_FALLING)
+			P_DamageMobj (ent, NULL, NULL, damage, MOD_FALLING);
+	}
+	else
+	{
+		//ent->s.event = EV_FALLSHORT;
+		return;
+	}
+
+}
 
 
 //
@@ -237,11 +307,13 @@ void P_DeathThink (player_t* player)
 //
 // P_PlayerThink
 //
-void P_PlayerThink (player_t* player)
+void P_PlayerThink (player_t *player)
 {
-	ticcmd_t*			cmd;
-	weapontype_t		newweapon;
-		
+	ticcmd_t *cmd;
+	weapontype_t newweapon;
+
+	player->xviewshift = 0;		// [RH] Make sure view is in right place
+
 	// fixme: do this in the cheat code
 	if (player->cheats & CF_NOCLIP)
 		player->mo->flags |= MF_NOCLIP;
@@ -299,7 +371,7 @@ void P_PlayerThink (player_t* player)
 
 	P_CalcHeight (player);
 
-	if (player->mo->subsector->sector->special)
+	if (player->mo->subsector->sector->special || player->mo->subsector->sector->damage)
 		P_PlayerInSpecialSector (player);
 
 	// Check for weapon change.
@@ -307,45 +379,64 @@ void P_PlayerThink (player_t* player)
 	// A special event has no other buttons.
 	if (cmd->ucmd.buttons & BT_SPECIAL)
 		cmd->ucmd.buttons = 0;						
-				
-	if (cmd->ucmd.buttons & BT_CHANGE)
+	
+	if ((cmd->ucmd.buttons & BT_CHANGE) || cmd->ucmd.impulse >= 50)
 	{
-		// The actual changing of the weapon is done
-		//	when the weapon psprite can do it
-		//	(read: not in the middle of an attack).
-		newweapon = (cmd->ucmd.buttons&BT_WEAPONMASK)>>BT_WEAPONSHIFT;
-		
-		if (newweapon == wp_fist
-			&& player->weaponowned[wp_chainsaw]
-			&& !(player->readyweapon == wp_chainsaw
-				 && player->powers[pw_strength]))
-		{
-			newweapon = wp_chainsaw;
-		}
-		
-		if ( (gamemode == commercial)
-			&& newweapon == wp_shotgun 
-			&& player->weaponowned[wp_supershotgun]
-			&& player->readyweapon != wp_supershotgun)
-		{
-			newweapon = wp_supershotgun;
-		}
-		
-
-		if (player->weaponowned[newweapon]
-			&& newweapon != player->readyweapon)
-		{
-			// Do not go to plasma or BFG in shareware,
-			//	even if cheated.
-			if ((newweapon != wp_plasma
-				 && newweapon != wp_bfg)
-				|| (gamemode != shareware) )
+		// [RH] Support direct weapon changes
+		if (cmd->ucmd.impulse) {
+			newweapon = cmd->ucmd.impulse - 50;
+		} else {
+			// The actual changing of the weapon is done
+			//	when the weapon psprite can do it
+			//	(read: not in the middle of an attack).
+			newweapon = (cmd->ucmd.buttons&BT_WEAPONMASK)>>BT_WEAPONSHIFT;
+			
+			if (newweapon == wp_fist
+				&& player->weaponowned[wp_chainsaw]
+				&& !(player->readyweapon == wp_chainsaw
+					 && player->powers[pw_strength]))
 			{
-				player->pendingweapon = newweapon;
+				newweapon = wp_chainsaw;
+			}
+			
+			if ( (gamemode == commercial)
+				&& newweapon == wp_shotgun 
+				&& player->weaponowned[wp_supershotgun]
+				&& player->readyweapon != wp_supershotgun)
+			{
+				newweapon = wp_supershotgun;
+			}
+		}
+
+		if (newweapon >= 0 && newweapon < NUMWEAPONS) {
+			if (player->weaponowned[newweapon]
+				&& newweapon != player->readyweapon)
+			{
+				// Do not go to plasma or BFG in shareware,
+				//	even if cheated.
+				if ((newweapon != wp_plasma
+					 && newweapon != wp_bfg)
+					|| (gamemode != shareware) )
+				{
+					player->pendingweapon = newweapon;
+				}
 			}
 		}
 	}
 
+	// [RH] check for jump
+	if ((cmd->ucmd.buttons & BT_JUMP) == BT_JUMP) {
+		if (!player->jumpdown && !(dmflags & DF_NO_JUMP)) {
+			// only jump if we are on the ground
+			if (P_FindFloor (player->mo)) {
+				player->mo->momz += 8 * FRACUNIT;
+				player->mo->flags2 |= MF2_JUMPING;
+				S_StartSound (player->mo, "*jump1", 100);
+			}
+			player->jumpdown = true;
+		}
+	} else player->jumpdown = false;
+
 	// check for use
 	if (cmd->ucmd.buttons & BT_USE)
 	{
@@ -358,16 +449,6 @@ void P_PlayerThink (player_t* player)
 	else
 		player->usedown = false;
 
-	// [RH] check for jump
-	if ((cmd->ucmd.buttons & BT_JUMP) == BT_JUMP) {
-		if (!player->jumpdown && !(dmflags & DF_NO_JUMP)) {
-			// only jump if we are on the ground
-			if (P_FindFloor (player->mo))
-				player->mo->momz += 8 * FRACUNIT;
-			player->jumpdown = true;
-		}
-	} else player->jumpdown = false;
-
 	// cycle psprites
 	P_MovePsprites (player);
 
@@ -421,4 +502,3 @@ void P_PlayerThink (player_t* player)
 		player->fixedcolormap = 0;
 }
 
-
diff --git a/code/P_xlat.c b/code/P_xlat.c
new file mode 100644
index 0000000000..2d82db7770
--- /dev/null
+++ b/code/P_xlat.c
@@ -0,0 +1,613 @@
+// p_xlat.c: Translate old linedefs to new linedefs
+
+#include "doomtype.h"
+#include "p_lnspec.h"
+#include "doomdata.h"
+#include "r_data.h"
+#include "m_swap.h"
+#include "p_spec.h"
+#include "p_local.h"
+
+// Speeds for ceilings/crushers (x/8 units per tic)
+//	(Hexen crushers go up at half the speed that they go down)
+#define C_SLOW			8
+#define C_NORMAL		16
+#define C_FAST			32
+#define C_TURBO			64
+
+#define CEILWAIT		150
+
+// Speeds for floors (x/8 units per tic)
+#define F_SLOW			8
+#define F_NORMAL		16
+#define F_FAST			32
+#define F_TURBO			64
+
+// Speeds for doors (x/8 units per tic)
+#define D_SLOW			16
+#define D_NORMAL		32
+#define D_FAST			64
+#define D_TURBO			128
+
+#define VDOORWAIT		150
+
+// Speeds for stairs (x/8 units per tic)
+#define S_SLOW			2
+#define S_NORMAL		4
+#define S_FAST			16
+#define S_TURBO			32
+
+// Speeds for plats (Hexen plats stop 8 units above the floor)
+#define P_SLOW			8
+#define P_NORMAL		16
+#define P_FAST			32
+#define P_TURBO			64
+
+#define PLATWAIT		105
+
+#define ELEVATORSPEED	32
+
+// Speeds for donut slime and pillar (x/8 units per tic)
+#define DORATE			4
+
+// Texture scrollers operate at a rate of x/64 units per tic.
+#define SCROLL_UNIT		64
+
+
+//Define masks, shifts, for fields in generalized linedef types
+// (from BOOM's p_psec.h file)
+
+#define GenFloorBase          0x6000
+#define GenCeilingBase        0x4000
+#define GenDoorBase           0x3c00
+#define GenLockedBase         0x3800
+#define GenLiftBase           0x3400
+#define GenStairsBase         0x3000
+#define GenCrusherBase        0x2F80
+
+// define names for the TriggerType field of the general linedefs
+
+typedef enum
+{
+  WalkOnce,
+  WalkMany,
+  SwitchOnce,
+  SwitchMany,
+  GunOnce,
+  GunMany,
+  PushOnce,
+  PushMany,
+} triggertype_e;
+
+
+// Line special translation structure
+typedef struct {
+	byte	flags;
+	byte	newspecial;
+	byte	args[5];
+} xlat_t;
+
+#define TAG	123		// Special value that gets replaced with the line tag
+
+#define WALK	(ML_ACTIVATECROSS>>8)
+#define USE		(ML_ACTIVATEUSE>>8)
+#define SHOOT	(ML_ACTIVATEPROJECTILEHIT>>8)
+#define MONST	(ML_MONSTERSCANACTIVATE>>8)
+#define MONWALK (ML_ACTIVATEMONSTERCROSS>>8)
+#define REP		(ML_REPEATABLE>>8)
+
+static const xlat_t SpecialTranslation[] = {
+/*   0 */ { 0 },
+/*   1 */ { USE|MONST|REP,	Door_Raise,					 { 0, D_SLOW, VDOORWAIT } },
+/*   2 */ { WALK,			Door_Open,					 { TAG, D_SLOW } },
+/*   3 */ { WALK,			Door_Close,					 { TAG, D_SLOW } },
+/*   4 */ { WALK|MONST,		Door_Raise,					 { TAG, D_SLOW, VDOORWAIT } },
+/*   5 */ { WALK,			Floor_RaiseToLowestCeiling,	 { TAG, F_SLOW } },
+/*	 6 */ { WALK,			Ceiling_CrushAndRaiseA,		 { TAG, C_NORMAL, C_NORMAL, 10 } },
+/*   7 */ { USE,			Stairs_BuildUpDoom,			 { TAG, S_SLOW, 8 } },
+/*   8 */ { WALK,			Stairs_BuildUpDoom,			 { TAG, S_SLOW, 8 } },
+/*	 9 */ { USE,			Floor_Donut,				 { TAG, DORATE, DORATE } },
+/*  10 */ { WALK|MONST,		Plat_DownWaitUpStayLip,		 { TAG, P_FAST, PLATWAIT, 0 } },
+/*  11 */ { USE,			Exit_Normal,				 { 0 } },
+/*  12 */ { WALK,			Light_MaxNeighbor,			 { TAG } },
+/*  13 */ { WALK,			Light_ChangeToValue,		 { TAG, 255 } },
+/*  14 */ { USE,			Plat_UpByValueStayTx,		 { TAG, P_SLOW/2, 4 } },
+/*  15 */ { USE,			Plat_UpByValueStayTx,		 { TAG, P_SLOW/2, 3 } },
+/*  16 */ { WALK,			Door_CloseWaitOpen,			 { TAG, D_SLOW, 240 } },
+/*  17 */ { WALK,			Light_StrobeDoom,			 { TAG, 5, 35 } },
+/*  18 */ { USE,			Floor_RaiseToNearest,		 { TAG, F_SLOW } },
+/*  19 */ { WALK,			Floor_LowerToHighest,		 { TAG, F_SLOW, 128 } },
+/*  20 */ { USE,			Plat_RaiseAndStayTx0,		 { TAG, P_SLOW/2 } },
+/*  21 */ { USE,			Plat_DownWaitUpStayLip,		 { TAG, P_FAST, PLATWAIT } },
+/*  22 */ { WALK,			Plat_RaiseAndStayTx0,		 { TAG, P_SLOW/2 } },
+/*  23 */ { USE,			Floor_LowerToLowest,		 { TAG, F_SLOW } },
+/*  24 */ { SHOOT,			Floor_RaiseToLowestCeiling,  { TAG, F_SLOW } },
+/*  25 */ { WALK,			Ceiling_CrushAndRaiseA,		 { TAG, C_SLOW, C_SLOW, 10 } },
+/*  26 */ { USE|REP,		Door_LockedRaise,			 { TAG, D_SLOW, VDOORWAIT, BCard | CardIsSkull } },
+/*  27 */ { USE|REP,		Door_LockedRaise,			 { TAG, D_SLOW, VDOORWAIT, YCard | CardIsSkull } },
+/*  28 */ { USE|REP,		Door_LockedRaise,			 { TAG, D_SLOW, VDOORWAIT, RCard | CardIsSkull } },
+/*  29 */ { USE,			Door_Raise,					 { TAG, D_SLOW, VDOORWAIT } },
+/*  30 */ { WALK,			Floor_RaiseByTexture,		 { TAG, F_SLOW } },
+/*  31 */ { USE,			Door_Open,					 { 0, D_SLOW } },
+/*  32 */ { USE|MONST,		Door_LockedRaise,			 { 0, D_SLOW, 0, BCard | CardIsSkull } },
+/*  33 */ { USE|MONST,		Door_LockedRaise,			 { 0, D_SLOW, 0, RCard | CardIsSkull } },
+/*  34 */ { USE|MONST,		Door_LockedRaise,			 { 0, D_SLOW, 0, YCard | CardIsSkull } },
+/*  35 */ { WALK,			Light_ChangeToValue,		 { TAG, 35 } },
+/*  36 */ { WALK,			Floor_LowerToHighest,		 { TAG, F_FAST, 136 } },
+/*  37 */ { WALK,			Floor_LowerToLowestTxTy,	 { TAG, F_SLOW } },
+/*  38 */ { WALK,			Floor_LowerToLowest,		 { TAG, F_SLOW } },
+/*  39 */ { WALK|MONST,		Teleport,					 { TAG } },
+/*  40 */ { WALK,			Generic_Ceiling,			 { TAG, C_SLOW, 0, 1, 8 } },
+/*  41 */ { USE,			Ceiling_LowerToFloor,		 { TAG, C_SLOW } },
+/*  42 */ { USE|REP,		Door_Close,					 { TAG, D_SLOW } },
+/*  43 */ { USE|REP,		Ceiling_LowerToFloor,		 { TAG, C_SLOW } },
+/*  44 */ { WALK,			Ceiling_LowerAndCrush,		 { TAG, C_SLOW, 0 } },
+/*  45 */ { USE|REP,		Floor_LowerToHighest,		 { TAG, F_SLOW, 128 } },
+/*  46 */ { SHOOT|REP|MONST,Door_Open,					 { TAG, D_SLOW } },
+/*  47 */ { SHOOT,			Plat_RaiseAndStayTx0,		 { TAG, P_SLOW/2 } },
+/*  48 */ { 0,				Scroll_Texture_Left,		 { SCROLL_UNIT } },
+/*  49 */ { USE,			Ceiling_CrushAndRaiseA,		 { TAG, C_SLOW, C_SLOW, 10 } },
+/*  50 */ { USE,			Door_Close,					 { TAG, D_SLOW } },
+/*  51 */ { USE,			Exit_Secret,				 { 0 } },
+/*  52 */ { WALK,			Exit_Normal,				 { 0 } },
+/*  53 */ { WALK,			Plat_PerpetualRaiseLip,		 { TAG, P_SLOW, PLATWAIT, 0 } },
+/*  54 */ { WALK,			Plat_Stop,					 { TAG } },
+/*  55 */ { USE,			Floor_RaiseAndCrush,		 { TAG, F_SLOW, 10 } },
+/*  56 */ { WALK,			Floor_RaiseAndCrush,		 { TAG, F_SLOW, 10 } },
+/*  57 */ { WALK,			Ceiling_CrushStop,			 { TAG } },
+/*  58 */ { WALK,			Floor_RaiseByValue,			 { TAG, F_SLOW, 24 } },
+/*  59 */ { WALK,			Floor_RaiseByValueTxTy,		 { TAG, F_SLOW, 24 } },
+/*  60 */ { USE|REP,		Floor_LowerToLowest,		 { TAG, F_SLOW } },
+/*  61 */ { USE|REP,		Door_Open,					 { TAG, D_SLOW } },
+/*  62 */ { USE|REP,		Plat_DownWaitUpStayLip,		 { TAG, P_FAST, PLATWAIT, 0 } },
+/*  63 */ { USE|REP,		Door_Raise,					 { TAG, D_SLOW, VDOORWAIT } },
+/*  64 */ { USE|REP,		Floor_RaiseToLowestCeiling,	 { TAG, F_SLOW } },
+/*  65 */ { USE|REP,		Floor_RaiseAndCrush,		 { TAG, F_SLOW, 10 } },
+/*  66 */ { USE|REP,		Plat_UpByValueStayTx,		 { TAG, P_SLOW/2, 3 } },
+/*  67 */ { USE|REP,		Plat_UpByValueStayTx,		 { TAG, P_SLOW/2, 4 } },
+/*  68 */ { USE|REP,		Plat_RaiseAndStayTx0,		 { TAG, P_SLOW/2 } },
+/*  69 */ { USE|REP,		Floor_RaiseToNearest,		 { TAG, F_SLOW } },
+/*  70 */ { USE|REP,		Floor_LowerToHighest,		 { TAG, F_FAST, 136 } },
+/*  71 */ { USE,			Floor_LowerToHighest,		 { TAG, F_FAST, 136 } },
+/*  72 */ { WALK|REP,		Ceiling_LowerAndCrush,		 { TAG, C_SLOW, 0 } },
+/*  73 */ { WALK|REP,		Ceiling_CrushAndRaiseA,		 { TAG, C_SLOW, C_SLOW, 10 } },
+/*  74 */ { WALK|REP,		Ceiling_CrushStop,			 { TAG } },
+/*  75 */ { WALK|REP,		Door_Close,					 { TAG, D_SLOW } },
+/*  76 */ { WALK|REP,		Door_CloseWaitOpen,			 { TAG, D_SLOW, 240 } },
+/*  77 */ { WALK|REP,		Ceiling_CrushAndRaiseA,		 { TAG, C_NORMAL, C_NORMAL, 10 } },
+/*  78 */ { USE|REP,		Floor_TransferNumeric,		 { TAG } },			// <- BOOM special
+/*  79 */ { WALK|REP,		Light_ChangeToValue,		 { TAG, 35 } },
+/*  80 */ { WALK|REP,		Light_MaxNeighbor,			 { TAG } },
+/*  81 */ { WALK|REP,		Light_ChangeToValue,		 { TAG, 255 } },
+/*  82 */ { WALK|REP,		Floor_LowerToLowest,		 { TAG, F_SLOW } },
+/*  83 */ { WALK|REP,		Floor_LowerToHighest,		 { TAG, F_SLOW, 128 } },
+/*  84 */ { WALK|REP,		Floor_LowerToLowestTxTy,	 { TAG, F_SLOW } },
+/*  85 */ { 0,				Scroll_Texture_Right,		 { SCROLL_UNIT } }, // <- BOOM special
+/*  86 */ { WALK|REP,		Door_Open,					 { TAG, D_SLOW } },
+/*  87 */ { WALK|REP,		Plat_PerpetualRaiseLip,		 { TAG, P_SLOW, PLATWAIT, 0 } },
+/*  88 */ { WALK|REP|MONST, Plat_DownWaitUpStayLip,		 { TAG, P_FAST, PLATWAIT, 0 } },
+/*  89 */ { WALK|REP,		Plat_Stop,					 { TAG } },
+/*  90 */ { WALK|REP,		Door_Raise,					 { TAG, D_SLOW, VDOORWAIT } },
+/*  91 */ { WALK|REP,		Floor_RaiseToLowestCeiling,	 { TAG, F_SLOW } },
+/*  92 */ { WALK|REP,		Floor_RaiseByValue,			 { TAG, F_SLOW, 24 } },
+/*  93 */ { WALK|REP,		Floor_RaiseByValueTxTy,		 { TAG, F_SLOW, 24 } },
+/*  94 */ { WALK|REP,		Floor_RaiseAndCrush,		 { TAG, F_SLOW, 10 } },
+/*  95 */ { WALK|REP,		Plat_RaiseAndStayTx0,		 { TAG, P_SLOW/2 } },
+/*  96 */ { WALK|REP,		Floor_RaiseByTexture,		 { TAG, F_SLOW } },
+/*  97 */ { WALK|REP|MONST, Teleport,					 { TAG } },
+/*  98 */ { WALK|REP,		Floor_LowerToHighest,		 { TAG, F_FAST, 136 } },
+/*  99 */ { USE|REP,		Door_LockedRaise,			 { TAG, D_FAST, 0, BCard | CardIsSkull } },
+/* 100 */ { WALK,			Stairs_BuildUpDoom,			 { TAG, S_TURBO, 16, 0, 0 } },
+/* 101 */ { USE,			Floor_RaiseToLowestCeiling,	 { TAG, F_SLOW } },
+/* 102 */ { USE,			Floor_LowerToHighest,		 { TAG, F_SLOW, 128 } },
+/* 103 */ { USE,			Door_Open,					 { TAG, D_SLOW } },
+/* 104 */ { WALK,			Light_MinNeighbor,			 { TAG } },
+/* 105 */ { WALK|REP,		Door_Raise,					 { TAG, D_FAST, VDOORWAIT } },
+/* 106 */ { WALK|REP,		Door_Open,					 { TAG, D_FAST } },
+/* 107 */ { WALK|REP,		Door_Close,					 { TAG, D_FAST } },
+/* 108 */ { WALK,			Door_Raise,					 { TAG, D_FAST, VDOORWAIT } },
+/* 109 */ { WALK,			Door_Open,					 { TAG, D_FAST } },
+/* 110 */ { WALK,			Door_Close,					 { TAG, D_FAST } },
+/* 111 */ { USE,			Door_Raise,					 { TAG, D_FAST, VDOORWAIT } },
+/* 112 */ { USE,			Door_Open,					 { TAG, D_FAST } },
+/* 113 */ { USE,			Door_Close,					 { TAG, D_FAST } },
+/* 114 */ { USE|REP,		Door_Raise,					 { TAG, D_FAST, VDOORWAIT } },
+/* 115 */ { USE|REP,		Door_Open,					 { TAG, D_FAST } },
+/* 116 */ { USE|REP,		Door_Close,					 { TAG, D_FAST } },
+/* 117 */ { USE|REP,		Door_Raise,					 { 0, D_FAST, VDOORWAIT } },
+/* 118 */ { USE,			Door_Open,					 { 0, D_FAST } },
+/* 119 */ { WALK,			Floor_RaiseToNearest,		 { TAG, F_SLOW } },
+/* 120 */ { WALK|REP,		Plat_DownWaitUpStayLip,		 { TAG, P_TURBO, PLATWAIT, 0 } },
+/* 121 */ { WALK,			Plat_DownWaitUpStayLip,		 { TAG, P_TURBO, PLATWAIT, 0 } },
+/* 122 */ { USE,			Plat_DownWaitUpStayLip,		 { TAG, P_TURBO, PLATWAIT, 0 } },
+/* 123 */ { USE|REP,		Plat_DownWaitUpStayLip,		 { TAG, P_TURBO, PLATWAIT, 0 } },
+/* 124 */ { WALK,			Exit_Secret,				 { 0 } },
+/* 125 */ { MONWALK,		Teleport,					 { TAG } },
+/* 126 */ { MONWALK|REP,	Teleport,					 { TAG } },
+/* 127 */ { USE,			Stairs_BuildUpDoom,			 { TAG, S_TURBO, 16, 0, 0 } },
+/* 128 */ { WALK|REP,		Floor_RaiseToNearest,		 { TAG, F_SLOW } },
+/* 129 */ { WALK|REP,		Floor_RaiseToNearest,		 { TAG, F_FAST } },
+/* 130 */ { WALK,			Floor_RaiseToNearest,		 { TAG, F_FAST } },
+/* 131 */ { USE,			Floor_RaiseToNearest,		 { TAG, F_FAST } },
+/* 132 */ { USE|REP,		Floor_RaiseToNearest,		 { TAG, F_FAST } },
+/* 133 */ { USE,			Door_LockedRaise,			 { TAG, D_FAST, 0, BCard | CardIsSkull } },
+/* 134 */ { USE|REP,		Door_LockedRaise,			 { TAG, D_FAST, 0, BCard | CardIsSkull } },
+/* 135 */ { USE,			Door_LockedRaise,			 { TAG, D_FAST, 0, RCard | CardIsSkull } },
+/* 136 */ { USE|REP,		Door_LockedRaise,			 { TAG, D_FAST, 0, YCard | CardIsSkull } },
+/* 137 */ { USE,			Door_LockedRaise,			 { TAG, D_FAST, 0, YCard | CardIsSkull } },
+/* 138 */ { USE|REP,		Light_ChangeToValue,		 { TAG, 255 } },
+/* 139 */ { USE|REP,		Light_ChangeToValue,		 { TAG, 35 } },
+/* 140 */ { USE,			Floor_RaiseByValueTimes8,	 { TAG, F_SLOW, 64 } },
+/* 141 */ { WALK,			Ceiling_CrushAndRaiseSilentA,{ TAG, C_SLOW, C_SLOW, 10 } },
+
+/****** The following are all new to BOOM ******/
+
+/* 142 */ { WALK,			Floor_RaiseByValueTimes8,	 { TAG, F_SLOW, 64 } },
+/* 143 */ { WALK,			Plat_UpByValueStayTx,		 { TAG, P_SLOW/2, 3 } },
+/* 144 */ { WALK,			Plat_UpByValueStayTx,		 { TAG, P_SLOW/2, 4 } },
+/* 145 */ { WALK,			Ceiling_LowerToFloor,		 { TAG, C_SLOW } },
+/* 146 */ { WALK,			Floor_Donut,				 { TAG, DORATE, DORATE } },
+/* 147 */ { WALK|REP,		Floor_RaiseByValueTimes8,	 { TAG, F_SLOW, 64 } },
+/* 148 */ { WALK|REP,		Plat_UpByValueStayTx,		 { TAG, P_SLOW/2, 3 } },
+/* 149 */ { WALK|REP,		Plat_UpByValueStayTx,		 { TAG, P_SLOW/2, 4 } },
+/* 150 */ { WALK|REP,		Ceiling_CrushAndRaiseSilentA,{ TAG, C_SLOW, C_SLOW, 10 } },
+/* 151 */ { WALK|REP,		FloorAndCeiling_LowerRaise,	 { TAG, F_SLOW, C_SLOW } },
+/* 152 */ { WALK|REP,		Ceiling_LowerToFloor,		 { TAG, C_SLOW } },
+/* 153 */ { WALK,			Floor_TransferTrigger,		 { TAG } },
+/* 154 */ { WALK|REP,		Floor_TransferTrigger,		 { TAG } },
+/* 155 */ { WALK|REP,		Floor_Donut,				 { TAG, DORATE, DORATE } },
+/* 156 */ { WALK|REP,		Light_StrobeDoom,			 { TAG, 5, 35 } },
+/* 157 */ { WALK|REP,		Light_MinNeighbor,			 { TAG } },
+/* 158 */ { USE,			Floor_RaiseByTexture,		 { TAG, F_SLOW } },
+/* 159 */ { USE,			Floor_LowerToLowestTxTy,	 { TAG, F_SLOW } },
+/* 160 */ { USE,			Floor_RaiseByValueTxTy,		 { TAG, F_SLOW, 24 } },
+/* 161 */ { USE,			Floor_RaiseByValue,			 { TAG, F_SLOW, 24 } },
+/* 162 */ { USE,			Plat_PerpetualRaiseLip,		 { TAG, P_SLOW, PLATWAIT, 0 } },
+/* 163 */ { USE,			Plat_Stop,					 { TAG } },
+/* 164 */ { USE,			Ceiling_CrushAndRaiseA,		 { TAG, C_NORMAL, C_NORMAL, 10 } },
+/* 165 */ { USE,			Ceiling_CrushAndRaiseSilentA,{ TAG, C_SLOW, C_SLOW, 10 } },
+/* 166 */ { USE,			FloorAndCeiling_LowerRaise,	 { TAG, F_SLOW, C_SLOW } },
+/* 167 */ { USE,			Ceiling_LowerAndCrush,		 { TAG, C_SLOW, 0 } },
+/* 168 */ { USE,			Ceiling_CrushStop,			 { TAG } },
+/* 169 */ { USE,			Light_MaxNeighbor,			 { TAG } },
+/* 170 */ { USE,			Light_ChangeToValue,		 { TAG, 35 } },
+/* 171 */ { USE,			Light_ChangeToValue,		 { TAG, 255 } },
+/* 172 */ { USE,			Light_StrobeDoom,			 { TAG, 5, 35 } },
+/* 173 */ { USE,			Light_MinNeighbor,			 { TAG } },
+/* 174 */ { USE|MONST,		Teleport,					 { TAG } },
+/* 175 */ { USE,			Door_CloseWaitOpen,			 { TAG, F_SLOW, 240 } },
+/* 176 */ { USE|REP,		Floor_RaiseByTexture,		 { TAG, F_SLOW } },
+/* 177 */ { USE|REP,		Floor_LowerToLowestTxTy,	 { TAG, F_SLOW } },
+/* 178 */ { USE|REP,		Floor_RaiseByValueTimes8,	 { TAG, F_SLOW, 64 } },
+/* 179 */ { USE|REP,		Floor_RaiseByValueTxTy,		 { TAG, F_SLOW, 24 } },
+/* 180 */ { USE|REP,		Floor_RaiseByValue,			 { TAG, F_SLOW, 24 } },
+/* 181 */ { USE|REP,		Plat_PerpetualRaiseLip,		 { TAG, P_SLOW, PLATWAIT, 0 } },
+/* 182 */ { USE|REP,		Plat_Stop,					 { TAG } },
+/* 183 */ { USE|REP,		Ceiling_CrushAndRaiseA,		 { TAG, C_NORMAL, C_NORMAL, 10 } },
+/* 184 */ { USE|REP,		Ceiling_CrushAndRaiseA,		 { TAG, C_SLOW, C_SLOW, 10 } },
+/* 185 */ { USE|REP,		Ceiling_CrushAndRaiseSilentA,{ TAG, C_SLOW, C_SLOW, 10 } },
+/* 186 */ { USE|REP,		FloorAndCeiling_LowerRaise,	 { TAG, F_SLOW, C_SLOW } },
+/* 187 */ { USE|REP,		Ceiling_LowerAndCrush,		 { TAG, C_SLOW, 0 } },
+/* 188 */ { USE|REP,		Ceiling_CrushStop,			 { TAG } },
+/* 189 */ { USE,			Floor_TransferTrigger,		 { TAG } },
+/* 190 */ { USE|REP,		Floor_TransferTrigger,		 { TAG } },
+/* 191 */ { USE|REP,		Floor_Donut,				 { TAG, DORATE, DORATE } },
+/* 192 */ { USE|REP,		Light_MaxNeighbor,			 { TAG } },
+/* 193 */ { USE|REP,		Light_StrobeDoom,			 { TAG, 5, 35 } },
+/* 194 */ { USE|REP,		Light_MinNeighbor,			 { TAG } },
+/* 195 */ { USE|REP|MONST,	Teleport,					 { TAG } },
+/* 196 */ { USE|REP,		Door_CloseWaitOpen,			 { TAG, D_SLOW, 240 } },
+/* 197 */ { SHOOT,			Exit_Normal,				 { 0 } },
+/* 198 */ { SHOOT,			Exit_Secret,				 { 0 } },
+/* 199 */ { WALK,			Ceiling_LowerToLowest,		 { TAG, C_SLOW } },
+/* 200 */ { WALK,			Ceiling_LowerToHighestFloor, { TAG, C_SLOW } },
+/* 201 */ { WALK|REP,		Ceiling_LowerToLowest,		 { TAG, C_SLOW } },
+/* 202 */ { WALK|REP,		Ceiling_LowerToHighestFloor, { TAG, C_SLOW } },
+/* 203 */ { USE,			Ceiling_LowerToLowest,		 { TAG, C_SLOW } },
+/* 204 */ { USE,			Ceiling_LowerToHighestFloor, { TAG, C_SLOW } },
+/* 205 */ { USE|REP,		Ceiling_LowerToLowest,		 { TAG, C_SLOW } },
+/* 206 */ { USE|REP,		Ceiling_LowerToHighestFloor, { TAG, C_SLOW } },
+/* 207 */ { WALK|MONST,		Teleport_NoFog,				 { TAG } },
+/* 208 */ { WALK|REP|MONST,	Teleport_NoFog,				 { TAG } },
+/* 209 */ { USE|MONST,		Teleport_NoFog,				 { TAG } },
+/* 210 */ { USE|REP|MONST,	Teleport_NoFog,				 { TAG } },
+/* 211 */ { USE|REP,		Plat_ToggleCeiling,			 { TAG } },
+/* 212 */ { WALK|REP,		Plat_ToggleCeiling,			 { TAG } },
+/* 213 */ { 0,				Transfer_FloorLight,		 { TAG } },
+/* 214 */ { 0,				Scroll_Ceiling,				 { TAG, 6, 0, 0, 0 } },
+/* 215 */ { 0,				Scroll_Floor,				 { TAG, 6, 0, 0, 0 } },
+/* 216 */ { 0,				Scroll_Floor,				 { TAG, 6, 1, 0, 0 } },
+/* 217 */ { 0,				Scroll_Floor,				 { TAG, 6, 2, 0, 0 } },
+/* 218 */ { 0,				Scroll_Texture_Model,		 { TAG, 2 } },
+/* 219 */ { WALK,			Floor_LowerToNearest,		 { TAG, F_SLOW } },
+/* 220 */ { WALK|REP,		Floor_LowerToNearest,		 { TAG, F_SLOW } },
+/* 221 */ { USE,			Floor_LowerToNearest,		 { TAG, F_SLOW } },
+/* 222 */ { USE|REP,		Floor_LowerToNearest,		 { TAG, F_SLOW } },
+/* 223 */ { 0,				Sector_SetFriction,			 { TAG, 0 } },
+/* 224 */ { 0,				Sector_SetWind,				 { TAG, 0, 0, 1 } },
+/* 225 */ { 0,				Sector_SetCurrent,			 { TAG, 0, 0, 1 } },
+/* 226 */ { 0,				PointPush_SetForce,			 { TAG, 0, 0, 1 } },
+/* 227 */ { WALK,			Elevator_RaiseToNearest,	 { TAG, ELEVATORSPEED } },
+/* 228 */ { WALK|REP,		Elevator_RaiseToNearest,	 { TAG, ELEVATORSPEED } },
+/* 229 */ { USE,			Elevator_RaiseToNearest,	 { TAG, ELEVATORSPEED } },
+/* 230 */ { USE|REP,		Elevator_RaiseToNearest,	 { TAG, ELEVATORSPEED } },
+/* 231 */ { WALK,			Elevator_LowerToNearest,	 { TAG, ELEVATORSPEED } },
+/* 232 */ { WALK|REP,		Elevator_LowerToNearest,	 { TAG, ELEVATORSPEED } },
+/* 233 */ { USE,			Elevator_LowerToNearest,	 { TAG, ELEVATORSPEED } },
+/* 234 */ { USE|REP,		Elevator_LowerToNearest,	 { TAG, ELEVATORSPEED } },
+/* 235 */ { WALK,			Elevator_MoveToFloor,		 { TAG, ELEVATORSPEED } },
+/* 236 */ { WALK|REP,		Elevator_MoveToFloor,		 { TAG, ELEVATORSPEED } },
+/* 237 */ { USE,			Elevator_MoveToFloor,		 { TAG, ELEVATORSPEED } },
+/* 238 */ { USE|REP,		Elevator_MoveToFloor,		 { TAG, ELEVATORSPEED } },
+/* 239 */ { WALK,			Floor_TransferNumeric,		 { TAG } },
+/* 240 */ { WALK|REP,		Floor_TransferNumeric,		 { TAG } },
+/* 241 */ { USE,			Floor_TransferNumeric,		 { TAG } },
+/* 242 */ { 0,				Transfer_Heights,			 { TAG } },
+/* 243 */ { WALK|MONST,		Teleport_Line,				 { TAG, TAG, 0 } },
+/* 244 */ { WALK|REP|MONST,	Teleport_Line,				 { TAG, TAG, 0 } },
+/* 245 */ { 0,				Scroll_Ceiling,				 { TAG, 5, 0, 0, 0 } },
+/* 246 */ { 0,				Scroll_Floor,				 { TAG, 5, 0, 0, 0 } },
+/* 247 */ { 0,				Scroll_Floor,				 { TAG, 5, 1, 0, 0 } },
+/* 248 */ { 0,				Scroll_Floor,				 { TAG, 5, 2, 0, 0 } },
+/* 249 */ { 0,				Scroll_Texture_Model,		 { TAG, 1 } },
+/* 250 */ { 0,				Scroll_Ceiling,				 { TAG, 4, 0, 0, 0 } },
+/* 251 */ { 0,				Scroll_Floor,				 { TAG, 4, 0, 0, 0 } },
+/* 252 */ { 0,				Scroll_Floor,				 { TAG, 4, 1, 0, 0 } },
+/* 253 */ { 0,				Scroll_Floor,				 { TAG, 4, 2, 0, 0 } },
+/* 254 */ { 0,				Scroll_Texture_Model,		 { TAG, 0 } },
+/* 255 */ { 0,				Scroll_Texture_Offsets },
+/* 256 */ { WALK|REP,		Stairs_BuildUpDoom,			 { TAG, S_SLOW, 8, 0, 0 } },
+/* 257 */ { WALK|REP,		Stairs_BuildUpDoom,			 { TAG, S_TURBO, 16, 0, 0 } },
+/* 258 */ { USE|REP,		Stairs_BuildUpDoom,			 { TAG, S_SLOW, 8, 0, 0 } },
+/* 259 */ { USE|REP,		Stairs_BuildUpDoom,			 { TAG, S_TURBO, 16, 0, 0 } },
+/* 260 */ { 0,				TranslucentLine,			 { TAG, 128 } },
+/* 261 */ { 0,				Transfer_CeilingLight,		 { TAG } },
+/* 262 */ { WALK|MONST,		Teleport_Line,				 { TAG, TAG, 1 } },
+/* 263 */ { WALK|REP|MONST,	Teleport_Line,				 { TAG, TAG, 1 } },
+/* 264 */ { MONWALK,		Teleport_Line,				 { TAG, TAG, 1 } },
+/* 265 */ { MONWALK|REP,	Teleport_Line,				 { TAG, TAG, 1 } },
+/* 266 */ { MONWALK,		Teleport_Line,				 { TAG, TAG, 0 } },
+/* 267 */ { MONWALK|REP,	Teleport_Line,				 { TAG, TAG, 0 } },
+/* 268 */ { MONWALK,		Teleport_NoFog,				 { TAG } },
+/* 269 */ { MONWALK|REP,	Teleport_NoFog,				 { TAG } }
+};
+#define NUM_SPECIALS 269
+
+void P_TranslateLineDef (line_t *ld, maplinedef_t *mld)
+{
+	short special = SHORT(mld->special);
+	short tag = SHORT(mld->tag);
+	short flags = SHORT(mld->flags);
+	int i;
+
+	if (flags & ML_PASSUSEORG)	// Remap ML_PASSUSE flag from BOOM.
+		flags = (flags & ~ML_PASSUSEORG) | ML_PASSUSE;
+
+	flags = flags & 0x41ff;	// Ignore flags unknown in DOOM.
+
+	if (special <= NUM_SPECIALS) {
+		// This is a regular special; translate thru LUT
+		flags = flags | (SpecialTranslation[special].flags << 8);
+		ld->special = SpecialTranslation[special].newspecial;
+		for (i = 0; i < 5; i++)
+			ld->args[i] = SpecialTranslation[special].args[i] == TAG ? tag :
+						  SpecialTranslation[special].args[i];
+	} else if (special <= GenCrusherBase) {
+		// This is an unknown special. Just zero it.
+		ld->special = 0;
+		memset (ld->args, 0, sizeof(ld->args));
+	} else {
+		// Anything else is a BOOM generalized linedef type
+		switch (special & 0x0007) {
+			case WalkMany:
+				flags |= ML_REPEATABLE;
+			case WalkOnce:
+				flags |= ML_ACTIVATECROSS;
+				break;
+
+			case SwitchMany:
+			case PushMany:
+				flags |= ML_REPEATABLE;
+			case SwitchOnce:
+			case PushOnce:
+				flags |= ML_ACTIVATEUSE;
+				break;
+
+			case GunMany:
+				flags |= ML_REPEATABLE;
+			case GunOnce:
+				flags |= ML_ACTIVATEPROJECTILEHIT;
+				break;
+		}
+
+		// We treat push triggers like switch triggers with zero tags.
+		if ((special & 0x0007) == PushMany ||
+			(special & 0x0007) == PushOnce)
+			ld->args[0] = 0;
+		else
+			ld->args[0] = tag;
+
+		if (special <= GenStairsBase) {
+			// Generalized crusher (tag, dnspeed, upspeed, silent, damage)
+			ld->special = Generic_Crusher;
+			if (special & 0x0020)
+				flags |= ML_MONSTERSCANACTIVATE;
+			switch (special & 0x0018) {
+				case 0x0000:	ld->args[1] = C_SLOW;	break;
+				case 0x0008:	ld->args[1] = C_NORMAL;	break;
+				case 0x0010:	ld->args[1] = C_FAST;	break;
+				case 0x0018:	ld->args[1] = C_TURBO;	break;
+			}
+			ld->args[2] = ld->args[1];
+			ld->args[3] = (special & 0x0040) >> 6;
+			ld->args[4] = 10;
+		} else if (special <= GenLiftBase) {
+			// Generalized stairs (tag, speed, step, dir/igntxt, reset)
+			ld->special = Generic_Stairs;
+			if (special & 0x0020)
+				flags |= ML_MONSTERSCANACTIVATE;
+			switch (special & 0x0018) {
+				case 0x0000:	ld->args[1] = S_SLOW;	break;
+				case 0x0008:	ld->args[1] = S_NORMAL;	break;
+				case 0x0010:	ld->args[1] = S_FAST;	break;
+				case 0x0018:	ld->args[1] = S_TURBO;	break;
+			}
+			switch (special & 0x00c0) {
+				case 0x0000:	ld->args[2] = 4;		break;
+				case 0x0040:	ld->args[2] = 8;		break;
+				case 0x0080:	ld->args[2] = 16;		break;
+				case 0x00c0:	ld->args[2] = 24;		break;
+			}
+			ld->args[3] = (special & 0x0300) >> 8;
+			ld->args[4] = 0;
+		} else if (special <= GenLockedBase) {
+			// Generalized lift (tag, speed, delay, target, height)
+			ld->special = Generic_Lift;
+			if (special & 0x0020)
+				flags |= ML_MONSTERSCANACTIVATE;
+			switch (special & 0x0018) {
+				case 0x0000:	ld->args[1] = P_SLOW*2;		break;
+				case 0x0008:	ld->args[1] = P_NORMAL*2;	break;
+				case 0x0010:	ld->args[1] = P_FAST*2;		break;
+				case 0x0018:	ld->args[1] = P_TURBO*2;	break;
+			}
+			switch (special & 0x00c0) {
+				case 0x0000:	ld->args[2] = 8;		break;
+				case 0x0040:	ld->args[2] = 24;		break;
+				case 0x0080:	ld->args[2] = 40;		break;
+				case 0x00c0:	ld->args[2] = 80;		break;
+			}
+			ld->args[3] = ((special & 0x0300) >> 8) + 1;
+			ld->args[4] = 0;
+		} else if (special <= GenDoorBase) {
+			// Generalized locked door (tag, speed, kind, delay, lock)
+			ld->special = Generic_Door;
+			if (special & 0x0080)
+				flags |= ML_MONSTERSCANACTIVATE;
+			switch (special & 0x0018) {
+				case 0x0000:	ld->args[1] = D_SLOW;	break;
+				case 0x0008:	ld->args[1] = D_NORMAL;	break;
+				case 0x0010:	ld->args[1] = D_FAST;	break;
+				case 0x0018:	ld->args[1] = D_TURBO;	break;
+			}
+			ld->args[2] = (special & 0x0020) >> 5;
+			ld->args[3] = 0;
+			ld->args[4] = (special & 0x01c0) >> 6;
+			if (ld->args[4] == 0)
+				ld->args[4] = AnyKey;
+			else if (ld->args[4] == 7)
+				ld->args[4] = AllKeys;
+			ld->args[4] |= (special & 0x0200) >> 2;
+		} else if (special <= GenCeilingBase) {
+			// Generalized door (tag, speed, kind, delay, lock)
+			ld->special = Generic_Door;
+			switch (special & 0x0018) {
+				case 0x0000:	ld->args[1] = D_SLOW;	break;
+				case 0x0008:	ld->args[1] = D_NORMAL;	break;
+				case 0x0010:	ld->args[1] = D_FAST;	break;
+				case 0x0018:	ld->args[1] = D_TURBO;	break;
+			}
+			ld->args[2] = (special & 0x0060) >> 5;
+			switch (special & 0x0300) {
+				case 0x0000:	ld->args[3] = 8;		break;
+				case 0x0100:	ld->args[3] = 32;		break;
+				case 0x0200:	ld->args[3] = 72;		break;
+				case 0x0300:	ld->args[3] = 240;		break;
+			}
+			ld->args[4] = 0;
+		} else {
+			// Generalized ceiling (tag, speed, height, target, change/model/direct/crush)
+			// Generalized floor (tag, speed, height, target, change/model/direct/crush)
+			if (special <= GenFloorBase)
+				ld->special = Generic_Ceiling;
+			else
+				ld->special = Generic_Floor;
+			
+			switch (special & 0x0018) {
+				case 0x0000:	ld->args[1] = F_SLOW;	break;
+				case 0x0008:	ld->args[1] = F_NORMAL;	break;
+				case 0x0010:	ld->args[1] = F_FAST;	break;
+				case 0x0018:	ld->args[1] = F_TURBO;	break;
+			}
+			ld->args[3] = ((special & 0x0380) >> 7) + 1;
+			if (ld->args[3] >= 7) {
+				ld->args[2] = 24 + (ld->args[3] - 7) * 8;
+				ld->args[3] = 0;
+			} else {
+				ld->args[2] = 0;
+			}
+			ld->args[4] = ((special & 0x0c00) >> 10) |
+						  ((special & 0x0060) >> 2) |
+						  ((special & 0x1000) >> 8);
+		}
+	}
+
+	ld->flags = flags;
+
+	// For purposes of maintaining BOOM compatibility, each
+	// line also needs to have its ID set to the same as its tag.
+	// An external conversion program would need to do this more
+	// intelligently.
+
+	ld->id = tag;
+}
+
+// The teleport specials that use things as destinations also require
+// that their TIDs be set to the tags of their containing sectors. We
+// do that after the rest of the level has been loaded.
+
+void P_TranslateTeleportThings (void)
+{
+	int i, j;
+	thinker_t *thinker;
+	mobj_t *m;
+
+	for (i = 0; i < numlines; i++) {
+		if (lines[i].special == Teleport ||
+			lines[i].special == Teleport_NoFog) {
+			// The sector tag hash table hasn't been set up yet,
+			// so we need to use this linear search.
+			for (j = 0; j < numsectors; j++) {
+				if (sectors[j].tag == lines[i].args[0]) {
+					thinker = thinkercap.next;
+					for (thinker = thinkercap.next;
+						 thinker != &thinkercap;
+						 thinker = thinker->next)
+					{
+						// not a mobj
+						if (thinker->function.acp1 != (actionf_p1)P_MobjThinker)
+							continue;
+
+						m = (mobj_t *)thinker;
+						
+						// not a teleportman
+						if (m->type != MT_TELEPORTMAN && m->type != MT_TELEPORTMAN2)
+							continue;
+
+						// wrong sector
+						if (m->subsector->sector - sectors != j)
+							continue;
+
+						// It's a teleportman, so set it's tid to match
+						// the sector's tag.
+						m->tid = lines[i].args[0];
+						P_AddMobjToHash (m);
+
+						// We only bother with the first teleportman
+						break;
+					}
+					if (thinker != &thinkercap)
+						break;
+				}
+			}
+		}
+	}
+}
+
+int P_TranslateSectorSpecial (int special)
+{
+	// This supports phased lighting with specials 21-24
+	return (special == 9) ? SECRET_MASK :
+			((special & 0xfe0) << 3) |
+			((special & 0x01f) + (((special & 0x1f) < 21) ? 64 : -20));
+}
\ No newline at end of file
diff --git a/code/Qmus2mid.c b/code/Qmus2mid.c
index 1b7fd42432..18987538f5 100644
--- a/code/Qmus2mid.c
+++ b/code/Qmus2mid.c
@@ -20,6 +20,7 @@
 */
 
 /* Hacked for DOOM Win32 port by Petteri Kangaslampi <pekangas@sci.fi> */
+// [RH] And then further to not use any intermediate files
 
 //#define MSDOG
 
@@ -63,14 +64,14 @@ char tmp[MAXPATH] ;
 
 size_t fwrite2(const int2 *ptr, size_t size, FILE *file)
 {
-  int4 rev = 0, work;
+  int4 rev = 0;
   int i;
 
   for( i = 0 ; (size_t)i < size ; i++ ) {
 // VC++ didn't like this magic (but only for the release build!)
 //    rev = (rev << 8) + (((*ptr) >> (i*8)) & 0xFF) ;
+    int4 work = (*ptr) >> (i << 3);
     rev <<= 8;
-    work = (*ptr) >> (i << 3);
     rev |= (work & 0xFF);
   }
 
@@ -629,54 +630,3 @@ int convert( const char *mus, const char *mid, int nodisplay, int div,
   return 0 ;
 }
 
-
-int CheckParm( char *check, int argc, char *argv[] )
-{
-  int i;
-
-  for ( i = 1 ; i<argc ; i++ )
-#ifdef MSDOG
-    if( !stricmp( check, argv[i] ) )
-#else
-    if( !strcmp( check, argv[i] ) )
-#endif
-      return i ;
-
-  return 0;
-}
-
-
-void PrintHeader( void )
-{
-/*  Print( "===============================================================================\n"
-         "              Quick MUS->MID v2.0 ! (C) 1995,96 Sebastien Bacquet\n"
-         "                        E-mail : bacquet@iie.cnam.fr\n"
-         "===============================================================================\n" ) ;*/
-}
-
-
-void PrintSyntax( void )
-{
-  PrintHeader() ;
-  Printf(
-#ifdef MSDOG
-         "\nSyntax : QMUS2MID musfile1[.mus] {musfile2[.mus] ... | "
-         "midifile.mid} [options]\n"
-         "   Wildcards are accepted.\n"
-         "   Options are :\n"
-         "     -query    : Query before processing\n"
-         "     -ow       : OK, overwrite (without query)\n"
-#else
-         "\nSyntax : QMUS2MID musfile midifile [options]\n"
-         "   Options are :\n"
-#endif
-         "     -noow     : Don't overwrite !\n"
-         "     -nodisp   : Display nothing ! (except errors)\n"
-         "     -nocomp   : Don't compress !\n"
-         "     -size ### : Set the track buffer size to ### (in KB). "
-         "Default = 64 KB\n"
-         "     -t ###    : Ticks per quarter note. Default = 89\n"
-         ) ;
-}
-
-
diff --git a/code/R_bsp.c b/code/R_bsp.c
index ac9c69df90..bf1f56e978 100644
--- a/code/R_bsp.c
+++ b/code/R_bsp.c
@@ -38,6 +38,7 @@
 // State.
 #include "doomstat.h"
 #include "r_state.h"
+#include "v_palett.h"
 
 //#include "r_local.h"
 
@@ -302,7 +303,7 @@ sector_t *R_FakeFlat(sector_t *sec, sector_t *tempsec,
 	if (sec->heightsec != -1)
 	{
 		const sector_t *s = &sectors[sec->heightsec];
-		int heightsec = viewplayer->mo->subsector->sector->heightsec;
+		int heightsec = camera->subsector->sector->heightsec;
 		int underwater = heightsec!=-1 && viewz<=sectors[heightsec].floorheight;
 
 		// Replace sector being drawn, with a copy to be hacked
@@ -320,7 +321,7 @@ sector_t *R_FakeFlat(sector_t *sec, sector_t *tempsec,
 			tempsec->floor_xoffs = s->floor_xoffs;
 			tempsec->floor_yoffs = s->floor_yoffs;
 
-			if (underwater)
+			if (underwater) {
 				if (s->ceilingpic == skyflatnum)
 				{
 					tempsec->floorheight   = tempsec->ceilingheight+1;
@@ -334,6 +335,7 @@ sector_t *R_FakeFlat(sector_t *sec, sector_t *tempsec,
 					tempsec->ceiling_xoffs = s->ceiling_xoffs;
 					tempsec->ceiling_yoffs = s->ceiling_yoffs;
 				}
+			}
 
 			tempsec->lightlevel  = s->lightlevel;
 
@@ -480,9 +482,9 @@ void R_AddLine (seg_t*	line)
 	// Identical floor and ceiling on both sides,
 	// identical light levels on both sides,
 	// and no middle texture.
-	if (backsector->ceilingpic == frontsector->ceilingpic
+	if (backsector->lightlevel == frontsector->lightlevel
 		&& backsector->floorpic == frontsector->floorpic
-		&& backsector->lightlevel == frontsector->lightlevel
+		&& backsector->ceilingpic == frontsector->ceilingpic
 		&& curline->sidedef->midtexture == 0
 
 		// killough 3/7/98: Take flats offsets into account:
@@ -494,6 +496,9 @@ void R_AddLine (seg_t*	line)
 		// killough 4/16/98: consider altered lighting
 		&& backsector->floorlightsec == frontsector->floorlightsec
 		&& backsector->ceilinglightsec == frontsector->ceilinglightsec
+
+		// [RH] Also consider colormaps
+		&& backsector->colormap == frontsector->colormap
 		)
 	{
 		return;
@@ -655,7 +660,7 @@ void R_Subsector (int num)
 	sector_t     tempsec;				// killough 3/7/98: deep water hack
 	int          floorlightlevel;		// killough 3/16/98: set floor lightlevel
 	int          ceilinglightlevel;		// killough 4/11/98
-		
+
 #ifdef RANGECHECK
 	if (num>=numsubsectors)
 		I_Error ("R_Subsector: ss %i with numss = %i", num, numsubsectors);
@@ -666,6 +671,8 @@ void R_Subsector (int num)
 	count = sub->numlines;
 	line = &segs[sub->firstline];
 
+	basecolormap = frontsector->colormap->maps;	// [RH] set basecolormap
+
 	// killough 3/8/98, 4/4/98: Deep water / fake ceiling effect
 	frontsector = R_FakeFlat(frontsector, &tempsec, &floorlightlevel,
 						   &ceilinglightlevel, false);	// killough 4/11/98
@@ -694,7 +701,9 @@ void R_Subsector (int num)
 					frontsector->ceiling_yoffs
 					) : NULL;
 
-	R_AddSprites (frontsector); 
+	// [RH] Fix BOOM bug where things in deep water sectors with
+	//		several subsectors caused massive slowdown.
+	R_AddSprites (sub->sector);
 
 	while (count--)
 	{
diff --git a/code/R_data.c b/code/R_data.c
index 275dd8db89..131e0b6d3d 100644
--- a/code/R_data.c
+++ b/code/R_data.c
@@ -154,13 +154,6 @@ static byte**	texturecomposite;
 int*			flattranslation;
 int*			texturetranslation;
 
-// needed for pre rendering
-fixed_t*		spritewidth;	
-fixed_t*		spriteoffset;
-fixed_t*		spritetopoffset;
-
-//lighttable_t	*colormaps;
-
 
 //
 // MAPTEXTURE_T CACHING
@@ -502,21 +495,8 @@ void R_InitTextures (void)
 #undef ALLOC
 
 	totalwidth = 0;
-	
-	//	Really complex printing shit...
-	{
-		int temp3 = (((W_GetNumForName ("S_END") - 1) -
-						W_GetNumForName ("S_START") + 127) >> 7) +
-						((numtextures+127) >> 8);
 
-		Printf("[");
-		for (i = temp3; i > 0; i--)
-			Printf(" ");
-		Printf("        ]");
-		for (i = temp3; i > 0; i--)
-			Printf("\x8");
-		Printf("\x8\x8\x8\x8\x8\x8\x8\x8\x8\x8");	
-	}
+	// [RH] Removed the complex printing shit
 
 	for (i = 0; i < numtextures; i++, directory++)
 	{
@@ -534,7 +514,7 @@ void R_InitTextures (void)
 		offset = LONG(*directory);
 
 		if (offset > maxoff)
-			I_Error ("R_InitTextures: bad texture directory");
+			I_FatalError ("R_InitTextures: bad texture directory");
 		
 		mtexture = (maptexture_t *) ( (byte *)maptex + offset);
 
@@ -589,7 +569,7 @@ void R_InitTextures (void)
 		Z_Free (maptex2);
 	
 	if (errors)
-		I_Error ("%d errors in R_InitTextures.", errors);
+		I_FatalError ("%d errors in R_InitTextures.", errors);
 
 	// [RH] Setup hash chains. Go from back to front so that if
 	//		duplicates are found, the first one gets used instead
@@ -609,7 +589,7 @@ void R_InitTextures (void)
 		R_GenerateLookup (i, &errors);
 
 	if (errors)
-		I_Error ("%d errors encountered during texture generation.", errors);
+		I_FatalError ("%d errors encountered during texture generation.", errors);
 	
 	// Create translation table for global animation.
 	texturetranslation = Z_Malloc ((numtextures+1)*sizeof(*texturetranslation), PU_STATIC, 0);
@@ -648,51 +628,112 @@ void R_InitFlats (void)
 //
 void R_InitSpriteLumps (void)
 {
-	int			i;
-	patch_t 	*patch;
-		
 	firstspritelump = W_GetNumForName ("S_START") + 1;
 	lastspritelump = W_GetNumForName ("S_END") - 1;
-	
-	numspritelumps = lastspritelump - firstspritelump + 1;
-	spritewidth = Z_Malloc (numspritelumps*4, PU_STATIC, 0);
-	spriteoffset = Z_Malloc (numspritelumps*4, PU_STATIC, 0);
-	spritetopoffset = Z_Malloc (numspritelumps*4, PU_STATIC, 0);
-		
-	for (i = 0; i < numspritelumps; i++)
-	{
-		if (!(i&127))
-			Printf (".");
 
-		patch = W_CacheLumpNum (firstspritelump+i, PU_CACHE);
-		spritewidth[i] = SHORT(patch->width)<<FRACBITS;
-		spriteoffset[i] = SHORT(patch->leftoffset)<<FRACBITS;
-		spritetopoffset[i] = SHORT(patch->topoffset)<<FRACBITS;
-	}
+	numspritelumps = lastspritelump - firstspritelump + 1;
+
+	// [RH] Rather than maintaining separate spritewidth, spriteoffset,
+	//		and spritetopoffset arrays, this data has now been moved into
+	//		the sprite frame definition and gets initialized by
+	//		R_InstallSpriteLump(), so there really isn't anything to do here.
 }
 
 
+static struct {
+	char name[8];
+	unsigned int blend;
+} *fakecmaps;
+size_t numfakecmaps;
+int firstfakecmap;
+byte *realcolormaps;
+int lastusedcolormap;
+
+void R_SetDefaultColormap (const char *name)
+{
+	if (strnicmp (fakecmaps[0].name, name, 8)) {
+		byte *data = W_CacheLumpName (name, PU_CACHE);
+
+		memcpy (realcolormaps, data, (NUMCOLORMAPS+1)*256);
+		uppercopy (fakecmaps[0].name, name);
+		fakecmaps[0].blend = 0;
+	}
+}
 
 //
 // R_InitColormaps
 //
 void R_InitColormaps (void)
 {
-	// [RH] This is all done dynamically in v_palette.c
-#if 0
-	int lump, length;
+	// [RH] Try and convert BOOM colormaps into blending values.
+	//		This is a really rough hack, but it's better than
+	//		not doing anything with them at all (right?)
+	int lastfakecmap = W_CheckNumForName ("C_END");
+	firstfakecmap = W_CheckNumForName ("C_START");
 
-	// Load in the light tables,
-	//	256 byte align tables.
-	lump = W_GetNumForName("COLORMAP");
-	length = W_LumpLength (lump) + 255;
-	colormaps = Z_Malloc (length, PU_STATIC, 0);
-	colormaps = (byte *)( ((int)colormaps + 255)&~0xff);
-	W_ReadLump (lump,colormaps);
-#endif
+	if (firstfakecmap == -1 || lastfakecmap == -1)
+		numfakecmaps = 1;
+	else
+		numfakecmaps = lastfakecmap - firstfakecmap;
+	realcolormaps = Z_Malloc (256*(NUMCOLORMAPS+1)*numfakecmaps+255,PU_STATIC,0);
+	realcolormaps = (byte *)((int)(realcolormaps + 255) & ~255);
+	fakecmaps = Z_Malloc (sizeof(*fakecmaps) * numfakecmaps, PU_STATIC, 0);
+
+	fakecmaps[0].name[0] = 0;
+	R_SetDefaultColormap ("COLORMAP");
+
+	if (numfakecmaps > 1)
+	{
+		int i;
+		size_t j;
+		palette_t *pal = GetDefaultPalette ();
+
+		for (i = ++firstfakecmap, j = 1; j < numfakecmaps; i++, j++) {
+			if (W_LumpLength (i) >= (NUMCOLORMAPS+1)*256) {
+				int k, r, g, b;
+				byte *map = W_CacheLumpNum (i, PU_CACHE);
+
+				memcpy (realcolormaps+(NUMCOLORMAPS+1)*256*j,
+						map, (NUMCOLORMAPS+1)*256);
+
+				r = RPART(pal->basecolors[*map]);
+				g = GPART(pal->basecolors[*map]);
+				b = BPART(pal->basecolors[*map]);
+
+				W_GetLumpName (fakecmaps[j].name, i);
+				for (k = 1; k < 256; k++) {
+					r = (r + RPART(pal->basecolors[map[k]])) >> 1;
+					g = (g + GPART(pal->basecolors[map[k]])) >> 1;
+					b = (b + BPART(pal->basecolors[map[k]])) >> 1;
+				}
+				fakecmaps[j].blend = MAKEARGB (255, r, g, b);
+			}
+		}
+	}
 }
 
+// [RH] Returns an index into realcolormaps. Multiply it by
+//		256*(NUMCOLORMAPS+1) to find the start of the colormap to use.
+//		WATERMAP is an exception and returns a blending value instead.
+int R_ColormapNumForName (const char *name)
+{
+	int lump, blend = 0;
 
+	if (strnicmp (name, "COLORMAP", 8))	{	// COLORMAP always returns 0
+		if (-1 != (lump = (W_CheckNumForName)(name, ns_colormaps)) )
+			blend = lump - firstfakecmap + 1;
+		else if (!strnicmp (name, "WATERMAP", 8))
+			blend = MAKEARGB (128,0,0x4f,0xa5);
+	}
+
+	return blend;
+}
+
+unsigned int R_BlendForColormap (int map)
+{
+	return APART(map) ? map : 
+		   (unsigned)map < numfakecmaps ? fakecmaps[map].blend : 0;
+}
 
 //
 // R_InitData
@@ -882,7 +923,7 @@ void R_PrecacheLevel (void)
 				int k;
 
 				for (k = 7; k >= 0; k--)
-					W_CacheLumpNum(firstspritelump + sflumps[k], PU_CACHE);
+					W_CacheLumpNum(sflumps[k], PU_CACHE);
 			}
 		}
 	}
diff --git a/code/R_defs.h b/code/R_defs.h
index 932f869848..2fa767b2bc 100644
--- a/code/R_defs.h
+++ b/code/R_defs.h
@@ -41,6 +41,7 @@
 
 
 
+
 // Silhouette, needed for clipping Segs (mainly)
 // and sprites representing things.
 #define SIL_NONE				0
@@ -90,10 +91,13 @@ struct degenmobj_s
 
 };
 typedef struct degenmobj_s degenmobj_t;
+
 //
 // The SECTORS record, at runtime.
 // Stores things/mobjs.
 //
+struct dyncolormap_s;
+
 struct sector_s
 {
 	fixed_t 	floorheight;
@@ -103,6 +107,7 @@ struct sector_s
 	short		lightlevel;
 	short		special;
 	short		tag;
+	int			nexttag,firsttag;	// killough 1/30/98: improves searches for tags.
 
 	int 		soundtraversed;	// 0 = untraversed, 1,2 = sndlines -1
 	mobj_t* 	soundtarget;	// thing that made a sound (or null)
@@ -131,6 +136,10 @@ struct sector_s
 	// killough 4/11/98: support for lightlevels coming from another sector
 	int floorlightsec, ceilinglightsec;
 
+	unsigned int bottommap, midmap, topmap; // killough 4/4/98: dynamic colormaps
+											// [RH] these can also be blend values if
+											//		the alpha mask is non-zero
+
 	// list of mobjs that are at least partially in the sector
 	// thinglist is a subset of touching_thinglist
 	struct msecnode_s *touching_thinglist;				// phares 3/14/98
@@ -138,6 +147,10 @@ struct sector_s
 	int linecount;
 	struct line_s **lines;		// [linecount] size
 	
+	float gravity;		// [RH] Sector gravity (1.0 is normal)
+	short damage;		// [RH] Damage to do while standing on floor
+	short mod;			// [RH] Means-of-death for applied damage
+	struct dyncolormap_s *colormap;	// [RH] Per-sector colormap
 };
 typedef struct sector_s sector_t;
 
@@ -161,6 +174,9 @@ struct side_s
 	short		bottomtexture;
 	short		midtexture;
 
+	// [RH] Bah. Had to add this for BOOM
+	byte		special;
+
 	// Sector the SideDef is facing.
 	sector_t*	sector;
 	
@@ -194,9 +210,13 @@ struct line_s
 
 	// Animation related.
 	short		flags;
-	short		special;
-	short		tag;
-	byte		args[5];	// [RH] Hexen-style arguments
+	byte		special;	// [RH] Only one byte per special.
+	byte		lucency;	// <--- Translucency (0-255/255=opaque)
+	short		id;			// <--- Same as tag or set with Line_SetIdentification.
+	short		args[5];	// <--- Hexen-style arguments
+							//		Note that these are shorts in order to support
+							//		the tag parameter from DOOM.
+	int			firstid, nextid;
 
 	// Visual appearance: SideDefs.
 	//	sidenum[1] will be -1 if one sided
@@ -216,9 +236,6 @@ struct line_s
 
 	// if == validcount, already checked
 	int 		validcount;
-
-	// thinker_t for reversable actions
-	void*		specialdata;			
 };
 typedef struct line_s line_t;
 
@@ -377,7 +394,6 @@ struct drawseg_s
 	short*				sprtopclip; 			
 	short*				sprbottomclip;	
 	short*				maskedtexturecol;
-	
 };
 typedef struct drawseg_s drawseg_t;
 
@@ -430,8 +446,7 @@ struct vissprite_s
 	fixed_t 			texturemid;
 	int 				patch;
 
-	// for color translation and shadow draw,
-	//	maxbright frames as well
+	// for color translation and maxbright frames as well
 	lighttable_t*		colormap;
    
 	int 				mobjflags;
@@ -471,13 +486,18 @@ struct spriteframe_s
 	// Lump to use for view angles 0-7.
 	short		lump[8];
 
+	// [RH] Move some data out of spritewidth, spriteoffset,
+	//		and spritetopoffset arrays.
+	fixed_t		width[8];
+	fixed_t		topoffset[8];
+	fixed_t		offset[8];
+
 	// Flip bit (1 = flip) to use for view angles 0-7.
 	byte		flip[8];
 	
 };
 typedef struct spriteframe_s spriteframe_t;
 
-
 //
 // A sprite definition:
 //	a number of animation frames.
@@ -490,28 +510,36 @@ struct spritedef_s
 };
 typedef struct spritedef_s spritedef_t;
 
+//
+// [RH] Internal "skin" definition.
+//
+struct playerskin_s
+{
+	char				name[17];	// 16 chars + NULL
+	char				face[3];
+	int					sprite;
+	int					namespc;	// namespace for this skin
+	int					gender;		// This skin's gender (not used)
+};
+typedef struct playerskin_s playerskin_t;
 
 //
-// Now what is a visplane, anyway?
+// The infamous visplane
 // 
 struct visplane_s
 {
-  fixed_t				height;
-  int					picnum;
-  int					lightlevel;
-  fixed_t				xoffs;
-  fixed_t				yoffs;
-  int					minx;
-  int					maxx;
-  
-  // leave pads for [minx-1]/[maxx+1]
-  
-  // Here lies the rub for all
-  //  dynamic resize/change of resolution.
+	struct visplane_s *next;		// Next visplane in hash chain -- killough
 
-  // These actually point one short past the memory
-  // area allocated (for padding)
-  unsigned short				*top, *bottom;
+	fixed_t		height;
+	int			picnum;
+	int			lightlevel;
+	fixed_t		xoffs, yoffs;		// killough 2/28/98: Support scrolling flats
+	int			minx, maxx;
+	byte		*colormap;			// [RH] Support multiple colormaps
+
+	unsigned short *bottom;			// [RH] bottom and top arrays are dynamically
+	unsigned short pad;				//		allocated immediately after the
+	unsigned short top[3];			//		visplane.
 };
 typedef struct visplane_s visplane_t;
 
diff --git a/code/R_draw.c b/code/R_draw.c
index dbcff87327..2370f766b9 100644
--- a/code/R_draw.c
+++ b/code/R_draw.c
@@ -254,7 +254,7 @@ void R_DrawFuzzColumnP_C (void)
 	if (count < 0) 
 		return; 
 
-	map = DefaultPalette->colormaps + 6*256;
+	map = DefaultPalette->maps.colormaps + 6*256;
 	
 #ifdef RANGECHECK 
 	if (dc_x >= screens[0].width
@@ -494,6 +494,8 @@ void R_DrawSpanP (void)
 /*										*/
 /****************************************/
 
+#define dc_shademap ((unsigned int *)dc_colormap)
+
 void R_DrawColumnD_C (void) 
 { 
 	int 				count; 
@@ -523,7 +525,7 @@ void R_DrawColumnD_C (void)
 
 	do 
 	{
-		*dest = V_Palette[dc_colormap[dc_source[(frac>>FRACBITS)&dc_mask]]];
+		*dest = dc_shademap[dc_source[(frac>>FRACBITS)&dc_mask]];
 		
 		dest += dc_pitch >> 2; 
 		frac += fracstep;
@@ -608,7 +610,7 @@ void R_DrawTranslucentColumnD_C (void)
 	do 
 	{
 		*dest = ((*dest >> 1) & 0x7f7f7f) +
-				((V_Palette[dc_colormap[dc_source[(frac>>FRACBITS)&dc_mask]]] >> 1) & 0x7f7f7f);
+				((dc_shademap[dc_source[(frac>>FRACBITS)&dc_mask]] >> 1) & 0x7f7f7f);
 		dest += dc_pitch >> 2;
 		
 		frac += fracstep;
@@ -646,7 +648,7 @@ void R_DrawTranslatedColumnD_C (void)
 	// Here we do an additional index re-mapping.
 	do
 	{
-		*dest = V_Palette[dc_colormap[dc_translation[dc_source[(frac>>FRACBITS) & dc_mask]]]];
+		*dest = dc_shademap[dc_translation[dc_source[(frac>>FRACBITS) & dc_mask]]];
 		dest += dc_pitch >> 2;
 		
 		frac += fracstep;
@@ -686,7 +688,7 @@ void R_DrawSpanD (void)
 
 		// Lookup pixel from flat texture tile,
 		//  re-index using light/colormap.
-		*dest = V_Palette[ds_colormap[ds_source[spot]]];
+		*dest = ((unsigned int *)ds_colormap)[ds_source[spot]];
 		dest += ds_colsize >> 2;
 
 		// Next step in u,v.
diff --git a/code/R_draw.h b/code/R_draw.h
index 5d62ff0eca..d257ec1b24 100644
--- a/code/R_draw.h
+++ b/code/R_draw.h
@@ -28,6 +28,7 @@
 extern int				dc_pitch;		// [RH] Distance between rows
 
 extern lighttable_t*	dc_colormap;
+extern unsigned int*	dc_shademap;	// [RH] For high/true color modes
 extern int				dc_x;
 extern int				dc_yl;
 extern int				dc_yh;
diff --git a/code/R_main.c b/code/R_main.c
index 06a4b146e4..55b7043565 100644
--- a/code/R_main.c
+++ b/code/R_main.c
@@ -50,7 +50,7 @@ cvar_t *r_viewsize;
 extern int dmflags;
 
 // Fineangles in the SCREENWIDTH wide window.
-#define FIELDOFVIEW 	2048	
+#define FIELDOFVIEW 	2048
 
 
 
@@ -59,9 +59,10 @@ int 					viewangleoffset;
 // increment every time a check is made
 int 					validcount = 1; 		
 
+lighttable_t*			basecolormap;	// [RH] colormap currently drawing with
 
 lighttable_t*			fixedcolormap;
-extern lighttable_t**	walllights;
+extern int*				walllights;		// [RH] changed from lighttable_t** to int*
 
 int 					centerx;
 int 					centery;
@@ -89,7 +90,7 @@ angle_t 				viewangle;
 fixed_t 				viewcos;
 fixed_t 				viewsin;
 
-player_t*				viewplayer;
+mobj_t*					camera;		// [RH] camera to draw from. doesn't have to be a player
 
 //
 // precalculated math tables
@@ -117,13 +118,15 @@ angle_t 				*xtoviewangle;
 // fixed_t				finesine[5*FINEANGLES/4];
 fixed_t*				finecosine = &finesine[FINEANGLES/4];
 
+// [RH] Changed these from lighttable_t* to int.
+int						scalelight[LIGHTLEVELS][MAXLIGHTSCALE];
+int						scalelightfixed[MAXLIGHTSCALE];
+int						zlight[LIGHTLEVELS][MAXLIGHTZ];
 
-lighttable_t*			scalelight[LIGHTLEVELS][MAXLIGHTSCALE];
-lighttable_t*			scalelightfixed[MAXLIGHTSCALE];
-lighttable_t*			zlight[LIGHTLEVELS][MAXLIGHTZ];
+int						lightscalexmul;	// [RH] used to keep hires modes dark enough
+int						lightscaleymul;
 
-// bumped light from gun blasts
-int 					extralight;
+int 					extralight;		// bumped light from gun blasts
 
 extern BOOL				DrawNewHUD;		// [RH] Defined in d_main.c.
 
@@ -144,11 +147,7 @@ void (*spanfunc) (void);
 // Expand a given bbox
 // so that it encloses a given point.
 //
-void
-R_AddPointToBox
-( int			x,
-  int			y,
-  fixed_t*		box )
+void R_AddPointToBox (int x, int y, fixed_t *box)
 {
 	if (x< box[BOXLEFT])
 		box[BOXLEFT] = x;
@@ -163,123 +162,87 @@ R_AddPointToBox
 
 //
 // R_PointOnSide
-// Traverse BSP (sub) tree,
-//	check point against partition plane.
+// Traverse BSP (sub) tree, check point against partition plane.
 // Returns side 0 (front) or 1 (back).
+// [RH] Re-arranged slightly.
 //
-int
-R_PointOnSide
-( fixed_t		x,
-  fixed_t		y,
-  node_t*		node )
+int R_PointOnSide (fixed_t x, fixed_t y, node_t *node)
 {
-	fixed_t 	dx;
-	fixed_t 	dy;
-	fixed_t 	left;
-	fixed_t 	right;
-		
 	if (!node->dx)
 	{
-		if (x <= node->x)
-			return node->dy > 0;
-		
-		return node->dy < 0;
+		return (x <= node->x) ? (node->dy > 0) : (node->dy < 0);
 	}
-	if (!node->dy)
+	else if (!node->dy)
 	{
-		if (y <= node->y)
-			return node->dx < 0;
-		
-		return node->dx > 0;
+		return (y <= node->y) ? (node->dx < 0) : (node->dx > 0);
 	}
-		
-	dx = (x - node->x);
-	dy = (y - node->y);
-		
-	// Try to quickly decide by looking at sign bits.
-	if ( (node->dy ^ node->dx ^ dx ^ dy)&0x80000000 )
+	else
 	{
-		if	( (node->dy ^ dx) & 0x80000000 )
+		fixed_t dx = (x - node->x);
+		fixed_t dy = (y - node->y);
+		
+		// Try to quickly decide by looking at sign bits.
+		if ( (node->dy ^ node->dx ^ dx ^ dy)&0x80000000 )
 		{
-			// (left is negative)
-			return 1;
+			if	( (node->dy ^ dx) & 0x80000000 )
+			{
+				// (left is negative)
+				return 1;
+			}
+			return 0;
 		}
-		return 0;
-	}
 
-	left = FixedMul ( node->dy>>FRACBITS , dx );
-	right = FixedMul ( dy , node->dx>>FRACBITS );
-		
-	if (right < left)
-	{
-		// front side
-		return 0;
+		if (FixedMul (dy, node->dx>>FRACBITS) < FixedMul (node->dy>>FRACBITS, dx))
+		{
+			// front side
+			return 0;
+		}
+		// back side
+		return 1;
 	}
-	// back side
-	return 1;					
 }
 
-
-int
-R_PointOnSegSide
-( fixed_t		x,
-  fixed_t		y,
-  seg_t*		line )
+// [RH] Rearranged this slightly, too.
+int R_PointOnSegSide (fixed_t x, fixed_t y, seg_t *line)
 {
-	fixed_t 	lx;
-	fixed_t 	ly;
-	fixed_t 	ldx;
-	fixed_t 	ldy;
-	fixed_t 	dx;
-	fixed_t 	dy;
-	fixed_t 	left;
-	fixed_t 	right;
-		
-	lx = line->v1->x;
-	ly = line->v1->y;
-		
-	ldx = line->v2->x - lx;
-	ldy = line->v2->y - ly;
-		
+	fixed_t lx = line->v1->x;
+	fixed_t ly = line->v1->y;
+
+	fixed_t ldx = line->v2->x - lx;
+	fixed_t ldy = line->v2->y - ly;
+
 	if (!ldx)
 	{
-		if (x <= lx)
-			return ldy > 0;
-		
-		return ldy < 0;
+		return (x <= lx) ? (ldy > 0) : (ldy < 0);
 	}
-	if (!ldy)
+	else if (!ldy)
 	{
-		if (y <= ly)
-			return ldx < 0;
-		
-		return ldx > 0;
+		return (y <= ly) ? (ldx < 0) : (ldx > 0);
 	}
-		
-	dx = (x - lx);
-	dy = (y - ly);
-		
-	// Try to quickly decide by looking at sign bits.
-	if ( (ldy ^ ldx ^ dx ^ dy)&0x80000000 )
+	else
 	{
-		if	( (ldy ^ dx) & 0x80000000 )
-		{
-			// (left is negative)
-			return 1;
-		}
-		return 0;
-	}
+		fixed_t dx = (x - lx);
+		fixed_t dy = (y - ly);
 
-	left = FixedMul ( ldy>>FRACBITS , dx );
-	right = FixedMul ( dy , ldx>>FRACBITS );
-		
-	if (right < left)
-	{
-		// front side
-		return 0;
+		// Try to quickly decide by looking at sign bits.
+		if ( (ldy ^ ldx ^ dx ^ dy)&0x80000000 )
+		{
+			if	( (ldy ^ dx) & 0x80000000 )
+			{
+				// (left is negative)
+				return 1;
+			}
+			return 0;
+		}
+
+		if (FixedMul (dy, ldx>>FRACBITS) < FixedMul (ldy>>FRACBITS, dx))
+		{
+			// front side
+			return 0;
+		}
+		// back side
+		return 1;
 	}
-	// back side
-	return 1;					
 }
 
 
@@ -293,10 +256,6 @@ R_PointOnSegSide
 //	tantoangle[] table.
 
 //
-
-
-
-
 angle_t R_PointToAngle (fixed_t x, fixed_t y)
 {		
 	x -= viewx;
@@ -379,12 +338,7 @@ angle_t R_PointToAngle (fixed_t x, fixed_t y)
 }
 
 
-angle_t
-R_PointToAngle2
-( fixed_t		x1,
-  fixed_t		y1,
-  fixed_t		x2,
-  fixed_t		y2 )
+angle_t R_PointToAngle2 (fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2)
 {		
 	viewx = x1;
 	viewy = y1;
@@ -398,7 +352,10 @@ R_PointToAngle2
 //
 void R_InitPointToAngle (void)
 {
-	// UNUSED - now getting from tables.c [or are we? -RH]
+	// UNUSED - now getting from tables.c
+	// [RH] Actually, if you define CALC_TABLES, the game will use the FPU
+	//		to calculate these tables at runtime so that a little space
+	//		can be saved on disk.
 #ifdef CALC_TABLES
 	double		i, f;
 //
@@ -480,7 +437,9 @@ fixed_t R_ScaleFromGlobalAngle (angle_t visangle)
 //
 void R_InitTables (void)
 {
-	// UNUSED: now getting from tables.c [or are we? -RH]
+	// UNUSED: now getting from tables.c
+	// [RH] As with R_InitPointToAngle, you can #define CALC_TABLES
+	//		to generate these tables at runtime.
 #ifdef CALC_TABLES
 	int 		i;
 	double		a;
@@ -512,10 +471,10 @@ void R_InitTables (void)
 //
 void R_InitTextureMapping (void)
 {
-	int 				i;
-	int 				x;
-	int 				t;
-	fixed_t 			focallength;
+	int 	i;
+	int 	x;
+	int 	t;
+	fixed_t focallength;
 	
 	// Use tangent table to generate viewangletox:
 	//	viewangletox will give the next greatest x
@@ -526,7 +485,7 @@ void R_InitTextureMapping (void)
 	focallength = FixedDiv (centerxfrac,
 							finetangent[FINEANGLES/4+FIELDOFVIEW/2] );
 		
-	for (i=0 ; i<FINEANGLES/2 ; i++)
+	for (i = 0; i < FINEANGLES/2; i++)
 	{
 		if (finetangent[i] > FRACUNIT*2)
 			t = -1;
@@ -548,7 +507,7 @@ void R_InitTextureMapping (void)
 	// Scan viewangletox[] to generate xtoviewangle[]:
 	//	xtoviewangle will give the smallest view angle
 	//	that maps to x. 
-	for (x=0;x<=viewwidth;x++)
+	for (x = 0; x <= viewwidth; x++)
 	{
 		i = 0;
 		while (viewangletox[i]>x)
@@ -557,7 +516,7 @@ void R_InitTextureMapping (void)
 	}
 	
 	// Take out the fencepost cases from viewangletox.
-	for (i=0 ; i<FINEANGLES/2 ; i++)
+	for (i = 0; i < FINEANGLES/2; i++)
 	{
 		t = FixedMul (finetangent[i], focallength);
 		t = centerx - t;
@@ -577,37 +536,43 @@ void R_InitTextureMapping (void)
 // R_InitLightTables
 // Only inits the zlight table,
 //	because the scalelight table changes with view size.
+// [RH] This now setups indices into a colormap rather than pointers into the
+//		colormap, because the colormap can vary by sector, but the indices
+//		into it don't.
 //
-#define DISTMAP 		2
+#define DISTMAP 2
 
 void R_InitLightTables (void)
 {
-	int 		i;
-	int 		j;
-	int 		level;
-	int 		startmap;		
-	int 		scale;
-	
+	int i;
+	int j;
+	int level;
+	int startmap;		
+	int scale;
+	int lightmapsize = 8 + (screens[0].is8bit ? 0 : 2);
+
 	// Calculate the light levels to use
 	//	for each level / distance combination.
-	for (i=0 ; i< LIGHTLEVELS ; i++)
+	for (i = 0; i < LIGHTLEVELS; i++)
 	{
 		startmap = ((LIGHTLEVELS-1-i)*2)*NUMCOLORMAPS/LIGHTLEVELS;
 		for (j=0 ; j<MAXLIGHTZ ; j++)
 		{
-			scale = FixedDiv ((screens[0].width/2*FRACUNIT), (j+1)<<LIGHTZSHIFT);
-			scale >>= LIGHTSCALESHIFT;
+			scale = FixedDiv ((160*FRACUNIT), (j+1)<<LIGHTZSHIFT);
+			scale >>= LIGHTSCALESHIFT-LIGHTSCALEMULBITS;
 			level = startmap - scale/DISTMAP;
 			
 			if (level < 0)
 				level = 0;
-
-			if (level >= NUMCOLORMAPS)
+			else if (level >= NUMCOLORMAPS)
 				level = NUMCOLORMAPS-1;
 
-			zlight[i][j] = DefaultPalette->maps.colormaps + level*256;
+			zlight[i][j] = level << lightmapsize;
 		}
 	}
+
+	lightscalexmul = 320 * (1<<LIGHTSCALEMULBITS) / screens[0].width;
+	lightscaleymul = 200 * (1<<LIGHTSCALEMULBITS) / screens[0].height;
 }
 
 
@@ -618,9 +583,9 @@ void R_InitLightTables (void)
 //	because it might be in the middle of a refresh.
 // The change will take effect next refresh.
 //
-BOOL	 		setsizeneeded;
-int 			setblocks;
-int				setdetail = -1;
+BOOL setsizeneeded;
+int	 setblocks;
+int	 setdetail = -1;
 
 
 void R_SetViewSize (int blocks)
@@ -667,6 +632,7 @@ void R_ExecuteSetViewSize (void)
 	int 		startmap;
 	int			aspectx;
 	int			virtheight, virtwidth;
+	int			lightmapsize = 8 + (screens[0].is8bit ? 0 : 2);
 
 	setsizeneeded = false;
 
@@ -685,7 +651,8 @@ void R_ExecuteSetViewSize (void)
 		realviewwidth = screens[0].width;
 		realviewheight = ST_Y;
 		freelookviewheight = screens[0].height;
-	} else
+	}
+	else
 	{
 		realviewwidth = ((setblocks*screens[0].width)/10) & (~(15>>(screens[0].is8bit ? 0 : 2)));
 		realviewheight = ((setblocks*ST_Y)/10)&~7;
@@ -717,7 +684,7 @@ void R_ExecuteSetViewSize (void)
 	virtwidth = screens[0].width >> detailxshift;
 	virtheight = screens[0].height >> detailyshift;
 
-	// [RH] aspect ratio stuff (based Doom Legacy's)
+	// [RH] aspect ratio stuff (based on Doom Legacy's)
 	aspectx = ((virtheight * centerx * 320) / 200) / virtwidth * FRACUNIT;
 
 	projection = centerxfrac;
@@ -768,8 +735,8 @@ void R_ExecuteSetViewSize (void)
 		distscale[i] = FixedDiv (FRACUNIT,cosadj);
 	}
 	
-	// Calculate the light levels to use
-	//	for each level / scale combination.
+	// Calculate the light levels to use for each level / scale combination.
+	// [RH] This just stores indices into the colormap rather than pointers into it.
 	for (i=0 ; i< LIGHTLEVELS ; i++)
 	{
 		startmap = ((LIGHTLEVELS-1-i)*2)*NUMCOLORMAPS/LIGHTLEVELS;
@@ -779,13 +746,15 @@ void R_ExecuteSetViewSize (void)
 			
 			if (level < 0)
 				level = 0;
-
-			if (level >= NUMCOLORMAPS)
+			else if (level >= NUMCOLORMAPS)
 				level = NUMCOLORMAPS-1;
 
-			scalelight[i][j] = DefaultPalette->maps.colormaps + level*256;
+			scalelight[i][j] = level << lightmapsize;
 		}
 	}
+
+	// [RH] Initialize z-light tables here
+	R_InitLightTables ();
 }
 
 
@@ -820,29 +789,14 @@ void R_Init (void)
 	R_DetailCallback (r_detail);
 
 	R_InitData ();
-	Printf (".");
-//	Printf ("\nR_InitData");
 	R_InitPointToAngle ();
-	Printf (".");
-//	Printf ("\nR_InitPointToAngle");
 	R_InitTables ();
 	// viewwidth / viewheight are set by the defaults
-	Printf (".");
-//	Printf ("\nR_InitTables");
 
 	R_SetViewSize ((int)screenblocks->value);
 	R_InitPlanes ();
-	Printf (".");
-//	Printf ("\nR_InitPlanes");
 	R_InitLightTables ();
-	Printf (".");
-//	Printf ("\nR_InitLightTables");
-//	R_InitSkyMap ();
-	Printf (".");
-//	Printf ("\nR_InitSkyMap");
 	R_InitTranslationTables ();
-	Printf (".");
-//	Printf ("\nR_InitTranslationsTables");
 		
 	framecount = 0;
 }
@@ -851,10 +805,7 @@ void R_Init (void)
 //
 // R_PointInSubsector
 //
-subsector_t*
-R_PointInSubsector
-( fixed_t		x,
-  fixed_t		y )
+subsector_t *R_PointInSubsector (fixed_t x, fixed_t y)
 {
 	node_t* 	node;
 	int 		side;
@@ -881,38 +832,79 @@ R_PointInSubsector
 //
 // R_SetupFrame
 //
-void R_SetupFrame (player_t* player)
+extern dyncolormap_t NormalLight;
+
+void R_SetupFrame (player_t *player)
 {				
-	int i;
+	static unsigned int oldblend = ~0;
+	unsigned int newblend;
 	int dy;
 	
-	viewplayer = player;
-	viewx = player->mo->x;
-	viewy = player->mo->y;
-	viewangle = player->mo->angle + viewangleoffset;
-	extralight = player->extralight;
-
-	viewz = player->viewz;
+	camera = player->camera;	// [RH] Use camera instead of viewplayer
+	viewx = camera->x;
+	viewy = camera->y;
+	viewangle = camera->angle + viewangleoffset;
+	extralight = camera == player->mo ? player->extralight : 0;
+	viewz = camera->player ? camera->player->viewz : camera->z;
 
 	viewsin = finesine[viewangle>>ANGLETOFINESHIFT];
 	viewcos = finecosine[viewangle>>ANGLETOFINESHIFT];
 		
-	if (player->fixedcolormap)
+	// killough 3/20/98, 4/4/98: select colormap based on player status
+	// [RH] Can also select a blend
+
+	if (camera->subsector->sector->heightsec != -1)
 	{
-		fixedcolormap =
-			DefaultPalette->maps.colormaps
-			+ player->fixedcolormap*256*sizeof(lighttable_t);
+		const sector_t *s = camera->subsector->sector->heightsec + sectors;
+		newblend = viewz < s->floorheight ? s->bottommap : viewz > s->ceilingheight ?
+				   s->topmap : s->midmap;
+		if (!screens[0].is8bit)
+			newblend = R_BlendForColormap (newblend);
+		else if (APART(newblend) == 0 && newblend >= numfakecmaps)
+			newblend = 0;
+	} else {
+		newblend = 0;
+	}
+
+	// [RH] Don't override testblend unless entering a sector with a
+	//		blend different from the previous sector's. Same goes with
+	//		NormalLight's maps pointer.
+	if (oldblend != newblend) {
+		oldblend = newblend;
+		if (APART(newblend)) {
+			BaseBlendR = RPART(newblend);
+			BaseBlendG = GPART(newblend);
+			BaseBlendB = BPART(newblend);
+			BaseBlendA = APART(newblend) / 255.0f;
+			NormalLight.maps = realcolormaps;
+		} else {
+			NormalLight.maps = realcolormaps + (NUMCOLORMAPS+1)*256*newblend;
+			BaseBlendR = BaseBlendG = BaseBlendB = 0;
+			BaseBlendA = 0.0f;
+		}
+	}
+
+	if (camera == player->mo && player->fixedcolormap)
+	{
+		if (screens[0].is8bit)
+			fixedcolormap =
+				DefaultPalette->maps.colormaps
+				+ player->fixedcolormap*256;
+		else
+			fixedcolormap = (lighttable_t *)
+				(DefaultPalette->maps.shades
+				+ player->fixedcolormap*256);
 		
 		walllights = scalelightfixed;
 
-		for (i=0 ; i<MAXLIGHTSCALE ; i++)
-			scalelightfixed[i] = fixedcolormap;
+		// [RH] scalelightfixed is an int* now, not a lighttable_t**
+		memset (scalelightfixed, 0, MAXLIGHTSCALE*sizeof(*scalelightfixed));
 	}
 	else
-		fixedcolormap = 0;
+		fixedcolormap = NULL;
 
 	// [RH] freelook stuff
-	dy = FixedMul (freelookviewheight << (FRACBITS/2), player->mo->pitch) >> 9;
+	dy = FixedMul (freelookviewheight << (FRACBITS/2), camera->pitch) >> 9;
 	yslope = yslopetab + (freelookviewheight >> 1) + dy + freediff;
 	centery = (viewheight >> 1) - dy;
 	centeryfrac = centery << FRACBITS;
@@ -927,8 +919,16 @@ void R_SetupFrame (player_t* player)
 //
 // R_RenderView
 //
-void R_RenderPlayerView (player_t* player)
-{		
+void R_RenderPlayerView (player_t *player)
+{
+	angle_t an;
+
+	// [RH] Shift view for earthquakes
+	if (player->xviewshift) {
+		an = (player->mo->angle-ANG90) >> ANGLETOFINESHIFT;
+		player->mo->x += finecosine[an]*player->xviewshift;
+		player->mo->y += finesine[an]*player->xviewshift;
+	}
 	R_SetupFrame (player);
 
 	// Clear buffers.
@@ -958,6 +958,12 @@ void R_RenderPlayerView (player_t* player)
 
 	// [RH] Apply detail mode doubling
 	R_DetailDouble ();
+
+	// [RH] Undo view shift
+	if (player->xviewshift) {
+		player->mo->x -= finecosine[an]*player->xviewshift;
+		player->mo->y -= finesine[an]*player->xviewshift;
+	}
 }
 
 // [RH] Do all multires stuff. Called from V_SetResolution()
diff --git a/code/R_main.h b/code/R_main.h
index 9d4a8b55b1..91bfbf3a23 100644
--- a/code/R_main.h
+++ b/code/R_main.h
@@ -50,7 +50,7 @@ extern fixed_t			projection;
 extern fixed_t			projectiony;	// [RH] fix aspect ratio (from doom3)
 extern fixed_t			skytopfrac;		// [RH] virtual top of the sky (for freelooking)
 
-
+extern byte*			basecolormap;	// [RH] Colormap for sector currently being drawn
 
 extern int				validcount;
 
@@ -70,17 +70,22 @@ extern int				loopcount;
 #define LIGHTSEGSHIFT			 4
 
 #define MAXLIGHTSCALE			48
-#define LIGHTSCALESHIFT 		12
+#define LIGHTSCALEMULBITS		 8	// [RH] for hires lighting fix
+#define LIGHTSCALESHIFT 		(12+LIGHTSCALEMULBITS)
 #define MAXLIGHTZ			   128
 #define LIGHTZSHIFT 			20
 
-extern lighttable_t*	scalelight[LIGHTLEVELS][MAXLIGHTSCALE];
-extern lighttable_t*	scalelightfixed[MAXLIGHTSCALE];
-extern lighttable_t*	zlight[LIGHTLEVELS][MAXLIGHTZ];
+// [RH] Changed from lighttable_t* to int.
+extern int				scalelight[LIGHTLEVELS][MAXLIGHTSCALE];
+extern int				scalelightfixed[MAXLIGHTSCALE];
+extern int				zlight[LIGHTLEVELS][MAXLIGHTZ];
 
 extern int				extralight;
 extern lighttable_t*	fixedcolormap;
 
+extern int				lightscalexmul;	// [RH] for hires lighting fix
+extern int				lightscaleymul;
+
 
 // Number of diminishing brightness levels.
 // There a 0-31, i.e. 32 LUT in the COLORMAP lump.
@@ -130,11 +135,6 @@ R_PointToAngle2
   fixed_t		x2,
   fixed_t		y2 );
 
-fixed_t
-R_PointToDist
-( fixed_t		x,
-  fixed_t		y );
-
 
 fixed_t R_ScaleFromGlobalAngle (angle_t visangle);
 
diff --git a/code/R_plane.c b/code/R_plane.c
index b543b56e01..c311b5e2d4 100644
--- a/code/R_plane.c
+++ b/code/R_plane.c
@@ -21,6 +21,17 @@
 //		 while maintaining a per column clipping list only.
 //		Moreover, the sky areas have to be determined.
 //
+// MAXVISPLANES is no longer a limit on the number of visplanes,
+// but a limit on the number of hash slots; larger numbers mean
+// better performance usually but after a point they are wasted,
+// and memory and time overheads creep in.
+//
+// For more information on visplanes, see:
+//
+// http://classicgaming.com/doom/editing/
+//
+// Lee Killough
+//
 //-----------------------------------------------------------------------------
 
 
@@ -43,18 +54,26 @@
 planefunction_t 		floorfunc;
 planefunction_t 		ceilingfunc;
 
+// Here comes the obnoxious "visplane".
+#define MAXVISPLANES 128    /* must be a power of 2 */
+
+static visplane_t		*visplanes[MAXVISPLANES];	// killough
+static visplane_t		*freetail;					// killough
+static visplane_t		**freehead = &freetail;		// killough
+
+visplane_t 				*floorplane;
+visplane_t 				*ceilingplane;
+
+// killough -- hash function for visplanes
+// Empirically verified to be fairly uniform:
+
+#define visplane_hash(picnum,lightlevel,height) \
+  ((unsigned)((picnum)*3+(lightlevel)+(height)*7) & (MAXVISPLANES-1))
+
 //
 // opening
 //
 
-// Here comes the obnoxious "visplane".
-int						MaxVisPlanes;
-visplane_t				*visplanes;
-visplane_t 				*lastvisplane;
-visplane_t 				*floorplane;
-visplane_t 				*ceilingplane;
-
-// ?
 size_t					maxopenings;
 short					*openings;
 short					*lastopening;
@@ -78,7 +97,7 @@ int 					*spanstop;
 //
 // texture mapping
 //
-lighttable_t**			planezlight;
+int*					planezlight;	// [RH] Changed from lighttable_t** to int*
 fixed_t 				planeheight;
 
 fixed_t 				*yslopetab;		// [RH] Added for freelook. ylook points into it
@@ -94,52 +113,12 @@ fixed_t 				*cachedxstep;
 fixed_t 				*cachedystep;
 
 
-static void PrepVisPlanes (int min)
-{
-	int i;
-	unsigned short *stuff;
-
-	for (i = min; i < MaxVisPlanes; i++) {
-		stuff = (unsigned short *)Calloc (screens[0].width * 2 + 4, sizeof(unsigned short));
-		visplanes[i].top = stuff + 1;
-		visplanes[i].bottom = stuff + screens[0].width + 3;
-	}
-}
-
 //
 // R_InitPlanes
 // Only at game startup.
-// [RH] This function is actually used now.
 //
 void R_InitPlanes (void)
 {
-	MaxVisPlanes = 128;			// Default. Increased as needed.
-	visplanes = (visplane_t *)Calloc (MaxVisPlanes, sizeof(visplane_t));
-	PrepVisPlanes (0);
-}
-
-static void GetMoreVisPlanes (visplane_t **toupdate)
-{
-	int oldMax;
-	visplane_t *old = visplanes;
-
-	oldMax = MaxVisPlanes;
-	MaxVisPlanes += 32;
-	visplanes = (visplane_t *)Realloc (visplanes, (MaxVisPlanes) * sizeof(visplane_t));
-
-	DPrintf ("MaxVisPlanes increased to %d\n", MaxVisPlanes);
-	
-	PrepVisPlanes (oldMax);
-
-	if (visplanes == old)
-		return;
-
-	*toupdate = &visplanes[*toupdate - old];
-	lastvisplane = &visplanes[lastvisplane - old];
-	if (floorplane)
-		floorplane = &visplanes[floorplane - old];
-	if (ceilingplane)
-		ceilingplane = &visplanes[ceilingplane - old];
 }
 
 //
@@ -154,6 +133,7 @@ static void GetMoreVisPlanes (visplane_t **toupdate)
 //	viewy
 //	xoffs
 //	yoffs
+//	basecolormap	// [RH]
 //
 // BASIC PRIMITIVE
 //
@@ -200,17 +180,16 @@ void R_MapPlane (int y, int x1, int x2)
 	{
 		index = distance >> LIGHTZSHIFT;
 		
-		if (index >= MAXLIGHTZ )
+		if (index >= MAXLIGHTZ)
 			index = MAXLIGHTZ-1;
 
-		ds_colormap = planezlight[index];
+		ds_colormap = planezlight[index] + basecolormap;	// [RH] add basecolormap
 	}
 		
 	ds_y = y;
 	ds_x1 = x1;
 	ds_x2 = x2;
 
-	// high or low detail
 	spanfunc ();		
 }
 
@@ -225,27 +204,47 @@ void R_ClearPlanes (void)
 	angle_t 	angle;
 	
 	// opening / clipping determination
-	for (i=0 ; i<viewwidth ; i++)
+	for (i = 0; i < viewwidth ; i++)
 	{
 		floorclip[i] = (short)viewheight;
 		ceilingclip[i] = -1;
 	}
 
-	lastvisplane = visplanes;
+	for (i = 0; i < MAXVISPLANES; i++)	// new code -- killough
+		for (*freehead = visplanes[i], visplanes[i] = NULL; *freehead; )
+			freehead = &(*freehead)->next;
+
 	lastopening = openings;
 	
 	// texture calculation
-	memset (cachedheight, 0, sizeof(fixed_t) * screens[0].height);
+	memset (cachedheight, 0, sizeof(*cachedheight) * screens[0].height);
 
 	// left to right mapping
-	angle = (viewangle-ANG90)>>ANGLETOFINESHIFT;
+	angle = (viewangle - ANG90)>>ANGLETOFINESHIFT;
 		
 	// scale will be unit scale at SCREENWIDTH/2 distance
 	basexscale = FixedDiv (finecosine[angle],centerxfrac);
 	baseyscale = -FixedDiv (finesine[angle],centerxfrac);
 }
 
+// New function, by Lee Killough
+// [RH] top and bottom buffers get allocated immediately
+//		after the visplane.
 
+static visplane_t *new_visplane(unsigned hash)
+{
+	visplane_t *check = freetail;
+
+	if (!check) {
+		check = Calloc (1, sizeof(*check) + sizeof(*check->top)*(screens[0].width*2));
+		check->bottom = &check->top[screens[0].width+2];
+	} else
+		if (!(freetail = freetail->next))
+			freehead = &freetail;
+	check->next = visplanes[hash];
+	visplanes[hash] = check;
+	return check;
+}
 
 
 //
@@ -257,40 +256,35 @@ visplane_t *R_FindPlane (fixed_t height, int picnum, int lightlevel,
 						 fixed_t xoffs, fixed_t yoffs)
 {
 	visplane_t *check;
+	unsigned hash;						// killough
 
 	if (picnum == skyflatnum)
 		height = lightlevel = 0;		// all skys map together
 		
-	for (check=visplanes; check<lastvisplane; check++)
-	{
-		if (height == check->height
-			&& picnum == check->picnum
-			&& lightlevel == check->lightlevel
-			&& xoffs == check->xoffs
-			&& yoffs == check->yoffs
-			)
-		{
-			break;
-		}
-	}
+	// New visplane algorithm uses hash table -- killough
+	hash = visplane_hash (picnum, lightlevel, height);
 
-	if (check < lastvisplane)
-		return check;
-				
-	if (lastvisplane - visplanes == MaxVisPlanes)
-		GetMoreVisPlanes (&check);
-				
-	lastvisplane++;
+	for (check = visplanes[hash]; check; check = check->next)	// killough
+		if (height == check->height &&
+			picnum == check->picnum &&
+			lightlevel == check->lightlevel &&
+			xoffs == check->xoffs &&	// killough 2/28/98: Add offset checks
+			yoffs == check->yoffs &&
+			basecolormap == check->colormap)	// [RH] Add colormap check
+		  return check;
+
+	check = new_visplane (hash);		// killough
 
 	check->height = height;
 	check->picnum = picnum;
 	check->lightlevel = lightlevel;
-	check->xoffs = xoffs;		// killough 2/28/98: Save offsets
+	check->xoffs = xoffs;				// killough 2/28/98: Save offsets
 	check->yoffs = yoffs;
+	check->colormap = basecolormap;		// [RH] Save colormap
 	check->minx = screens[0].width;
 	check->maxx = -1;
 	
-	memset (check->top,0xff,sizeof(short) * screens[0].width);
+	memset (check->top, 0xff, sizeof(*check->top) * screens[0].width);
 				
 	return check;
 }
@@ -329,37 +323,30 @@ visplane_t *R_CheckPlane (visplane_t *pl, int start, int stop)
 		intrh = stop;
 	}
 
-	for (x=intrl ; x<= intrh ; x++)
-		if (pl->top[x] != 0xffff)
-			break;
+	for (x=intrl ; x <= intrh && pl->top[x] == 0xffff; x++)
+		;
 
 	if (x > intrh)
 	{
 		pl->minx = unionl;
 		pl->maxx = unionh;
-
-		// use the same one
-		return pl;				
 	}
-		
-	// [RH] Need to make sure we actually have this lastvisplane
-	if (lastvisplane - visplanes == MaxVisPlanes)
-		GetMoreVisPlanes (&pl);
+	else
+	{
+		unsigned hash = visplane_hash (pl->picnum, pl->lightlevel, pl->height);
+		visplane_t *new_pl = new_visplane (hash);
 
-	// make a new visplane
-	lastvisplane->height = pl->height;
-	lastvisplane->picnum = pl->picnum;
-	lastvisplane->lightlevel = pl->lightlevel;
-    lastvisplane->xoffs = pl->xoffs;			// killough 2/28/98
-    lastvisplane->yoffs = pl->yoffs;
-	
-	pl = lastvisplane++;
-
-	pl->minx = start;
-	pl->maxx = stop;
-
-	memset (pl->top,0xff,sizeof(short) * screens[0].width);
-				
+		new_pl->height = pl->height;
+		new_pl->picnum = pl->picnum;
+		new_pl->lightlevel = pl->lightlevel;
+		new_pl->xoffs = pl->xoffs;			// killough 2/28/98
+		new_pl->yoffs = pl->yoffs;
+		new_pl->colormap = pl->colormap;	// [RH] Copy colormap
+		pl = new_pl;
+		pl->minx = start;
+		pl->maxx = stop;
+		memset (pl->top, 0xff, sizeof(*pl->top) * screens[0].width);
+	}
 	return pl;
 }
 
@@ -369,37 +356,20 @@ visplane_t *R_CheckPlane (visplane_t *pl, int start, int stop)
 //
 void R_MakeSpans (int x, int t1, int b1, int t2, int b2)
 {
-	//if (t1 != 0xffff)
-		while (t1 < t2 && t1<=b1)
-		{
-			R_MapPlane (t1,spanstart[t1],x-1);
-			t1++;
-		}
-	//if (b1 != 0xffff)
-		while (b1 > b2 && b1>=t1)
-		{
-			R_MapPlane (b1,spanstart[b1],x-1);
-			b1--;
-		}
-		
-	//if (t2 != 0xffff)
-		while (t2 < t1 && t2<=b2)
-		{
-			spanstart[t2] = x;
-			t2++;
-		}
-	//if (b2 != 0xffff)
-		while (b2 > b1 && b2>=t2)
-		{
-			spanstart[b2] = x;
-			b2--;
-		}
+	for (; t1 < t2 && t1 <= b1; t1++)
+		R_MapPlane(t1, spanstart[t1], x-1);
+	for (; b1 > b2 && b1 >= t1; b1--)
+		R_MapPlane(b1, spanstart[b1] ,x-1);
+	while (t2 < t1 && t2 <= b2)
+		spanstart[t2++] = x;
+	while (b2 > b1 && b2 >= t2)
+		spanstart[b2--] = x;
 }
 
 // [RH] This was separated from R_DrawPlanes() on 11.5.1998.
 //		Also added support for columns with holes since double skies
 //		opens up that possibility (modified from R_DrawMaskedColumn).
-//		One implication of this is that the sky will always wrap
+//		One implication of this is that the sky should always wrap
 //		properly, provided that it is tall enough.
 
 static void R_DrawMaskedSky (int skytexture, int skypos, fixed_t scale, fixed_t height, visplane_t *pl)
@@ -492,77 +462,78 @@ static void R_DrawSky (int skytexture, int skypos, visplane_t *pl)
 //
 void R_DrawPlanes (void)
 {
-	visplane_t* 		pl;
-	int 				light;
-	int 				x;
-	int 				stop;
+	visplane_t *pl;
+	int i;
 	
-	for (pl = visplanes ; pl < lastvisplane ; pl++)
-	{
-		if (pl->minx > pl->maxx)
-			continue;
-		
-		// sky flat
-		if (pl->picnum == skyflatnum)
+	for (i = 0; i < MAXVISPLANES; i++)
+		for (pl = visplanes[i]; pl; pl = pl->next)
 		{
-			// Sky is allways drawn full bright,
-			//	i.e. colormaps[0] is used.
-			// Because of this hack, sky is not affected
-			//	by INVUL inverse mapping.
-			dc_colormap = DefaultPalette->maps.colormaps;
+			if (pl->minx > pl->maxx)
+				continue;
+			
+			// sky flat
+			if (pl->picnum == skyflatnum)
+			{
+				// Sky is allways drawn full bright,
+				//	i.e. colormaps[0] is used.
+				// Because of this hack, sky is not affected
+				//	by INVUL inverse mapping.
+				dc_colormap = DefaultPalette->maps.colormaps;
 
-			if (level.flags & LEVEL_DOUBLESKY) {
-				dc_iscale = sky2iscale >> sky2stretch;
-				dc_texturemid = sky2texturemid;
-				if (textureheight[sky2texture] == (128<<FRACBITS))
-					R_DrawSky (sky2texture, sky2pos, pl);
+				if (level.flags & LEVEL_DOUBLESKY) {
+					dc_iscale = sky2iscale >> sky2stretch;
+					dc_texturemid = sky2texturemid;
+					if (textureheight[sky2texture] == (128<<FRACBITS))
+						R_DrawSky (sky2texture, sky2pos, pl);
+					else
+						R_DrawMaskedSky (sky2texture, sky2pos, sky2scale, sky2height, pl);
+				}
+
+				dc_iscale = sky1iscale >> sky1stretch;
+				dc_texturemid = sky1texturemid;
+				if ((level.flags & LEVEL_DOUBLESKY) || (textureheight[sky1texture] != (128<<FRACBITS)))
+					R_DrawMaskedSky (sky1texture, sky1pos, sky1scale, sky1height, pl);
 				else
-					R_DrawMaskedSky (sky2texture, sky2pos, sky2scale, sky2height, pl);
+					R_DrawSky (sky1texture, sky1pos, pl);
 			}
-
-			dc_iscale = sky1iscale >> sky1stretch;
-			dc_texturemid = sky1texturemid;
-			if ((level.flags & LEVEL_DOUBLESKY) || (textureheight[sky1texture] != (128<<FRACBITS)))
-				R_DrawMaskedSky (sky1texture, sky1pos, sky1scale, sky1height, pl);
 			else
-				R_DrawSky (sky1texture, sky1pos, pl);
+			{
+				// regular flat
+				int light, stop, x;
 
-			continue;
-		}
-		
-		// regular flat
-		ds_source = W_CacheLumpNum(firstflat +
-								   flattranslation[pl->picnum],
-								   PU_STATIC);
-		
-		xoffs = pl->xoffs;	// killough 2/28/98: Add offsets
-		yoffs = pl->yoffs;
-		planeheight = abs(pl->height-viewz);
-		light = (pl->lightlevel >> LIGHTSEGSHIFT)+extralight;
-
-		if (light >= LIGHTLEVELS)
-			light = LIGHTLEVELS-1;
-
-		if (light < 0)
-			light = 0;
-
-		planezlight = zlight[light];
-
-		pl->top[pl->maxx+1] = 0xffff;
-		pl->top[pl->minx-1] = 0xffff;
+				ds_source = W_CacheLumpNum(firstflat +
+										   flattranslation[pl->picnum],
+										   PU_STATIC);
 				
-		stop = pl->maxx + 1;
+				xoffs = pl->xoffs;	// killough 2/28/98: Add offsets
+				yoffs = pl->yoffs;
+				basecolormap = pl->colormap;	// [RH] set basecolormap
+				planeheight = abs(pl->height-viewz);
+				light = (pl->lightlevel >> LIGHTSEGSHIFT) + extralight;
 
-		for (x=pl->minx ; x<= stop ; x++)
-		{
-			R_MakeSpans(x,pl->top[x-1],
-						pl->bottom[x-1],
-						pl->top[x],
-						pl->bottom[x]);
+				if (light >= LIGHTLEVELS)
+					light = LIGHTLEVELS-1;
+				else if (light < 0)
+					light = 0;
+
+				planezlight = zlight[light];
+
+				pl->top[pl->maxx+1] = 0xffff;
+				pl->top[pl->minx-1] = 0xffff;
+						
+				stop = pl->maxx + 1;
+
+				for (x = pl->minx; x <= stop; x++)
+				{
+					R_MakeSpans(x,pl->top[x-1],
+								pl->bottom[x-1],
+								pl->top[x],
+								pl->bottom[x]);
+				}
+				
+				Z_ChangeTag (ds_source, PU_CACHE);
+			}
 		}
-		
-		Z_ChangeTag (ds_source, PU_CACHE);
-	}
 }
 
 BOOL R_PlaneInitData (void)
@@ -577,26 +548,41 @@ BOOL R_PlaneInitData (void)
 	if (cachedxstep)	free (cachedxstep);
 	if (cachedystep)	free (cachedystep);
 
-	floorclip = Calloc (screens[0].width, sizeof(short));
-	ceilingclip = Calloc (screens[0].width, sizeof(short));
+	floorclip = Calloc (screens[0].width, sizeof(*floorclip));
+	ceilingclip = Calloc (screens[0].width, sizeof(*ceilingclip));
 
-	spanstart = Calloc (screens[0].height, sizeof(int));
-	spanstop = Calloc (screens[0].height, sizeof(int));
+	spanstart = Calloc (screens[0].height, sizeof(*spanstart));
+	spanstop = Calloc (screens[0].height, sizeof(*spanstop));
 
-	yslopetab = Calloc ((screens[0].height<<1)+(screens[0].height>>1), sizeof(fixed_t));
-	distscale = Calloc (screens[0].width, sizeof(fixed_t));
-	cachedheight = Calloc (screens[0].height, sizeof(fixed_t));
-	cacheddistance = Calloc (screens[0].height, sizeof(fixed_t));
-	cachedxstep = Calloc (screens[0].height, sizeof(fixed_t));
-	cachedystep = Calloc (screens[0].height, sizeof(fixed_t));
+	yslopetab = Calloc ((screens[0].height<<1)+(screens[0].height>>1), sizeof(*yslopetab));
+	distscale = Calloc (screens[0].width, sizeof(*distscale));
+	cachedheight = Calloc (screens[0].height, sizeof(*cachedheight));
+	cacheddistance = Calloc (screens[0].height, sizeof(*cacheddistance));
+	cachedxstep = Calloc (screens[0].height, sizeof(*cachedxstep));
+	cachedystep = Calloc (screens[0].height, sizeof(*cachedystep));
 
-	if (visplanes) {
+	// Free all visplanes and let them be re-allocated as needed.
+	{
 		int i;
+		visplane_t *pl = freetail;
 
-		for (i = 0; i < MaxVisPlanes; i++)
-			free (visplanes[i].top - 1);
+		while (pl) {
+			visplane_t *next = pl->next;
+			free (pl);
+			pl = next;
+		}
+		freetail = NULL;
+		freehead = &freetail;
 
-		PrepVisPlanes (0);
+		for (i = 0; i < MAXVISPLANES; i++) {
+			pl = visplanes[i];
+			visplanes[i] = NULL;
+			while (pl) {
+				visplane_t *next = pl->next;
+				free (pl);
+				pl = next;
+			}
+		}
 	}
 
 	return true;
diff --git a/code/R_plane.h b/code/R_plane.h
index aa916e5c4a..4226b423ab 100644
--- a/code/R_plane.h
+++ b/code/R_plane.h
@@ -68,7 +68,7 @@ R_FindPlane
   int			picnum,
   int			lightlevel,
   fixed_t		xoffs,		// killough 2/28/98: add x-y offsets
-  fixed_t		yoffs);
+  fixed_t		yoffs );
 
 visplane_t*
 R_CheckPlane
diff --git a/code/R_segs.c b/code/R_segs.c
index 9e8720a4ae..dbc42fc5ce 100644
--- a/code/R_segs.c
+++ b/code/R_segs.c
@@ -28,6 +28,7 @@
 
 #include "m_alloc.h"
 #include <stdlib.h>
+#include <stddef.h>
 
 #include "i_system.h"
 
@@ -54,7 +55,7 @@ static int		midtexture;
 angle_t 		rw_normalangle;	// angle to line origin
 int 			rw_angle1;
 fixed_t 		rw_distance;
-lighttable_t**	walllights;
+int*			walllights;		// [RH] Changed from lighttable_t** to int*
 
 //
 // regular wall
@@ -104,11 +105,24 @@ void R_RenderMaskedSegRange (drawseg_t *ds, int x1, int x2)
 	// OPTIMIZE: get rid of LIGHTSEGSHIFT globally
 	curline = ds->curline;
 
+	// killough 4/11/98: draw translucent 2s normal textures
+	// [RH] modified because we don't use user-definable
+	//		translucency maps
+	colfunc = basecolfunc;
+	if (curline->linedef->lucency < 240)
+	{
+		colfunc = lucentcolfunc;
+		dc_transmap = TransTable + ((curline->linedef->lucency << 10) & 0x30000);
+	}
+	// killough 4/11/98: end translucent 2s normal code
+
 	frontsector = curline->frontsector;
 	backsector = curline->backsector;
 
 	texnum = texturetranslation[curline->sidedef->midtexture];
-		
+
+	basecolormap = frontsector->colormap->maps;	// [RH] Set basecolormap
+
 	// killough 4/13/98: get correct lightlevel for 2s normal textures
 	lightnum = (R_FakeFlat(frontsector, &tempsec, NULL, NULL, false)
 				->lightlevel >> LIGHTSEGSHIFT)+extralight;
@@ -154,12 +168,12 @@ void R_RenderMaskedSegRange (drawseg_t *ds, int x1, int x2)
 			// calculate lighting
 			if (!fixedcolormap)
 			{
-				unsigned index = spryscale>>LIGHTSCALESHIFT;
+				unsigned index = (spryscale*lightscalexmul)>>LIGHTSCALESHIFT;	// [RH]
 
 				if (index >= MAXLIGHTSCALE)
 					index = MAXLIGHTSCALE-1;
 
-				dc_colormap = walllights[index];
+				dc_colormap = walllights[index] + basecolormap;	// [RH] add basecolormap
 			}
 						
 			// killough 3/2/98:
@@ -175,7 +189,7 @@ void R_RenderMaskedSegRange (drawseg_t *ds, int x1, int x2)
 			{
 				__int64 t = ((__int64) centeryfrac << FRACBITS) -
 					(__int64) dc_texturemid * spryscale;
-// [RH] This doesn't work properly as-is with freelook
+// [RH] This doesn't work properly as-is with freelook. Probably just me.
 //				if (t + (__int64) textureheight[texnum] * spryscale < 0 ||
 //					 t > (__int64) screens[0].height << FRACBITS*2)
 //					continue;		// skip if the texture is out of screen's range
@@ -219,17 +233,13 @@ void R_RenderMaskedSegRange (drawseg_t *ds, int x1, int x2)
 
 void R_RenderSegLoop (void)
 {
-	angle_t 			angle;
-	unsigned			index;
-	int 				yl;
-	int 				yh;
-	int 				mid;
-	fixed_t 			texturecolumn;
-	int 				top;
-	int 				bottom;
+	int 	yl;
+	int 	yh;
+	fixed_t texturecolumn;
+
+	if (fixedcolormap)
+		dc_colormap = fixedcolormap;
 
-	//texturecolumn = 0;								// shut up compiler warning
-		
 	for ( ; rw_x < rw_stopx ; rw_x++)
 	{
 		// mark floor / ceiling areas
@@ -241,8 +251,8 @@ void R_RenderSegLoop (void)
 		
 		if (markceiling)
 		{
-			top = ceilingclip[rw_x]+1;
-			bottom = yl-1;
+			int top = ceilingclip[rw_x]+1;
+			int bottom = yl-1;
 
 			if (bottom >= floorclip[rw_x])
 				bottom = floorclip[rw_x]-1;
@@ -261,8 +271,8 @@ void R_RenderSegLoop (void)
 
 		if (markfloor)
 		{
-			top = yh+1;
-			bottom = floorclip[rw_x]-1;
+			int top = yh+1;
+			int bottom = floorclip[rw_x]-1;
 			if (top <= ceilingclip[rw_x])
 				top = ceilingclip[rw_x]+1;
 			if (top <= bottom)
@@ -276,16 +286,19 @@ void R_RenderSegLoop (void)
 		if (segtextured)
 		{
 			// calculate texture offset
-			angle = (rw_centerangle + xtoviewangle[rw_x])>>ANGLETOFINESHIFT;
-			texturecolumn = rw_offset-FixedMul(finetangent[angle],rw_distance);
+			texturecolumn = rw_offset-FixedMul(finetangent[(rw_centerangle + xtoviewangle[rw_x])>>ANGLETOFINESHIFT],rw_distance);
 			texturecolumn >>= FRACBITS;
-			// calculate lighting
-			index = rw_scale>>LIGHTSCALESHIFT;
 
-			if (index >=  MAXLIGHTSCALE )
-				index = MAXLIGHTSCALE-1;
+			if (!fixedcolormap) {
+				// calculate lighting
+				unsigned index = (rw_scale*lightscalexmul)>>LIGHTSCALESHIFT;
+
+				if (index >= MAXLIGHTSCALE)
+					index = MAXLIGHTSCALE-1;
+
+				dc_colormap = walllights[index] + basecolormap;	// [RH] add basecolormap
+			}
 
-			dc_colormap = walllights[index];
 			dc_x = rw_x;
 			dc_iscale = 0xffffffffu / (unsigned)rw_scale;
 		}
@@ -308,7 +321,7 @@ void R_RenderSegLoop (void)
 			if (toptexture)
 			{
 				// top wall
-				mid = pixhigh>>HEIGHTBITS;
+				int mid = pixhigh>>HEIGHTBITS;
 				pixhigh += pixhighstep;
 
 				if (mid >= floorclip[rw_x])
@@ -336,7 +349,7 @@ void R_RenderSegLoop (void)
 			if (bottomtexture)
 			{
 				// bottom wall
-				mid = (pixlow+HEIGHTUNIT-1)>>HEIGHTBITS;
+				int mid = (pixlow+HEIGHTUNIT-1)>>HEIGHTBITS;
 				pixlow += pixlowstep;
 
 				// no space above wall?
@@ -411,7 +424,7 @@ void R_StoreWallRange (int start, int stop)
 	angle_t 			distangle, offsetangle;
 	fixed_t 			vtop;
 	int 				lightnum;
-				
+
 #ifdef RANGECHECK
 	if (start >=viewwidth || start > stop)
 		I_Error ("Bad R_RenderWallRange: %i to %i", start , stop);
@@ -419,11 +432,11 @@ void R_StoreWallRange (int start, int stop)
 
 	// don't overflow and crash
 	if (ds_p == &drawsegs[MaxDrawSegs]) {
-		unsigned pos = ds_p - drawsegs;
 		// [RH] Grab some more drawsegs
-		MaxDrawSegs = MaxDrawSegs ? MaxDrawSegs*2 : 32;
-		drawsegs = Realloc (drawsegs, MaxDrawSegs * sizeof(drawseg_t));
-		ds_p = drawsegs + pos;
+		size_t newdrawsegs = MaxDrawSegs ? MaxDrawSegs*2 : 32;
+		drawsegs = Realloc (drawsegs, newdrawsegs * sizeof(drawseg_t));
+		ds_p = drawsegs + MaxDrawSegs;
+		MaxDrawSegs = newdrawsegs;
 		DPrintf ("MaxDrawSegs increased to %d\n", MaxDrawSegs);
 	}
 	
@@ -441,18 +454,18 @@ void R_StoreWallRange (int start, int stop)
 		offsetangle = ANG90;
 
 	distangle = ANG90 - offsetangle;
-	hyp = R_PointToDist (curline->v1->x, curline->v1->y);
+	hyp = (viewx == curline->v1->x && viewy == curline->v1->y) ?
+		0 : R_PointToDist (curline->v1->x, curline->v1->y);
 	sineval = finesine[distangle>>ANGLETOFINESHIFT];
 	rw_distance = FixedMul (hyp, sineval);
-				
-		
+
 	ds_p->x1 = rw_x = start;
 	ds_p->x2 = stop;
 	ds_p->curline = curline;
 	rw_stopx = stop+1;
-	
+
 	{	// killough 1/6/98, 2/1/98: remove limit on openings
-		size_t pos = lastopening - openings;
+		ptrdiff_t pos = lastopening - openings;
 		size_t need = (rw_stopx - start)*4 + pos;
 
 		if (need > maxopenings)
@@ -464,7 +477,7 @@ void R_StoreWallRange (int start, int stop)
 			do
 				maxopenings = maxopenings ? maxopenings*2 : 16384;
 			while (need > maxopenings);
-			openings = Realloc(openings, maxopenings * sizeof(*openings));
+			openings = Realloc (openings, maxopenings * sizeof(*openings));
 			lastopening = openings + pos;
 			DPrintf ("MaxOpenings increased to %u\n", maxopenings);
 
@@ -485,7 +498,7 @@ void R_StoreWallRange (int start, int stop)
 	ds_p->scale1 = rw_scale = 
 		R_ScaleFromGlobalAngle (viewangle + xtoviewangle[start]);
 	
-	if (stop > start )
+	if (stop > start)
 	{
 		ds_p->scale2 = R_ScaleFromGlobalAngle (viewangle + xtoviewangle[stop]);
 		ds_p->scalestep = rw_scalestep = 
@@ -612,16 +625,14 @@ void R_StoreWallRange (int start, int stop)
 		worldlow = backsector->floorheight - viewz;
 				
 		// hack to allow height changes in outdoor areas
-		if (frontsector->ceilingpic == skyflatnum 
-			&& backsector->ceilingpic == skyflatnum)
+		if (frontsector->ceilingpic == skyflatnum && backsector->ceilingpic == skyflatnum)
 		{
 			worldtop = worldhigh;
 		}
-		
-						
+								
 		markfloor = worldlow != worldbottom
-			|| backsector->floorpic != frontsector->floorpic
 			|| backsector->lightlevel != frontsector->lightlevel
+			|| backsector->floorpic != frontsector->floorpic
 
 			// killough 3/7/98: Add checks for (x,y) offsets
 			|| backsector->floor_xoffs != frontsector->floor_xoffs
@@ -633,11 +644,14 @@ void R_StoreWallRange (int start, int stop)
 
 			// killough 4/17/98: draw floors if different light levels
 			|| backsector->floorlightsec != frontsector->floorlightsec
+
+			// [RH] Add checks for colormaps
+			|| backsector->colormap != frontsector->colormap
 			;
 
 		markceiling = worldhigh != worldtop
-			|| backsector->ceilingpic != frontsector->ceilingpic
 			|| backsector->lightlevel != frontsector->lightlevel
+			|| backsector->ceilingpic != frontsector->ceilingpic
 
 			// killough 3/7/98: Add checks for (x,y) offsets
 			|| backsector->ceiling_xoffs != frontsector->ceiling_xoffs
@@ -650,6 +664,9 @@ void R_StoreWallRange (int start, int stop)
 
 			// killough 4/17/98: draw ceilings if different light levels
 			|| backsector->ceilinglightsec != frontsector->ceilinglightsec
+
+			// [RH] Add check for colormaps
+			|| backsector->colormap != frontsector->colormap
 			;
 
 		if (backsector->ceilingheight <= frontsector->floorheight
@@ -773,8 +790,7 @@ void R_StoreWallRange (int start, int stop)
 	// if a floor / ceiling plane is on the wrong side
 	//	of the view plane, it is definitely invisible
 	//	and doesn't need to be marked.
-	
-  
+
 	// killough 3/7/98: add deep water check
 	if (frontsector->heightsec == -1)
 	{
@@ -814,17 +830,19 @@ void R_StoreWallRange (int start, int stop)
 	}
 	
 	// render it
-	if (markceiling)
+	if (markceiling) {
 	    if (ceilingplane)	// killough 4/11/98: add NULL ptr checks
 			ceilingplane = R_CheckPlane (ceilingplane, rw_x, rw_stopx-1);
 		else
 			markceiling = 0;
+	}
 	
-	if (markfloor)
+	if (markfloor) {
 	    if (floorplane)		// killough 4/11/98: add NULL ptr checks
 			floorplane = R_CheckPlane (floorplane, rw_x, rw_stopx-1);
 		else
 			markfloor = 0;
+	}
 
 	R_RenderSegLoop ();
 
diff --git a/code/R_sky.c b/code/R_sky.c
index 13328a0e98..42837a8d19 100644
--- a/code/R_sky.c
+++ b/code/R_sky.c
@@ -74,7 +74,7 @@ void R_InitSkyMap (cvar_t *var)
 		sky1texturemid = 200/2*FRACUNIT;
 		sky1stretch = (var->value && !(dmflags & DF_NO_FREELOOK)) ? 1 : 0;
 	} else {
-		sky1texturemid = 240/2*FRACUNIT;
+		sky1texturemid = 200*FRACUNIT;
 		sky1stretch = 0;
 	}
 	sky1height = textureheight[sky1texture] << sky1stretch;
@@ -83,18 +83,19 @@ void R_InitSkyMap (cvar_t *var)
 		sky2texturemid = 200/2*FRACUNIT;
 		sky2stretch = (var->value && !(dmflags & DF_NO_FREELOOK)) ? 1 : 0;
 	} else {
-		sky2texturemid = 240/2*FRACUNIT;
+		sky2texturemid = 200*FRACUNIT;
 		sky2stretch = 0;
 	}
 	sky2height = textureheight[sky2texture] << sky2stretch;
-	if (viewwidth && viewheight) {
-		sky1iscale = (sky1texturemid << 1) / (((freelookviewheight<<detailxshift) * viewwidth) / (viewwidth<<detailxshift));
-		sky1scale = ((((freelookviewheight<<detailxshift) * viewwidth) / (viewwidth<<detailxshift)) << FRACBITS) /
-					(sky1texturemid>>(FRACBITS-1));
 
-		sky2iscale = (sky2texturemid << FRACBITS) / (((viewheight<<detailxshift) * viewwidth) / (viewwidth<<detailxshift));
-		sky2scale = ((((viewheight<<detailxshift) * viewwidth) / (viewwidth<<detailxshift)) << FRACBITS) /
-					(sky2texturemid>>(FRACBITS-1));
+	if (viewwidth && viewheight) {
+		sky1iscale = (200*FRACUNIT) / (((freelookviewheight<<detailxshift) * viewwidth) / (viewwidth<<detailxshift));
+		sky1scale = ((((freelookviewheight<<detailxshift) * viewwidth) / (viewwidth<<detailxshift)) << FRACBITS) /
+					(200);
+
+		sky2iscale = (200*FRACUNIT) / (((viewheight<<detailxshift) * viewwidth) / (viewwidth<<detailxshift));
+		sky2scale = ((((freelookviewheight<<detailxshift) * viewwidth) / (viewwidth<<detailxshift)) << FRACBITS) /
+					(200);
 	}
 }
 
diff --git a/code/R_things.c b/code/R_things.c
index 73440c63bf..c8f4a7374a 100644
--- a/code/R_things.c
+++ b/code/R_things.c
@@ -46,6 +46,9 @@
 
 #include "v_video.h"
 
+#include "cmdlib.h"
+#include "s_sound.h"
+
 
 
 #define MINZ							(FRACUNIT*4)
@@ -58,19 +61,6 @@ cvar_t *crosshair;
 cvar_t *r_drawfuzz;
 
 
-typedef struct
-{
-	int 		x1;
-	int 		x2;
-		
-	int 		column;
-	int 		topclip;
-	int 		bottomclip;
-
-} maskdraw_t;
-
-
-
 //
 // Sprite rotation 0 is facing the viewer,
 //	rotation 1 is one angle turn CLOCKWISE around the axis.
@@ -80,11 +70,11 @@ typedef struct
 //
 fixed_t 		pspritescale;
 fixed_t 		pspriteiscale;
-fixed_t			pspriteyscale;		// [RH] Aspect ratio handling (from doom3)
+fixed_t			pspriteyscale;		// [RH] Aspect ratio handling (from doom legacy)
 fixed_t			sky1scale;			// [RH] Sky 1 scale factor
 fixed_t			sky2scale;			// [RH] Sky 2 scale factor
 
-lighttable_t**	spritelights;
+int*			spritelights;		// [RH] Changed from lighttable_t** to int*
 
 // constant arrays
 //	used for psprite clipping and initializing clipping
@@ -109,6 +99,9 @@ spriteframe_t	sprtemp[MAX_SPRITE_FRAMES];
 int 			maxframe;
 char*			spritename;
 
+// [RH] skin globals
+playerskin_t	*skins;
+size_t			numskins;
 
 
 //
@@ -118,11 +111,20 @@ char*			spritename;
 // [RH] Removed checks for coexistance of rotation 0 with other
 //		rotations and made it look more like BOOM's version.
 //
-void R_InstallSpriteLump (int lump, unsigned frame, unsigned rotation, BOOL flipped)
+static void R_InstallSpriteLump (int lump, unsigned frame, unsigned rotation, BOOL flipped)
 {
+	// [RH] Record the sprite's width, offset, and topoffset here
+	//		instead of in R_InitSpriteLumps().
+	patch_t *patch;
+
 	if (frame >= MAX_SPRITE_FRAMES || rotation > 8)
-		I_Error("R_InstallSpriteLump: Bad frame characters in lump %i", lump);
-		
+		I_FatalError ("R_InstallSpriteLump: Bad frame characters in lump %i", lump);
+
+	patch = W_CacheLumpNum (lump, PU_CACHE);
+
+	if (!(lump & 127))
+		Printf (".");	// [RH] Print ticker
+
 	if ((int)frame > maxframe)
 		maxframe = frame;
 				
@@ -134,19 +136,78 @@ void R_InstallSpriteLump (int lump, unsigned frame, unsigned rotation, BOOL flip
 
 		for (r = 7; r >= 0; r--)
 			if (sprtemp[frame].lump[r] == -1) {
-				sprtemp[frame].lump[r] = (short)(lump - firstspritelump);
+				sprtemp[frame].lump[r] = (short)(lump);
 				sprtemp[frame].flip[r] = (byte)flipped;
 				sprtemp[frame].rotate = false;
+
+				// [RH] Need to set these, too.
+				sprtemp[frame].width[r] = SHORT(patch->width)<<FRACBITS;
+				sprtemp[frame].offset[r] = SHORT(patch->leftoffset)<<FRACBITS;
+				sprtemp[frame].topoffset[r] = SHORT(patch->topoffset)<<FRACBITS;
 			}
 	} else if (sprtemp[frame].lump[--rotation] == -1) {
 		// the lump is only used for one rotation
-		sprtemp[frame].lump[rotation] = (short)(lump - firstspritelump);
+		sprtemp[frame].lump[rotation] = (short)(lump);
 		sprtemp[frame].flip[rotation] = (byte)flipped;
 		sprtemp[frame].rotate = true;
+
+		// [RH] Need to set these, too.
+		sprtemp[frame].width[rotation] = SHORT(patch->width)<<FRACBITS;
+		sprtemp[frame].offset[rotation] = SHORT(patch->leftoffset)<<FRACBITS;
+		sprtemp[frame].topoffset[rotation] = SHORT(patch->topoffset)<<FRACBITS;
 	}
 }
 
 
+// [RH] Seperated out of R_InitSpriteDefs()
+static void R_InstallSprite (const char *name, int num)
+{
+	char sprname[5];
+	int frame;
+
+	if (maxframe == -1) {
+		sprites[num].numframes = 0;
+		return;
+	}
+
+	strncpy (sprname, name, 4);
+	sprname[4] = 0;
+
+	maxframe++;
+	
+	for (frame = 0 ; frame < maxframe ; frame++)
+	{
+		switch ((int)sprtemp[frame].rotate)
+		{
+		  case -1:
+			// no rotations were found for that frame at all
+			I_FatalError ("R_InstallSprite: No patches found for %s frame %c", sprname, frame+'A');
+			break;
+			
+		  case 0:
+			// only the first rotation is needed
+			break;
+					
+		  case 1:
+			// must have all 8 frames
+			{
+				int rotation;
+
+				for (rotation = 0; rotation < 8; rotation++)
+					if (sprtemp[frame].lump[rotation] == -1)
+						I_FatalError ("R_InstallSprite: Sprite %s frame %c is missing rotations",
+									  sprname, frame+'A');
+			}
+			break;
+		}
+	}
+	
+	// allocate space for the frames present and copy sprtemp to it
+	sprites[num].numframes = maxframe;
+	sprites[num].spriteframes = 
+		Z_Malloc (maxframe * sizeof(spriteframe_t), PU_STATIC, NULL);
+	memcpy (sprites[num].spriteframes, sprtemp, maxframe * sizeof(spriteframe_t));
+}
 
 
 //
@@ -164,21 +225,25 @@ void R_InstallSpriteLump (int lump, unsigned frame, unsigned rotation, BOOL flip
 //	letter/number appended.
 // The rotation character can be 0 to signify no rotations.
 //
-void R_InitSpriteDefs (char** namelist) 
+void R_InitSpriteDefs (char **namelist) 
 { 
-	int			i;
-	int 		l;
-	int 		intname;
-	int 		start;
-	int 		end;
+	int i;
+	int l;
+	int intname;
+	int start;
+	int end;
+	int realsprites;
 				
 	// count the number of sprite names
 	for (numsprites = 0; namelist[numsprites]; numsprites++)
 		;
+	// [RH] include skins in the count
+	realsprites = numsprites;
+	numsprites += numskins - 1;
 		
 	if (!numsprites)
 		return;
-				
+
 	sprites = Z_Malloc (numsprites * sizeof(*sprites), PU_STATIC, NULL);
 		
 	start = firstspritelump - 1;
@@ -187,7 +252,7 @@ void R_InitSpriteDefs (char** namelist)
 	// scan all the lump names for each of the names,
 	//	noting the highest frame letter.
 	// Just compare 4 characters as ints
-	for (i = 0; i < numsprites; i++)
+	for (i = 0; i < realsprites; i++)
 	{
 		spritename = namelist[i];
 		memset (sprtemp, -1, sizeof(sprtemp));
@@ -214,59 +279,213 @@ void R_InitSpriteDefs (char** namelist)
 			}
 		}
 		
-		// check the frames that were found for completeness
-		if (maxframe == -1)
-		{
-			sprites[i].numframes = 0;
+		R_InstallSprite (namelist[i], i);
+	}
+}
+
+// [RH]
+// R_InitSkins
+// Reads in everything applicable to a skin. The skins should have already
+// been counted and had their identifiers assigned to namespaces.
+//
+static const char *skinsoundnames[8][2] = {
+	"dsplpain",	NULL,
+	"dspldeth",	NULL,
+	"dspdiehi",	"xdeath1",
+	"dsoof",	"land1",
+	"dsnoway",	"grunt1",
+	"dsslop",	"gibbed",
+	"dspunch",	"fist",
+	"dsjump",	"jump1",
+};
+
+static char facenames[7][8] = {
+	"xxxTR", "xxxTL", "xxxOUCH", "xxxEVL", "xxxKILL", "xxxGOD0", "xxxDEAD0"
+};
+static const int facelens[7] = {
+	5, 5, 7, 6, 7, 7, 8
+};
+
+void R_InitSkins (void)
+{
+	char sndname[128];
+	int sndlumps[8];
+	char key[10];
+	int intname;
+	size_t i;
+	int j, k, base;
+	int stop;
+	char *def;
+
+	key[9] = 0;
+
+	for (i = 1; i < numskins; i++) {
+		for (j = 0; j < 8; j++)
+			sndlumps[j] = -1;
+		base = (W_CheckNumForName) ("S_SKIN", skins[i].namespc);
+		// The player sprite has 23 frames. This means that the S_SKIN
+		// marker needs a minimum of 23 lumps after it (probably more).
+		if (base >= numlumps - 23 || base == -1)
 			continue;
-		}
-				
-		maxframe++;
-		
-		{
-			int frame;
+		def = W_CacheLumpNum (base, PU_CACHE);
+		intname = 0;
 
-			for (frame = 0 ; frame < maxframe ; frame++)
-			{
-				switch ((int)sprtemp[frame].rotate)
-				{
-				  case -1:
-					// no rotations were found for that frame at all
-					I_Error ("R_InitSprites: No patches found "
-							 "for %s frame %c", namelist[i], frame+'A');
-					break;
-					
-				  case 0:
-					// only the first rotation is needed
-					break;
-							
-				  case 1:
-					// must have all 8 frames
-					{
-						int rotation;
-
-						for (rotation=0 ; rotation<8 ; rotation++)
-							if (sprtemp[frame].lump[rotation] == -1)
-								I_Error ("R_InitSprites: Sprite %s frame %c "
-										 "is missing rotations",
-										 namelist[i], frame+'A');
+		// Data is stored as "key = data". Don't see why the =
+		// is necessary, but that's the way the Doom Legacy
+		// guys decided to do it.
+		while (def = COM_Parse (def)) {
+			strncpy (key, com_token, 9);
+			def = COM_Parse (def);
+			if (com_token[0] != '=') {
+				Printf ("Bad format for skin %d: %s %s", i, key, com_token);
+				break;
+			}
+			def = COM_Parse (def);
+			if (!stricmp (key, "name")) {
+				strncpy (skins[i].name, com_token, 16);
+			} else if (!stricmp (key, "sprite")) {
+				for (j = 3; j >= 0; j--)
+					com_token[j] = toupper (com_token[j]);
+				intname = *((int *)com_token);
+			} else if (!stricmp (key, "face")) {
+				for (j = 2; j >= 0; j--)
+					skins[i].face[j] = toupper (com_token[j]);
+			} else {
+				for (j = 0; j < 8; j++) {
+					if (!stricmp (key, skinsoundnames[j][0])) {
+						// Can't use W_CheckNumForName because skin sounds
+						// haven't been assigned a namespace yet.
+						for (k = base + 1; k < numlumps &&
+										   lumpinfo[k].handle == lumpinfo[base].handle; k++) {
+							if (!strnicmp (com_token, lumpinfo[k].name, 8)) {
+								W_SetLumpNamespace (k, skins[i].namespc);
+								sndlumps[j] = k;
+								break;
+							}
+						}
+						if (sndlumps[j] == -1) {
+							// Replacement not found, try finding it in the global namespace
+							sndlumps[j] = S_FindSoundByLump (W_CheckNumForName (com_token));
+						}
+						break;
 					}
-					break;
+				}
+				//if (j == 8)
+				//	Printf ("Funny info for skin %i: %s = %s\n", i, key, com_token);
+			}
+		}
+
+		if (skins[i].name[0] == 0)
+			sprintf (skins[i].name, "skin%i", i);
+
+		// Register any sounds this skin provides
+		for (j = 0; j < 8; j++) {
+			if (sndlumps[j] != -1) {
+				if (j > 1) {
+					sprintf (sndname, "player/%s/%s", skins[i].name, skinsoundnames[j][1]);
+					S_AddSoundLump (sndname, sndlumps[j]);
+				} else if (j == 1) {
+					int r;
+
+					for (r = 1; r <= 4; r++) {
+						sprintf (sndname, "player/%s/death%d", skins[i].name, r);
+						S_AddSoundLump (sndname, sndlumps[j]);
+					}
+				} else {	// j == 0
+					int l, r;
+
+					for (l =  1; l <= 4; l++)
+						for (r = 1; r <= 2; r++) {
+							sprintf (sndname, "player/%s/pain%d_%d", skins[i].name, l*25, r);
+							S_AddSoundLump (sndname, sndlumps[j]);
+						}
 				}
 			}
 		}
-		
-		// allocate space for the frames present and copy sprtemp to it
-		sprites[i].numframes = maxframe;
-		sprites[i].spriteframes = 
-			Z_Malloc (maxframe * sizeof(spriteframe_t), PU_STATIC, NULL);
-		memcpy (sprites[i].spriteframes, sprtemp, maxframe*sizeof(spriteframe_t));
-	}
 
+		// Now collect the sprite frames for this skin. If the sprite name was not
+		// specified, use whatever immediately follows the specifier lump.
+		if (intname == 0) {
+			intname = *(int *)(lumpinfo[base+1].name);
+			for (stop = base + 2; stop < numlumps &&
+								  lumpinfo[stop].handle == lumpinfo[base].handle &&
+								  *(int *)lumpinfo[stop].name == intname; stop++)
+				;
+		} else {
+			stop = numlumps;
+		}
+
+		memset (sprtemp, -1, sizeof(sprtemp));
+		maxframe = -1;
+
+		for (k = base + 1;
+			 k < stop && lumpinfo[k].handle == lumpinfo[base].handle;
+			 k++) {
+			if (*(int *)lumpinfo[k].name == intname)
+			{
+
+				R_InstallSpriteLump (k, 
+									 lumpinfo[k].name[4] - 'A',
+									 lumpinfo[k].name[5] - '0',
+									 false);
+
+				if (lumpinfo[k].name[6])
+					R_InstallSpriteLump (k,
+									 lumpinfo[k].name[6] - 'A',
+									 lumpinfo[k].name[7] - '0',
+									 true);
+
+				W_SetLumpNamespace (k, skins[i].namespc);
+			}
+		}
+		R_InstallSprite ((char *)&intname, (skins[i].sprite = numsprites - numskins + i));
+
+		// Now go back and check for face graphics (if necessary)
+		if (skins[i].face[0] == 0 || skins[i].face[1] == 0 || skins[i].face[2] == 0) {
+			// No face name specified, so this skin doesn't replace it
+			skins[i].face[0] = 0;
+		} else {
+			// Need to go through and find all face graphics for the skin
+			// and assign them to the skin's namespace.
+			for (j = 0; j < 7; j++)
+				strncpy (facenames[j], skins[i].face, 3);
+
+			for (k = base + 1;
+				 k < numlumps && lumpinfo[k].handle == lumpinfo[base].handle;
+				 k++) {
+				for (j = 0; j < 7; j++)
+					if (!strncmp (facenames[j], lumpinfo[k].name, facelens[j])) {
+						W_SetLumpNamespace (k, skins[i].namespc);
+						break;
+					}
+			}
+		}
+	}
+	// Grrk. May have changed sound table. Fix it.
+	if (numskins > 1)
+		S_HashSounds ();
 }
 
+// [RH] Find a skin by name
+int R_FindSkin (char *name)
+{
+	int i;
 
+	for (i = 0; i < numskins; i++)
+		if (!strnicmp (skins[i].name, name, 16))
+			return i;
 
+	return 0;
+}
+
+// [RH] List the names of all installed skins
+void Cmd_Skins (player_t *plyr, int argc, char **argv)
+{
+	int i;
+
+	for (i = 0; i < numskins; i++)
+		Printf ("% 3d %s\n", i, skins[i].name);
+}
 
 //
 // GAME FUNCTIONS
@@ -283,13 +502,48 @@ int 			newvissprite;
 // R_InitSprites
 // Called at program start.
 //
-void R_InitSprites (char** namelist)
+void R_InitSprites (char **namelist)
 {
+	int i;
+
 	MaxVisSprites = 128;	// [RH] This is the initial default value. It grows as needed.
 	vissprites = Malloc (MaxVisSprites * sizeof(vissprite_t));
 	lastvissprite = &vissprites[MaxVisSprites];
 
+	// [RH] Count the number of skins, rename each S_SKIN?? identifier
+	//		to just S_SKIN, and assign it a unique namespace.
+	for (i = 0; i < numlumps; i++) {
+		if (!strncmp (lumpinfo[i].name, "S_SKIN", 6)) {
+			numskins++;
+			lumpinfo[i].name[6] = lumpinfo[i].name[7] = 0;
+			W_SetLumpNamespace (i, ns_skinbase + numskins);
+		}
+	}
+
+	// [RH] We always have a default "base" skin.
+	numskins++;
+
+	// [RH] We may have just renamed some lumps, so we need to create the
+	//		hash chains again.
+	W_InitHashChains ();
+
+	// [RH] Do some preliminary setup
+	skins = Z_Malloc (sizeof(*skins) * numskins, PU_STATIC, 0);
+	memset (skins, 0, sizeof(*skins) * numskins);
+	for (i = 1; i < numskins; i++) {
+		skins[i].namespc = i + ns_skinbase;
+	}
+
 	R_InitSpriteDefs (namelist);
+	R_InitSkins ();		// [RH] Finish loading skin data
+
+	// [RH] Set up base skin
+	strcpy (skins[0].name, "Base");
+	skins[0].face[0] = 'S';
+	skins[0].face[1] = 'T';
+	skins[0].face[2] = 'F';
+	skins[0].sprite = SPR_PLAY;
+	skins[0].namespc = ns_global;
 }
 
 
@@ -307,12 +561,12 @@ void R_ClearSprites (void)
 //
 // R_NewVisSprite
 //
-vissprite_t* R_NewVisSprite (void)
+vissprite_t *R_NewVisSprite (void)
 {
 	if (vissprite_p == lastvissprite) {
 		int prevvisspritenum = vissprite_p - vissprites;
 
-		MaxVisSprites += 64;
+		MaxVisSprites *= 2;
 		vissprites = Realloc (vissprites, MaxVisSprites * sizeof(vissprite_t));
 		lastvissprite = &vissprites[MaxVisSprites];
 		vissprite_p = &vissprites[prevvisspritenum];
@@ -324,7 +578,6 @@ vissprite_t* R_NewVisSprite (void)
 }
 
 
-
 //
 // R_DrawMaskedColumn
 // Used for sprites and masked mid textures.
@@ -391,20 +644,18 @@ void R_DrawVisSprite (vissprite_t *vis, int x1, int x2)
 	// [RH] Tutti-Frutti fix (also allows sprites up to 256 pixels tall)
 	dc_mask = 0xff;
 		
-	patch = W_CacheLumpNum (vis->patch+firstspritelump, PU_CACHE);
+	patch = W_CacheLumpNum (vis->patch, PU_CACHE);
 
 	dc_colormap = vis->colormap;
 	
-	if (!dc_colormap)
+	if (vis->mobjflags & MF_SHADOW)
 	{
 		// NULL colormap = shadow draw
-		if (!r_drawfuzz->value && TransTable) {
-			dc_colormap = DefaultPalette->maps.colormaps;
-			colfunc = lucentcolfunc;
-			dc_transmap = TransTable + 65536;
-		} else {
-			colfunc = fuzzcolfunc;
-		}
+		// [RH] I use MF_SHADOW to recognize fuzz effect now instead of
+		//		a NULL colormap. This allow proper substition of
+		//		MF_TRANSLUC25 with light levels if desired.
+		dc_transmap = TransTable + 65536;	// Just in case
+		colfunc = r_drawfuzz->value ? fuzzcolfunc : lucentcolfunc;
 	}
 	else if (vis->palette)
 	{
@@ -425,6 +676,10 @@ void R_DrawVisSprite (vissprite_t *vis, int x1, int x2)
 		colfunc = lucentcolfunc;
 		dc_transmap = TransTable + ((vis->mobjflags & MF_TRANSLUCBITS) >> (MF_TRANSLUCSHIFT - 16));
 	}
+	else
+	{
+		colfunc = basecolfunc;
+	}
 		
 	//dc_iscale = abs(vis->xiscale)>>detailshift;
 	dc_iscale = FixedDiv (FRACUNIT, vis->scale);	// [RH] from Doom Legacy
@@ -459,7 +714,7 @@ void R_DrawVisSprite (vissprite_t *vis, int x1, int x2)
 // Generates a vissprite for a thing
 //	if it might be visible.
 //
-void R_ProjectSprite (mobj_t* thing)
+void R_ProjectSprite (mobj_t *thing)
 {
 	fixed_t 			tr_x;
 	fixed_t 			tr_y;
@@ -495,7 +750,7 @@ void R_ProjectSprite (mobj_t* thing)
 
 
 	// [RH] Andy Baker's stealth monsters
-	if (thing->invisible == true)
+	if (thing->flags2 & MF2_INVISIBLE)
 		return;
 
 	// transform the origin point
@@ -550,26 +805,26 @@ void R_ProjectSprite (mobj_t* thing)
 	else
 	{
 		// use single rotation for all views
-		lump = sprframe->lump[0];
+		lump = sprframe->lump[rot = 0];
 		flip = (BOOL)sprframe->flip[0];
 	}
 	
 	// calculate edges of the shape
-	tx -= spriteoffset[lump];	
+	tx -= sprframe->offset[rot];	// [RH] Moved out of spriteoffset[]
 	x1 = (centerxfrac + FixedMul (tx,xscale) ) >>FRACBITS;
 
 	// off the right side?
 	if (x1 > viewwidth)
 		return;
 	
-	tx +=  spritewidth[lump];
+	tx += sprframe->width[rot];	// [RH] Moved out of spritewidth[]
 	x2 = ((centerxfrac + FixedMul (tx,xscale) ) >>FRACBITS) - 1;
 
 	// off the left side
 	if (x2 < 0)
 		return;
 
-	gzt = thing->z + spritetopoffset[lump];
+	gzt = thing->z + sprframe->topoffset[rot];	// [RH] Moved out of spritetopoffset[]
 
 	// killough 4/9/98: clip things which are out of view due to height
 // [RH] This doesn't work too well with freelook
@@ -585,7 +840,7 @@ void R_ProjectSprite (mobj_t* thing)
 
 	if (heightsec != -1)	// only clip things which are in special sectors
 	{
-		int phs = viewplayer->mo->subsector->sector->heightsec;
+		int phs = camera->subsector->sector->heightsec;
 
 		if (phs != -1 && viewz < sectors[phs].floorheight ?
 			thing->z >= sectors[heightsec].floorheight :
@@ -618,7 +873,7 @@ void R_ProjectSprite (mobj_t* thing)
 
 	if (flip)
 	{
-		vis->startfrac = spritewidth[lump]-1;
+		vis->startfrac = sprframe->width[rot]-1;	// [RH] Moved out of spritewidth
 		vis->xiscale = -iscale;
 	}
 	else
@@ -632,12 +887,7 @@ void R_ProjectSprite (mobj_t* thing)
 	vis->patch = lump;
 	
 	// get light level
-	if (thing->flags & MF_SHADOW)
-	{
-		// shadow draw
-		vis->colormap = NULL;
-	}
-	else if (fixedcolormap)
+	if (fixedcolormap)
 	{
 		// fixed map
 		vis->colormap = fixedcolormap;
@@ -645,29 +895,26 @@ void R_ProjectSprite (mobj_t* thing)
 	else if (thing->frame & FF_FULLBRIGHT)
 	{
 		// full bright
-		vis->colormap = DefaultPalette->maps.colormaps;
+		vis->colormap = basecolormap;	// [RH] Use basecolormap
 	}
-	
 	else
 	{
 		// diminished light
-		index = xscale>>LIGHTSCALESHIFT;
+		index = (xscale*lightscalexmul)>>LIGHTSCALESHIFT;	// [RH]
 
 		if (index >= MAXLIGHTSCALE) 
 			index = MAXLIGHTSCALE-1;
 
-		vis->colormap = spritelights[index];
+		vis->colormap = spritelights[index] + basecolormap;	// [RH] Use basecolormap
 	}	
 }
 
 
-
-
 //
 // R_AddSprites
 // During BSP traversal, this adds sprites by sector.
 //
-void R_AddSprites (sector_t* sec)
+void R_AddSprites (sector_t *sec)
 {
 	mobj_t *thing;
 	int 	lightnum;
@@ -722,7 +969,7 @@ void R_DrawPSprite (pspdef_t* psp, unsigned flags)
 	sprdef = &sprites[psp->state->sprite];
 #ifdef RANGECHECK
 	if ( (psp->state->frame & FF_FRAMEMASK)  >= sprdef->numframes) {
-		DPrintf ("R_ProjectSprite: invalid sprite frame %i : %i\n", psp->state->sprite, psp->state->frame);
+		DPrintf ("R_DrawPSprite: invalid sprite frame %i : %i\n", psp->state->sprite, psp->state->frame);
 		return;
 	}
 #endif
@@ -734,14 +981,14 @@ void R_DrawPSprite (pspdef_t* psp, unsigned flags)
 	// calculate edges of the shape
 	tx = psp->sx-((320/2)<<FRACBITS);
 		
-	tx -= spriteoffset[lump];	
+	tx -= sprframe->offset[0];	// [RH] Moved out of spriteoffset[]
 	x1 = (centerxfrac + FixedMul (tx,pspritescale) ) >>FRACBITS;
 
 	// off the right side
 	if (x1 > viewwidth)
 		return; 		
 
-	tx +=  spritewidth[lump];
+	tx += sprframe->width[0];	// [RH] Moved out of spritewidth[]
 	x2 = ((centerxfrac + FixedMul (tx, pspritescale) ) >>FRACBITS) - 1;
 
 	// off the left side
@@ -751,7 +998,8 @@ void R_DrawPSprite (pspdef_t* psp, unsigned flags)
 	// store information in a vissprite
 	vis = &avis;
 	vis->mobjflags = flags;
-	vis->texturemid = (BASEYCENTER<<FRACBITS)+FRACUNIT/2-(psp->sy-spritetopoffset[lump]);
+	vis->texturemid = (BASEYCENTER<<FRACBITS)+FRACUNIT/2-
+		(psp->sy-sprframe->topoffset[0]);	// [RH] Moved out of spritetopoffset[]
 	vis->x1 = x1 < 0 ? 0 : x1;
 	vis->x2 = x2 >= viewwidth ? viewwidth-1 : x2;		
 	vis->scale = pspriteyscale;
@@ -760,7 +1008,7 @@ void R_DrawPSprite (pspdef_t* psp, unsigned flags)
 	if (flip)
 	{
 		vis->xiscale = -pspriteiscale;
-		vis->startfrac = spritewidth[lump]-1;
+		vis->startfrac = sprframe->width[0]-1;	// [RH] Moved out of spritewidth[]
 	}
 	else
 	{
@@ -773,13 +1021,7 @@ void R_DrawPSprite (pspdef_t* psp, unsigned flags)
 
 	vis->patch = lump;
 
-	if (viewplayer->powers[pw_invisibility] > 4*32
-		|| viewplayer->powers[pw_invisibility] & 8)
-	{
-		// shadow draw
-		vis->colormap = NULL;
-	}
-	else if (fixedcolormap)
+	if (fixedcolormap)
 	{
 		// fixed color
 		vis->colormap = fixedcolormap;
@@ -787,12 +1029,19 @@ void R_DrawPSprite (pspdef_t* psp, unsigned flags)
 	else if (psp->state->frame & FF_FULLBRIGHT)
 	{
 		// full bright
-		vis->colormap = DefaultPalette->maps.colormaps;
+		vis->colormap = basecolormap;	// [RH] use basecolormap
 	}
 	else
 	{
 		// local light
-		vis->colormap = spritelights[MAXLIGHTSCALE-1];
+		vis->colormap = spritelights[MAXLIGHTSCALE-1] + basecolormap;	// [RH] add basecolormap
+		if (camera->player &&
+			(camera->player->powers[pw_invisibility] > 4*32
+			 || camera->player->powers[pw_invisibility] & 8))
+		{
+			// shadow draw
+			vis->mobjflags = MF_SHADOW;
+		}
 	}
 		
 	R_DrawVisSprite (vis, vis->x1, vis->x2);
@@ -810,10 +1059,12 @@ void R_DrawPlayerSprites (void)
 	pspdef_t*	psp;
 	
 	if (r_drawplayersprites->value) {
+		// [RH] set basecolormap
+		basecolormap = camera->subsector->sector->colormap->maps;
+
 		// get light level
 		lightnum =
-			(viewplayer->mo->subsector->sector->lightlevel >> LIGHTSEGSHIFT) 
-			+extralight;
+			(camera->subsector->sector->lightlevel >> LIGHTSEGSHIFT) + extralight;
 
 		if (lightnum < 0)				
 			spritelights = scalelight[0];
@@ -834,17 +1085,18 @@ void R_DrawPlayerSprites (void)
 			centeryfrac = centery << FRACBITS;
 
 			// add all active psprites
-			for (i=0, psp=viewplayer->psprites;
-				 i<NUMPSPRITES;
-				 i++,psp++)
-			{
-				if (psp->state) {
-					if (i == 1)
-						R_DrawPSprite (psp, MF_TRANSLUC75);
-					else
-						R_DrawPSprite (psp, 0);
+			if (camera->player)
+				for (i=0, psp=camera->player->psprites;
+					 i<NUMPSPRITES;
+					 i++,psp++)
+				{
+					if (psp->state) {
+						if (i == 1)
+							R_DrawPSprite (psp, MF_TRANSLUC75);
+						else
+							R_DrawPSprite (psp, 0);
+					}
 				}
-			}
 
 			centery = centerhack;
 			centeryfrac = centerhack << FRACBITS;
@@ -902,6 +1154,13 @@ void R_SortVisSprites (void)
 // [RH] Allocated in R_MultiresInit() to
 // SCREENWIDTH entries each.
 short *r_dsclipbot, *r_dscliptop;
+
+// [RH] The original code used -2 to indicate that a sprite was not clipped.
+//		With ZDoom's freelook, it's possible that the rendering process
+//		could actually generate a clip value of -2, and the rendering code
+//		would mistake this to indicate the the sprite wasn't clipped.
+#define NOT_CLIPPED		(-32768)
+
 //
 // R_DrawSprite
 //
@@ -915,7 +1174,7 @@ void R_DrawSprite (vissprite_t* spr)
 	fixed_t 			lowscale;
 
 	for (x = spr->x1 ; x<=spr->x2 ; x++)
-		r_dsclipbot[x] = r_dscliptop[x] = -2;
+		r_dsclipbot[x] = r_dscliptop[x] = NOT_CLIPPED;
 	
 	// Scan drawsegs from end to start for obscuring segs.
 	// The first drawseg that has a greater scale is the clip seg.
@@ -968,13 +1227,13 @@ void R_DrawSprite (vissprite_t* spr)
 
 		if (ds->silhouette&SIL_BOTTOM && spr->gz < ds->bsilheight) //bottom sil
 			for (x=r1 ; x<=r2 ; x++)
-				if (r_dsclipbot[x] == -2)
+				if (r_dsclipbot[x] == NOT_CLIPPED)
 					r_dsclipbot[x] = ds->sprbottomclip[x];
 
 		if (ds->silhouette&SIL_TOP && spr->gzt > ds->tsilheight)   // top sil
 			for (x=r1 ; x<=r2 ; x++)
-			if (r_dscliptop[x] == -2)
-				r_dscliptop[x] = ds->sprtopclip[x];
+				if (r_dscliptop[x] == NOT_CLIPPED)
+					r_dscliptop[x] = ds->sprtopclip[x];
 	}
 
 	// killough 3/27/98:
@@ -985,20 +1244,24 @@ void R_DrawSprite (vissprite_t* spr)
 	if (spr->heightsec != -1)	// only things in specially marked sectors
 	{
 		fixed_t h,mh;
-		int phs = viewplayer->mo->subsector->sector->heightsec;
+		int phs = camera->subsector->sector->heightsec;
 		if ((mh = sectors[spr->heightsec].floorheight) > spr->gz &&
 			(h = centeryfrac - FixedMul(mh-=viewz, spr->scale)) >= 0 &&
 			(h >>= FRACBITS) < viewheight)
-		if (mh <= 0 || (phs != -1 && viewz > sectors[phs].floorheight))
-		{							// clip bottom
-			for (x=spr->x1 ; x<=spr->x2 ; x++)
-				if (r_dsclipbot[x] == -2 || h < r_dsclipbot[x])
-					r_dsclipbot[x] = h;
+		{
+			if (mh <= 0 || (phs != -1 && viewz > sectors[phs].floorheight))
+			{						// clip bottom
+				for (x=spr->x1 ; x<=spr->x2 ; x++)
+					if (r_dsclipbot[x] == NOT_CLIPPED || h < r_dsclipbot[x])
+						r_dsclipbot[x] = h;
+			}
+			else 
+			{						// clip top
+				for (x=spr->x1 ; x<=spr->x2 ; x++)
+					if (r_dscliptop[x] == NOT_CLIPPED || h > r_dscliptop[x])
+						r_dscliptop[x] = h;
+			}
 		}
-		else						// clip top
-			for (x=spr->x1 ; x<=spr->x2 ; x++)
-				if (r_dscliptop[x] == -2 || h > r_dscliptop[x])
-					r_dscliptop[x] = h;
 
 		if ((mh = sectors[spr->heightsec].ceilingheight) < spr->gzt &&
 			(h = centeryfrac - FixedMul(mh-viewz, spr->scale)) >= 0 &&
@@ -1007,13 +1270,13 @@ void R_DrawSprite (vissprite_t* spr)
 			if (phs != -1 && viewz >= sectors[phs].ceilingheight)
 			{						// clip bottom
 				for (x=spr->x1 ; x<=spr->x2 ; x++)
-					if (r_dsclipbot[x] == -2 || h < r_dsclipbot[x])
+					if (r_dsclipbot[x] == NOT_CLIPPED || h < r_dsclipbot[x])
 						r_dsclipbot[x] = h;
 			}
 			else
 			{						// clip top
 				for (x=spr->x1 ; x<=spr->x2 ; x++)
-					if (r_dscliptop[x] == -2 || h > r_dscliptop[x])
+					if (r_dscliptop[x] == NOT_CLIPPED || h > r_dscliptop[x])
 						r_dscliptop[x] = h;
 			}
 		}
@@ -1025,10 +1288,10 @@ void R_DrawSprite (vissprite_t* spr)
 	// check for unclipped columns
 	for (x = spr->x1 ; x<=spr->x2 ; x++)
 	{
-		if (r_dsclipbot[x] == -2)			
+		if (r_dsclipbot[x] == NOT_CLIPPED)			
 			r_dsclipbot[x] = (short)viewheight;
 
-		if (r_dscliptop[x] == -2)
+		if (r_dscliptop[x] == NOT_CLIPPED)
 			r_dscliptop[x] = -1;
 	}
 				
@@ -1122,6 +1385,3 @@ void R_DrawMasked (void)
 		R_DrawPlayerSprites ();
 	}
 }
-
-
-
diff --git a/code/S_sound.c b/code/S_sound.c
index bbe87a8c09..83978a8524 100644
--- a/code/S_sound.c
+++ b/code/S_sound.c
@@ -20,9 +20,6 @@
 //-----------------------------------------------------------------------------
 
 
-
-
-
 #include <stdio.h>
 #include <stdlib.h>
 #include "m_alloc.h"
@@ -30,8 +27,8 @@
 #include "i_system.h"
 #include "i_sound.h"
 #include "i_music.h"
-#include "sounds.h"
 #include "s_sound.h"
+#include "c_dispch.h"
 
 #include "z_zone.h"
 #include "m_random.h"
@@ -42,6 +39,8 @@
 
 #include "doomstat.h"
 #include "cmdlib.h"
+#include "v_video.h"
+#include "v_text.h"
 
 
 #define S_MAX_VOLUME			255
@@ -72,27 +71,32 @@ typedef struct
 	void*		origin;		// origin of sound
 	int 		handle;		// handle of the sound being played
 	int			volume;		// [RH] volume of sound at origin
+	int			priority;	// [RH] priority of sound
 } channel_t;
 
+// [RH] Hacks for pitch variance
+int sfx_sawup, sfx_sawidl, sfx_sawful, sfx_sawhit;
+int sfx_itemup, sfx_tink;
 
-typedef struct sndname_s
-{
-	struct sndname_s   *left, *right;
-	int					sfxid;
-	char				name[1];
-} sndname_t;
+// [RH] Use surround sounds?
+cvar_t *snd_surround;
 
+// [RH] Print sound debugging info?
+cvar_t *noisedebug;
 
 // the set of channels available
-static channel_t*		channels;
+static channel_t *channels;
 
 // Maximum volume of a sound effect.
 // Internal default is max out of 0-15.
 cvar_t 			*snd_SfxVolume;
 
-// Maximum volume of music. Almost useless so far.
+// Maximum volume of MOD music.
 cvar_t 			*snd_MusicVolume; 
 
+// Maximum volume of MIDI/MUS music.
+cvar_t			*snd_MidiVolume;
+
 // whether songs are mus_paused
 static BOOL		mus_paused; 	
 
@@ -105,31 +109,80 @@ static struct {
 // following is set
 //	by the defaults code in M_misc:
 // number of channels available
-cvar_t 					*snd_channels;
-int						numChannels;
+cvar_t 			*snd_channels;
+int				numChannels;
 
-static int				nextcleanup;
+static int		nextcleanup;
 
 
+//
+// [RH] Separated out of S_UpdateSoundParams
+//
+static fixed_t P_ApproxDistance (mobj_t *one, mobj_t *two)
+{
+	// calculate the distance to sound origin
+	//	and clip it if necessary
+	fixed_t adx = abs (one->x - two->x);
+	fixed_t ady = abs (one->y - two->y);
+	// From _GG1_ p.428. Appox. eucledian distance fast.
+	return adx + ady - ((adx < ady ? adx : ady)>>1);
+}
+
+//
+// [RH] Print sound debug info. Called from D_Display()
+//
+void S_NoiseDebug (void)
+{
+	int i, y;
+
+	y = 32;
+	if (level.time & 16)
+		V_DrawText (0, y, "*** SOUND DEBUG INFO ***");
+	y += 8;
+
+	V_DrawText (0, y, "name");
+	V_DrawText (100, y, "mo.x");
+	V_DrawText (150, y, "mo.y");
+	V_DrawText (200, y, "id");
+	V_DrawText (230, y, "pri");
+	V_DrawText (260, y, "dist");
+	y += 8;
+
+	for (i = 0; i < numChannels && y < screens[0].height - 16; i++, y += 8) {
+		if (channels[i].sfxinfo) {
+			char temp[16];
+			mobj_t *origin = (mobj_t *)channels[i].origin;
+
+			if ((unsigned int)origin < (unsigned int)ORIGIN_STARTOFNORMAL)
+				origin = players[consoleplayer].camera;
+
+			strcpy (temp, lumpinfo[channels[i].sfxinfo->lumpnum].name);
+			temp[8] = 0;
+			V_DrawText (0, y, temp);
+			sprintf (temp, "%d", origin->x / FRACUNIT);
+			V_DrawText (100, y, temp);
+			sprintf (temp, "%d", origin->y / FRACUNIT);
+			V_DrawText (150, y, temp);
+			sprintf (temp, "%d", channels[i].sfxinfo - S_sfx);
+			V_DrawText (200, y, temp);
+			sprintf (temp, "%d", channels[i].priority);
+			V_DrawText (230, y, temp);
+			sprintf (temp, "%d", P_ApproxDistance (players[consoleplayer].camera, origin) / FRACUNIT);
+			V_DrawText (260, y, temp);
+		} else {
+			V_DrawText (0, y, "------");
+		}
+	}
+}
+
 
 //
 // Internals.
 //
-int
-S_getChannel
-( void* 		origin,
-  sfxinfo_t*	sfxinfo );
-
-
-int
-S_AdjustSoundParams
-( mobj_t*		listener,
-  mobj_t*		source,
-  int*			vol,
-  int*			sep,
-  int*			pitch );
-
-void S_StopChannel(int cnum);
+static int S_getChannel (void *origin, sfxinfo_t *sfxinfo, int pri);
+static int S_AdjustSoundParams (mobj_t *listener, mobj_t *source,
+								int *vol, int *sep, int *pitch );
+static void S_StopChannel (int cnum);
 
 
 static void ChangeMusicVol (cvar_t *var)
@@ -142,6 +195,10 @@ static void ChangeSfxVol (cvar_t *var)
 	S_SetSfxVolume ((int)var->value);
 }
 
+static void ChangeMidiVol (cvar_t *var)
+{
+	I_SetMIDIVolume (var->value);
+}
 
 //
 // Initializes sound stuff, including volume
@@ -152,24 +209,27 @@ void S_Init (int sfxVolume, int musicVolume)
 {
 	int i;
 
+	snd_MidiVolume->u.callback = ChangeMidiVol;
 	snd_MusicVolume->u.callback = ChangeMusicVol;
 	snd_SfxVolume->u.callback = ChangeSfxVol;
+	ChangeMidiVol (snd_MidiVolume);
 
 	Printf ("S_Init: default sfx volume %d\n", sfxVolume);
 
+	// [RH] Read in sound sequences (TODO)
+	//S_ParseSndSeq ();
+
 	// Whatever these did with DMX, these are rather dummies now.
 	I_SetChannels();
 	
 	S_SetSfxVolume(sfxVolume);
-	// No music with Linux - another dummy.
 	S_SetMusicVolume(musicVolume);
 
 	// Allocating the internal channels for mixing
 	// (the maximum numer of sounds rendered
 	// simultaneously) within zone memory.
 	numChannels = (int)snd_channels->value;
-	channels =
-		(channel_t *) Z_Malloc(numChannels*sizeof(channel_t), PU_STATIC, 0);
+	channels = (channel_t *) Z_Malloc(numChannels*sizeof(channel_t), PU_STATIC, 0);
 	
 	// Free all channels for use
 	for (i=0 ; i<numChannels ; i++)
@@ -179,13 +239,12 @@ void S_Init (int sfxVolume, int musicVolume)
 	mus_paused = 0;
 
 	// Note that sounds have not been cached (yet).
-	for (i=1 ; i<NUMSFX ; i++)
-		S_sfx[i].lumpnum = S_sfx[i].usefulness = -1;
+	for (i=1; i < numsfx; i++)
+		S_sfx[i].usefulness = -1;
 }
 
 
 
-
 //
 // Per level startup code.
 // Kills playing sounds at start of level,
@@ -197,118 +256,125 @@ void S_Start(void)
 
 	// kill all playing sounds at start of level
 	//	(trust me - a good idea)
-	for (cnum=0 ; cnum<numChannels ; cnum++)
+	for (cnum = 0; cnum < numChannels; cnum++)
 		if (channels[cnum].sfxinfo)
-			S_StopChannel(cnum);
+			S_StopChannel (cnum);
 	
 	// start new music for the level
 	mus_paused = 0;
 	
 	// [RH] This is a lot simpler now.
-	S_ChangeMusic(level.music, true);
+	S_ChangeMusic (level.music, true);
 	
 	nextcleanup = 15;
 }
 
 
-
-
-
-void S_StartSoundAtVolume (void *origin_p, int sfx_id, int volume)
+// [RH] Split S_StartSoundAtVolume into two parts so that sounds can
+//		be specified both by id and by name.
+void S_StartSfxAtVolume (void *origin_p, int sfx_id, int pri, int volume)
 {
-
-	int 			rc;
-	int 			sep;
-	int 			pitch;
-	int 			priority;
-	sfxinfo_t*		sfx;
-	int 			cnum;
+	int 		rc;
+	int 		sep;
+	int 		pitch;
+	int 		priority;
+	sfxinfo_t*	sfx;
+	int 		cnum;
 	
-	mobj_t* 		origin = (mobj_t *) origin_p;
+	mobj_t* 	origin = (mobj_t *) origin_p;
 	
+	if (sfx_id == -1) {
+		S_StopSound (origin);
+		return;
+	}
 	
 	// Debug.
 	/*fprintf( stderr,
 			   "S_StartSoundAtVolume: playing sound %d (%s)\n",
 			   sfx_id, S_sfx[sfx_id].name );*/
 	
-	// check for bogus sound #
-	if (sfx_id < 1 || sfx_id > NUMSFX)
-		I_Error("Bad sfx #: %d", sfx_id);
-	
+
 	sfx = &S_sfx[sfx_id];
 	
 	// Initialize sound parameters
-	if (sfx->link)
-	{
-		pitch = sfx->pitch;
-		priority = sfx->priority;
-		volume += sfx->volume;
-		
-		if (volume < 1)
-			return;
-	}
-	else
-	{
-		pitch = NORM_PITCH;
-		priority = NORM_PRIORITY;
-	}
-
+	pitch = NORM_PITCH;
+	priority = NORM_PRIORITY;
 
 	// Check to see if it is audible,
 	//	and if not, modify the params
 	if (((unsigned int)origin >= (unsigned int)ORIGIN_STARTOFNORMAL) &&
-		origin != players[displayplayer].mo)
+		origin != players[consoleplayer].camera)	// [RH] Use camera
 	{
-		rc = S_AdjustSoundParams(players[displayplayer].mo,
+		rc = S_AdjustSoundParams(players[consoleplayer].camera,	// [RH] Use camera
 								 origin,
 								 &volume,
 								 &sep,
 								 &pitch);
 				
-		if ( origin->x == players[displayplayer].mo->x
-				 && origin->y == players[displayplayer].mo->y)
+		if (!rc)
+			return;
+
+		if ( origin->x == players[consoleplayer].camera->x	// [RH] use camera
+				 && origin->y == players[consoleplayer].camera->y)
 		{
 			sep = NORM_SEP;
 		}
-		
-		if (!rc)
-			return;
+#if 0
+		else
+		{
+			// [RH] Don't play more than two sounds w/ approximately
+			//		the same origin. (Doesn't work.)
+			int similarseps = 0;
+			int i;
+
+			for (i = 0; i < numChannels; i++) {
+				if (channels[i].sfxinfo && channels[i].origin &&
+					P_ApproxDistance (channels[i].origin, origin) < 64)
+					similarseps++;
+			}
+			if (similarseps > 1)
+				return;
+		}
+#endif
 	} else if (((unsigned int)origin < (unsigned int)ORIGIN_STARTOFNORMAL) &&
-				((unsigned int)origin) & 128) {
+				(((unsigned int)origin) & 128) &&
+				snd_surround->value) {
 		sep = -1;
 	} else {
 		sep = NORM_SEP;
 	}
 	// hacks to vary the sfx pitches
-	if (sfx_id >= sfx_sawup	&& sfx_id <= sfx_sawhit)
+	if (sfx_id == sfx_sawup	|| sfx_id == sfx_sawhit ||
+		sfx_id == sfx_sawidl || sfx_id == sfx_sawful)
 		pitch += 8 - (M_Random()&15);
 	else if (sfx_id != sfx_itemup && sfx_id != sfx_tink)
 		pitch += 16 - (M_Random()&31);
 
 	// kill old sound
-	S_StopSound(origin);
+	S_StopSound (origin);
 
 	// try to find a channel
-	cnum = S_getChannel(origin, sfx);
+	cnum = S_getChannel (origin, sfx, pri);
 	
-	if (cnum<0)
+	if (cnum < 0)
 		return;
 
+	if (sfx->link)
+		sfx = sfx->link;
+
 	//
 	// This is supposed to handle the loading/caching.
 	// For some odd reason, the caching is done nearly
 	//	each time the sound is needed?
 	//
 	
-	// get lumpnum if necessary
-	if (sfx->lumpnum < 0)
-		sfx->lumpnum = I_GetSfxLumpNum(sfx);
-
 	// cache data if necessary
 	if (!sfx->data)
 	{
-		Printf ("S_StartSoundAtVolume: 16bit and not pre-cached - wtf?\n");
+		//Printf ("S_StartSoundAtVolume: 16bit and not pre-cached - wtf?\n");
+		I_LoadSound (sfx);
+		if (sfx->link)
+			sfx = sfx->link;
 
 		// DOS remains, 8bit handling
 		//sfx->data = (void *) W_CacheLumpNum(sfx->lumpnum, PU_MUSIC);
@@ -327,7 +393,7 @@ void S_StartSoundAtVolume (void *origin_p, int sfx_id, int volume)
 
 	// Assigns the handle to one of the channels in the
 	//	mix/output buffer.
-	channels[cnum].handle = I_StartSound(sfx_id,
+	channels[cnum].handle = I_StartSound(sfx,
 										 /*sfx->data,*/
 										 volume,
 										 sep,
@@ -335,20 +401,45 @@ void S_StartSoundAtVolume (void *origin_p, int sfx_id, int volume)
 										 priority);
 }
 
-void S_StartSound (void *origin, int sfx_id)
+void S_StartSoundAtVolume (void *origin_p, char *name, int pri, int volume)
 {
-	S_StartSoundAtVolume(origin, sfx_id, 255);
+	int sfx_id;
+	
+	if (*name == '*') {
+		// Sexed sound
+		char nametemp[128];
+		const char templat[] = "player/%s/%s";
+		const char *genders[] = { "male", "female", "neuter" };
+		player_t *player;
+
+		sfx_id = -1;
+		if (origin_p >= ORIGIN_STARTOFNORMAL && (player = ((mobj_t *)origin_p)->player)) {
+			sprintf (nametemp, templat, skins[player->userinfo.skin].name, name + 1);
+			sfx_id = S_FindSound (nametemp);
+			if (sfx_id == -1) {
+				sprintf (nametemp, templat, genders[player->userinfo.gender], name + 1);
+				sfx_id = S_FindSound (nametemp);
+			}
+		}
+		if (sfx_id == -1) {
+			sprintf (nametemp, templat, "male", name + 1);
+			sfx_id = S_FindSound (nametemp);
+		}
+	} else
+		sfx_id = S_FindSound (name);
+
+	if (sfx_id == -1)
+		DPrintf ("Unknown sound %s\n", name);
+
+	S_StartSfxAtVolume (origin_p, sfx_id, pri, volume);
 }
 
 
-
-
-void S_StopSound(void *origin)
+void S_StopSound (void *origin)
 {
-
 	int cnum;
 
-	for (cnum=0 ; cnum<numChannels ; cnum++)
+	for (cnum = 0; cnum < numChannels; cnum++)
 	{
 		if (channels[cnum].sfxinfo && channels[cnum].origin == origin)
 		{
@@ -359,13 +450,6 @@ void S_StopSound(void *origin)
 }
 
 
-
-
-
-
-
-
-
 //
 // Stop and resume music, during game PAUSE.
 //
@@ -378,11 +462,11 @@ void S_PauseSound(void)
 	}
 }
 
-void S_ResumeSound(void)
+void S_ResumeSound (void)
 {
 	if (mus_playing.handle && mus_paused)
 	{
-		I_ResumeSong(mus_playing.handle);
+		I_ResumeSong (mus_playing.handle);
 		mus_paused = false;
 	}
 }
@@ -391,7 +475,7 @@ void S_ResumeSound(void)
 //
 // Updates music & sounds
 //
-void S_UpdateSounds(void* listener_p)
+void S_UpdateSounds (void *listener_p)
 {
 	int 		audible;
 	int 		cnum;
@@ -412,8 +496,7 @@ void S_UpdateSounds(void* listener_p)
 	{
 		for (i=1 ; i<NUMSFX ; i++)
 		{
-			if (S_sfx[i].usefulness < 1
-				&& S_sfx[i].usefulness > -1)
+			if (S_sfx[i].usefulness < 1 && S_sfx[i].usefulness > -1)
 			{
 				if (--S_sfx[i].usefulness == -1)
 				{
@@ -425,31 +508,20 @@ void S_UpdateSounds(void* listener_p)
 		nextcleanup = gametic + 15;
 	}*/
 	
-	for (cnum=0 ; cnum<numChannels ; cnum++)
+	for (cnum = 0; cnum < numChannels; cnum++)
 	{
 		c = &channels[cnum];
 		sfx = c->sfxinfo;
 
 		if (c->sfxinfo)
 		{
-			if (I_SoundIsPlaying(c->handle))
+			if (I_SoundIsPlaying (c->handle))
 			{
 				// initialize parameters
 				volume = c->volume;
 				pitch = NORM_PITCH;
 				sep = NORM_SEP;
 
-				if (sfx->link)
-				{
-					pitch = sfx->pitch;
-					volume += sfx->volume;
-					if (volume < 1)
-					{
-						S_StopChannel(cnum);
-						continue;
-					}
-				}
-
 				// check non-local sounds for distance clipping
 				//	or modify their params
 				if (c->origin >= ORIGIN_STARTOFNORMAL && listener_p != c->origin)
@@ -462,10 +534,10 @@ void S_UpdateSounds(void* listener_p)
 					
 					if (!audible)
 					{
-						S_StopChannel(cnum);
+						S_StopChannel (cnum);
 					}
 					else
-						I_UpdateSoundParams(c->handle, volume, sep, pitch);
+						I_UpdateSoundParams (c->handle, volume, sep, pitch);
 				}
 			}
 			else
@@ -589,7 +661,7 @@ void S_StopMusic(void)
 
 
 
-void S_StopChannel(int cnum)
+static void S_StopChannel(int cnum)
 {
 
 	int 		i;
@@ -629,20 +701,13 @@ void S_StopChannel(int cnum)
 // If the sound is not audible, returns a 0.
 // Otherwise, modifies parameters and returns 1.
 //
-int S_AdjustSoundParams (mobj_t *listener, mobj_t *source, int *vol, int *sep, int *pitch)
+static int S_AdjustSoundParams (mobj_t *listener, mobj_t *source,
+								int *vol, int *sep, int *pitch)
 {
 	fixed_t 	approx_dist;
-	fixed_t 	adx;
-	fixed_t 	ady;
 	angle_t 	angle;
 
-	// calculate the distance to sound origin
-	//	and clip it if necessary
-	adx = abs(listener->x - source->x);
-	ady = abs(listener->y - source->y);
-
-	// From _GG1_ p.428. Appox. eucledian distance fast.
-	approx_dist = adx + ady - ((adx < ady ? adx : ady)>>1);
+	approx_dist = P_ApproxDistance (listener, source);
 	
 	if (!(level.flags & LEVEL_NOSOUNDCLIPPING) && approx_dist > S_CLIPPING_DIST)
 	{
@@ -694,18 +759,14 @@ int S_AdjustSoundParams (mobj_t *listener, mobj_t *source, int *vol, int *sep, i
 // S_getChannel :
 //	 If none available, return -1.	Otherwise channel #.
 //
-int
-S_getChannel
-( void* 		origin,
-  sfxinfo_t*	sfxinfo )
+static int S_getChannel (void *origin, sfxinfo_t *sfxinfo, int pri)
 {
 	// channel number to use
-	int 		cnum;
-	
-	channel_t*	c;
+	int cnum;
+	channel_t *c;
 
 	// Find an open channel
-	for (cnum=0 ; cnum<numChannels ; cnum++)
+	for (cnum = 0; cnum < numChannels; cnum++)
 	{
 		if (!channels[cnum].sfxinfo)
 			break;
@@ -720,8 +781,8 @@ S_getChannel
 	if (cnum == numChannels)
 	{
 		// Look for lower priority
-		for (cnum=0 ; cnum<numChannels ; cnum++)
-			if (channels[cnum].sfxinfo->priority >= sfxinfo->priority) break;
+		for (cnum = 0; cnum < numChannels; cnum++)
+			if (channels[cnum].priority >= pri) break;
 
 		if (cnum == numChannels)
 		{
@@ -740,6 +801,7 @@ S_getChannel
 	// channel is decided to be cnum.
 	c->sfxinfo = sfxinfo;
 	c->origin = origin;
+	c->priority = pri;
 
 	return cnum;
 }
@@ -750,110 +812,105 @@ S_getChannel
 //
 // =============================== [RH]
 
-typedef struct {
-	thinker_t thinker;
-	struct AmbientSound *ambient;
-	int ticker;
-} ambientthinker_t;
+sfxinfo_t *S_sfx;	// [RH] This is no longer defined in sounds.c
+static int maxsfx;	// [RH] Current size of S_sfx array.
+int numsfx;			// [RH] Current number of sfx defined.
 
 static struct AmbientSound {
 	unsigned	type;		// type of ambient sound
 	int			periodmin;	// # of tics between repeats
 	int			periodmax;	// max # of tics for random ambients
 	int			volume;		// relative volume of sound
-	int			sfxid;		// ID of attached real sound
-	ambientthinker_t *thinker;	// thinker for world sound
-} Ambients[64];
+	char		sound[MAX_SNDNAME+1]; // Logical name of sound to play
+} Ambients[256];
 
 #define RANDOM		1
 #define PERIODIC	2
 #define POSITIONAL	4
 #define SURROUND	16
 
-static sndname_t *LogicalNames;
-
-int S_GetFreeSoundIndex (void)
+void S_HashSounds (void)
 {
-	static int freeIndex = sfx_ambient0;
+	int i;
+	unsigned j;
 
-	if (freeIndex <= sfx_ambient63)
-		return freeIndex++;
-	else
-		return sfx_None;
+	// Mark all buckets as empty
+	for (i = 0; i < numsfx; i++)
+		S_sfx[i].index = -1;
+
+	// Now set up the chains
+	for (i = 0; i < numsfx; i++) {
+		j = MakeKey (S_sfx[i].name) % (unsigned)numsfx;
+		S_sfx[i].next = S_sfx[j].index;
+		S_sfx[j].index = i;
+	}
 }
 
-int S_GetSoundIndexFromLumpName (char *lumpname)
+int S_FindSound (const char *logicalname)
 {
 	int i;
 
-	for (i = sfx_ambient0; i <= sfx_ambient63; i++)
-		if (S_sfx[i].name)
-			if (!stricmp (S_sfx[i].name, lumpname))
-				return i;
+	i = S_sfx[MakeKey (logicalname) % (unsigned)numsfx].index;
 
-	return sfx_None;
+	while ((i != -1) && strnicmp (S_sfx[i].name, logicalname, MAX_SNDNAME))
+		i = S_sfx[i].next;
+
+	return i;
 }
 
-static sndname_t **InsertionPoint;
-
-sndname_t *S_FindLogicalName (char *logicalname)
+int S_FindSoundByLump (int lump)
 {
-	sndname_t *sound;
-	int cmpval;
+	if (lump != -1) {
+		int i;
 
-	InsertionPoint = &LogicalNames;
-	sound = LogicalNames;
+		for (i = 0; i < numsfx; i++)
+			if (S_sfx[i].lumpnum == lump)
+				return i;
+	}
+	return -1;
+}
 
-	while (sound) {
-		cmpval = strcmp (sound->name, logicalname);
-		if (cmpval == 0) {
-			return sound;
-		} else if (cmpval < 0) {
-			InsertionPoint = &sound->left;
-			sound = sound->left;
-		} else {
-			InsertionPoint = &sound->right;
-			sound = sound->right;
-		}
+int S_AddSoundLump (char *logicalname, int lump)
+{
+	if (numsfx == maxsfx) {
+		maxsfx = maxsfx ? maxsfx*2 : 128;
+		S_sfx = Realloc (S_sfx, maxsfx * sizeof(*S_sfx));
 	}
 
-	return NULL;
+	// logicalname MUST be < MAX_SNDNAME chars long
+	strcpy (S_sfx[numsfx].name, logicalname);
+	S_sfx[numsfx].data = NULL;
+	S_sfx[numsfx].link = NULL;
+	S_sfx[numsfx].usefulness = 0;
+	S_sfx[numsfx].lumpnum = lump;
+	return numsfx++;
 }
 
-void S_AddLogicalName (char *logicalname, char *lumpname)
+int S_AddSound (char *logicalname, char *lumpname)
 {
-	sndname_t *sound;
 	int sfxid;
 
-	lumpname += 2;		// Skip ds header
+	// If the sound has already been defined, change the old definition.
+	for (sfxid = 0; sfxid < numsfx; sfxid++)
+		if (0 == stricmp (logicalname, S_sfx[sfxid].name))
+			break;
 
-	if (!(sound = S_FindLogicalName (logicalname))) {
-		sound = Malloc (sizeof(sndname_t) + strlen (logicalname));
-		sound->left = NULL;
-		sound->right = NULL;
-		strcpy (sound->name, logicalname);
-		*InsertionPoint = sound;
+	// Otherwise, prepare a new one.
+	if (sfxid == numsfx) {
+		sfxid = S_AddSoundLump (logicalname, W_CheckNumForName (lumpname));
+	} else {
+		S_sfx[sfxid].lumpnum = W_CheckNumForName (lumpname);
 	}
 
-	if ((sfxid = S_GetSoundIndexFromLumpName (lumpname)) == sfx_None) {
-		if ((sfxid = S_GetFreeSoundIndex ()) == sfx_None) {
-			Printf ("no room to add %s to sound table\n", lumpname);
-		} else {
-			S_sfx[sfxid].name = copystring (lumpname);
-		}
-	}
-
-	sound->sfxid = sfxid;
+	return sfxid;
 }
 
 // S_ParseSndInfo
-// Parses all loaded SNDINFO lumps. Currently, this is only used
-// to gather information for ambient sounds.
+// Parses all loaded SNDINFO lumps.
 void S_ParseSndInfo (void)
 {
 	int lastlump, lump;
 	char *sndinfo;
-	char *logicalname;
 	char *data;
 
 	lastlump = 0;
@@ -876,41 +933,31 @@ void S_ParseSndInfo (void)
 				if (!stricmp (com_token + 1, "ambient")) {
 					// $ambient <num> <logical name> [point|surround] <type> [secs] <relative volume>
 					struct AmbientSound *ambient, dummy;
-					sndname_t *logicalinfo;
 					int index;
 
 					sndinfo = COM_Parse (sndinfo);
 					index = atoi (com_token);
-					if (index < 1 || index > 64) {
+					if (index < 0 || index > 255) {
 						Printf ("Bad ambient index (%d)\n", index);
 						ambient = &dummy;
 					} else {
-						index--;
 						ambient = Ambients + index;
 					}
 					memset (ambient, 0, sizeof(struct AmbientSound));
 
 					sndinfo = COM_Parse (sndinfo);
-					logicalinfo = S_FindLogicalName (com_token);
-					if (logicalinfo)
-						ambient->sfxid = logicalinfo->sfxid;
-					else
-						ambient->sfxid = sfx_None;
+					strncpy (ambient->sound, com_token, MAX_SNDNAME);
+					ambient->sound[MAX_SNDNAME] = 0;
 
 					sndinfo = COM_Parse (sndinfo);
 					if (!stricmp (com_token, "point")) {
 						ambient->type = POSITIONAL;
 						sndinfo = COM_Parse (sndinfo);
-						if (ambient != &dummy) {
-							mobjinfo[MT_AMBIENT0 + index].spawnstate = S_AMBIENTSOUND;
-						}
 					} else {
 						if (!stricmp (com_token, "surround")) {
 							ambient->type = SURROUND;
 							sndinfo = COM_Parse (sndinfo);
 						}
-						if (ambient != &dummy)
-							mobjinfo[MT_AMBIENT0 + index].spawnstate = S_NULL;
 					}
 
 					if (!stricmp (com_token, "continuous")) {
@@ -951,14 +998,57 @@ void S_ParseSndInfo (void)
 				}
 			} else {
 				// com_token is a logical sound mapping
+				char name[MAX_SNDNAME+1];
 
-				logicalname = copystring (com_token);
+				strncpy (name, com_token, MAX_SNDNAME);
+				name[MAX_SNDNAME] = 0;
 				sndinfo = COM_Parse (sndinfo);
-				S_AddLogicalName (logicalname, com_token);
-				free (logicalname);
+				S_AddSound (name, com_token);
 			}
 		}
 	}
+	S_HashSounds ();
+
+	// [RH] Hack for pitch varying
+	sfx_sawup = S_FindSound ("weapons/sawup");
+	sfx_sawidl = S_FindSound ("weapons/sawidle");
+	sfx_sawful = S_FindSound ("weapons/sawfull");
+	sfx_sawhit = S_FindSound ("weapons/sawhit");
+	sfx_itemup = S_FindSound ("misc/i_pkup");
+	sfx_tink = S_FindSound ("misc/chat2");
+}
+
+void Cmd_Soundlist (void *plyr, int argc, char **argv)
+{
+	char lumpname[9];
+	int i;
+
+	lumpname[8] = 0;
+	for (i = 0; i < numsfx; i++)
+		if (S_sfx[i].lumpnum != -1) {
+			strncpy (lumpname, lumpinfo[S_sfx[i].lumpnum].name, 8);
+			Printf ("%3d. %s (%s)\n", i+1, S_sfx[i].name, lumpname);
+		} else
+			Printf ("%3d. %s **not present**\n", i+1, S_sfx[i].name);
+}
+
+void Cmd_Soundlinks (void *plyr, int argc, char **argv)
+{
+	int i;
+
+	for (i = 0; i < numsfx; i++)
+		if (S_sfx[i].link)
+			Printf ("%s -> %s\n", S_sfx[i].name, S_sfx[i].link->name);
+}
+
+void S_StartAmbient (char *name, int volume, BOOL surround)
+{
+	static int last = -1;
+
+	if (++last >= 64)
+		last = 0;
+
+	S_StartSoundAtVolume ((mobj_t *)((8+last)|(surround?128:0)), name, 32, volume);
 }
 
 static void SetTicker (int *tics, struct AmbientSound *ambient)
@@ -974,12 +1064,13 @@ static void SetTicker (int *tics, struct AmbientSound *ambient)
 
 void A_Ambient (mobj_t *actor)
 {
-	struct AmbientSound *ambient;
+	struct AmbientSound *ambient = &Ambients[actor->args[0]];
 
-	ambient = &Ambients[actor->type - MT_AMBIENT0];
-
-	if (ambient->sfxid) {
-		S_StartSoundAtVolume (actor, ambient->sfxid, ambient->volume);
+	if (ambient->sound[0]) {
+		if (ambient->type & POSITIONAL)
+			S_StartSoundAtVolume (actor, ambient->sound, 32, ambient->volume);
+		else
+			S_StartAmbient (ambient->sound, ambient->volume, ambient->type & SURROUND);
 
 		SetTicker (&actor->tics, ambient);
 	} else {
@@ -987,58 +1078,21 @@ void A_Ambient (mobj_t *actor)
 	}
 }
 
-void T_WorldAmbient (ambientthinker_t *thinker)
-{
-	struct AmbientSound *ambient;
-	int channel;
-
-	if (thinker->ticker) {
-		thinker->ticker--;
-		return;
-	}
-
-	ambient = thinker->ambient;
-
-	channel = ambient - Ambients + 8;
-	if (ambient->type & SURROUND)
- 		channel |= 128;
-	S_StartSoundAtVolume ((void *)channel, ambient->sfxid, ambient->volume);
-	SetTicker (&thinker->ticker, ambient);
-}
-
-void S_ActivateAmbient (void *origin, int ambient)
+void S_ActivateAmbient (mobj_t *origin, int ambient)
 {
 	struct AmbientSound *amb = &Ambients[ambient];
 
-	if (!(amb->type & 3) && !amb->periodmin)
-		amb->periodmin = (S_sfx[amb->sfxid].ms * TICRATE) / 1000;
+	if (!(amb->type & 3) && !amb->periodmin) {
+		sfxinfo_t *sfx = S_sfx + S_FindSound (amb->sound);
 
-	if (amb->type & POSITIONAL) {
-		// Point sounds
-	} else {
-		// World sounds
-		DPrintf ("ActivateAmbient %d\n", ambient);
-
-		if (!amb->thinker) {
-			Z_Malloc (sizeof(ambientthinker_t), PU_LEVSPEC, &amb->thinker);
-			P_AddThinker (&amb->thinker->thinker);
-			amb->thinker->ambient = amb;
-			amb->thinker->thinker.function.acp1 = (actionf_p1) T_WorldAmbient;
-			if (amb->type & 3)
-				SetTicker (&amb->thinker->ticker, amb);
-			else
-				amb->thinker->ticker = 0;
-		}
+		// Make sure the sound has been loaded so we know how long it is
+		if (!sfx->data)
+			I_LoadSound (sfx);
+		amb->periodmin = (sfx->ms * TICRATE) / 1000;
 	}
+
+	if (amb->type & (RANDOM|PERIODIC))
+		SetTicker (&origin->tics, amb);
+	else
+		origin->tics = 1;
 }
-
-void S_ClearAmbients (void)
-{
-	int i;
-
-	for (i = 0; i < 64; i++)
-		if (Ambients[i].thinker) {
-			P_RemoveThinker ((thinker_t *)Ambients[i].thinker);
-			Ambients[i].thinker = NULL;
-		}
-}
\ No newline at end of file
diff --git a/code/S_sound.h b/code/S_sound.h
index 10dc79f8ec..2115016cc9 100644
--- a/code/S_sound.h
+++ b/code/S_sound.h
@@ -25,38 +25,56 @@
 
 
 
+#define MAX_SNDNAME	63
 
 //
+// SoundFX struct.
+//
+typedef struct sfxinfo_struct sfxinfo_t;
+
+struct sfxinfo_struct
+{
+	char		name[MAX_SNDNAME+1];	// [RH] Sound name defined in SNDINFO
+	void*		data;					// sound data
+
+	struct sfxinfo_struct *link;
+
+	// this is checked every second to see if sound
+	// can be thrown out (if 0, then decrement, if -1,
+	// then throw out, if > 0, then it is in use)
+	int 		usefulness;
+
+	int 		lumpnum;				// lump number of sfx
+	unsigned int ms;					// [RH] length of sfx in milliseconds
+	unsigned int next, index;			// [RH] For hashing
+};
+
+// the complete set of sound effects
+extern sfxinfo_t *S_sfx;
+
+// [RH] Number of defined sounds
+extern int numsfx;
+
 // Initializes sound stuff, including volume
 // Sets channels, SFX and music volume,
 //	allocates channel buffer, sets S_sfx lookup.
 //
-void
-S_Init
-( int			sfxVolume,
-  int			musicVolume );
+void S_Init (int sfxVolume, int musicVolume);
 
-
-
-
-//
 // Per level startup code.
 // Kills playing sounds at start of level,
 //	determines music if any, changes music.
 //
 void S_Start(void);
 
-
-//
-// Start sound for thing at <origin>
-//	using <sound_id> from sounds.h
-//
-void S_StartSound (void *origin, int sound_id);
-
-
+// Start sound for thing at <origin> using <sound_id> from sounds.h
+// [RH] macro-fied
+#define S_StartSound(o,n,p) S_StartSoundAtVolume (o,n,p,255)
+#define S_StartSfx(o,n,p) S_StartSfxAtVolume (o,n,p,255)
 
 // Will start a sound at a given volume.
-void S_StartSoundAtVolume (void *origin, int sound_id, int volume);
+void S_StartSoundAtVolume (void *origin, char *name, int pri, int volume);
+void S_StartSfxAtVolume (void *origin, int sfxid, int pri, int volume);
 
 #define ORIGIN_SURROUNDBIT (128)
 #define ORIGIN_AMBIENT	(NULL)					// Sound is not attenuated
@@ -71,11 +89,14 @@ void S_StartSoundAtVolume (void *origin, int sound_id, int volume);
 
 #define ORIGIN_STARTOFNORMAL	((void *)256)	// [RH] Used internally
 
+// [RH] Simplified world ambient playing. Will cycle through all
+//		ORIGIN_WORLDAMBIENTS positions automatically.
+void S_StartAmbient (char *name, int volume, int surround);
+
 
 // Stop sound for thing at <origin>
 void S_StopSound (void *origin);
 
-
 // Start music using <music_name>
 void S_StartMusic (char *music_name);
 
@@ -100,15 +121,25 @@ void S_SetMusicVolume (int volume);
 void S_SetSfxVolume (int volume);
 
 
-// [RH] Parses all SNDINFO lumps. Should be called from I_InitSound()
-void S_ParseSndInfo (void);
-
 // [RH] Activates an ambient sound. Called when the thing is added to the map.
 //		(0-biased)
 void S_ActivateAmbient (void *mobj, int ambient);
 
-// [RH] Deactivates all ambient sounds.
-void S_ClearAmbients (void);
+// [RH] S_sfx "maintenance" routines
+void S_ParseSndInfo (void);
+
+void S_HashSounds (void);
+int S_FindSound (const char *logicalname);
+int S_FindSoundByLump (int lump);
+int S_AddSound (char *logicalname, char *lumpname);	// Add sound by lumpname
+int S_AddSoundLump (char *logicalname, int lump);	// Add sound by lump index
+
+// [RH] Prints sound debug info to the screen.
+//		Modelled after Hexen's noise cheat.
+void S_NoiseDebug (void);
+extern struct cvar_s *noisedebug;
+
+
 
 #endif
 //-----------------------------------------------------------------------------
diff --git a/code/Sounds.c b/code/Sounds.c
index 5341cf6087..67746fd898 100644
--- a/code/Sounds.c
+++ b/code/Sounds.c
@@ -31,6 +31,7 @@
 //
 // Information about all the sfx
 //
+#if 0
 
 sfxinfo_t S_sfx[] =
 {
@@ -212,4 +213,5 @@ sfxinfo_t S_sfx[] =
   { 0L, false, 32, 0, -1, -1, 0 },
   { 0L, false, 32, 0, -1, -1, 0 }
 };
+#endif
 
diff --git a/code/Sounds.h b/code/Sounds.h
deleted file mode 100644
index aeb52aca60..0000000000
--- a/code/Sounds.h
+++ /dev/null
@@ -1,264 +0,0 @@
-// Emacs style mode select	 -*- C++ -*- 
-//-----------------------------------------------------------------------------
-//
-// $Id:$
-//
-// Copyright (C) 1993-1996 by id Software, Inc.
-//
-// This source is available for distribution and/or modification
-// only under the terms of the DOOM Source Code License as
-// published by id Software. All rights reserved.
-//
-// The source is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// FITNESS FOR A PARTICULAR PURPOSE. See the DOOM Source Code License
-// for more details.
-//
-// DESCRIPTION:
-//		Created by the sound utility written by Dave Taylor.
-//		Kept as a sample, DOOM2  sounds. Frozen.
-//
-//-----------------------------------------------------------------------------
-
-#ifndef __SOUNDS__
-#define __SOUNDS__
-
-
-//
-// SoundFX struct.
-//
-typedef struct sfxinfo_struct	sfxinfo_t;
-
-struct sfxinfo_struct
-{
-	// up to 6-character name
-	char		*name;
-
-	// Sfx singularity (only one at a time)
-	int 		singularity;
-
-	// Sfx priority
-	int 		priority;
-
-	// referenced sound if a link
-	sfxinfo_t*	link;
-
-	// pitch if a link
-	int 		pitch;
-
-	// volume if a link
-	int 		volume;
-
-	// sound data
-	void*		data;
-
-	// this is checked every second to see if sound
-	// can be thrown out (if 0, then decrement, if -1,
-	// then throw out, if > 0, then it is in use)
-	int 		usefulness;
-
-	// lump number of sfx
-	int 		lumpnum;
-
-	// [RH] length of sfx in milliseconds
-	unsigned	ms;
-};
-
-
-
-
-// the complete set of sound effects
-extern sfxinfo_t		S_sfx[];
-
-//
-// Identifiers for all sfx in game.
-//
-
-typedef enum
-{
-	sfx_None,
-	sfx_pistol,
-	sfx_shotgn,
-	sfx_sgcock,
-	sfx_dshtgn,
-	sfx_dbopn,
-	sfx_dbcls,
-	sfx_dbload,
-	sfx_plasma,
-	sfx_bfg,
-	sfx_sawup,
-	sfx_sawidl,
-	sfx_sawful,
-	sfx_sawhit,
-	sfx_rlaunc,
-	sfx_rxplod,
-	sfx_firsht,
-	sfx_firxpl,
-	sfx_pstart,
-	sfx_pstop,
-	sfx_doropn,
-	sfx_dorcls,
-	sfx_stnmov,
-	sfx_swtchn,
-	sfx_swtchx,
-	sfx_plpain,
-	sfx_dmpain,
-	sfx_popain,
-	sfx_vipain,
-	sfx_mnpain,
-	sfx_pepain,
-	sfx_slop,
-	sfx_itemup,
-	sfx_wpnup,
-	sfx_oof,
-	sfx_telept,
-	sfx_posit1,
-	sfx_posit2,
-	sfx_posit3,
-	sfx_bgsit1,
-	sfx_bgsit2,
-	sfx_sgtsit,
-	sfx_cacsit,
-	sfx_brssit,
-	sfx_cybsit,
-	sfx_spisit,
-	sfx_bspsit,
-	sfx_kntsit,
-	sfx_vilsit,
-	sfx_mansit,
-	sfx_pesit,
-	sfx_sklatk,
-	sfx_sgtatk,
-	sfx_skepch,
-	sfx_vilatk,
-	sfx_claw,
-	sfx_skeswg,
-	sfx_pldeth,
-	sfx_pdiehi,
-	sfx_podth1,
-	sfx_podth2,
-	sfx_podth3,
-	sfx_bgdth1,
-	sfx_bgdth2,
-	sfx_sgtdth,
-	sfx_cacdth,
-	sfx_skldth,
-	sfx_brsdth,
-	sfx_cybdth,
-	sfx_spidth,
-	sfx_bspdth,
-	sfx_vildth,
-	sfx_kntdth,
-	sfx_pedth,
-	sfx_skedth,
-	sfx_posact,
-	sfx_bgact,
-	sfx_dmact,
-	sfx_bspact,
-	sfx_bspwlk,
-	sfx_vilact,
-	sfx_noway,
-	sfx_barexp,
-	sfx_punch,
-	sfx_hoof,
-	sfx_metal,
-	sfx_chgun,
-	sfx_tink,
-	sfx_bdopn,
-	sfx_bdcls,
-	sfx_itmbk,
-	sfx_flame,
-	sfx_flamst,
-	sfx_getpow,
-	sfx_bospit,
-	sfx_boscub,
-	sfx_bossit,
-	sfx_bospn,
-	sfx_bosdth,
-	sfx_manatk,
-	sfx_mandth,
-	sfx_sssit,
-	sfx_ssdth,
-	sfx_keenpn,
-	sfx_keendt,
-	sfx_skeact,
-	sfx_skesit,
-	sfx_skeatk,
-	sfx_radio,
-	// [RH] Sound played when entering secret sector
-	sfx_secret,
-	// [RH] Up to 64 ambient sounds
-	sfx_ambient0,
-	sfx_ambient1,
-	sfx_ambient2,
-	sfx_ambient3,
-	sfx_ambient4,
-	sfx_ambient5,
-	sfx_ambient6,
-	sfx_ambient7,
-	sfx_ambient8,
-	sfx_ambient9,
-	sfx_ambient10,
-	sfx_ambient11,
-	sfx_ambient12,
-	sfx_ambient13,
-	sfx_ambient14,
-	sfx_ambient15,
-	sfx_ambient16,
-	sfx_ambient17,
-	sfx_ambient18,
-	sfx_ambient19,
-	sfx_ambient20,
-	sfx_ambient21,
-	sfx_ambient22,
-	sfx_ambient23,
-	sfx_ambient24,
-	sfx_ambient25,
-	sfx_ambient26,
-	sfx_ambient27,
-	sfx_ambient28,
-	sfx_ambient29,
-	sfx_ambient30,
-	sfx_ambient31,
-	sfx_ambient32,
-	sfx_ambient33,
-	sfx_ambient34,
-	sfx_ambient35,
-	sfx_ambient36,
-	sfx_ambient37,
-	sfx_ambient38,
-	sfx_ambient39,
-	sfx_ambient40,
-	sfx_ambient41,
-	sfx_ambient42,
-	sfx_ambient43,
-	sfx_ambient44,
-	sfx_ambient45,
-	sfx_ambient46,
-	sfx_ambient47,
-	sfx_ambient48,
-	sfx_ambient49,
-	sfx_ambient50,
-	sfx_ambient51,
-	sfx_ambient52,
-	sfx_ambient53,
-	sfx_ambient54,
-	sfx_ambient55,
-	sfx_ambient56,
-	sfx_ambient57,
-	sfx_ambient58,
-	sfx_ambient59,
-	sfx_ambient60,
-	sfx_ambient61,
-	sfx_ambient62,
-	sfx_ambient63,
-	NUMSFX
-} sfxenum_t;
-
-#endif
-//-----------------------------------------------------------------------------
-//
-// $Log:$
-//
-//-----------------------------------------------------------------------------
-
diff --git a/code/St_stuff.c b/code/St_stuff.c
index ce23311627..74b219a45f 100644
--- a/code/St_stuff.c
+++ b/code/St_stuff.c
@@ -58,7 +58,6 @@
 
 // Data.
 #include "dstrings.h"
-#include "sounds.h"
 
 // Cheats and cvars
 #include "c_cmds.h"
@@ -84,20 +83,16 @@ void ST_initNew (void);
 void ST_unloadNew (void);
 void ST_newDraw (void);
 
+// [RH] Base blending values (for e.g. underwater)
+int BaseBlendR, BaseBlendG, BaseBlendB;
+float BaseBlendA;
+
+
 //
 // STATUS BAR DATA
 //
 
 
-// Palette indices.
-// For damage/bonus red-/gold-shifts
-#define STARTREDPALS			1
-#define STARTBONUSPALS			9
-#define NUMREDPALS				8
-#define NUMBONUSPALS			4
-// Radiation suit, green shift.
-#define RADIATIONPAL			13
-
 // N/256*100% probability
 //	that the normal face state will change
 #define ST_FACEPROBABILITY		96
@@ -106,10 +101,7 @@ void ST_newDraw (void);
 #define ST_TOGGLECHAT			KEY_ENTER
 
 // Location of status bar
-#define ST_X2					(104)
-
 #define ST_FX					(143)
-#define ST_FY					(1)
 
 // Should be set to patch width
 //	for tall numbers later on
@@ -298,9 +290,6 @@ BOOL					st_firsttime;
 // used to execute ST_Init() only once
 static int				veryfirsttime = 1;
 
-// lump number for PLAYPAL
-static int				lu_palette;
-
 // used for timing
 static unsigned int 	st_clock;
 
@@ -348,11 +337,10 @@ patch_t*		 		tallpercent;
 // 0-9, short, yellow (,different!) numbers
 static patch_t* 		shortnum[10];
 
-// 3 key-cards, 3 skulls
-static patch_t* 		keys[NUMCARDS]; 
+// 3 key-cards, 3 skulls, [RH] 3 combined
+static patch_t* 		keys[NUMCARDS+NUMCARDS/2]; 
 
-// face status patches
-// [RH] no longer static
+// face status patches [RH] no longer static
 patch_t* 				faces[ST_NUMFACES];
 
 // face background
@@ -535,8 +523,7 @@ void ST_refreshBackground(void)
 		if (netgame) {
 			// [RH] Always draw faceback with the player's color
 			//		using a translation rather than a different patch.
-			//		Use displayplayer instead of consoleplayer.
-			V_ColorMap = translationtables + displayplayer*256;
+			V_ColorMap = translationtables + (plyr - players)*256;
 			V_DrawTranslatedPatch (ST_FX, 0, &BG, faceback);
 		}
 
@@ -552,15 +539,15 @@ void ST_refreshBackground(void)
 
 BOOL CheckCheatmode (void);
 
-// Respond to keyboard input events,
-//	intercept cheats.
+// Respond to keyboard input events, intercept cheats.
+// [RH] Cheats eat the last keypress used to trigger them
 BOOL ST_Responder (event_t *ev)
 {
+  BOOL eat = false;
   int i;
 	
   // Filter automap on/off.
-  if (ev->type == ev_keyup
-	  && ((ev->data1 & 0xffff0000) == AM_MSGHEADER))
+  if (ev->type == ev_keyup && ((ev->data1 & 0xffff0000) == AM_MSGHEADER))
   {
 	switch(ev->data1)
 	{
@@ -570,7 +557,6 @@ BOOL ST_Responder (event_t *ev)
 		break;
 		
 	  case AM_MSGEXITED:
-		//		fprintf(stderr, "AM exited\n");
 		st_gamestate = FirstPersonState;
 		break;
 	}
@@ -590,6 +576,7 @@ BOOL ST_Responder (event_t *ev)
 
 		  Net_WriteByte (DEM_GENERICCHEAT);
 		  Net_WriteByte (CHT_IDDQD);
+		  eat = true;
 	  }
 
 	  // 'fa' cheat for killer fucking arsenal
@@ -600,6 +587,7 @@ BOOL ST_Responder (event_t *ev)
 
 		  Net_WriteByte (DEM_GENERICCHEAT);
 		  Net_WriteByte (CHT_IDFA);
+		  eat = true;
 	  }
 
 	  // 'kfa' cheat for key full ammo
@@ -610,6 +598,7 @@ BOOL ST_Responder (event_t *ev)
 
 		  Net_WriteByte (DEM_GENERICCHEAT);
 		  Net_WriteByte (CHT_IDKFA);
+		  eat = true;
 	  }
 
 	  // Simplified, accepting both "noclip" and "idspispopd".
@@ -622,6 +611,7 @@ BOOL ST_Responder (event_t *ev)
 
 		  Net_WriteByte (DEM_GENERICCHEAT);
 		  Net_WriteByte (CHT_NOCLIP);
+		  eat = true;
 	  }
 	  // 'behold?' power-up cheats
 	  for (i=0;i<6;i++)
@@ -633,6 +623,7 @@ BOOL ST_Responder (event_t *ev)
 
 			Net_WriteByte (DEM_GENERICCHEAT);
 			Net_WriteByte ((byte)(CHT_BEHOLDV + i));
+			eat = true;
 		}
 	  }
 	  
@@ -650,12 +641,14 @@ BOOL ST_Responder (event_t *ev)
 	  {
 		  Net_WriteByte (DEM_GENERICCHEAT);
 		  Net_WriteByte (CHT_CHAINSAW);
+		  eat = true;
 	  }
 
 	  // 'mypos' for player position
 	  else if (cht_CheckCheat(&cheat_mypos, (char)ev->data2))
 	  {
 		AddCommandString ("toggle idmypos");
+		eat = true;
 	  }
 	
 	  // 'clev' change-level cheat
@@ -670,6 +663,7 @@ BOOL ST_Responder (event_t *ev)
 		argv[0] = "idclev";
 		argv[1] = buf;
 		Cmd_idclev (plyr, 2, argv);
+		eat = true;
 	  }
 
 	  // 'idmus' change-music cheat
@@ -682,10 +676,11 @@ BOOL ST_Responder (event_t *ev)
 
 		sprintf (buf + 3, "idmus %s\n", buf);
 		AddCommandString (buf + 3);
+		eat = true;
 	  }
 	}
 
-  return false;
+  return eat;
 }
 
 
@@ -918,8 +913,9 @@ void ST_updateWidgets(void)
 	{
 		keyboxes[i] = plyr->cards[i] ? i : -1;
 
+		// [RH] show multiple keys per box, too
 		if (plyr->cards[i+3])
-			keyboxes[i] = i+3;
+			keyboxes[i] = (keyboxes[i] == -1) ? i+3 : i+6;
 	}
 
 	// refresh everything if this is him coming back to life
@@ -951,21 +947,66 @@ void ST_Ticker (void)
 
 }
 
-static int st_palette = 0;
+static float st_palette[4];
+
+// [RH] Amount of red flash for up to 114 damage points. Calculated by hand
+//		using a logarithmic scale and my trusty HP48G.
+static byte damageToAlpha[114] = {
+	  0,   8,  16,  23,  30,  36,  42,  47,  53,  58,  62,  67,  71,  75,  79,
+	 83,  87,  90,  94,  97, 100, 103, 107, 109, 112, 115, 118, 120, 123, 125,
+	128, 130, 133, 135, 137, 139, 141, 143, 145, 147, 149, 151, 153, 155, 157,
+	159, 160, 162, 164, 165, 167, 169, 170, 172, 173, 175, 176, 178, 179, 181,
+	182, 183, 185, 186, 187, 189, 190, 191, 192, 194, 195, 196, 197, 198, 200,
+	201, 202, 203, 204, 205, 206, 207, 209, 210, 211, 212, 213, 214, 215, 216,
+	217, 218, 219, 220, 221, 221, 222, 223, 224, 225, 226, 227, 228, 229, 229,
+	230, 231, 232, 233, 234, 235, 235, 236, 237
+};
+
+/*
+=============
+SV_AddBlend
+[RH] This is from Q2.
+=============
+*/
+void SV_AddBlend (float r, float g, float b, float a, float *v_blend)
+{
+	float a2, a3;
+
+	if (a <= 0)
+		return;
+	a2 = v_blend[3] + (1-v_blend[3])*a;	// new total alpha
+	a3 = v_blend[3]/a2;		// fraction of color from old
+
+	v_blend[0] = v_blend[0]*a3 + r*(1-a3);
+	v_blend[1] = v_blend[1]*a3 + g*(1-a3);
+	v_blend[2] = v_blend[2]*a3 + b*(1-a3);
+	v_blend[3] = a2;
+}
 
 void ST_doPaletteStuff (void)
 {
+	float blend[4];
+	int cnt;
 
-	int 		palette;
-	int 		cnt;
-	int 		bzc;
+	blend[0] = blend[1] = blend[2] = blend[3] = 0;
 
-	cnt = plyr->damagecount << 1;
+	SV_AddBlend (BaseBlendR / 255.0f, BaseBlendG / 255.0f, BaseBlendB / 255.0f, BaseBlendA, blend);
+	if (plyr->powers[pw_ironfeet] > 4*32 || plyr->powers[pw_ironfeet]&8)
+		SV_AddBlend (0.0f, 1.0f, 0.0f, 0.125f, blend);
+	if (plyr->bonuscount) {
+		cnt = plyr->bonuscount << 3;
+		SV_AddBlend (0.8431f, 0.7294f, 0.2706f, cnt > 128 ? 0.5f : cnt / 255.0f, blend);
+	}
+
+	if (plyr->damagecount < 114)
+		cnt = damageToAlpha[plyr->damagecount];
+	else
+		cnt = damageToAlpha[113];
 
 	if (plyr->powers[pw_strength])
 	{
 		// slowly fade the berzerk out
-		bzc = 128 - ((plyr->powers[pw_strength]>>3) & (~0x1f));
+		int bzc = 128 - ((plyr->powers[pw_strength]>>3) & (~0x1f));
 
 		if (bzc > cnt)
 			cnt = bzc;
@@ -975,31 +1016,14 @@ void ST_doPaletteStuff (void)
 	{
 		if (cnt > 228)
 			cnt = 228;
-		else if (cnt < 28)
-			cnt = 28;
 
-		palette = MAKEARGB(cnt,255,0,0);
+		SV_AddBlend (1.0f, 0.0f, 0.0f, cnt / 255.0f, blend);
 	}
 
-	else if (plyr->bonuscount)
-	{
-		cnt = plyr->bonuscount << 3;
-
-		palette = MAKEARGB((cnt > 128) ? 128 : cnt,215,186,69);
-	}
-
-	else if ( plyr->powers[pw_ironfeet] > 4*32
-			  || plyr->powers[pw_ironfeet]&8)
-	{
-		palette = MAKEARGB(32,0,255,0);
-	}
-	
-	else 
-		palette = MAKEARGB(0,0,0,0);
-
-	if (palette != st_palette) {
-		st_palette = palette;
-		V_SetBlend (RPART(palette), GPART(palette), BPART(palette), APART(palette));
+	if (memcmp (blend, st_palette, sizeof(blend))) {
+		memcpy (st_palette, blend, sizeof(blend));
+		V_SetBlend ((int)(blend[0] * 255.0f), (int)(blend[1] * 255.0f),
+					(int)(blend[2] * 255.0f), (int)(blend[3] * 256.0f));
 	}
 }
 
@@ -1062,7 +1086,7 @@ void ST_diffDraw(void)
 
 void ST_Drawer (BOOL fullscreen, BOOL refresh)
 {
-  
+
 	st_statusbaron = (!fullscreen) || automapactive;
 	st_firsttime = st_firsttime || refresh;
 
@@ -1081,22 +1105,26 @@ void ST_Drawer (BOOL fullscreen, BOOL refresh)
 	V_UnlockScreen (&stbarscreen);
 
 	// [RH] Hey, it's somewhere to put the idmypos stuff!
-	//		Use displayplayer instead of consoleplayer
 	if (idmypos->value)
 		Printf ("ang=%d;x,y=(%d,%d)\n",
-				players[displayplayer].mo->angle/FRACUNIT,
-				players[displayplayer].mo->x/FRACUNIT,
-				players[displayplayer].mo->y/FRACUNIT);
+				players[consoleplayer].camera->angle/FRACUNIT,
+				players[consoleplayer].camera->x/FRACUNIT,
+				players[consoleplayer].camera->y/FRACUNIT);
 }
 
 void ST_loadGraphics(void)
 {
-
-	int 		i;
-	int 		j;
-	int 		facenum;
+	playerskin_t *skin;
+	int i, j;
+	int namespc;
+	int facenum;
 	
-	char		namebuf[9];
+	char namebuf[9];
+
+	if (plyr)
+		skin = &skins[plyr->userinfo.skin];
+	else
+		skin = &skins[players[consoleplayer].userinfo.skin];
 
 	// Load the numbers, tall and short
 	for (i=0;i<10;i++)
@@ -1113,7 +1141,7 @@ void ST_loadGraphics(void)
 	tallpercent = (patch_t *) W_CacheLumpName("STTPRCNT", PU_STATIC);
 
 	// key cards
-	for (i=0;i<NUMCARDS;i++)
+	for (i=0;i<NUMCARDS+NUMCARDS/2;i++)
 	{
 		sprintf(namebuf, "STKEYS%d", i);
 		keys[i] = (patch_t *) W_CacheLumpName(namebuf, PU_STATIC);
@@ -1144,32 +1172,44 @@ void ST_loadGraphics(void)
 
 	// face states
 	facenum = 0;
-	for (i=0;i<ST_NUMPAINFACES;i++)
+
+	// [RH] Use face specified by "skin"
+	if (skin->face[0]) {
+		// The skin has its own face
+		strncpy (namebuf, skin->face, 3);
+		namespc = skin->namespc;
+	} else {
+		// The skin doesn't have its own face; use the normal one
+		namebuf[0] = 'S'; namebuf[1] = 'T'; namebuf[2] = 'F';
+		namespc = ns_global;
+	}
+
+	for (i = 0; i < ST_NUMPAINFACES; i++)
 	{
-		for (j=0;j<ST_NUMSTRAIGHTFACES;j++)
+		for (j = 0; j < ST_NUMSTRAIGHTFACES; j++)
 		{
-			sprintf(namebuf, "STFST%d%d", i, j);
+			sprintf(namebuf+3, "ST%d%d", i, j);
 			faces[facenum++] = W_CacheLumpName(namebuf, PU_STATIC);
 		}
-		sprintf(namebuf, "STFTR%d0", i);		// turn right
-		faces[facenum++] = W_CacheLumpName(namebuf, PU_STATIC);
-		sprintf(namebuf, "STFTL%d0", i);		// turn left
-		faces[facenum++] = W_CacheLumpName(namebuf, PU_STATIC);
-		sprintf(namebuf, "STFOUCH%d", i);		// ouch!
-		faces[facenum++] = W_CacheLumpName(namebuf, PU_STATIC);
-		sprintf(namebuf, "STFEVL%d", i);		// evil grin ;)
-		faces[facenum++] = W_CacheLumpName(namebuf, PU_STATIC);
-		sprintf(namebuf, "STFKILL%d", i);		// pissed off
-		faces[facenum++] = W_CacheLumpName(namebuf, PU_STATIC);
+		sprintf(namebuf+3, "TR%d0", i);		// turn right
+		faces[facenum++] = W_CacheLumpNum ((W_CheckNumForName)(namebuf, namespc), PU_STATIC);
+		sprintf(namebuf+3, "TL%d0", i);		// turn left
+		faces[facenum++] = W_CacheLumpNum ((W_CheckNumForName)(namebuf, namespc), PU_STATIC);
+		sprintf(namebuf+3, "OUCH%d", i);		// ouch!
+		faces[facenum++] = W_CacheLumpNum ((W_CheckNumForName)(namebuf, namespc), PU_STATIC);
+		sprintf(namebuf+3, "EVL%d", i);		// evil grin ;)
+		faces[facenum++] = W_CacheLumpNum ((W_CheckNumForName)(namebuf, namespc), PU_STATIC);
+		sprintf(namebuf+3, "KILL%d", i);		// pissed off
+		faces[facenum++] = W_CacheLumpNum ((W_CheckNumForName)(namebuf, namespc), PU_STATIC);
 	}
-	faces[facenum++] = W_CacheLumpName("STFGOD0", PU_STATIC);
-	faces[facenum++] = W_CacheLumpName("STFDEAD0", PU_STATIC);
-
+	strcpy (namebuf+3, "GOD0");
+	faces[facenum++] = W_CacheLumpNum ((W_CheckNumForName)(namebuf, namespc), PU_STATIC);
+	strcpy (namebuf+3, "DEAD0");
+	faces[facenum++] = W_CacheLumpNum ((W_CheckNumForName)(namebuf, namespc), PU_STATIC);
 }
 
 void ST_loadData(void)
 {
-	lu_palette = W_GetNumForName ("PLAYPAL");
 	ST_loadGraphics();
 }
 
@@ -1195,7 +1235,7 @@ void ST_unloadGraphics(void)
 		Z_ChangeTag(arms[i][0], PU_CACHE);
 	
 	// unload the key cards
-	for (i=0;i<NUMCARDS;i++)
+	for (i=0;i<NUMCARDS+NUMCARDS/2;i++)
 		Z_ChangeTag(keys[i], PU_CACHE);
 
 	Z_ChangeTag(sbar, PU_CACHE);
@@ -1222,7 +1262,10 @@ void ST_initData(void)
 	int i;
 
 	st_firsttime = true;
-	plyr = &players[displayplayer];		// [RH] Not consoleplayer
+	if (players[consoleplayer].camera && players[consoleplayer].camera->player)
+		plyr = players[consoleplayer].camera->player;		// [RH] use camera
+	else
+		plyr = &players[consoleplayer];
 
 	st_clock = 0;
 	st_chatstate = StartChatState;
@@ -1233,7 +1276,7 @@ void ST_initData(void)
 	st_cursoron = false;
 
 	st_faceindex = 0;
-	st_palette = -1;
+	memset (st_palette, 255, sizeof(st_palette));
 
 	st_oldhealth = -1;
 
diff --git a/code/ST_STUFF.H b/code/St_stuff.h
similarity index 90%
rename from code/ST_STUFF.H
rename to code/St_stuff.h
index 5301061635..8865d0b0fc 100644
--- a/code/ST_STUFF.H
+++ b/code/St_stuff.h
@@ -58,6 +58,9 @@ void ST_Init (void);
 // Draw the HUD (only if old status bar is not drawn)
 void ST_newDraw (void);
 
+// Called on init and whenever player's skin changes
+void ST_loadGraphics (void);
+
 
 // States for status bar code.
 typedef enum
@@ -80,6 +83,9 @@ typedef enum
 
 BOOL ST_Responder(event_t* ev);
 
+// [RH] Base blending values (for e.g. underwater)
+extern int BaseBlendR, BaseBlendG, BaseBlendB;
+extern float BaseBlendA;
 
 
 #endif
diff --git a/code/V_video.c b/code/V_video.c
index ab3f27e072..68d627006c 100644
--- a/code/V_video.c
+++ b/code/V_video.c
@@ -25,6 +25,12 @@
 
 
 #include <stdio.h>
+
+#include "minilzo.h"
+// [RH] Output buffer size for LZO compression.
+//		Extra space in case uncompressable.
+#define OUT_LEN(a)		((a) + (a) / 64 + 16 + 3)
+
 #include "m_alloc.h"
 
 #include "i_system.h"
@@ -38,6 +44,7 @@
 #include "doomdata.h"
 #include "doomstat.h"
 
+#include "c_consol.h"
 #include "hu_stuff.h"
 
 #include "m_argv.h"
@@ -57,13 +64,17 @@
 
 extern void STACK_ARGS DimScreenPLoop (byte *colormap, byte *screen, int width, int modulo, int height);
 
+extern char *IdStrings[22];
+extern int DisplayID;
+
+
 
 // [RH] Screens are no longer mere byte arrays.
 screen_t screens[2];
- 
+
 int 	dirtybox[4];
 
-cvar_t *vid_defwidth, *vid_defheight, *vid_defbpp;
+cvar_t *vid_defwidth, *vid_defheight, *vid_defid;
 cvar_t *dimamount, *dimcolor;
 
 byte	*TransTable;
@@ -74,7 +85,7 @@ palette_t *DefaultPalette;
 // [RH] Set true when vid_setmode command has been executed
 BOOL	setmodeneeded = false;
 // [RH] Resolution to change to when setmodeneeded is true
-int		NewWidth, NewHeight, NewBpp;
+int		NewWidth, NewHeight, NewID;
 
 
 //
@@ -485,9 +496,10 @@ void V_Blit (screen_t *src, int srcx, int srcy, int srcwidth, int srcheight,
 //
 // V_SetResolution
 //
-BOOL V_DoModeSetup (int width, int height, int bpp)
+BOOL V_DoModeSetup (int width, int height, int id)
 {
 	int i;
+	int bpp;
 
 	CleanXfac = width / 320;
 	CleanYfac = height / 200;
@@ -499,8 +511,8 @@ BOOL V_DoModeSetup (int width, int height, int bpp)
 		if (screens[i].impdata)
 			V_FreeScreen (&screens[i]);
 
-	I_SetMode (width, height, bpp);
-	bpp = (bpp == 8) ? bpp : 32;
+	I_SetMode (width, height, id);
+	bpp = (id == 1010) ? 8 : 32;
 
 	for (i = 0; i < 2; i++) {
 		if (!I_AllocateScreen (&screens[i], width, height, bpp))
@@ -517,98 +529,127 @@ BOOL V_DoModeSetup (int width, int height, int bpp)
 	return true;
 }
 
-BOOL V_SetResolution (int width, int height, int Bpp)
+BOOL V_SetResolution (int width, int height, int id)
 {
 	int oldwidth, oldheight;
-	int oldBpp;
+	int oldID;
 
 	if (screens[0].impdata) {
 		oldwidth = screens[0].width;
 		oldheight = screens[0].height;
-		oldBpp = screens[0].Bpp * 8;
+		oldID = DisplayID;
 	} else {
 		// Harmless if screens[0] wasn't allocated
 		oldwidth = width;
 		oldheight = height;
-		oldBpp = Bpp;
+		oldID = id;
 	}
 
-	if (!I_CheckResolution (width, height, Bpp)) {				// Try specified resolution
-		if (!I_CheckResolution (oldwidth, oldheight, oldBpp)) {	// Try previous resolution (if any)
-			if (!I_CheckResolution (320, 200, 8)) {				// Try "standard" resolution
-				if (!I_CheckResolution (640, 480, 8)) {			// Try a resolution that *should* be available
+	if (!I_CheckResolution (width, height, id)) {				// Try specified resolution
+		if (!I_CheckResolution (oldwidth, oldheight, oldID)) {	// Try previous resolution (if any)
+			if (!I_CheckResolution (320, 200, 1010)) {			// Try "standard" resolution
+				if (!I_CheckResolution (640, 480, 1010)) {		// Try a resolution that *should* be available
 					return false;
 				} else {
 					width = 640;
 					height = 480;
-					Bpp = 8;
+					id = 1010;
 				}
 			} else {
 				width = 320;
 				height = 200;
-				Bpp = 8;
+				id = 1010;
 			}
 		} else {
 			width = oldwidth;
 			height = oldheight;
-			Bpp = oldBpp;
+			id = oldID;
 		}
 	}
 
-	return V_DoModeSetup (width, height, Bpp);
+	return V_DoModeSetup (width, height, id);
 }
 
 void Cmd_Vid_SetMode (void *plyr, int argc, char **argv)
 {
 	BOOL	goodmode = false;
-	int		width = 0, height = screens[0].height, bpp = screens[0].Bpp * 8;
+	int		width = 0, height = screens[0].height;
+	int		id = DisplayID;
 
 	if (argc > 1) {
 		width = atoi (argv[1]);
 		if (argc > 2) {
 			height = atoi (argv[2]);
-			if (argc > 3)
-				bpp = atoi (argv[3]);
+			if (argc > 3) {
+				int i;
+
+				for (i = 0; i < 22; i++)
+					if (!stricmp (IdStrings[i], argv[3]))
+						break;
+
+				if (i < 22)
+					id = 1000 + i;
+			}
 		}
 	}
 
 	if (width) {
-		if (I_CheckResolution (width, height, bpp))
+		if (I_CheckResolution (width, height, id))
 			goodmode = true;
 	}
 
 	if (goodmode) {
 		// The actual change of resolution will take place
 		// near the beginning of D_Display().
-		setmodeneeded = true;
-		NewWidth = width;
-		NewHeight = height;
-		NewBpp = bpp;
+		if (gamestate != GS_STARTUP) {
+			setmodeneeded = true;
+			NewWidth = width;
+			NewHeight = height;
+			NewID = id;
+		}
 	} else if (width) {
-		Printf ("Unknown resolution %d x %d x %d\n", width, height, bpp);
+		Printf ("Unknown resolution %d x %d (%s)\n", width, height, IdStrings[id-1000]);
 	} else {
-		Printf ("Usage: vid_setmode <width> <height> <bpp>\n");
+		Printf ("Usage: vid_setmode <width> <height> <mode>\n");
 	}
 }
 
 //
 // V_Init
-// 
+//
+extern char *IdStrings[22];
+extern int DisplayID;
+
+static int IdNameToId (char *name)
+{
+	int i;
+
+	for (i = 0; i < 22; i++) {
+		if (!stricmp (IdStrings[0], name))
+			break;
+	}
+
+	if (i < 22)
+		return i + 1000;
+	else
+		return 1010;	// INDEX8
+}
+
 void V_Init (void) 
 { 
+	static const char tag[] = "LZO-Compressed ZDoom Translucency Cache File v01";
 	int i;
-	int width, height, bpp;
+	int width, height, id;
 
 	// [RH] Setup gamma callback
 	gammalevel->u.callback = GammaCallback;
 	GammaCallback (gammalevel);
 
 	// [RH] Initialize palette subsystem
-	Printf ("InitPalettes\n");
 	if (!(DefaultPalette = InitPalettes ("PLAYPAL")))
-		I_FatalError ("Could not start palette subsystem");
+		I_FatalError ("Could not initialize palette");
 
-	width = height = bpp = 0;
+	width = height = id = 0;
 
 	if ( (i = M_CheckParm ("-width")) )
 		if (i < myargc - 1)
@@ -616,11 +657,11 @@ void V_Init (void)
 
 	if ( (i = M_CheckParm ("-height")) )
 		if (i < myargc - 1)
-		height = atoi (myargv[i + 1]);
+			height = atoi (myargv[i + 1]);
 
-	if ( (i = M_CheckParm ("-bpp")) )
+	if ( (i = M_CheckParm ("-mode")) )
 		if (i < myargc - 1)
-			bpp = atoi (myargv[i + 1]);
+			id = IdNameToId (myargv[i + 1]);
 
 	if (width == 0) {
 		if (height == 0) {
@@ -633,19 +674,20 @@ void V_Init (void)
 		height = (width * 6) / 8;
 	}
 
-	if (bpp == 0) {
-		bpp = (int)(vid_defbpp->value);
+	if (id == 0) {
+		id = IdNameToId (vid_defid->string);
 	}
 
-	if (!V_SetResolution (width, height, bpp)) {
-		I_FatalError ("Could not set resolution to %d x %d x %d", width, height, bpp);
+	if (!V_SetResolution (width, height, id)) {
+		I_FatalError ("Could not set resolution to %d x %d (%s)", width, height, IdStrings[id-1000]);
 	} else {
-		Printf ("Resolution: %d x %d x %d\n", screens[0].width, screens[0].height, screens[0].Bpp * 8);
+		Printf ("Resolution: %d x %d (%s)\n", screens[0].width, screens[0].height, IdStrings[id-1000]);
 	}
 
 	V_InitConChars (0xf7);
+	C_InitConsole (screens[0].width, screens[0].height, true);
 
-	{
+	{/*
 		static int palpoop[256];
 		byte *palette = W_CacheLumpName ("PLAYPAL", PU_CACHE);
 		int i;
@@ -656,15 +698,14 @@ void V_Init (void)
 						 (palette[2]);
 			palette += 3;
 		}
-
-		V_Palette = palpoop;
+*/
+		V_Palette = DefaultPalette->colors;
 	}
 
 	if (!M_CheckParm ("-notrans")) {
 		char cachename[256];
 		byte *palette;
-		BOOL isCached = false;
-		FILE *cached;
+		FILE *cache;
 		int i;
 
 		// Align TransTable on a 64k boundary
@@ -674,6 +715,7 @@ void V_Init (void)
 		i = M_CheckParm("-transfile");
 		if (i && i < myargc - 1) {
 			strcpy (cachename, myargv[i+1]);
+			FixPathSeperator (cachename);
 			DefaultExtension (cachename, ".tch");
 		} else {
 			sprintf (cachename, "%stranstab.tch", progdir);
@@ -681,36 +723,109 @@ void V_Init (void)
 		palette = W_CacheLumpName ("PLAYPAL", PU_CACHE);
 
 		{	// Check for cached translucency table
-			byte cachepal[768];
+			byte *cachemem;
+			byte *out;
+			int newlen;
+			int cachelen;
+			int insidelen;
+			int r;
 
-			cached = fopen (cachename, "rb");
-			if (cached) {
-				if (fread (cachepal, 1, 768, cached) == 768) {
-					if (memcmp (cachepal, palette, 768)) {
-						Printf ("Translucency cache was generated with a different palette\n");
-					} else {
-						isCached = (fread (TransTable, 1, 65536*3, cached) == 65536*3);
-					}
+			cache = fopen (cachename, "rb");
+			if (cache) {
+				fseek (cache, 0, SEEK_END);
+				cachelen = ftell (cache);
+				fseek (cache, 0, SEEK_SET);
+
+				if (cachelen <= strlen(tag) + sizeof(int)) {
+					fclose (cache);
+					cache = NULL;
+					goto maketable;
 				}
-				if (!isCached) {
-					Printf ("Bad translucency cache file\n");
+
+				cachemem = Z_Malloc (cachelen, PU_STATIC, 0);
+				if (fread (cachemem, 1, cachelen, cache) != cachelen) {
+					fclose (cache);
+					cache = NULL;
+					Printf ("Trouble reading tranlucency cache\n");
+					goto maketable;
 				}
+
+				fclose (cache);
+
+				if (strncmp (tag, cachemem, strlen(tag)) != 0) {
+					Printf ("Regenerating old translucency cache\n");
+					cache = NULL;
+					goto maketable;
+				}
+
+				// So far, so good. Try expanding the cached data.
+				memcpy (&insidelen, cachemem + strlen(tag), sizeof(int));
+				if (insidelen != cachelen - strlen(tag) - sizeof(int)) {
+					Printf ("Translucency cache wrong size\n");
+					cache = NULL;
+					goto maketable;
+				}
+
+				out = Z_Malloc (65536*3+768, PU_STATIC, 0);
+
+				r = lzo1x_decompress (cachemem + strlen(tag) + sizeof(int),
+									  insidelen, out, &newlen, NULL);
+
+				if (r != LZO_E_OK || newlen != 65536*3+768) {
+					Printf ("Bad translucency cache\n");
+					cache = NULL;
+					Z_Free (out);
+					goto maketable;
+				}
+
+				// Check to make sure if the cache was generated from the
+				// current PLAYPAL. If not, we need to generate it, but
+				// don't bother replacing this one.
+				if (memcmp (out, palette, 768)) {
+					Printf ("Translucency cache was generated with a different palette\n");
+					Z_Free (out);
+					goto maketable;
+				}
+
+				// Everything's good. Use the cached data.
+				memcpy (TransTable, out+768, 65536*3);
+				TransTable -= 65536;
+				Z_Free (out);
+				return;
 			}
 		}
 
-		if (!isCached) {
-			Printf ("Creating translucency tables\n");
-			BuildTransTable (TransTable, DefaultPalette->basecolors);
-			if (!cached) {
-				cached = fopen (cachename, "wb");
-				if (cached) {
-					fwrite (palette, 1, 768, cached);
-					fwrite (TransTable, 1, 65536*3, cached);
+	maketable:
+		Printf ("Creating translucency tables\n");
+		BuildTransTable (TransTable, DefaultPalette->basecolors);
+		if (!cache) {
+			byte *out, *wrkmem, *in;
+			int outlen, r;
+
+			wrkmem = Z_Malloc (LZO1X_1_MEM_COMPRESS, PU_STATIC, 0);
+			in = Z_Malloc (768 + 65536*3, PU_STATIC, 0);
+			out = Z_Malloc (768 + 65536*3, PU_STATIC, 0);
+
+			strncpy (in, tag, strlen (tag));
+			memcpy (in, palette, 768);
+			memcpy (in+768, TransTable, 65536*3);
+
+			r = lzo1x_1_compress (in, 768+65536*3, out, &outlen, wrkmem);
+
+			Z_Free (wrkmem);
+			Z_Free (in);
+
+			if (r == LZO_E_OK) {
+				cache = fopen (cachename, "wb");
+
+				if (cache) {
+					fwrite (tag, 1, strlen(tag), cache);
+					fwrite (&outlen, sizeof(outlen), 1, cache);
+					fwrite (out, 1, outlen, cache);
+					fclose (cache);
 				}
 			}
 		}
-		if (cached)
-			fclose (cached);
 
 		TransTable -= 65536;
 	}
diff --git a/code/W_wad.c b/code/W_wad.c
index eafd431c1c..5f5662f5ca 100644
--- a/code/W_wad.c
+++ b/code/W_wad.c
@@ -18,6 +18,7 @@
 //
 // DESCRIPTION:
 //		Handles WAD file header, directory, lump I/O.
+//		[RH] Changed to use buffered I/O (fread, etc)
 //
 //-----------------------------------------------------------------------------
 
@@ -57,14 +58,19 @@ int				numlumps;
 void**			lumpcache;
 
 
-int W_filelength (int handle) 
+int W_filelength (FILE *handle) 
 {
-	struct stat	fileinfo;
+	int len;
 
-	if (fstat (handle,&fileinfo) == -1)
-		I_Error ("Error fstating");
+	if (fseek (handle, 0, SEEK_END))
+		I_Error ("Error fseeking");
 
-	return fileinfo.st_size;
+	len = ftell (handle);
+
+	if (fseek (handle, 0, SEEK_SET))
+		I_Error ("Error fseeking");
+
+	return len;
 }
 
 // [RH] Copy up to 8 chars, upper-casing them in the process
@@ -102,7 +108,7 @@ void W_AddFile (char *filename)
 	wadinfo_t		header;
 	lumpinfo_t*		lump_p;
 	unsigned		i;
-	int				handle;
+	FILE			*handle;
 	int				length;
 	int				startlump;
 	filelump_t*		fileinfo, *fileinfo2free;
@@ -116,17 +122,17 @@ void W_AddFile (char *filename)
 
 	// open the file and add to directory
 
-	if ((handle = open (name, O_RDONLY | O_BINARY)) == -1)
+	if ((handle = fopen (name, "rb")) == NULL)
 	{
 		Printf (" couldn't open %s\n",filename);
 		return;
 	}
 
-	Printf (" adding %s",filename);
+	Printf (" adding %s", name);
 	startlump = numlumps;
 	
 	// [RH] Determine if file is a WAD based on its signature, not its name.
-	read (handle, &header, sizeof(header));
+	fread (&header, sizeof(header), 1, handle);
 
 	if (header.identification == IWAD_ID ||
 		header.identification == PWAD_ID) {
@@ -136,8 +142,8 @@ void W_AddFile (char *filename)
 		header.infotableofs = LONG(header.infotableofs);
 		length = header.numlumps * sizeof(filelump_t);
 		fileinfo = fileinfo2free = Z_Malloc (length, PU_STATIC, 0);
-		lseek (handle, header.infotableofs, SEEK_SET);
-		read (handle, fileinfo, length);
+		fseek (handle, header.infotableofs, SEEK_SET);
+		fread (fileinfo, 1, length, handle);
 		numlumps += header.numlumps;
 		Printf (" (%d lumps)", header.numlumps);
 	} else {
@@ -188,7 +194,7 @@ void W_AddFile (char *filename)
 // The name searcher looks backwards, so a later file
 //  does override all earlier ones.
 //
-void W_InitMultipleFiles (char** filenames)
+void W_InitMultipleFiles (wadlist_t **filenames)
 {
 	int i;
 
@@ -198,11 +204,16 @@ void W_InitMultipleFiles (char** filenames)
 	// will be realloced as lumps are added
 	lumpinfo = NULL;		// [RH] Start out as NULL
 
-	for ( ; *filenames ; filenames++)
-		W_AddFile (*filenames);
+	while (*filenames) {
+		wadlist_t *next = (*filenames)->next;
+
+		W_AddFile ((*filenames)->name);
+		Z_Free (*filenames);
+		*filenames = next;
+	}
 
 	if (!numlumps)
-		I_Error ("W_InitFiles: no files found");
+		I_FatalError ("W_InitFiles: no files found");
 
 	// [RH] Set namespace markers to global for everything
 	for (i = 0; i < numlumps; i++)
@@ -232,13 +243,13 @@ void W_InitMultipleFiles (char** filenames)
 // W_InitFile
 // Just initialize from a single file.
 //
-void W_InitFile (char* filename)
+void W_InitFile (char *filename)
 {
-	char *names[2];
+	wadlist_t *names = Z_Malloc (sizeof(*names)+strlen(filename), PU_STATIC, 0);
 
-	names[0] = filename;
-	names[1] = NULL;
-	W_InitMultipleFiles (names);
+	names->next = NULL;
+	strcpy (names->name, filename);
+	W_InitMultipleFiles (&names);
 }
 
 
@@ -328,8 +339,8 @@ void W_ReadLump (int lump, void *dest)
 
 	l = lumpinfo + lump;
 	
-	lseek (l->handle, l->position, SEEK_SET);
-	c = read (l->handle, dest, l->size);
+	fseek (l->handle, l->position, SEEK_SET);
+	c = fread (dest, 1, l->size, l->handle);
 
 	if (c < l->size)
 		I_Error ("W_ReadLump: only read %i of %i on lump %i",
@@ -348,7 +359,7 @@ void *W_CacheLumpNum (int lump, int tag)
 	int lumplen;
 
 	if ((unsigned)lump >= numlumps)
-		I_Error ("W_CacheLumpNum: %i >= numlumps",lump);
+		I_Error ("W_CacheLumpNum: %u >= numlumps",lump);
 
 	if (!lumpcache[lump])
 	{
@@ -463,8 +474,8 @@ void W_MergeLumps (const char *start, const char *end, int space)
 				if (!newlumps) {
 					newlumps++;
 					strncpy (newlumpinfos[0].name, ustart, 8);
-					newlumpinfos[0].handle =
-						newlumpinfos[0].position =
+					newlumpinfos[0].handle = NULL;
+					newlumpinfos[0].position =
 						newlumpinfos[0].size = 0;
 					newlumpinfos[0].namespc = ns_global;
 				}
@@ -492,8 +503,8 @@ void W_MergeLumps (const char *start, const char *end, int space)
 	// Only create an end marker if there was one in the original list.
 	if (haveEndMarker) {
 		strncpy (newlumpinfos[newlumps].name, uend, 8);
-		newlumpinfos[newlumps].handle =
-			newlumpinfos[newlumps].position =
+		newlumpinfos[newlumps].handle = NULL;
+		newlumpinfos[newlumps].position =
 			newlumpinfos[newlumps].size = 0;
 		newlumpinfos[newlumps].namespc = ns_global;
 		newlumps++;
@@ -623,4 +634,29 @@ BOOL W_CheckLumpName (int lump, const char *name)
 		return false;
 
 	return !strnicmp (lumpinfo[lump].name, name, 8);
+}
+
+// [RH] Copies the lump name to to using uppercopy
+void W_GetLumpName (char *to, int lump)
+{
+	if (lump >= numlumps)
+		*to = 0;
+	else
+		uppercopy (to, lumpinfo[lump].name);
+}
+
+// [RH] Returns file ptr for specified lump
+FILE *W_GetLumpFile (int lump)
+{
+	if (lump >= numlumps)
+		return NULL;
+	else
+		return lumpinfo[lump].handle;
+}
+
+// [RH] Put a lump in a certain namespace
+void W_SetLumpNamespace (int lump, int nmspace)
+{
+	if (lump < numlumps)
+		lumpinfo[lump].namespc = nmspace;
 }
\ No newline at end of file
diff --git a/code/Wi_stuff.c b/code/Wi_stuff.c
index a33af6516e..d313c1e9fc 100644
--- a/code/Wi_stuff.c
+++ b/code/Wi_stuff.c
@@ -42,9 +42,6 @@
 
 #include "doomstat.h"
 
-// Data.
-#include "sounds.h"
-
 // Needs access to LFB.
 #include "v_video.h"
 
@@ -976,7 +973,7 @@ void WI_updateDeathmatchStats(void)
 		}
 		
 
-		S_StartSound(ORIGIN_AMBIENT, sfx_barexp);
+		S_StartSound (ORIGIN_AMBIENT, "weapons/rocklx", 60);
 		dm_state = 4;
 	}
 
@@ -984,7 +981,7 @@ void WI_updateDeathmatchStats(void)
 	if (dm_state == 2)
 	{
 		if (!(bcnt&3))
-			S_StartSound(ORIGIN_AMBIENT, sfx_pistol);
+			S_StartSound (ORIGIN_AMBIENT, "weapons/pistol", 64);
 		
 		stillticking = false;
 
@@ -1023,7 +1020,7 @@ void WI_updateDeathmatchStats(void)
 		}
 		if (!stillticking)
 		{
-			S_StartSound(ORIGIN_AMBIENT, sfx_barexp);
+			S_StartSound(ORIGIN_AMBIENT, "weapons/rocklx", 60);
 			dm_state++;
 		}
 
@@ -1032,7 +1029,7 @@ void WI_updateDeathmatchStats(void)
 	{
 		if (acceleratestage)
 		{
-			S_StartSound(ORIGIN_AMBIENT, sfx_slop);
+			S_StartSound(ORIGIN_AMBIENT, "players/male/gibbed", 78);
 
 			if ( gamemode == commercial)
 				WI_initNoState();
@@ -1206,16 +1203,16 @@ void WI_updateNetgameStats(void)
 			cnt_secret[i] = plrs[i].ssecret;
 
 			if (dofrags)
-				cnt_frags[i] = WI_fragSum(i);
+				cnt_frags[i] = WI_fragSum (i);
 		}
-		S_StartSound(ORIGIN_AMBIENT, sfx_barexp);
+		S_StartSound (ORIGIN_AMBIENT, "weapons/rocklx", 60);
 		ng_state = 10;
 	}
 
 	if (ng_state == 2)
 	{
 		if (!(bcnt&3))
-			S_StartSound(ORIGIN_AMBIENT, sfx_pistol);
+			S_StartSound (ORIGIN_AMBIENT, "weapons/pistol", 64);
 
 		stillticking = false;
 
@@ -1234,14 +1231,14 @@ void WI_updateNetgameStats(void)
 		
 		if (!stillticking)
 		{
-			S_StartSound(ORIGIN_AMBIENT, sfx_barexp);
+			S_StartSound (ORIGIN_AMBIENT, "weapons/rocklx", 60);
 			ng_state++;
 		}
 	}
 	else if (ng_state == 4)
 	{
 		if (!(bcnt&3))
-			S_StartSound(ORIGIN_AMBIENT, sfx_pistol);
+			S_StartSound (ORIGIN_AMBIENT, "weapons/pistol", 64);
 
 		stillticking = false;
 
@@ -1258,14 +1255,14 @@ void WI_updateNetgameStats(void)
 		}
 		if (!stillticking)
 		{
-			S_StartSound(ORIGIN_AMBIENT, sfx_barexp);
+			S_StartSound (ORIGIN_AMBIENT, "weapons/rocklx", 60);
 			ng_state++;
 		}
 	}
 	else if (ng_state == 6)
 	{
 		if (!(bcnt&3))
-			S_StartSound(ORIGIN_AMBIENT, sfx_pistol);
+			S_StartSound (ORIGIN_AMBIENT, "weapons/pistol", 64);
 
 		stillticking = false;
 
@@ -1284,14 +1281,14 @@ void WI_updateNetgameStats(void)
 		
 		if (!stillticking)
 		{
-			S_StartSound(ORIGIN_AMBIENT, sfx_barexp);
+			S_StartSound (ORIGIN_AMBIENT, "weapons/rocklx", 60);
 			ng_state += 1 + 2*!dofrags;
 		}
 	}
 	else if (ng_state == 8)
 	{
 		if (!(bcnt&3))
-			S_StartSound(ORIGIN_AMBIENT, sfx_pistol);
+			S_StartSound (ORIGIN_AMBIENT, "weapons/pistol", 64);
 
 		stillticking = false;
 
@@ -1310,7 +1307,7 @@ void WI_updateNetgameStats(void)
 		
 		if (!stillticking)
 		{
-			S_StartSound(ORIGIN_AMBIENT, sfx_pldeth);
+			S_StartSound (ORIGIN_AMBIENT, "player/male/death1", 32);
 			ng_state++;
 		}
 	}
@@ -1318,7 +1315,7 @@ void WI_updateNetgameStats(void)
 	{
 		if (acceleratestage)
 		{
-			S_StartSound(ORIGIN_AMBIENT, sfx_sgcock);
+			S_StartSound (ORIGIN_AMBIENT, "weapons/shotgr", 64);
 			if ( gamemode == commercial )
 				WI_initNoState();
 			else
@@ -1425,7 +1422,7 @@ void WI_updateStats(void)
 		cnt_secret[0] = plrs[me].ssecret;
 		cnt_time = plrs[me].stime / TICRATE;
 		cnt_par = wbs->partime / TICRATE;
-		S_StartSound(ORIGIN_AMBIENT, sfx_barexp);
+		S_StartSound (ORIGIN_AMBIENT, "weapons/rocklx", 60);
 		sp_state = 10;
 	}
 
@@ -1434,12 +1431,12 @@ void WI_updateStats(void)
 		cnt_kills[0] += 2;
 
 		if (!(bcnt&3))
-			S_StartSound(ORIGIN_AMBIENT, sfx_pistol);
+			S_StartSound (ORIGIN_AMBIENT, "weapons/pistol", 64);
 
 		if (cnt_kills[0] >= plrs[me].skills)
 		{
 			cnt_kills[0] = plrs[me].skills;
-			S_StartSound(ORIGIN_AMBIENT, sfx_barexp);
+			S_StartSound (ORIGIN_AMBIENT, "weapons/rocklx", 60);
 			sp_state++;
 		}
 	}
@@ -1448,12 +1445,12 @@ void WI_updateStats(void)
 		cnt_items[0] += 2;
 
 		if (!(bcnt&3))
-			S_StartSound(ORIGIN_AMBIENT, sfx_pistol);
+			S_StartSound (ORIGIN_AMBIENT, "weapons/pistol", 64);
 
 		if (cnt_items[0] >= plrs[me].sitems)
 		{
 			cnt_items[0] = plrs[me].sitems;
-			S_StartSound(ORIGIN_AMBIENT, sfx_barexp);
+			S_StartSound (ORIGIN_AMBIENT, "weapons/rocklx", 60);
 			sp_state++;
 		}
 	}
@@ -1462,12 +1459,12 @@ void WI_updateStats(void)
 		cnt_secret[0] += 2;
 
 		if (!(bcnt&3))
-			S_StartSound(ORIGIN_AMBIENT, sfx_pistol);
+			S_StartSound (ORIGIN_AMBIENT, "weapons/pistol", 64);
 
 		if (cnt_secret[0] >= plrs[me].ssecret)
 		{
 			cnt_secret[0] = plrs[me].ssecret;
-			S_StartSound(ORIGIN_AMBIENT, sfx_barexp);
+			S_StartSound (ORIGIN_AMBIENT, "weapons/rocklx", 60);
 			sp_state++;
 		}
 	}
@@ -1475,7 +1472,7 @@ void WI_updateStats(void)
 	else if (sp_state == 8)
 	{
 		if (!(bcnt&3))
-			S_StartSound(ORIGIN_AMBIENT, sfx_pistol);
+			S_StartSound (ORIGIN_AMBIENT, "weapons/pistol", 64);
 
 		cnt_time += 3;
 
@@ -1490,7 +1487,7 @@ void WI_updateStats(void)
 
 			if (cnt_time >= plrs[me].stime / TICRATE)
 			{
-				S_StartSound(ORIGIN_AMBIENT, sfx_barexp);
+				S_StartSound (ORIGIN_AMBIENT, "weapons/rocklx", 60);
 				sp_state++;
 			}
 		}
@@ -1499,7 +1496,7 @@ void WI_updateStats(void)
 	{
 		if (acceleratestage)
 		{
-			S_StartSound(ORIGIN_AMBIENT, sfx_sgcock);
+			S_StartSound (ORIGIN_AMBIENT, "weapons/shotgr", 64);
 
 			if (gamemode == commercial)
 				WI_initNoState();
diff --git a/code/c_bind.c b/code/c_bind.c
index 3e4bd0b1c5..7626c71045 100644
--- a/code/c_bind.c
+++ b/code/c_bind.c
@@ -3,6 +3,8 @@
 #include "cmdlib.h"
 #include "c_dispch.h"
 #include "c_bind.h"
+#include "g_level.h"
+#include "dstrings.h"
 
 #include <math.h>
 #include <stdlib.h>
@@ -57,7 +59,7 @@ char DefBindings[] =
 	"bind \\ +showscores; "				// <- Another new command
 	"bind f12 spynext";
 
-static const char *KeyNames[256+8+32] = {
+static const char *KeyNames[NUM_KEYS] = {
 	// This array is dependant on the particular keyboard input
 	// codes generated in i_input.c. If they change there, they
 	// also need to change here. In this case, we use the
@@ -98,9 +100,9 @@ static const char *KeyNames[256+8+32] = {
 	NULL,	NULL,	NULL,	NULL,	NULL,	NULL,	NULL,		"pause",	//F8
 
 	// non-keyboard buttons that can be bound
-	"mouse1",	"mouse2",	"mouse3",	"mouse4",		// DInput has four of these...
-	NULL,		NULL,		NULL,		NULL,			// Space for double clicking if I feel like it
-	"joy1",		"joy2",		"joy3",		"joy4",			// 32 joystick buttons!
+	"mouse1",	"mouse2",	"mouse3",	"mouse4",		// 4 mouse buttons
+	"mwheelup",	"mwheeldown",NULL,		NULL,			// the wheel and some extra space
+	"joy1",		"joy2",		"joy3",		"joy4",			// 32 joystick buttons
 	"joy5",		"joy6",		"joy7",		"joy8",
 	"joy9",		"joy10",	"joy11",	"joy12",
 	"joy13",	"joy14",	"joy15",	"joy16",
@@ -110,7 +112,10 @@ static const char *KeyNames[256+8+32] = {
 	"joy29",	"joy30",	"joy31",	"joy32"
 };
 
-static char *Bindings[256+8+32];
+static char *Bindings[NUM_KEYS];
+static char *DoubleBindings[NUM_KEYS];
+static int DClickTime[NUM_KEYS];
+static byte DClicked[(NUM_KEYS+7)/8];
 
 static int GetKeyFromName (const char *name)
 {
@@ -122,7 +127,7 @@ static int GetKeyFromName (const char *name)
 	}
 
 	// Otherwise, we scan the KeyNames[] array for a matching name
-	for (i = 0; i < 256+8+32; i++) {
+	for (i = 0; i < NUM_KEYS; i++) {
 		if (KeyNames[i] && !stricmp (KeyNames[i], name))
 			return i;
 	}
@@ -144,12 +149,17 @@ void Cmd_Unbindall (void *plyr, int argc, char **argv)
 {
 	int i;
 
-	for (i = 0; i < 256+8+32; i++) {
+	for (i = 0; i < NUM_KEYS; i++)
 		if (Bindings[i]) {
 			free (Bindings[i]);
 			Bindings[i] = NULL;
 		}
-	}
+
+	for (i = 0; i < NUM_KEYS; i++)
+		if (DoubleBindings[i]) {
+			free (DoubleBindings[i]);
+			DoubleBindings[i] = NULL;
+		}
 }
 
 void Cmd_Unbind (void *plyr, int argc, char **argv)
@@ -183,43 +193,115 @@ void Cmd_Bind (void *plyr, int argc, char **argv)
 		if (argc == 2) {
 			Printf ("\"%s\" = \"%s\"\n", argv[1], (Bindings[i] ? Bindings[i] : ""));
 		} else {
-			if (Bindings[i])
-				free (Bindings[i]);
-
-			Bindings[i] = copystring (argv[2]);
+			ReplaceString (&Bindings[i], argv[2]);
 		}
 	} else {
 		Printf ("Current key bindings:\n");
 		
-		for (i = 0; i < 256+8+32; i++) {
+		for (i = 0; i < NUM_KEYS; i++) {
 			if (Bindings[i])
 				Printf ("%s \"%s\"\n", KeyName (i), Bindings[i]);
 		}
 	}
 }
 
+void Cmd_UnDoubleBind (void *plyr, int argc, char **argv)
+{
+	int i;
+
+	if (argc > 1) {
+		if ( (i = GetKeyFromName (argv[1])) ) {
+			if (DoubleBindings[i]) {
+				free (DoubleBindings[i]);
+				DoubleBindings[i] = NULL;
+			}
+		} else {
+			Printf ("Unknown key \"%s\"\n", argv[1]);
+			return;
+		}
+
+	}
+}
+
+void Cmd_DoubleBind (void *plyr, int argc, char **argv)
+{
+	int i;
+
+	if (argc > 1) {
+		i = GetKeyFromName (argv[1]);
+		if (!i) {
+			Printf ("Unknown key \"%s\"\n", argv[1]);
+			return;
+		}
+		if (argc == 2) {
+			Printf ("\"%s\" = \"%s\"\n", argv[1], (DoubleBindings[i] ? DoubleBindings[i] : ""));
+		} else {
+			ReplaceString (&DoubleBindings[i], argv[2]);
+		}
+	} else {
+		Printf ("Current key doublebindings:\n");
+		
+		for (i = 0; i < NUM_KEYS; i++) {
+			if (DoubleBindings[i])
+				Printf ("%s \"%s\"\n", KeyName (i), DoubleBindings[i]);
+		}
+	}
+}
+
 void Cmd_BindDefaults (void *plyr, int argc, char **argv)
 {
 	AddCommandString (DefBindings);
 }
 
-BOOL C_DoKey (int key, BOOL up)
+BOOL C_DoKey (event_t *ev)
 {
 	extern BOOL chat_on;
+	char *binding = NULL;
+	int dclickspot;
+	byte dclickmask;
 
-	if (Bindings[key] && (!chat_on || key < 256)) {
-		if (!up) {
-			AddCommandString (Bindings[key]);
+	if (ev->type != ev_keydown && ev->type != ev_keyup)
+		return false;
+
+	dclickspot = ev->data1 >> 3;
+	dclickmask = 1 << (ev->data1 & 7);
+
+	if (DClickTime[ev->data1] > level.time && ev->type == ev_keydown) {
+		// Key pressed for a double click
+		binding = DoubleBindings[ev->data1];
+		DClicked[dclickspot] |= dclickmask;
+	} else {
+		if (ev->type == ev_keydown) {
+			// Key pressed for a normal press
+			binding = Bindings[ev->data1];
+			DClickTime[ev->data1] = level.time + 20;
+		} else if (DClicked[dclickspot] & dclickmask) {
+			// Key released from a double click
+			binding = DoubleBindings[ev->data1];
+			DClicked[dclickspot] &= ~dclickmask;
+			DClickTime[ev->data1] = 0;
+		} else {
+			// Key released from a normal press
+			binding = Bindings[ev->data1];
+		}
+	}
+
+	if (!binding)
+		binding = Bindings[ev->data1];
+
+	if (binding && (!chat_on || ev->data1 < 256)) {
+		if (ev->type == ev_keydown) {
+			AddCommandString (binding);
 		} else {
 			char *achar;
 		
-			achar = strchr (Bindings[key], '+');
+			achar = strchr (binding, '+');
 			if (!achar)
 				return false;
 
-			if ((achar == Bindings[key]) || (*(achar - 1) <= ' ')) {
+			if ((achar == binding) || (*(achar - 1) <= ' ')) {
 				*achar = '-';
-				AddCommandString (Bindings[key]);
+				AddCommandString (binding);
 				*achar = '+';
 			}
 		}
@@ -233,11 +315,12 @@ void C_ArchiveBindings (FILE *f)
 	int i;
 
 	fprintf (f, "unbindall\n");
-	for (i = 0; i < 256+8+32; i++) {
-		if (Bindings[i]) {
+	for (i = 0; i < NUM_KEYS; i++)
+		if (Bindings[i])
 			fprintf (f, "bind \"%s\" \"%s\"\n", KeyName (i), Bindings[i]);
-		}
-	}
+	for (i = 0; i < NUM_KEYS; i++)
+		if (DoubleBindings[i])
+			fprintf (f, "doublebind \"%s\" \"%s\"\n", KeyName (i), DoubleBindings[i]);
 }
 
 int C_GetKeysForCommand (char *cmd, int *first, int *second)
@@ -246,7 +329,7 @@ int C_GetKeysForCommand (char *cmd, int *first, int *second)
 
 	*first = *second = c = i = 0;
 
-	while (i < 256+8+32 && c < 2) {
+	while (i < NUM_KEYS && c < 2) {
 		if (Bindings[i] && !stricmp (cmd, Bindings[i])) {
 			if (c++ == 0)
 				*first = i;
@@ -283,7 +366,7 @@ void C_UnbindACommand (char *str)
 {
 	int i;
 
-	for (i = 0; i < 256+8+32; i++) {
+	for (i = 0; i < NUM_KEYS; i++) {
 		if (Bindings[i] && !stricmp (str, Bindings[i])) {
 			free (Bindings[i]);
 			Bindings[i] = NULL;
diff --git a/code/c_bind.h b/code/c_bind.h
index 6091e5820e..762a6162ef 100644
--- a/code/c_bind.h
+++ b/code/c_bind.h
@@ -2,9 +2,10 @@
 #define __C_BINDINGS_H__
 
 #include "doomtype.h"
+#include "d_event.h"
 #include <stdio.h>
 
-BOOL C_DoKey (int key, BOOL up);
+BOOL C_DoKey (event_t *ev);
 void C_ArchiveBindings (FILE *f);
 
 // Stuff used by the customize controls menu
diff --git a/code/c_cmds.h b/code/c_cmds.h
index bdd1089264..cd0a24c53c 100644
--- a/code/c_cmds.h
+++ b/code/c_cmds.h
@@ -7,6 +7,9 @@ void C_InstallCommands (void);
 // am_map.c
 CMD(Cmd_Togglemap)
 
+// d_main.c
+CMD(Cmd_Endgame)
+
 // m_menu.c
 CMD(Cmd_Menu_Main)
 CMD(Cmd_Menu_Load)
@@ -34,9 +37,12 @@ CMD(Cmd_Menu_Gameplay)
 CMD(Cmd_Impulse)
 CMD(Cmd_CenterView)
 CMD(Cmd_Pause)
+CMD(Cmd_WeapNext)
+CMD(Cmd_WeapPrev)
 CMD(Cmd_Stop)
 CMD(Cmd_SpyNext)
 CMD(Cmd_SpyPrev)
+CMD(Cmd_Turn180)
 
 // g_level.c
 CMD(Cmd_Map)
@@ -51,6 +57,8 @@ CMD(Cmd_Bind)
 CMD(Cmd_BindDefaults)
 CMD(Cmd_Unbind)
 CMD(Cmd_Unbindall)
+CMD(Cmd_DoubleBind)
+CMD(Cmd_UnDoubleBind)
 
 // c_consol.c
 void C_ToggleConsole (void);
@@ -78,6 +86,12 @@ CMD(Cmd_DumpHeap)
 CMD(Cmd_Logfile)
 CMD(Cmd_Limits)
 CMD(Cmd_ChangeMap)
+CMD(Cmd_Quit)
+CMD(Cmd_Puke)
+CMD(Cmd_Error)
+
+// d_net.c
+CMD(Cmd_Pings)
 
 // p_inter.c
 CMD(Cmd_Kill)
@@ -92,5 +106,17 @@ CMD(Cmd_Screenshot)
 // hu_stuff.c
 CMD(Cmd_MessageMode)
 CMD(Cmd_Say)
+CMD(Cmd_MessageMode2)
+CMD(Cmd_Say_Team)
+
+// r_things.c
+CMD(Cmd_Skins)
+
+// s_sounds.c
+CMD(Cmd_Soundlist)
+CMD(Cmd_Soundlinks)
+
+// z_zone.c
+CMD(Cmd_Mem)
 
 #undef CMD
\ No newline at end of file
diff --git a/code/c_consol.c b/code/c_consol.c
index 6390763bc3..2ab4acbe8b 100644
--- a/code/c_consol.c
+++ b/code/c_consol.c
@@ -4,13 +4,16 @@
 #include <math.h>
 #include <stdlib.h>
 
+#include "version.h"
 #include "dstrings.h"
+#include "g_game.h"
 #include "c_consol.h"
 #include "c_cvars.h"
 #include "c_dispch.h"
 #include "hu_stuff.h"
 #include "i_input.h"
 #include "i_system.h"
+#include "i_video.h"
 #include "m_swap.h"
 #include "v_video.h"
 #include "v_text.h"
@@ -19,6 +22,7 @@
 #include "r_main.h"
 #include "r_draw.h"
 #include "st_stuff.h"
+#include "s_sound.h"
 
 #include "doomstat.h"
 
@@ -31,11 +35,7 @@ static screen_t conback;		// As of 1.13, Console backdrop is just another screen
 
 extern int		gametic;
 extern BOOL		automapactive;	// in AM_map.c
-
-typedef enum cstate_t {
-	up=0, down=1, falling=2, rising=3
-} constate;
-
+extern BOOL		advancedemo;
 
 int			ConRows, ConCols, PhysRows;
 char		*Lines, *Last = NULL;
@@ -43,7 +43,7 @@ BOOL		vidactive = false, gotconback = false;
 BOOL		cursoron = false;
 int			ShowRows, SkipRows, ConsoleTicker, ConBottom, ConScroll, RowAdjust;
 int			CursorTicker, ScrollState = 0;
-int			ConsoleState = up;
+constate_e	ConsoleState = c_up;
 char		VersionString[8];
 
 event_t		RepeatEvent;		// always type ev_keydown
@@ -56,8 +56,7 @@ BOOL		KeysShifted;
 #define SCROLLNO 0
 
 extern cvar_t *showMessages;
-extern BOOL message_dontfuckwithme;		// Who came up with this name?
-
+extern BOOL message_dontfuckwithme;
 extern BOOL chat_on;
 
 struct History {
@@ -86,7 +85,7 @@ FILE *Logfile = NULL;
 
 extern patch_t *hu_font[HU_FONTSIZE];	// from hu_stuff.c
 
-void C_HandleKey (event_t *ev, byte *buffer, int len);
+BOOL C_HandleKey (event_t *ev, byte *buffer, int len);
 
 
 static int C_hu_CharWidth (int c)
@@ -152,8 +151,15 @@ void C_InitConsole (int width, int height, BOOL ingame)
 					}
 				}
 			}
-			sprintf (VersionString, "v%d.%d", VERSION / 100, VERSION % 100);
 
+			{
+				int i;
+
+				VersionString[0] = 0x11;
+				for (i = 0; i < strlen(DOTVERSIONSTR); i++)
+					VersionString[i+1] = DOTVERSIONSTR[i]-30;
+				VersionString[i+1] = 0;
+			}
 			V_UnlockScreen (&conback);
 
 			gotconback = true;
@@ -179,9 +185,10 @@ void C_InitConsole (int width, int height, BOOL ingame)
 
 	if (old) {
 		char string[256];
-		FILE *templog;
+		gamestate_t oldstate = gamestate;	// Don't print during reformatting
+		FILE *templog = Logfile;		// Don't log our reformatting pass
 
-		templog = Logfile;		// Don't log our reformatting pass
+		gamestate = -1;
 		Logfile = NULL;
 
 		for (row = 0, zap = old; row < rows; row++, zap += cols + 2) {
@@ -198,7 +205,11 @@ void C_InitConsole (int width, int height, BOOL ingame)
 		ShowRows = 0;
 
 		Logfile = templog;
+		gamestate = oldstate;
 	}
+
+	if (ingame && gamestate == GS_STARTUP)
+		C_FullConsole ();
 }
 
 void C_AddNotifyString (const char *source)
@@ -303,13 +314,31 @@ int PrintString (const char *outline) {
 
 	printxormask = 0;
 
+	if (vidactive &&
+		((gameaction != ga_nothing && ConsoleState == c_down)
+		|| gamestate == GS_STARTUP)) {
+		static size_t lastprinttime = 0;
+		size_t nowtime = I_GetTime();
+
+		if (nowtime - lastprinttime > 1) {
+			I_BeginUpdate ();
+			C_DrawConsole ();
+			I_FinishUpdate ();
+			lastprinttime = nowtime;
+		}
+	}
+
 	return strlen (outline);
 }
 
+extern BOOL gameisdead;
 int VPrintf (const char *format, va_list parms)
 {
 	char outline[8192];
 
+	if (gameisdead)
+		return 0;
+
 	vsprintf (outline, format, parms);
 	return PrintString (outline);
 }
@@ -359,12 +388,19 @@ void C_FlushDisplay (void)
 	ShowRows = 0;
 }
 
+void C_AdjustBottom (void)
+{
+	if (gamestate == GS_FULLCONSOLE || gamestate == GS_STARTUP)
+		ConBottom = screens[0].height / 8;
+	else if (ConBottom > screens[0].height / 16 || ConsoleState == c_down)
+		ConBottom = screens[0].height / 16;
+}
+
 void C_NewModeAdjust (void)
 {
 	C_InitConsole (screens[0].width, screens[0].height, true);
 	ShowRows = 0;
-	if (ConBottom > screens[0].height / 16 || ConsoleState == down)
-		ConBottom = screens[0].height / 16;
+	C_AdjustBottom ();
 }
 
 void C_Ticker (void)
@@ -374,7 +410,7 @@ void C_Ticker (void)
 	if (lasttic == 0)
 		lasttic = gametic - 1;
 
-	if (ConsoleState != up) {
+	if (ConsoleState != c_up) {
 		// Handle repeating keys
 		switch (ScrollState) {
 			case SCROLLUP:
@@ -396,16 +432,16 @@ void C_Ticker (void)
 				break;
 		}
 
-		if (ConsoleState == falling) {
+		if (ConsoleState == c_falling) {
 			ConBottom += (gametic - lasttic) * (screens[0].height / 100);
 			if (ConBottom >= screens[0].height / 16) {
 				ConBottom = screens[0].height / 16;
-				ConsoleState = down;
+				ConsoleState = c_down;
 			}
-		} else if (ConsoleState == rising) {
+		} else if (ConsoleState == c_rising) {
 			ConBottom -= (gametic - lasttic) * (screens[0].height / 100);
 			if (ConBottom <= 0) {
-				ConsoleState = up;
+				ConsoleState = c_up;
 				ConBottom = 0;
 			}
 		}
@@ -474,7 +510,7 @@ void C_DrawConsole (void)
 
 	oldbottom = ConBottom;
 
-	if (ConsoleState == up) {
+	if (ConsoleState == c_up) {
 		C_DrawNotifyText ();
 		return;
 	} else if (ConBottom) {
@@ -486,60 +522,88 @@ void C_DrawConsole (void)
 		V_Blit (&conback, 0, conback.height - realheight, conback.width, realheight,
 				&screens[0], 0, 0, screens[0].width, visheight);
 
-		if (ConBottom >= 2)
+		if (ConBottom >= 2) {
 			V_PrintStr (screens[0].width - 8 - strlen(VersionString) * 8,
 						ConBottom * 8 - 16,
-						VersionString, strlen(VersionString), 0x80);
+						VersionString, strlen (VersionString));
+			if (gamestate == GS_STARTUP)
+				V_PrintStr (8, ConBottom * 8 - 16, DoomStartupTitle, strlen (DoomStartupTitle));
+		}
 	}
 
+	if (menuactive)
+		return;
+
 	if (lines > 0) {
 		for (; lines; lines--) {
-			V_PrintStr (left, -8 + lines * 8, &zap[2], zap[1], 0);
+			V_PrintStr (left, -8 + lines * 8, &zap[2], zap[1]);
 			zap -= ConCols + 2;
 		}
 		if (ConBottom > 1) {
-			V_PrintStr (left, (ConBottom - 2) * 8, "]", 1, 0x80);
+			if (gamestate != GS_STARTUP)
+				V_PrintStr (left, (ConBottom - 2) * 8, "\x8c", 1);
 #define MIN(a,b) (((a)<(b))?(a):(b))
 			V_PrintStr (left + 8, (ConBottom - 2) * 8,
 						&CmdLine[2+CmdLine[259]],
-						MIN(CmdLine[0] - CmdLine[259], ConCols - 1), 0);
+						MIN(CmdLine[0] - CmdLine[259], ConCols - 1));
 #undef MIN
 			if (cursoron) {
 				V_PrintStr (left + 8 + (CmdLine[1] - CmdLine[259])* 8,
-							(ConBottom - 2) * 8, "\xb", 1, 0);
+							(ConBottom - 2) * 8, "\xb", 1);
 			}
 			if (RowAdjust && ConBottom > 2) {
 				char c;
 
-				// Indicate that the view has been scrolled up...
-				if (SkipRows + RowAdjust + ConBottom != ConRows)
-					c = '^';
-				// and if we can scroll no further
-				else
-					c = '*';
-				V_PrintStr (0, (ConBottom - 3) * 8 + 6, &c, 1, 0x80);
+				// Indicate that the view has been scrolled up (10)
+				// and if we can scroll no further (12)
+				c = (SkipRows + RowAdjust + ConBottom != ConRows) ? 10 : 12;
+				V_PrintStr (0, (ConBottom - 3) * 8 + 4, &c, 1);
 			}
 		}
 	}
 }
 
+void C_FullConsole (void)
+{
+	if (demoplayback)
+		G_CheckDemoStatus ();
+	advancedemo = false;
+	ConsoleState = c_down;
+	HistPos = NULL;
+	TabbedLast = false;
+	if (gamestate != GS_STARTUP) {
+		gamestate = GS_FULLCONSOLE;
+		level.music[0] = '\0';
+		S_Start ();
+		I_PauseMouse ();
+	} else
+		C_AdjustBottom ();
+}
+
 void C_ToggleConsole (void)
 {
-	// Only let the console go up if chat mode is on
-	if (!chat_on && (ConsoleState == up || ConsoleState == rising)) {
-		ConsoleState = falling;
+	if (gamestate == GS_DEMOSCREEN || demoplayback) {
+		gameaction = ga_fullconsole;
+	} else if (!chat_on && (ConsoleState == c_up || ConsoleState == c_rising)) {
+		ConsoleState = c_falling;
 		HistPos = NULL;
 		TabbedLast = false;
-	} else {
-		ConsoleState = rising;
+		I_PauseMouse ();
+	} else if (gamestate != GS_FULLCONSOLE && gamestate != GS_STARTUP) {
+		ConsoleState = c_rising;
+		I_ResumeMouse ();
 	}
 }
 
 void C_HideConsole (void)
 {
-	ConsoleState = up;
-	ConBottom = 0;
-	HistPos = NULL;
+	if (gamestate != GS_FULLCONSOLE && gamestate != GS_STARTUP) {
+		ConsoleState = c_up;
+		ConBottom = 0;
+		HistPos = NULL;
+		if (!menuactive)
+			I_ResumeMouse ();
+	}
 }
 
 static void makestartposgood (void)
@@ -571,7 +635,7 @@ static void makestartposgood (void)
 	CmdLine[259] = n;
 }
 
-void C_HandleKey (event_t *ev, byte *buffer, int len)
+BOOL C_HandleKey (event_t *ev, byte *buffer, int len)
 {
 	switch (ev->data1) {
 		case KEY_TAB:
@@ -744,8 +808,11 @@ void C_HandleKey (event_t *ev, byte *buffer, int len)
 				AddCommandString (&buffer[2]);
 				TabbedLast = false;
 			} else if (ev->data2 == '`' || ev->data1 == KEY_ESCAPE) {
-				// Close console, both ` and ESC clear command line
-
+				// Close console, clear command line, but if we're in the
+				// fullscreen console mode, there's nothing to fall back on
+				// if it's closed.
+				if (gamestate == GS_FULLCONSOLE || gamestate == GS_STARTUP)
+					return false;
 				buffer[0] = buffer[1] = buffer[len+4] = 0;
 				HistPos = NULL;
 				C_ToggleConsole ();
@@ -779,11 +846,12 @@ void C_HandleKey (event_t *ev, byte *buffer, int len)
 			}
 			break;
 	}
+	return true;
 }
 
 BOOL C_Responder (event_t *ev)
 {
-	if (ConsoleState == up || ConsoleState == rising) {
+	if (ConsoleState == c_up || ConsoleState == c_rising || menuactive) {
 		return false;
 	}
 
@@ -816,12 +884,9 @@ BOOL C_Responder (event_t *ev)
 		// Others do.
 			RepeatCountdown = KeyRepeatDelay;
 		RepeatEvent = *ev;
-		C_HandleKey (ev, CmdLine, 255);
-
+		return C_HandleKey (ev, CmdLine, 255);
 	} else
 		return false;
-
-	return true;
 }
 
 void Cmd_History (player_t *plyr, int argc, char **argv)
@@ -880,11 +945,11 @@ void C_DrawMid (void)
 		int i, line, x, y;
 		byte *holdwhite = WhiteMap;
 
-		// Hack! Hack! I need to get mult-colored text output written...
+		// Hack! Hack! I need to get multi-colored text output written (still)...
 		WhiteMap = Ranges + 5 * 256;
 		y = 8 * CleanYfac;
 		x = screens[0].width >> 1;
-		for (i = 0, line = (ST_Y >> 1) - MidLines * 4 * CleanYfac; i < MidLines; i++, line += y) {
+		for (i = 0, line = (ST_Y * 3) / 8 - MidLines * 4 * CleanYfac; i < MidLines; i++, line += y) {
 			V_DrawTextClean (x - (MidMsg[i].width >> 1) * CleanXfac, line, MidMsg[i].string);
 		}
 
diff --git a/code/c_consol.h b/code/c_consol.h
index 62147b6e59..5e0634991d 100644
--- a/code/c_consol.h
+++ b/code/c_consol.h
@@ -11,6 +11,10 @@
 
 #define C_BLINKRATE			(TICRATE/2)
 
+typedef enum cstate_t {
+	c_up=0, c_down=1, c_falling=2, c_rising=3
+} constate_e;
+
 // Initialize the console
 void C_InitConsole (int width, int height, BOOL ingame);
 
@@ -26,7 +30,9 @@ int Printf_Bold (const char *format, ...);
 void C_AddNotifyString (const char *s);
 void C_DrawConsole (void);
 void C_ToggleConsole (void);
+void C_FullConsole (void);
 void C_HideConsole (void);
+void C_AdjustBottom (void);
 void C_FlushDisplay (void);
 
 void C_MidPrint (char *message);
diff --git a/code/c_dispch.c b/code/c_dispch.c
index 791f9292a2..d989f0f717 100644
--- a/code/c_dispch.c
+++ b/code/c_dispch.c
@@ -21,24 +21,24 @@ struct CmdData *Commands[HASH_SIZE];
 struct CmdData *Aliases[HASH_SIZE];
 
 struct ActionBits actionbits[NUM_ACTIONS] = {
-	{ 0x116716a2, ACTION_SPEED,		 "speed" },
-	{ 0x1e60dad4, ACTION_RIGHT,		 "right" },
-	{ 0x206c10aa, ACTION_KLOOK,		 "klook" },
-	{ 0x226a20ae, ACTION_MLOOK,		 "mlook" },
-	{ 0x4d63cc88, ACTION_USE,		 "use" },
-	{ 0x50183a64, ACTION_SHOWSCORES, "showscores" },
-	{ 0x620a3c5e, ACTION_MOVELEFT,	 "moveleft" },
-	{ 0x6d157234, ACTION_LOOKDOWN,	 "lookdown" },
-	{ 0x6f03745a, ACTION_MOVEDOWN,	 "movedown" },
-	{ 0x78086cf0, ACTION_ATTACK,	 "attack" },
-	{ 0x8517869e, ACTION_STRAFE,	 "strafe" },
-	{ 0x910b0cac, ACTION_BACK,		 "back" },
-	{ 0x9a02b460, ACTION_LOOKUP,	 "lookup" },
-	{ 0x9c14ae86, ACTION_MOVEUP,	 "moveup" },
-	{ 0xab1b201e, ACTION_LEFT,		 "left" },
-	{ 0xbc02544e, ACTION_JUMP,		 "jump" },
-	{ 0xd571f880, ACTION_MOVERIGHT,	 "moveright" },
-	{ 0xf57be8e2, ACTION_FORWARD,	 "forward" }
+	{ 0x00409, ACTION_USE,		  "use" },
+	{ 0x0074d, ACTION_BACK,		  "back" },
+	{ 0x007e4, ACTION_LEFT,		  "left" },
+	{ 0x00816, ACTION_JUMP,		  "jump" },
+	{ 0x0106d, ACTION_KLOOK,	  "klook" },
+	{ 0x0109d, ACTION_MLOOK,	  "mlook" },
+	{ 0x010d8, ACTION_RIGHT,	  "right" },
+	{ 0x0110a, ACTION_SPEED,	  "speed" },
+	{ 0x01fc5, ACTION_ATTACK,	  "attack" },
+	{ 0x021ae, ACTION_LOOKUP,	  "lookup" },
+	{ 0x021fe, ACTION_MOVEUP,	  "moveup" },
+	{ 0x02315, ACTION_STRAFE,	  "strafe" },
+	{ 0x041c4, ACTION_FORWARD,	  "forward" },
+	{ 0x08788, ACTION_LOOKDOWN,	  "lookdown" },
+	{ 0x088c4, ACTION_MOVELEFT,	  "moveleft" },
+	{ 0x088c8, ACTION_MOVEDOWN,	  "movedown" },
+	{ 0x11268, ACTION_MOVERIGHT,  "moveright" },
+	{ 0x2314d, ACTION_SHOWSCORES, "showscores" }
 };
 int Actions;
 
@@ -53,21 +53,18 @@ static int ListActionCommands (void)
 	return NUM_ACTIONS * 2;
 }
 
-unsigned int MakeKey (char *s)
+unsigned int MakeKey (const char *s)
 {
-	byte a,b,c,d,e;
+	register unsigned int v = 0;
 
-	a = b = c = d = 0;
+	if (*s)
+		v = tolower(*s++);
+	if (*s)
+		v = (v*3) + tolower(*s++);
+	while (*s)
+		v = (v << 1) + tolower(*s++);
 
-	while (*s) {
-		e = tolower (*s++);
-		a += e;
-		b ^= e;
-		c += a - b;
-		d += a + b;
-	}
-
-	return (a << 24) | (b << 16) | (c << 8) | d;
+	return v;
 }
 
 // GetActionBit scans through the actionbits[] array
diff --git a/code/c_dispch.h b/code/c_dispch.h
index 401a3a4da9..de514bbe5e 100644
--- a/code/c_dispch.h
+++ b/code/c_dispch.h
@@ -68,4 +68,6 @@ struct ActionBits {
 	char			name[12];
 };
 
+extern unsigned int MakeKey (const char *s);
+
 #endif //__C_DISPATCH_H__
\ No newline at end of file
diff --git a/code/c_varini.c b/code/c_varini.c
index cffc473fbe..3cb140d483 100644
--- a/code/c_varini.c
+++ b/code/c_varini.c
@@ -13,7 +13,6 @@ typedef struct {
 
 extern cvar_t	*gammalevel,
 				*st_scale,
-				*var_language,
 				*gameskill,
 				*crosshair,
 				*WI_Percents,
@@ -27,17 +26,21 @@ extern cvar_t	*gammalevel,
 				*idmypos,
 				*vid_defwidth,
 				*vid_defheight,
-				*vid_defbpp,
+				*vid_defid,
 				*i_remapkeypad,
 				*cl_run,
 				*chat_macros[10],
 				*showMessages,
+				*nobfgaim,
 
+				*snd_surround,
 				*snd_samplerate,
 				*snd_pitched,
 				*snd_channels,
 				*snd_SfxVolume,
 				*snd_MusicVolume,
+				*snd_MidiVolume,
+				*noisedebug,
 
 				*sv_gravity,
 				*sv_friction,
@@ -72,14 +75,7 @@ extern cvar_t	*gammalevel,
 				*am_gridcolor,
 				*am_xhaircolor,
 				*am_notseencolor,
-				*am_key1color,
-				*am_key2color,
-				*am_key3color,
-				/*
-				*am_key4color,
-				*am_key5color,
-				*am_key6color,
-				*/
+				*am_lockedcolor,
 				*am_ovyourcolor,
 				*am_ovwallcolor,
 				*am_ovthingcolor,
@@ -89,6 +85,7 @@ extern cvar_t	*gammalevel,
 				*dimamount,
 				*dimcolor,
 				
+				*teamplay,
 				*deathmatch,
 				*dmflagsvar,
 				*fraglimit,
@@ -97,25 +94,35 @@ extern cvar_t	*gammalevel,
 				*autoaim,
 				*name,
 				*color,
+				*skin,
+				*team,
+				*gender,
 
+				*boom_pushers,
+				*boom_friction,
+
+				*splashfactor,
 				*testgibs;
+				
 
 
 static const cvarinit_t Initializers[] = {
 	{ &gammalevel,			"gamma",				"1",				CVAR_ARCHIVE|CVAR_CALLBACK },
 	{ &testgibs,			"testgibs",				"0",				0 },
 	{ &st_scale,			"st_scale",				"0",				CVAR_ARCHIVE|CVAR_CALLBACK },
-	{ &var_language,		"language",				"english",			CVAR_ARCHIVE|CVAR_CALLBACK },
 	{ &dimamount,			"dimamount",			"1",				CVAR_ARCHIVE },
 	{ &dimcolor,			"dimcolor",				"ffff d7d7 0000",	CVAR_ARCHIVE },
 	{ &crosshair,			"crosshair",			"0",				CVAR_ARCHIVE },
 	{ &developer,			"developer",			"0",				0 },
 
+	{ &snd_surround,		"snd_surround",			"1",				CVAR_ARCHIVE },
 	{ &snd_SfxVolume,		"snd_sfxvolume",		"8",				CVAR_ARCHIVE|CVAR_CALLBACK },
 	{ &snd_MusicVolume,		"snd_musicvolume",		"9",				CVAR_ARCHIVE|CVAR_CALLBACK },
+	{ &snd_MidiVolume,		"snd_midivolume",		"0.5",				CVAR_ARCHIVE|CVAR_CALLBACK },
 	{ &snd_channels,		"snd_channels",			"8",				CVAR_ARCHIVE },
 	{ &snd_pitched,			"snd_pitched",			"0",				CVAR_ARCHIVE },
 	{ &snd_samplerate,		"snd_samplerate",		"44100",			CVAR_ARCHIVE },
+	{ &noisedebug,			"noise",				"0",				0 },
 
 	{ &screenblocks,		"screenblocks",			"10",				CVAR_ARCHIVE|CVAR_CALLBACK },
 	{ &usemouse,			"use_mouse",			"1",				CVAR_ARCHIVE },
@@ -143,7 +150,7 @@ static const cvarinit_t Initializers[] = {
 	{ &idmypos,				"idmypos",				"0",				0 },
 	{ &vid_defwidth,		"vid_defwidth",			"320",				CVAR_ARCHIVE },
 	{ &vid_defheight,		"vid_defheight",		"200",				CVAR_ARCHIVE },
-	{ &vid_defbpp,			"vid_defbpp",			"8",				CVAR_ARCHIVE },
+	{ &vid_defid,			"vid_defid",			"INDEX8",			CVAR_ARCHIVE },
 	{ &i_remapkeypad,		"i_remapkeypad",		"1",				CVAR_ARCHIVE },
 	{ &cl_run,				"cl_run",				"0",				CVAR_ARCHIVE },
 	{ &showMessages,		"show_messages",		"1",				CVAR_ARCHIVE },
@@ -175,28 +182,31 @@ static const cvarinit_t Initializers[] = {
 	{ &am_gridcolor,		"am_gridcolor",			"8b8b 5a5a 2b2b",	CVAR_ARCHIVE },
 	{ &am_xhaircolor,		"am_xhaircolor",		"8080 8080 8080",	CVAR_ARCHIVE },
 	{ &am_notseencolor,		"am_notseencolor",		"6c6c 6c6c 6c6c",	CVAR_ARCHIVE },
-	{ &am_key1color,		"am_key1color",			"0000 0000 9898",	CVAR_ARCHIVE },
-	{ &am_key2color,		"am_key2color",			"9898 0000 0000",	CVAR_ARCHIVE },
-	{ &am_key3color,		"am_key3color",			"e8e8 d8d8 5454",	CVAR_ARCHIVE },
-/*
-	&am_key4color,			"am_key4color",			"0000 0000 9898",	CVAR_ARCHIVE,
-	&am_key5color,			"am_key5color",			"9898 0000 0000",	CVAR_ARCHIVE,
-	&am_key6color,			"am_key6color",			"e8e8 d8d8 5454",	CVAR_ARCHIVE,
-*/
+	{ &am_lockedcolor,		"am_lockedcolor",		"0000 0000 9898",	CVAR_ARCHIVE },
 	{ &am_ovyourcolor,		"am_ovyourcolor",		"fcfc e8e8 d8d8",	CVAR_ARCHIVE },
 	{ &am_ovwallcolor,		"am_ovwallcolor",		"0000 ffff 0000",	CVAR_ARCHIVE },
 	{ &am_ovthingcolor,		"am_ovthingcolor",		"e8e8 8888 0000",	CVAR_ARCHIVE },
 	{ &am_ovotherwallscolor,"am_ovotherwallscolor",	"0000 8888 4444",	CVAR_ARCHIVE },
 	{ &am_ovunseencolor,	"am_ovunseencolor",		"0000 2222 6e6e",	CVAR_ARCHIVE },
 
+	{ &teamplay,			"teamplay",				"0",				CVAR_SERVERINFO },
 	{ &deathmatch,			"deathmatch",			"0",				CVAR_SERVERINFO|CVAR_LATCH },
 	{ &dmflagsvar,			"dmflags",				"0",				CVAR_SERVERINFO|CVAR_CALLBACK },
 	{ &timelimit,			"timelimit",			"0",				CVAR_SERVERINFO },
 	{ &fraglimit,			"fraglimit",			"0",				CVAR_SERVERINFO },
+	{ &nobfgaim,			"nobfgaim",				"0",				CVAR_SERVERINFO },
 
 	{ &autoaim,				"autoaim",				"5000",				CVAR_USERINFO|CVAR_ARCHIVE },
 	{ &name,				"name",					"Player",			CVAR_USERINFO|CVAR_ARCHIVE },
 	{ &color,				"color",				"4040 cfcf 0000",	CVAR_USERINFO|CVAR_ARCHIVE },
+	{ &skin,				"skin",					"base",				CVAR_USERINFO|CVAR_ARCHIVE },
+	{ &team,				"team",					"",					CVAR_USERINFO|CVAR_ARCHIVE },
+	{ &gender,				"gender",				"male",				CVAR_USERINFO|CVAR_ARCHIVE },
+
+	{ &boom_friction,		"var_friction",			"1",				CVAR_SERVERINFO },
+	{ &boom_pushers,		"var_pushers",			"1",				CVAR_SERVERINFO },
+
+	{ &splashfactor,		"splashfactor",			"1.0",				CVAR_SERVERINFO|CVAR_CALLBACK },
 
 	{ NULL }
 };
diff --git a/code/d_event.h b/code/d_event.h
index c4a7186664..236f949465 100644
--- a/code/d_event.h
+++ b/code/d_event.h
@@ -61,7 +61,8 @@ typedef enum
 	ga_completed,
 	ga_victory,
 	ga_worlddone,
-	ga_screenshot
+	ga_screenshot,
+	ga_fullconsole
 } gameaction_t;
 
 
diff --git a/code/d_french.h b/code/d_french.h
deleted file mode 100644
index ad951d8ac5..0000000000
--- a/code/d_french.h
+++ /dev/null
@@ -1,433 +0,0 @@
-// Emacs style mode select	 -*- C++ -*- 
-//-----------------------------------------------------------------------------
-//
-// $Id:$
-//
-// Copyright (C) 1993-1996 by id Software, Inc.
-//
-// This source is available for distribution and/or modification
-// only under the terms of the DOOM Source Code License as
-// published by id Software. All rights reserved.
-//
-// The source is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// FITNESS FOR A PARTICULAR PURPOSE. See the DOOM Source Code License
-// for more details.
-//
-// DESCRIPTION:
-//		Printed strings, french translation.
-//
-//-----------------------------------------------------------------------------
-
-
-#ifndef __D_FRENCH__
-#define __D_FRENCH__
-
-//
-// D_Main.C
-//
-#define D_DEVSTR		"MODE DEVELOPPEMENT ON.\n"
-#define D_CDROM 		"VERSION CD-ROM: DEFAULT.CFG DANS C:\\DOOMDATA\n"
-
-//
-//		M_Menu.C
-//
-#define PRESSKEY		"APPUYEZ SUR UNE TOUCHE."
-#define PRESSYN 		"APPUYEZ SUR Y OU N"
-#define QUITMSG 		"VOUS VOULEZ VRAIMENT\nQUITTER CE SUPER JEU?"
-#define LOADNET 		"VOUS NE POUVEZ PAS CHARGER\nUN JEU EN RESEAU!\n\n"PRESSKEY
-#define QLOADNET		"CHARGEMENT RAPIDE INTERDIT EN RESEAU!\n\n"PRESSKEY
-#define QSAVESPOT		"VOUS N'AVEZ PAS CHOISI UN EMPLACEMENT!\n\n"PRESSKEY
-#define SAVEDEAD		"VOUS NE POUVEZ PAS SAUVER SI VOUS NE JOUEZ "\
-"PAS!\n\n"PRESSKEY
-#define QSPROMPT		"SAUVEGARDE RAPIDE DANS LE FICHIER \n\n'%s'?\n\n"PRESSYN
-#define QLPROMPT		"VOULEZ-VOUS CHARGER LA SAUVEGARDE"\
-"\n\n'%s'?\n\n"PRESSYN
-#define NEWGAME 		"VOUS NE POUVEZ PAS LANCER\n"\
-"UN NOUVEAU JEU SUR RESEAU.\n\n"PRESSKEY
-#define NIGHTMARE		"VOUS CONFIRMEZ? CE NIVEAU EST\n"\
-"VRAIMENT IMPITOYABLE!n"PRESSYN
-#define SWSTRING		"CECI EST UNE VERSION SHAREWARE DE DOOM.\n\n"\
-"VOUS DEVRIEZ COMMANDER LA TRILOGIE COMPLETE.\n\n"PRESSKEY
-#define MSGOFF			"MESSAGES OFF"
-#define MSGON			"MESSAGES ON"
-#define NETEND			"VOUS NE POUVEZ PAS METTRE FIN A UN JEU SUR "\
-"RESEAU!\n\n"PRESSKEY
-#define ENDGAME 		"VOUS VOULEZ VRAIMENT METTRE FIN AU JEU?\n\n"PRESSYN
-
-#define DOSY			"(APPUYEZ SUR Y POUR REVENIR AU OS.)"
-
-#define DETAILHI		"GRAPHISMES MAXIMUM "
-#define DETAILLO		"GRAPHISMES MINIMUM "
-#define GAMMALVL0		"CORRECTION GAMMA OFF"
-#define GAMMALVL1		"CORRECTION GAMMA NIVEAU 1"
-#define GAMMALVL2		"CORRECTION GAMMA NIVEAU 2"
-#define GAMMALVL3		"CORRECTION GAMMA NIVEAU 3"
-#define GAMMALVL4		"CORRECTION GAMMA NIVEAU 4"
-#define EMPTYSTRING 	"EMPLACEMENT VIDE"
-
-//
-//		P_inter.C
-//
-#define GOTARMOR		"ARMURE RECUPEREE."
-#define GOTMEGA 		"MEGA-ARMURE RECUPEREE!"
-#define GOTHTHBONUS 	"BONUS DE SANTE RECUPERE."
-#define GOTARMBONUS 	"BONUS D'ARMURE RECUPERE."
-#define GOTSTIM 		"STIMPACK RECUPERE."
-#define GOTMEDINEED 	"MEDIKIT RECUPERE. VOUS EN AVEZ VRAIMENT BESOIN!"
-#define GOTMEDIKIT		"MEDIKIT RECUPERE."
-#define GOTSUPER		"SUPERCHARGE!"
-
-#define GOTBLUECARD 	"CARTE MAGNETIQUE BLEUE RECUPEREE."
-#define GOTYELWCARD 	"CARTE MAGNETIQUE JAUNE RECUPEREE."
-#define GOTREDCARD		"CARTE MAGNETIQUE ROUGE RECUPEREE."
-#define GOTBLUESKUL 	"CLEF CRANE BLEUE RECUPEREE."
-#define GOTYELWSKUL 	"CLEF CRANE JAUNE RECUPEREE."
-#define GOTREDSKULL 	"CLEF CRANE ROUGE RECUPEREE."
-
-#define GOTINVUL		"INVULNERABILITE!"
-#define GOTBERSERK		"BERSERK!"
-#define GOTINVIS		"INVISIBILITE PARTIELLE "
-#define GOTSUIT 		"COMBINAISON ANTI-RADIATIONS "
-#define GOTMAP			"CARTE INFORMATIQUE "
-#define GOTVISOR		"VISEUR A AMPLIFICATION DE LUMIERE "
-#define GOTMSPHERE		"MEGASPHERE!"
-
-#define GOTCLIP 		"CHARGEUR RECUPERE."
-#define GOTCLIPBOX		"BOITE DE BALLES RECUPEREE."
-#define GOTROCKET		"ROQUETTE RECUPEREE."
-#define GOTROCKBOX		"CAISSE DE ROQUETTES RECUPEREE."
-#define GOTCELL 		"CELLULE D'ENERGIE RECUPEREE."
-#define GOTCELLBOX		"PACK DE CELLULES D'ENERGIE RECUPERE."
-#define GOTSHELLS		"4 CARTOUCHES RECUPEREES."
-#define GOTSHELLBOX 	"BOITE DE CARTOUCHES RECUPEREE."
-#define GOTBACKPACK 	"SAC PLEIN DE MUNITIONS RECUPERE!"
-
-#define GOTBFG9000		"VOUS AVEZ UN BFG9000!  OH, OUI!"
-#define GOTCHAINGUN 	"VOUS AVEZ LA MITRAILLEUSE!"
-#define GOTCHAINSAW 	"UNE TRONCONNEUSE!"
-#define GOTLAUNCHER 	"VOUS AVEZ UN LANCE-ROQUETTES!"
-#define GOTPLASMA		"VOUS AVEZ UN FUSIL A PLASMA!"
-#define GOTSHOTGUN		"VOUS AVEZ UN FUSIL!"
-#define GOTSHOTGUN2 	"VOUS AVEZ UN SUPER FUSIL!"
-
-//
-// P_Doors.C
-//
-#define PD_BLUEO		"IL VOUS FAUT UNE CLEF BLEUE"
-#define PD_REDO 		"IL VOUS FAUT UNE CLEF ROUGE"
-#define PD_YELLOWO		"IL VOUS FAUT UNE CLEF JAUNE"
-#define PD_BLUEK		PD_BLUEO
-#define PD_REDK 		PD_REDO
-#define PD_YELLOWK		PD_YELLOWO
-
-//
-//		G_game.C
-//
-#define GGSAVED 		"JEU SAUVEGARDE."
-
-//
-//		HU_stuff.C
-//
-#define HUSTR_MSGU		"[MESSAGE NON ENVOYE]"
-
-#define HUSTR_E1M1		"E1M1: HANGAR"
-#define HUSTR_E1M2		"E1M2: USINE NUCLEAIRE "
-#define HUSTR_E1M3		"E1M3: RAFFINERIE DE TOXINES "
-#define HUSTR_E1M4		"E1M4: CENTRE DE CONTROLE "
-#define HUSTR_E1M5		"E1M5: LABORATOIRE PHOBOS "
-#define HUSTR_E1M6		"E1M6: TRAITEMENT CENTRAL "
-#define HUSTR_E1M7		"E1M7: CENTRE INFORMATIQUE "
-#define HUSTR_E1M8		"E1M8: ANOMALIE PHOBOS "
-#define HUSTR_E1M9		"E1M9: BASE MILITAIRE "
-
-#define HUSTR_E2M1		"E2M1: ANOMALIE DEIMOS "
-#define HUSTR_E2M2		"E2M2: ZONE DE CONFINEMENT "
-#define HUSTR_E2M3		"E2M3: RAFFINERIE"
-#define HUSTR_E2M4		"E2M4: LABORATOIRE DEIMOS "
-#define HUSTR_E2M5		"E2M5: CENTRE DE CONTROLE "
-#define HUSTR_E2M6		"E2M6: HALLS DES DAMNES "
-#define HUSTR_E2M7		"E2M7: CUVES DE REPRODUCTION "
-#define HUSTR_E2M8		"E2M8: TOUR DE BABEL "
-#define HUSTR_E2M9		"E2M9: FORTERESSE DU MYSTERE "
-
-#define HUSTR_E3M1		"E3M1: DONJON DE L'ENFER "
-#define HUSTR_E3M2		"E3M2: BOURBIER DU DESESPOIR "
-#define HUSTR_E3M3		"E3M3: PANDEMONIUM"
-#define HUSTR_E3M4		"E3M4: MAISON DE LA DOULEUR "
-#define HUSTR_E3M5		"E3M5: CATHEDRALE PROFANE "
-#define HUSTR_E3M6		"E3M6: MONT EREBUS"
-#define HUSTR_E3M7		"E3M7: LIMBES"
-#define HUSTR_E3M8		"E3M8: DIS"
-#define HUSTR_E3M9		"E3M9: CLAPIERS"
-
-#define HUSTR_1 		"NIVEAU 1: ENTREE "
-#define HUSTR_2 		"NIVEAU 2: HALLS SOUTERRAINS "
-#define HUSTR_3 		"NIVEAU 3: LE FEU NOURRI "
-#define HUSTR_4 		"NIVEAU 4: LE FOYER "
-#define HUSTR_5 		"NIVEAU 5: LES EGOUTS "
-#define HUSTR_6 		"NIVEAU 6: LE BROYEUR "
-#define HUSTR_7 		"NIVEAU 7: L'HERBE DE LA MORT"
-#define HUSTR_8 		"NIVEAU 8: RUSES ET PIEGES "
-#define HUSTR_9 		"NIVEAU 9: LE PUITS "
-#define HUSTR_10		"NIVEAU 10: BASE DE RAVITAILLEMENT "
-#define HUSTR_11		"NIVEAU 11: LE CERCLE DE LA MORT!"
-
-#define HUSTR_12		"NIVEAU 12: L'USINE "
-#define HUSTR_13		"NIVEAU 13: LE CENTRE VILLE"
-#define HUSTR_14		"NIVEAU 14: LES ANTRES PROFONDES "
-#define HUSTR_15		"NIVEAU 15: LA ZONE INDUSTRIELLE "
-#define HUSTR_16		"NIVEAU 16: LA BANLIEUE"
-#define HUSTR_17		"NIVEAU 17: LES IMMEUBLES"
-#define HUSTR_18		"NIVEAU 18: LA COUR "
-#define HUSTR_19		"NIVEAU 19: LA CITADELLE "
-#define HUSTR_20		"NIVEAU 20: JE T'AI EU!"
-
-#define HUSTR_21		"NIVEAU 21: LE NIRVANA"
-#define HUSTR_22		"NIVEAU 22: LES CATACOMBES "
-#define HUSTR_23		"NIVEAU 23: LA GRANDE FETE "
-#define HUSTR_24		"NIVEAU 24: LE GOUFFRE "
-#define HUSTR_25		"NIVEAU 25: LES CHUTES DE SANG"
-#define HUSTR_26		"NIVEAU 26: LES MINES ABANDONNEES "
-#define HUSTR_27		"NIVEAU 27: CHEZ LES MONSTRES "
-#define HUSTR_28		"NIVEAU 28: LE MONDE DE L'ESPRIT "
-#define HUSTR_29		"NIVEAU 29: LA LIMITE "
-#define HUSTR_30		"NIVEAU 30: L'ICONE DU PECHE "
-
-#define HUSTR_31		"NIVEAU 31: WOLFENSTEIN"
-#define HUSTR_32		"NIVEAU 32: LE MASSACRE"
-
-
-#define HUSTR_CHATMACRO1		"JE SUIS PRET A LEUR EN FAIRE BAVER!"
-#define HUSTR_CHATMACRO2		"JE VAIS BIEN."
-#define HUSTR_CHATMACRO3		"JE N'AI PAS L'AIR EN FORME!"
-#define HUSTR_CHATMACRO4		"AU SECOURS!"
-#define HUSTR_CHATMACRO5		"TU CRAINS!"
-#define HUSTR_CHATMACRO6		"LA PROCHAINE FOIS, MINABLE..."
-#define HUSTR_CHATMACRO7		"VIENS ICI!"
-#define HUSTR_CHATMACRO8		"JE VAIS M'EN OCCUPER."
-#define HUSTR_CHATMACRO9		"OUI"
-#define HUSTR_CHATMACRO0		"NON"
-
-#define HUSTR_TALKTOSELF1		"VOUS PARLEZ TOUT SEUL "
-#define HUSTR_TALKTOSELF2		"QUI EST LA?"
-#define HUSTR_TALKTOSELF3		"VOUS VOUS FAITES PEUR "
-#define HUSTR_TALKTOSELF4		"VOUS COMMENCEZ A DELIRER "
-#define HUSTR_TALKTOSELF5		"VOUS ETES LARGUE..."
-
-#define HUSTR_MESSAGESENT		"[MESSAGE ENVOYE]"
-
-// The following should NOT be changed unless it seems
-// just AWFULLY necessary
-
-#define HUSTR_PLRGREEN	"VERT: "
-#define HUSTR_PLRINDIGO "INDIGO: "
-#define HUSTR_PLRBROWN	"BRUN: "
-#define HUSTR_PLRRED			"ROUGE: "
-
-#define HUSTR_KEYGREEN	'g' 	// french key should be "V"
-#define HUSTR_KEYINDIGO 'i' 	
-#define HUSTR_KEYBROWN	'b' 	
-#define HUSTR_KEYRED			'r'
-
-//
-//		AM_map.C
-//
-
-#define AMSTR_FOLLOWON			"MODE POURSUITE ON"
-#define AMSTR_FOLLOWOFF 		"MODE POURSUITE OFF"
-
-#define AMSTR_GRIDON			"GRILLE ON"
-#define AMSTR_GRIDOFF			"GRILLE OFF"
-
-#define AMSTR_MARKEDSPOT		"REPERE MARQUE "
-#define AMSTR_MARKSCLEARED		"REPERES EFFACES "
-
-//
-//		ST_stuff.C
-//
-
-#define STSTR_MUS				"CHANGEMENT DE MUSIQUE "
-#define STSTR_NOMUS 			"IMPOSSIBLE SELECTION"
-#define STSTR_DQDON 			"INVULNERABILITE ON "
-#define STSTR_DQDOFF			"INVULNERABILITE OFF"
-
-#define STSTR_KFAADDED			"ARMEMENT MAXIMUM! "
-#define STSTR_FAADDED			"ARMES (SAUF CLEFS) AJOUTEES"
-
-#define STSTR_NCON				"BARRIERES ON"
-#define STSTR_NCOFF 			"BARRIERES OFF"
-
-#define STSTR_BEHOLD			" inVuln, Str, Inviso, Rad, Allmap, or Lite-amp"
-#define STSTR_BEHOLDX			"AMELIORATION ACTIVEE"
-
-#define STSTR_CHOPPERS			"... DOESN'T SUCK - GM"
-#define STSTR_CLEV				"CHANGEMENT DE NIVEAU..."
-
-//
-//		F_Finale.C
-//
-#define E1TEXT	"APRES AVOIR VAINCU LES GROS MECHANTS\n"\
-"ET NETTOYE LA BASE LUNAIRE, VOUS AVEZ\n"\
-"GAGNE, NON? PAS VRAI? OU EST DONC VOTRE\n"\
-" RECOMPENSE ET VOTRE BILLET DE\n"\
-"RETOUR? QU'EST-QUE CA VEUT DIRE?CE"\
-"N'EST PAS LA FIN ESPEREE!\n"\
-"\n" \
-"CA SENT LA VIANDE PUTREFIEE, MAIS\n"\
-"ON DIRAIT LA BASE DEIMOS. VOUS ETES\n"\
-"APPAREMMENT BLOQUE AUX PORTES DE L'ENFER.\n"\
-"LA SEULE ISSUE EST DE L'AUTRE COTE.\n"\
-"\n"\
-"POUR VIVRE LA SUITE DE DOOM, JOUEZ\n"\
-"A 'AUX PORTES DE L'ENFER' ET A\n"\
-"L'EPISODE SUIVANT, 'L'ENFER'!\n"
-								
-#define E2TEXT	"VOUS AVEZ REUSSI. L'INFAME DEMON\n"\
-"QUI CONTROLAIT LA BASE LUNAIRE DE\n"\
-"DEIMOS EST MORT, ET VOUS AVEZ\n"\
-"TRIOMPHE! MAIS... OU ETES-VOUS?\n"\
-"VOUS GRIMPEZ JUSQU'AU BORD DE LA\n"\
-"LUNE ET VOUS DECOUVREZ L'ATROCE\n"\
-"VERITE.\n" \
-"\n"\
-"DEIMOS EST AU-DESSUS DE L'ENFER!\n"\
-"VOUS SAVEZ QUE PERSONNE NE S'EN\n"\
-"EST JAMAIS ECHAPPE, MAIS CES FUMIERS\n"\
-"VONT REGRETTER DE VOUS AVOIR CONNU!\n"\
-"VOUS REDESCENDEZ RAPIDEMENT VERS\n"\
-"LA SURFACE DE L'ENFER.\n"\
-"\n" \
-"VOICI MAINTENANT LE CHAPITRE FINAL DE\n"\
-"DOOM! -- L'ENFER."
-
-#define E3TEXT	"LE DEMON ARACHNEEN ET REPUGNANT\n"\
-"QUI A DIRIGE L'INVASION DES BASES\n"\
-"LUNAIRES ET SEME LA MORT VIENT DE SE\n"\
-"FAIRE PULVERISER UNE FOIS POUR TOUTES.\n"\
-"\n"\
-"UNE PORTE SECRETE S'OUVRE. VOUS ENTREZ.\n"\
-"VOUS AVEZ PROUVE QUE VOUS POUVIEZ\n"\
-"RESISTER AUX HORREURS DE L'ENFER.\n"\
-"IL SAIT ETRE BEAU JOUEUR, ET LORSQUE\n"\
-"VOUS SORTEZ, VOUS REVOYEZ LES VERTES\n"\
-"PRAIRIES DE LA TERRE, VOTRE PLANETE.\n"\
-"\n"\
-"VOUS VOUS DEMANDEZ CE QUI S'EST PASSE\n"\
-"SUR TERRE PENDANT QUE VOUS AVEZ\n"\
-"COMBATTU LE DEMON. HEUREUSEMENT,\n"\
-"AUCUN GERME DU MAL N'A FRANCHI\n"\
-"CETTE PORTE AVEC VOUS..."
-
-
-
-// after level 6, put this:
-
-#define C1TEXT	"VOUS ETES AU PLUS PROFOND DE L'ASTROPORT\n" \
-"INFESTE DE MONSTRES, MAIS QUELQUE CHOSE\n" \
-"NE VA PAS. ILS ONT APPORTE LEUR PROPRE\n" \
-"REALITE, ET LA TECHNOLOGIE DE L'ASTROPORT\n" \
-"EST AFFECTEE PAR LEUR PRESENCE.\n" \
-"\n"\
-"DEVANT VOUS, VOUS VOYEZ UN POSTE AVANCE\n" \
-"DE L'ENFER, UNE ZONE FORTIFIEE. SI VOUS\n" \
-"POUVEZ PASSER, VOUS POURREZ PENETRER AU\n" \
-"COEUR DE LA BASE HANTEE ET TROUVER \n" \
-"L'INTERRUPTEUR DE CONTROLE QUI GARDE LA \n" \
-"POPULATION DE LA TERRE EN OTAGE."
-
-// After level 11, put this:
-
-#define C2TEXT	"VOUS AVEZ GAGNE! VOTRE VICTOIRE A PERMIS\n" \
-"A L'HUMANITE D'EVACUER LA TERRE ET \n"\
-"D'ECHAPPER AU CAUCHEMAR. VOUS ETES \n"\
-"MAINTENANT LE DERNIER HUMAIN A LA SURFACE \n"\
-"DE LA PLANETE. VOUS ETES ENTOURE DE \n"\
-"MUTANTS CANNIBALES, D'EXTRATERRESTRES \n"\
-"CARNIVORES ET D'ESPRITS DU MAL. VOUS \n"\
-"ATTENDEZ CALMEMENT LA MORT, HEUREUX \n"\
-"D'AVOIR PU SAUVER VOTRE RACE.\n"\
-"MAIS UN MESSAGE VOUS PARVIENT SOUDAIN\n"\
-"DE L'ESPACE: \"NOS CAPTEURS ONT LOCALISE\n"\
-"LA SOURCE DE L'INVASION EXTRATERRESTRE.\n"\
-"SI VOUS Y ALLEZ, VOUS POURREZ PEUT-ETRE\n"\
-"LES ARRETER. LEUR BASE EST SITUEE AU COEUR\n"\
-"DE VOTRE VILLE NATALE, PRES DE L'ASTROPORT.\n"\
-"VOUS VOUS RELEVEZ LENTEMENT ET PENIBLEMENT\n"\
-"ET VOUS REPARTEZ POUR LE FRONT."
-
-// After level 20, put this:
-
-#define C3TEXT	"VOUS ETES AU COEUR DE LA CITE CORROMPUE,\n"\
-"ENTOURE PAR LES CADAVRES DE VOS ENNEMIS.\n"\
-"VOUS NE VOYEZ PAS COMMENT DETRUIRE LA PORTE\n"\
-"DES CREATURES DE CE COTE. VOUS SERREZ\n"\
-"LES DENTS ET PLONGEZ DANS L'OUVERTURE.\n"\
-"\n"\
-"IL DOIT Y AVOIR UN MOYEN DE LA FERMER\n"\
-"DE L'AUTRE COTE. VOUS ACCEPTEZ DE\n"\
-"TRAVERSER L'ENFER POUR LE FAIRE?"
-
-// After level 29, put this:
-
-#define C4TEXT	"LE VISAGE HORRIBLE D'UN DEMON D'UNE\n"\
-"TAILLE INCROYABLE S'EFFONDRE DEVANT\n"\
-"VOUS LORSQUE VOUS TIREZ UNE SALVE DE\n"\
-"ROQUETTES DANS SON CERVEAU. LE MONSTRE\n"\
-"SE RATATINE, SES MEMBRES DECHIQUETES\n"\
-"SE REPANDANT SUR DES CENTAINES DE\n"\
-"KILOMETRES A LA SURFACE DE L'ENFER.\n"\
-"\n"\
-"VOUS AVEZ REUSSI. L'INVASION N'AURA.\n"\
-"PAS LIEU. LA TERRE EST SAUVEE. L'ENFER\n"\
-"EST ANEANTI. EN VOUS DEMANDANT OU IRONT\n"\
-"MAINTENANT LES DAMNES, VOUS ESSUYEZ\n"\
-"VOTRE FRONT COUVERT DE SUEUR ET REPARTEZ\n"\
-"VERS LA TERRE. SA RECONSTRUCTION SERA\n"\
-"BEAUCOUP PLUS DROLE QUE SA DESTRUCTION.\n"
-
-// Before level 31, put this:
-
-#define C5TEXT	"FELICITATIONS! VOUS AVEZ TROUVE LE\n"\
-"NIVEAU SECRET! IL SEMBLE AVOIR ETE\n"\
-"CONSTRUIT PAR LES HUMAINS. VOUS VOUS\n"\
-"DEMANDEZ QUELS PEUVENT ETRE LES\n"\
-"HABITANTS DE CE COIN PERDU DE L'ENFER."
-
-// Before level 32, put this:
-
-#define C6TEXT	"FELICITATIONS! VOUS AVEZ DECOUVERT\n"\
-"LE NIVEAU SUPER SECRET! VOUS FERIEZ\n"\
-"MIEUX DE FONCER DANS CELUI-LA!\n"
-
-//
-// Character cast strings F_FINALE.C
-//
-#define CC_ZOMBIE		"ZOMBIE"
-#define CC_SHOTGUN		"TYPE AU FUSIL"
-#define CC_HEAVY		"MEC SUPER-ARME"
-#define CC_IMP			"DIABLOTIN"
-#define CC_DEMON		"DEMON"
-#define CC_LOST 		"AME PERDUE"
-#define CC_CACO 		"CACODEMON"
-#define CC_HELL 		"CHEVALIER DE L'ENFER"
-#define CC_BARON		"BARON DE L'ENFER"
-#define CC_ARACH		"ARACHNOTRON"
-#define CC_PAIN 		"ELEMENTAIRE DE LA DOULEUR"
-#define CC_REVEN		"REVENANT"
-#define CC_MANCU		"MANCUBUS"
-#define CC_ARCH 		"ARCHI-INFAME"
-#define CC_SPIDER		"L'ARAIGNEE CERVEAU"
-#define CC_CYBER		"LE CYBERDEMON"
-#define CC_HERO 		"NOTRE HEROS"
-
-
-
-#endif
-//-----------------------------------------------------------------------------
-//
-// $Log:$
-//
-//-----------------------------------------------------------------------------
-
-
diff --git a/code/d_items.c b/code/d_items.c
index f60be95944..7d8c306263 100644
--- a/code/d_items.c
+++ b/code/d_items.c
@@ -128,7 +128,7 @@ weaponinfo_t	weaponinfo[NUMWEAPONS] =
 int num_items;
 
 // [RH] Guess what. These next three functions are from Quake2:
-//	game/g_items.c
+//	g_items.c
 
 /*
 ===============
@@ -140,7 +140,7 @@ gitem_t	*GetItemByIndex (int index)
 	if (index == 0 || index >= num_items)
 		return NULL;
 
-	return &ItemList[index];
+	return &itemlist[index];
 }
 
 
@@ -150,19 +150,15 @@ FindItemByClassname
 
 ===============
 */
-gitem_t	*FindItemByClassname (char *classname)
+gitem_t	*FindItemByClassname (const char *classname)
 {
 	int		i;
 	gitem_t	*it;
 
-	it = ItemList;
-	for (i=0 ; i<num_items ; i++, it++)
-	{
-		if (!it->classname)
-			continue;
-		if (!stricmp(it->classname, classname))
+	it = itemlist;
+	for (i = 0; i < num_items; i++, it++)
+		if (it->classname && !stricmp(it->classname, classname))
 			return it;
-	}
 
 	return NULL;
 }
@@ -173,19 +169,15 @@ FindItem
 
 ===============
 */
-gitem_t	*FindItem (char *pickup_name)
+gitem_t	*FindItem (const char *pickup_name)
 {
 	int		i;
 	gitem_t	*it;
 
-	it = ItemList;
-	for (i=0 ; i<num_items ; i++, it++)
-	{
-		if (!it->pickup_name)
-			continue;
-		if (!stricmp(it->pickup_name, pickup_name))
+	it = itemlist;
+	for (i = 0; i < num_items; i++, it++)
+		if (it->pickup_name && !stricmp(it->pickup_name, pickup_name))
 			return it;
-	}
 
 	return NULL;
 }
@@ -195,7 +187,7 @@ gitem_t	*FindItem (char *pickup_name)
 // Used mainly by the give command. Hopefully will
 // become more general-purpose later.
 // (Yes, this was inspired by Quake 2)
-gitem_t ItemList[] = {
+gitem_t itemlist[] = {
 	{
 		NULL
 	},	// leave index 0 alone
@@ -240,6 +232,16 @@ gitem_t ItemList[] = {
 		"Fist"
 	},
 
+	{
+		"weapon_chainsaw",
+		NULL,
+		NULL,
+		IT_WEAPON,
+		wp_chainsaw,
+		0,
+		"Chainsaw"
+	},
+
 	{
 		"weapon_pistol",
 		NULL,
@@ -260,6 +262,16 @@ gitem_t ItemList[] = {
 		"Shotgun"
 	},
 
+	{
+		"weapon_supershotgun",
+		NULL,
+		NULL,
+		IT_WEAPON,
+		wp_supershotgun,
+		0,
+		"Super Shotgun"
+	},
+
 	{
 		"weapon_chaingun",
 		NULL,
@@ -300,26 +312,6 @@ gitem_t ItemList[] = {
 		"BFG9000"
 	},
 
-	{
-		"weapon_chainsaw",
-		NULL,
-		NULL,
-		IT_WEAPON,
-		wp_chainsaw,
-		0,
-		"Chainsaw"
-	},
-
-	{
-		"weapon_supershotgun",
-		NULL,
-		NULL,
-		IT_WEAPON,
-		wp_supershotgun,
-		0,
-		"Super Shotgun"
-	},
-
 	{
 		"ammo_bullets",
 		NULL,
@@ -367,7 +359,7 @@ gitem_t ItemList[] = {
 		"item_invulnerability",
 		NULL,
 		NULL,
-		IT_POWER,
+		IT_POWERUP,
 		pw_invulnerability,
 		0,
 		"Invulnerability"
@@ -377,7 +369,7 @@ gitem_t ItemList[] = {
 		"item_berserk",
 		NULL,
 		NULL,
-		IT_POWER,
+		IT_POWERUP,
 		pw_strength,
 		0,
 		"Berserk"
@@ -387,7 +379,7 @@ gitem_t ItemList[] = {
 		"item_invisibility",
 		NULL,
 		NULL,
-		IT_POWER,
+		IT_POWERUP,
 		pw_invisibility,
 		0,
 		"Partial Invisibility"
@@ -397,7 +389,7 @@ gitem_t ItemList[] = {
 		"item_ironfeet",
 		NULL,
 		NULL,
-		IT_POWER,
+		IT_POWERUP,
 		pw_ironfeet,
 		0,
 		"Iron Feet"
@@ -407,7 +399,7 @@ gitem_t ItemList[] = {
 		"item_allmap",
 		NULL,
 		NULL,
-		IT_POWER,
+		IT_POWERUP,
 		pw_allmap,
 		0,
 		"Computer Map"
@@ -417,7 +409,7 @@ gitem_t ItemList[] = {
 		"item_visor",
 		NULL,
 		NULL,
-		IT_POWER,
+		IT_POWERUP,
 		pw_infrared,
 		0,
 		"Light Amplification Visor"
@@ -493,5 +485,5 @@ gitem_t ItemList[] = {
 
 void InitItems (void)
 {
-	num_items = sizeof(ItemList)/sizeof(ItemList[0]) - 1;
+	num_items = sizeof(itemlist)/sizeof(itemlist[0]) - 1;
 }
\ No newline at end of file
diff --git a/code/d_main.h b/code/d_main.h
index 41e405e8a4..b67b14b004 100644
--- a/code/d_main.h
+++ b/code/d_main.h
@@ -25,13 +25,10 @@
 #ifndef __D_MAIN__
 #define __D_MAIN__
 
+#include <setjmp.h>
 #include "d_event.h"
 
 
-
-#define MAXWADFILES 			20
-extern char*			wadfiles[MAXWADFILES];
-
 void D_AddFile (char *file);
 
 
@@ -47,7 +44,7 @@ void D_DoomMain (void);
 // Called by IO functions when input is detected.
 void D_PostEvent (const event_t* ev);
 
-		
+
 
 //
 // BASE LEVEL
@@ -57,4 +54,13 @@ void D_PageDrawer (void);
 void D_AdvanceDemo (void);
 void D_StartTitle (void);
 
+
+// [RH] Set this to something to draw an icon during the next screen refresh.
+extern char *D_DrawIcon;
+
+// [RH] Allow for recoverable errors to drop to console only
+extern char errortext[2048];
+extern jmp_buf errorjmp;
+extern BOOL errorjmpable;
+
 #endif
diff --git a/code/d_netinf.c b/code/d_netinf.c
index c1427c1a4c..cf094ea387 100644
--- a/code/d_netinf.c
+++ b/code/d_netinf.c
@@ -1,5 +1,6 @@
 #include <math.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "doomtype.h"
 #include "doomdef.h"
@@ -11,28 +12,43 @@
 #include "v_video.h"
 #include "i_system.h"
 #include "r_draw.h"
+#include "r_state.h"
+#include "st_stuff.h"
 
 extern BOOL st_firsttime;
 
 cvar_t *autoaim;
 cvar_t *name;
 cvar_t *color;
+cvar_t *skin;
+cvar_t *team;
+cvar_t *gender;
 
-static userinfo_t userinfos[MAXPLAYERS];
+int D_GenderToInt (const char *gender)
+{
+	if (!stricmp (gender, "female"))
+		return GENDER_FEMALE;
+	else if (!stricmp (gender, "neuter"))
+		return GENDER_NEUTER;
+	else
+		return GENDER_MALE;
+}
 
 void D_SetupUserInfo (void)
 {
 	int i;
+	userinfo_t *coninfo = &players[consoleplayer].userinfo;
 
-	for (i = 0; i < MAXPLAYERS; i++) {
-		memset (&userinfos[i], 0, sizeof(userinfo_t));
-		players[i].userinfo = &userinfos[i];
-	}
+	for (i = 0; i < MAXPLAYERS; i++)
+		memset (&players[i].userinfo, 0, sizeof(userinfo_t));
 
-	strncpy (userinfos[consoleplayer].netname, name->string, MAXPLAYERNAME);
-	userinfos[consoleplayer].aimdist = (fixed_t)(autoaim->value * 16384.0);
-	userinfos[consoleplayer].color = V_GetColorFromString (NULL, color->string);
-	R_BuildPlayerTranslation (consoleplayer, userinfos[consoleplayer].color);
+	strncpy (coninfo->netname, name->string, MAXPLAYERNAME);
+	strncpy (coninfo->team, team->string, MAXPLAYERNAME);
+	coninfo->aimdist = (fixed_t)(autoaim->value * 16384.0);
+	coninfo->color = V_GetColorFromString (NULL, color->string);
+	coninfo->skin = R_FindSkin (skin->string);
+	coninfo->gender = D_GenderToInt (gender->string);
+	R_BuildPlayerTranslation (consoleplayer, coninfo->color);
 }
 
 void D_UserInfoChanged (cvar_t *cvar)
@@ -122,12 +138,15 @@ void D_WriteUserInfoStrings (int i, byte **stream)
 	if (i >= MAXPLAYERS) {
 		WriteByte (0, stream);
 	} else {
-		userinfo_t *info = players[i].userinfo;
+		userinfo_t *info = &players[i].userinfo;
 
-		sprintf (*stream, "\\name\\%s\\autoaim\\%g\\color\\%x %x %x",
+		sprintf (*stream, "\\name\\%s\\autoaim\\%g\\color\\%x %x %x\\skin\\%s\\team\\%s\\gender\\%s",
 						  info->netname,
 						  (double)info->aimdist / 16384.0,
-						  RPART(info->color), GPART(info->color), BPART(info->color)
+						  RPART(info->color), GPART(info->color), BPART(info->color),
+						  skins[info->skin].name, info->team,
+						  info->gender == GENDER_FEMALE ? "female" :
+								info->gender == GENDER_NEUTER ? "neuter" : "male"
 						  );
 	}
 
@@ -136,7 +155,7 @@ void D_WriteUserInfoStrings (int i, byte **stream)
 
 void D_ReadUserInfoStrings (int i, byte **stream, BOOL update)
 {
-	userinfo_t *info = players[i].userinfo;
+	userinfo_t *info = &players[i].userinfo;
 	byte *ptr = *stream;
 	byte *breakpt;
 	byte *value;
@@ -163,10 +182,27 @@ void D_ReadUserInfoStrings (int i, byte **stream, BOOL update)
 
 				if (update)
 					Printf ("%s is now known as %s\n", oldname, info->netname);
+			} else if (!stricmp (ptr, "team")) {
+				strncpy (info->team, value, MAXPLAYERNAME);
+				info->team[MAXPLAYERNAME] = 0;
+				if (update) {
+					if (info->team[0])
+						Printf ("%s joined the %s team\n", info->netname, info->team);
+					else
+						Printf ("%s is not on a team\n", info->netname);
+				}
 			} else if (!stricmp (ptr, "color")) {
 				info->color = V_GetColorFromString (NULL, value);
 				R_BuildPlayerTranslation (i, info->color);
 				st_firsttime = true;
+			} else if (!stricmp (ptr, "skin")) {
+				info->skin = R_FindSkin (value);
+				if (players[i].mo)
+					players[i].mo->sprite = skins[info->skin].sprite;
+				ST_loadGraphics ();
+				st_firsttime = true;
+			} else if (!stricmp (ptr, "gender")) {
+				info->gender = D_GenderToInt (value);
 			}
 
 			*(value - 1) = '\\';
diff --git a/code/d_netinf.h b/code/d_netinf.h
index e6c950c597..17569e2644 100644
--- a/code/d_netinf.h
+++ b/code/d_netinf.h
@@ -5,12 +5,19 @@
 
 extern cvar_t *autoaim;
 
-#define MAXPLAYERNAME	23
+#define MAXPLAYERNAME	15
+
+#define GENDER_MALE		0
+#define GENDER_FEMALE	1
+#define GENDER_NEUTER	2
 
 struct userinfo_s {
 	char		netname[MAXPLAYERNAME+1];
+	char		team[MAXPLAYERNAME+1];
 	fixed_t		aimdist;
 	int			color;
+	int			skin;
+	int			gender;
 };
 typedef struct userinfo_s userinfo_t;
 
diff --git a/code/ChangeLog b/code/docs/ChangeLog
similarity index 100%
rename from code/ChangeLog
rename to code/docs/ChangeLog
diff --git a/code/DOOMLIC.TXT b/code/docs/DOOMLIC.TXT
similarity index 100%
rename from code/DOOMLIC.TXT
rename to code/docs/DOOMLIC.TXT
diff --git a/code/FILES b/code/docs/FILES
similarity index 100%
rename from code/FILES
rename to code/docs/FILES
diff --git a/code/FILES2 b/code/docs/FILES2
similarity index 100%
rename from code/FILES2
rename to code/docs/FILES2
diff --git a/code/docs/README.Carmack b/code/docs/README.Carmack
new file mode 100644
index 0000000000..c67f7b740e
--- /dev/null
+++ b/code/docs/README.Carmack
@@ -0,0 +1,78 @@
+
+Here it is, at long last.  The DOOM source code is released for your
+non-profit use.  You still need real DOOM data to work with this code.
+If you don't actually own a real copy of one of the DOOMs, you should
+still be able to find them at software stores.
+
+Many thanks to Bernd Kreimeier for taking the time to clean up the
+project and make sure that it actually works.  Projects tends to rot if
+you leave it alone for a few years, and it takes effort for someone to
+deal with it again.
+
+The bad news:  this code only compiles and runs on linux.  We couldn't
+release the dos code because of a copyrighted sound library we used
+(wow, was that a mistake -- I write my own sound code now), and I
+honestly don't even know what happened to the port that microsoft did
+to windows.
+
+Still, the code is quite portable, and it should be straightforward to
+bring it up on just about any platform.
+
+I wrote this code a long, long time ago, and there are plenty of things
+that seem downright silly in retrospect (using polar coordinates for
+clipping comes to mind), but overall it should still be a usefull base
+to experiment and build on.
+
+The basic rendering concept -- horizontal and vertical lines of constant
+Z with fixed light shading per band was dead-on, but the implementation
+could be improved dramatically from the original code if it were
+revisited.  The way the rendering proceded from walls to floors to
+sprites could be collapsed into a single front-to-back walk of the bsp
+tree to collect information, then draw all the contents of a subsector
+on the way back up the tree.  It requires treating floors and ceilings
+as polygons, rather than just the gaps between walls, and it requires
+clipping sprite billboards into subsector fragments, but it would be
+The Right Thing.
+
+The movement and line of sight checking against the lines is one of the
+bigger misses that I look back on.  It is messy code that had some
+failure cases, and there was a vastly simpler (and faster) solution
+sitting in front of my face.  I used the BSP tree for rendering things,
+but I didn't realize at the time that it could also be used for
+environment testing.  Replacing the line of sight test with a bsp line
+clip would be pretty easy.  Sweeping volumes for movement gets a bit
+tougher, and touches on many of the challenges faced in quake / quake2
+with edge bevels on polyhedrons.
+
+Some project ideas:
+
+Port it to your favorite operating system.
+
+Add some rendering features -- transparency, look up / down, slopes,
+etc.
+
+Add some game features -- weapons, jumping, ducking, flying, etc.
+
+Create a packet server based internet game.
+
+Create a client / server based internet game.
+
+Do a 3D accelerated version.  On modern hardware (fast pentium + 3DFX)
+you probably wouldn't even need to be clever -- you could just draw the
+entire level and get reasonable speed.  With a touch of effort, it should
+easily lock at 60 fps (well, there are some issues with DOOM's 35 hz
+timebase...).  The biggest issues would probably be the non-power of two
+texture sizes and the walls composed of multiple textures.
+
+
+I don't have a real good guess at how many people are going to be
+playing with this, but if significant projects are undertaken, it would
+be cool to see a level of community cooperation.  I know that most early
+projects are going to be rough hacks done in isolation, but I would be
+very pleased to see a coordinated 'net release of an improved, backwards
+compatable version of DOOM on multiple platforms next year.
+
+Have fun.
+
+John Carmack
+12-23-97
diff --git a/code/docs/README.LZO b/code/docs/README.LZO
new file mode 100644
index 0000000000..9c40bf8ba5
--- /dev/null
+++ b/code/docs/README.LZO
@@ -0,0 +1,136 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+
+
+ ============================================================================
+ miniLZO -- mini subset of the LZO real-time data compression library
+ ============================================================================
+
+ Author  : Markus Franz Xaver Johannes Oberhumer
+           <markus.oberhumer@jk.uni-linz.ac.at>
+           http://wildsau.idv.uni-linz.ac.at/mfx/lzo.html
+ Version : 1.04
+ Date    : 15-Mar-1998
+
+ I've created miniLZO for projects where it is inconvenient to
+ include (or require) the full LZO source code just because you
+ want to add a little bit of data compression to your application.
+
+ miniLZO implements the LZO1X-1 compressor and both the standard and
+ safe LZO1X decompressor. Apart from fast compression it also useful
+ for situations where you want to use pre-compressed data files (which
+ must have been compressed with LZO1X-999).
+
+ miniLZO consists of one C source file and two header files:
+    minilzo.c
+    minilzo.h
+    lzoconf.h
+
+ To use miniLZO just copy these files into your source directory, add
+ minilzo.c to your Makefile and #include minilzo.h from your program.
+ Note: you also must distribute this file (`README.LZO') with your project.
+
+ minilzo.o compiles to about 6 kB (using gcc or Watcom C on a i386), and
+ the sources are about 14 kB when packed with zip - so there's no more
+ excuse that your application doesn't support data compression :-)
+
+ For more information, documentation, example programs and other support
+ files (like Makefiles and build scripts) please download the full LZO
+ package from
+    http://wildsau.idv.uni-linz.ac.at/mfx/lzo.html
+
+ Have fun,
+  Markus
+
+
+ P.S. minilzo.c is generated automatically from the LZO sources and
+      therefore functionality is completely identical
+
+
+ Appendix A: building miniLZO
+ ----------------------------
+ miniLZO is written such a way that it should compile and run
+ out-of-the-box on most machines.
+
+ If you are running on a very unusual architecture and lzo_init() fails then
+ you should first recompile with `-DLZO_DEBUG' to see what causes the failure.
+ The most probable case is something like `sizeof(char *) != sizeof(long)'.
+ After identifying the problem you can compile by adding some defines
+ like `-DSIZEOF_CHAR_P=8' to your Makefile.
+
+ The best solution is (of course) using Autoconf - if your project uses
+ Autoconf anyway just add `-DMINILZO_HAVE_CONFIG_H' to your compiler
+ flags when compiling minilzo.c. See the LZO distribution for an example
+ how to set up configure.in.
+
+
+ Appendix B: list of public functions available in miniLZO
+ ---------------------------------------------------------
+ Library initialization
+    lzo_init()
+
+ Compression
+    lzo1x_1_compress()
+
+ Decompression
+    lzo1x_decompress()
+    lzo1x_decompress_safe()
+
+ Checksum functions
+    lzo_adler32()
+
+ Version functions
+    lzo_version()
+    lzo_version_string()
+    lzo_version_date()
+
+ Portable (but slow) string functions
+    lzo_memcmp()
+    lzo_memcpy()
+    lzo_memmove()
+    lzo_memset()
+
+
+ Appendix C: suggested macros for `configure.in' when using Autoconf
+ -------------------------------------------------------------------
+ Checks for typedefs and structures
+    AC_CHECK_TYPE(ptrdiff_t,long)
+    AC_TYPE_SIZE_T
+    AC_CHECK_SIZEOF(unsigned short)
+    AC_CHECK_SIZEOF(unsigned)
+    AC_CHECK_SIZEOF(unsigned long)
+    AC_CHECK_SIZEOF(char *)
+    AC_CHECK_SIZEOF(ptrdiff_t)
+    AC_CHECK_SIZEOF(size_t)
+
+ Checks for compiler characteristics
+    AC_C_CONST
+
+ Checks for library functions
+    AC_CHECK_FUNCS(memcmp memcpy memmove memset)
+
+
+ Appendix D: Copyright
+ ---------------------
+ LZO and miniLZO are Copyright (C) 1996, 1997, 1998
+ Markus Franz Xaver Johannes Oberhumer
+
+ LZO and miniLZO are distributed under the terms of the GNU General
+ Public License (GPL).  See the file COPYING.
+
+ Special licenses for commercial and other applications which
+ are not willing to accept the GNU General Public License
+ are available by contacting the author.
+
+
+
+
+-----BEGIN PGP SIGNATURE-----
+Version: 2.6.3ia
+Charset: noconv
+
+iQCVAwUBNQv2B210fyLu8beJAQFC8QQAzxteZ5VRs+iDmBz40HQmsfr+RZVnyccK
+9vJ7BtFKaxAwpfa6AzothnHa1zmSaKqbltLzAQHQ6elAIYegELdpV9HRHddx0Q/y
+ATDhaVlsSGJLiOazPRBpJq6ne0J9phIH9n2hZmNQFDTm3bKmcm6PYVxt39iDVgg0
+hMwf5skDc+k=
+=qpUY
+-----END PGP SIGNATURE-----
diff --git a/code/README.asm b/code/docs/README.asm
similarity index 100%
rename from code/README.asm
rename to code/docs/README.asm
diff --git a/code/README.b b/code/docs/README.b
similarity index 100%
rename from code/README.b
rename to code/docs/README.b
diff --git a/code/README.book b/code/docs/README.book
similarity index 100%
rename from code/README.book
rename to code/docs/README.book
diff --git a/code/README.gl b/code/docs/README.gl
similarity index 100%
rename from code/README.gl
rename to code/docs/README.gl
diff --git a/code/README.sound b/code/docs/README.sound
similarity index 100%
rename from code/README.sound
rename to code/docs/README.sound
diff --git a/code/Rh-log.txt b/code/docs/Rh-log.txt
similarity index 66%
rename from code/Rh-log.txt
rename to code/docs/Rh-log.txt
index 4dfe4a487c..d9306d9317 100644
--- a/code/Rh-log.txt
+++ b/code/docs/Rh-log.txt
@@ -1,4 +1,627 @@
+December 22, 1998
+- Fixed the thing spawners so that they don't spawn monsters if the
+  nomonsters dmflag is set.
+- Changed the imp fireball to be 75% opaque.
+- Replaced the am_key?color cvars with am_lockedcolor. Finally rewrote the
+  code in the automap that uses it, too. (Up until now, it was still using
+  the old Doom specials to determine locked doors, even though they all get
+  converted into Door_LockedRaise before the automap ever sees the line.
+
+December 21, 1998
+- Added ML_BLOCKEVERYTHING linedef flag.
+
+December 20, 1998
+- Added support for a ChangeCamera special.
+
+December 19, 1998
+- Added a fire effect to the player setup menu (which I had wanted to do
+  ever since I saw Unreal).
+
+December 15, 1998
+- Went through commands.txt, and documented new commands and cvars (and also
+  some that I had missed from 1.14). I still count 4 undocumented commands,
+  but I can't figure out what they are even when I compare it with the output
+  of the cmdlist command.
+- Fixed problem with V_BreakLines() not properly setting the pixels width
+  of lines that were broken.
+- Fixed problem of Plat_UpByValue not going back down.
+
+December 13, 1998
+- Fixed problem of lighting in hires modes lightening too quickly.
+- Added outsidefog key to MAPINFO lump parser to set the fog color for
+  any sectors with sky ceilings.
+- Removed the translucency on health bonuses.
+- Improved some of the error-handling code in the midi playback routines,
+  and the problem seems to have gone away.
+
+December 12, 1998
+- Started experiencing a strange midi problem: it works with the debug
+  build but not the release.
+- Added soundlist command to display the assignment of sounds.
+- Added dynamic sound linking so that sounds that refer to the same lump
+  use the same copy of the sound. Added the soundlinks command to view
+  the linking of sounds.
+- Fixed problem of punching someone to death being treated as an
+  unknown means of death in the obituaries.
+- Spawning players now telefrag things standing at their spawnpoint, so
+  it's no longer possible to get stuck inside another player when
+  spawning. Also relaxed the restriction on deathmatch starts so that
+  only one is needed to start a game.
+- Added nobfgaim cvar to disable freeaiming of the bfg. (suggested by
+  Tony Fabris)
+- Was trying to figure out why weapnext and weapprev only worked for
+  player 0 in network games, when they suddenly started working.
+  Hopefully it's permanent... [Now that I've thought about it a little
+  more, I probably just wasn't getting the mouse captured when I alt-tabbed
+  to the other player's window.]
+- Rewrote weapnext and weapprev commands to use the inventory "system."
+- Added a dir command.
+- Added support for the second joystick device because my joystick somehow
+  got assigned to it (and made me aware that it exists :-). Also added
+  joy_xthreshold, joy_ythreshold, joy_xsensitivity, joy_ysensitivity, and
+  joy_speedmultiplier cvars.
+- Added support for double bindings (for double clicking, but it works with
+  all keys, not just the mouse buttons) to C_DoKey() and some associated
+  console commands.
+- Changed C_DoKey() so that it takes an event as input.
+- Added some code to PTR_ShootTraverse so that bullet puffs can appear on
+  floors and ceilings.
+
+December 6, 1998
+- Fixed problem of monsters being slow to attack a player if they were
+  on a route: Their reactiontime was too high.
+- Added a gender option to the player setup menu.
+- If getsfx() tries to load a sexed sound, and it doesn't exist, it will
+  try to load a male version of the sound.
+- Added an empty sound (dsempty).
+- Changed sound handling slightly so that sounds are now loaded when
+  they are first used instead of during I_InitSound(). They still stick
+  around forever after that.
+- Changed the names of every sound in SNDINFO. It's no longer Hexen-
+  compatible, but it should at least be compatible with what I want to
+  do eventually. I also redid the way skin sounds are handled to better
+  fit my new sound naming conventions: Any gender/skin-specific sounds
+  can be used by prefacing them with a '*' and passing a player mobj to
+  a sound function. (If a player mobj is not passed, it defaults to male).
+- Fixed the problem of button sounds being played in the wrong place
+  when they're deactivated. For some reason, I had this line in
+  P_UpdateSpecials():
+		S_StartSound ((mobj_t *)&button->soundorg, "Switch1", 78);
+  but button->soundorg is an mobj_t *. I'm surprised it didn't crash.
+- Changed P_Thing_Spawn() and P_Thing_Projectile() so that they will only
+  spawn things at map spots and not just anything with a matching tid.
+- Fixed P_Thing_Projectile() so that it will still spawn missiles even if
+  there is something at their spawn spot.
+
+December 4, 1998
+- Was playing a dark level and noticed that the fog isn't "thick"
+  enough at higher resolutions: It transitions from darkness to fullbright
+  far too quickly.
+- Tweaked the falling damage some more using some code from Q2.
+- Rearranged the startup sequence slightly so that I_Init() gets called
+  before I_InitGraphics() (like it was before).
+- Added support for gendered death messages.
+- Rewrote portions of d_dehack.c so that it takes less space when compiled
+  and also added .bex support. (Tried it with a few .bex files, but didn't
+  do any extensive testing. Assuming it works. :-)
+- Added a check in Printf() to avoid drawing to the console too rapidly
+  during startup, because that can slow it down.
+- Changed P_LoadSegs so that it clears a line's ML_TWOSIDED flag if an
+  associated sidedef doesn't point to a back sector (otherwise the game
+  could crash in p_sight.c when the line came into view).
+- Removed foreign language "support." It's been broken for a while and was
+  too hard to add new strings.
+- Moved string names out of d_dehack.c and into dstrings.c (which is where
+  they should have been in the first place.)
+
+November 30, 1998
+- Had a flash of insight for how I could speed up the rendering of walls. A
+  quick test shows that filling the screen with columns of shorts is about
+  twice as fast as filling it with columns of bytes. If I draw wall columns
+  into memory in consecutive bytes, and then copy them to the screen in
+  another pass, I should be able to combine the writing of two or more
+  columns together, obtaining a speed boost that should, at the very least,
+  let me maintain 35 fps at 800x600 on my machine. I'll have to try it and
+  see if it actually works in practice. The overhead of writing the walls
+  twice might kill any performance boost this could offer. On 486s and slow
+  Pentiums, this will almost certainly be more of a hinderance than a help,
+  and it's not needed at low resolutions anyway, so I plan on keeping it
+  optional if it turns out to be benefitial.
+
+November 29, 1998
+- Tested a theory, and I was right. :-( Drawing vertical columns is
+  inherantly slower than drawing horizontal spans, probably because drawing
+  them vertically results in a whole lot more cache misses. What I did to
+  test it was replace most of D_Display() with a loop that filled the screen
+  a solid color. At 800x600, filling the screen by columns was no faster than
+  if I textured the walls (23 fps). Filling by rows, I could get 35 fps.
+  Apparently, any further optimizations in the renderer will have to focus
+  on drawing walls by rows instead of colums.
+
+November 28, 1998
+- Did some slight performance tuning in R_RenderSegLoop() by making more
+  variables local to only certain blocks in the function. In 800x600,
+  looking straight at a wall now gives ~23 fps vs ~20 fps before. (I really
+  wasn't expecting such a marked improvement. It might be worthwhile to try
+  and tweak this in assembly.)
+- Pulled some blending addition code from the Q2 DLL. I had been trying to
+  do the same thing myself, but couldn't quite manage it until I found
+  id's code.
+
+November 26, 1998
+- Added support for cancelling messagemode by pressing escape.
+- On the automap, a player with invulnerability is drawn with a color
+  slightly off from the background rather than being hard-coded to palette
+  entry 246 (which is almost black with the normal Doom palette).
+- Finally got around to working out the bugs in teamplay. (Missiles would
+  still hurt you even with friendly fire on.)
+- Disabled intermission texts in deathmatch.
+- Pretty sure I got a non-fatal version of I_Error working now. It uses
+  setjmp() and longjmp() to do its magic.
+- Removed the check for -statcopy in d_main.c.
+- Removed the system menu from the ZDoom window. Unfortunately, this also
+  means it doesn't get a minimize box. Oh well.
+- Removed the restriction on using messagemode only during a netgame.
+- Added mouse wheel support. Under Win95, it ought to work with DirectInput.
+  Under NT 4.0 and 98, it should always works.
+
+November 23, 1998
+- Changed the startup code so that the graphics mode is initialized as early
+  as possible, allowing us to use the in-game console for most startup text.
+- Moved all the functionality of I_StartGraphics() into I_InitGraphics()
+  because the game starts up in a fullscreen console now.
+- Added endgame to quit out of a game and drop to the fullscreen console.
+- Removed the ormask parameter from V_PrintStr() and V_PrintStr2(). It was
+  almost never used, and in those cases where it was, it was easy enough to
+  just or the string beforehand.
+- Adjusted the colors of the CONCHARS lumps and changed a few special
+  characters. With the fullscreen console, it was obvious that they were
+  all too dark.
+- Added a fullscreen console.
+- Changed handling of WM_DESTROY messages in i_input.c to call exit()
+  directly, because the WM_QUIT message didn't seem to be making its way
+  into the message stream.
+- Removed some unused #defines from doomdef.h
+- Removed the store demo check from D_ProcessEvents().
+
+November 22, 1998
+- Fixed saving of monster goals (was referencing the tracer field instead).
+- Made one-sided lines pushable.
+- Made P_PushSpecialLine aware of the side of the line that was pushed.
+- Moved the execution of deferred scripts out of P_StartOpenScripts so
+  that going to a level with a saved snapshot would not terminate the
+  script prematurely when the snapshot was loaded.
+
+November 21, 1998
+- Teleport_EndGame and Teleport_NewMap no longer execute if crossed
+  along a linedef's back side.
+- Discovered I had missed implementing Teleport_EndGame, so I added it.
+- Fixed problem with level snapshots where plats and ceilings that were
+  in stasis were saved incorrectly.
+
+November 15, 1998
+- Just tried listening to D_RUNNIN after a clean boot, and it didn't work
+  the first time. :-( At least it plays properly after I use iwinit now...
+
+November 14, 1998
+- Bumped the height of the three small torches up from 34 to 37 units so
+  that the player can't jump on top of them.
+- Tweaked the thing auto step up in PIT_CheckThing some more so that it
+  will only do the auto step up if you're not in the air. It seemed funny
+  to be able to jump on top of most monsters. Never mind. I can't seem to
+  get it to work only when I'm not jumping. :-(
+- Added code to mus2strm.c so that it generates a tempo event at the
+  beginning of the song. (The tempo used appears to be the default for
+  midiStreamOpen, but I felt like being safe anyway.) AddEventToStream() in
+  mid2strm.c also keeps track of all instruments used in a song now. This
+  way I can get around what appears to be a bug in the GUS PnP drivers
+  that would cause it not to play some instruments if they weren't already
+  loaded in the card's RAM. Just before I start playing the actual song, I
+  play each instrument very briefly and very quietly to get the instruments
+  into the card's RAM.
+
+November 2, 1998
+- Added snd_mididevice cvar to allow the user to select which MIDI device
+  to use and a snd_listmididevices cvar to enumerate the available devices.
+- Added MIDI volume cvar snd_midivolume and a corresponding menu item.
+- Finished mus2strm.c and made a few cleanups to the MIDI streaming code.
+  Now I just need to switch to MikMod, and I won't have to use temporary
+  files anywhere. (MIDAS can only load MODs from disk and not from memory.)
+
+November 1, 1998
+- Started cleaning up qmus2mid.c and transforming it into mus2strm.c.
+
+October 31, 1998
+- Took the mid2strm sample from the dx5sdk and used it to redo my MIDI
+  support so that I can use the MIDI stream API now, the primary benefit
+  being that it lets me set the MIDI volume for just that stream and not the
+  entire system.
+- Changed I_DetectOS() so that it doesn't identify Windows 98 as Windows 95.
+
+October 24, 1998
+- Discovered the blockmap generation wasn't actually working. Can't figure
+  out why, since the same code works just fine in BOOM...
+- Incorporated several of the changes from BOOM 2.02 such as "loose files",
+  fire trail elimination, and automatic blockmap generation for large maps.
+
+October 17, 1998
+- Implemented the Radius_Quake line special.
+- Removed limit on the size of recordable demos.
+- Changed P_SpawnPlayer() so that it always spawns players on the ground.
+- Created an MT_TELEPORTMAN2 that can be used to teleport things to points
+  above the ground and fixed MT_TELEPORTMAN so that it teleports things onto
+  the ground.
+- Updated the teleport code so that it finds destinations using P_FindGoal()
+  instead of searching through all the active thinkers.
+- Fixed a memory allocation problem with the -iwad parameter.
+
+October 16, 1998
+- Rewrote IdentifyVersion() so that it identifies IWADs by their contents
+  instead of their names. (except for tnt.wad and plutonia.wad, since I
+  don't know of any other way to distinguish them from doom2.wad)
+- Doors that needed yellow skull keys to be opened said they needed yellow
+  cards instead. Fixed.
+- Finally added proper support for substituting translucency for the fuzz
+  effect. Instead of using a NULL colormap to represent fuzz, it takes
+  advantage of the vissprite's flags field and sets MF_SHADOW. Then the
+  colormap points to the colormap that would be used if the sprite wasn't
+  shadow, so that it can be properly shaded when r_drawfuzz is 0.
+- Got the colormaps code working. I just wasn't allocating enough space for
+  the realcolormaps array. Oopsy.
+
+October 15, 1998
+- Decided to support changing of colormaps via Boom's 242 linedef after all
+  instead of just changing the blend, so I started adding some code to
+  support that. Unfortunately, now it doesn't work without any C_START/C_END
+  colormaps. :-( Will fix tomorrow.
+
+October 14, 1998
+- Added a callback for the splashfactor cvar that prevents it from being
+  set to illegal non-positive values and also computes the inverse of the
+  cvar for scaling of the thrust felt by things that chew on their own
+  missiles. That way, a player will always rocket jump the same height no
+  matter what their splashfactor is set to.
+- Fixed a problem with continuous sounds that prevented them from being
+  played. When I had consolidated to using a single mobj thinker for all
+  sounds instead of splitting them up as I had previously, I was erroneously
+  setting the activation time for continuous sounds to 0 because I wanted
+  their thinkers to get called right away. But the mobj thinker decrements
+  the tic counter and *then* compares it with 0, so it would decrement the
+  0, see -1, and then never doing anything with that mobj again.
+
+October 10, 1998
+- The button list gets saved in level snapshots now.
+- Added full support for activation types of projectile cross, projectile
+  hit, and push. Also added support for a few linedef types to be
+  monster-activatable depending on their activation type even if
+  ML_MONSTERSCANACTIVATE is not set. (So that, e.g. a monster can still
+  open a local door of type Door_Raise without the level designer
+  having to do anything special.)
+- Removed the MAXBUTTONS limit and also fixed a problem with the sound
+  origin used when activating switches/buttons.
+- Changed the error messages in V_DrawWrapper() and V_DrawSWrapper() to
+  use DPrintf() instead of Printf().
+- Fixed problem with invulnerability I introduced yesterday. (Walls were
+  still being drawn with the normal colormap.)
+
+October 9, 1998
+- Spent about an hour changing the rendering code so that each sector can
+  have its own colormap. The light tables are now indices into a colormap
+  rather than pointers into one. Spent about half an hour afterward
+  figuring out why it seemed to be merging visplanes that were alike in
+  everyway except for colormap. All in all, it was easier than I had
+  expected. Unfortunately, it's also too slow to build a colormap in the
+  middle of gameplay, so I guess an open script will have to be used to
+  build any colormaps before the level starts if anyone wants to change a
+  sector's color on the fly.
+
+Ocober 8, 1998
+- I had earlier changed PIT_RadiusAttack() to do only half damage to targets
+  that originated the explosion, so that rocket jumping didn't hurt so much.
+  The scale factor has now been moved into the cvar splashfactor and
+  defaults to 1.0. The former behavior can be restored by setting it to 0.5.
+
+October 5, 1998
+- Spent about 15 minutes writing a routine to build a colormap for non-
+  white lights. Tested it using an orange light for the entire level. It
+  worked nicely, so now I just need to make it possible to set the light
+  color on a sector-by-sector basis.
+- Issue: Teleport destinations need to be flush with the floor instead of
+  remembering the position they are spawned at. Discovered this while
+  playing MAP20. A teleport destination lowers a great distance the first
+  time you land on it. Going on it again will teleport you to its original
+  height, and you fall from there. Maybe another type for destinations that
+  remember their height, then?
+
+October 4, 1998
+- Added say_team and messagemode2 commands and team and teamplay cvars.
+- Externalized the obituary messages and added a "Strings" section to the
+  dehacked code. Since I'm pretty sure I'll be switching to scripted code
+  ala Quake, this is only temporary (along with everything else dehacked).
+- Added support for showing both skull and card keys in the status bar
+  ala Boom.
+- Added Sector_SetDamage and Sector_SetGravity line specials.
+- Added another mobj flag (MF2_NOADJUST) so that you can walk on floating
+  bridges without worrying about them getting bumped up above your head.
+- Adjused PIT_CheckThing() so that it allows stepping up on top of things
+  if their tops are no more than 24 units above the thing moving.
+
+October 3, 1998
+- Added an MT_AMBIENT mobj (doomed #14065). Its first argument determines
+  which ambient sound it represents. (And is valid in the range 0-255.) It
+  also subsumes the earlier MT_AMBIENT0 - MT_AMBIENT63 mobjs (doomed
+  #14001 - 14064), and P_SpawnMapThing translates them into an
+  instance of MT_AMBIENT. Also merged the world ambient thinker into the
+  mobj thinker so that all ambient sounds are controlled with a single
+  thinker function and not two.
+- Removed sounds.h. Everything necessary to use sounds is now found in
+  s_sound.h
+- Disabled the recognition of any display modes other than INDEX8 in
+  i_video.cpp. I'm no longer sure high/true color is such a good thing.
+  Without a major loss of performance, I can't see any way to avoid a
+  huge memory loss with more than a few palettes in those modes. :-(
+- Did some work with ARGB8888 modes: I_Blit can now blit from INDEX8 to
+  ARGB8888 surfaces. The console font now gets drawn on ARGB8888 surfaces
+  (pretty sure it was before, but it stopped working sometime).
+- Fixed the cast drawer so that the names don't get squashed together in
+  resolutions at least 640 pixels wide.
+- Fixed bug where pressing a key with a menu active would move the cursor
+  to a blank line if it wasn't assigned as a hotkey.
+- Added support for actually seeing skins as well as setting them in the
+  player setup menu.
+- Fixed bug with player colors for players 5-8.
+
+October 1, 1998
+- Continued work with "skins." Everything works now except actually
+  seeing them.
+- Did away with the spriteoffset[], spritewidth[], and spritetopoffset[]
+  arrays and moved their contents into the sprite frame structure.
+
+September 30, 1998
+- Started work on supporting Doom Legacy "skins." (Personally, I think
+  skin is a misnomer, but I'm afraid the term's probably here to stay.)
+- Removed the maskdraw_t structure from r_things.c since it wasn't used
+  anywhere. Here it is preserved for history:
+	typedef struct {
+		int x1, x2;
+		int column;
+		int topclip, bottomclip;
+	} maskdraw_t;
+  Wonder what it was for.
+
+September 27, 1998
+- Fixed long-standing bug in R_DrawSprite that could cause sprites to be
+  drawn through the floor of a cliff if you look down just the right amount
+  (when the top edge of the floor is exactly two pixels above the top of
+  the screen).
+- Added hacked-in support for colormaps with the Transfer_LightsHeights
+  special. ZDoom actually sets the blending through this special instead
+  of changing the colormap. To accomodate BOOM levels that use colormaps,
+  it will average all the colors in the colormap together and derive a
+  blend from that. Alternatively, you set the blend directly by setting
+  the appropriate texture name to a hex string of the format AARRGGBB.
+- Fixed barrels (again) so that barrel traps work as expected. Not sure if
+  this problem existed in 1.14a or not, but it's gone now.
+- Added ignoreInvisibility parameter to P_CheckSight(), because it is
+  occasionally used to determine if there is an unblocked line between two
+  things (not if one can see the other).
+- Switched to using a logarithmic scale for pain flashes.
+- Added support for Boom's push/pullers, wind, current, and friction effects.
+
+September 26, 1998
+- Saw this at the Team TNT message board:
+
+      the bug has been found and fixed. What was happening was that the fake
+	  sector was being passed instead of the real one, and this messed up
+	  the check for whether a sector had had its sprites added to the view
+	  already. As a result each sprite generated was being added once per
+	  subsector rather than just once.
+
+  So I went looking around in the code some and found this in R_Subsector():
+  "R_AddSprites (frontsector)". I replaced frontsector with sub->sector, and
+  that seems to have done the trick. A test level I made went from 15 fps to
+  35 fps (the max) with this fix.
+
+September 23, 1998
+- Using -cdrom creates the directory if it doesn't exist (like it used to).
+- When used with -cdrom, screenshots now get saved to C:\ZDOOMDAT instead of
+  the game directory.
+- Put back support for taking screenshots by pressing F1 with -devparm
+  active, since some people probably won't read the docs and realize there's
+  a screenshot command bound to the "Print Screen" key by default.
+- Added "ticker" cvar to control display of the -devparm ticker at the
+  bottom of the display (so that -devparm is now totally useless).
+- Changed the directory for -cdrom from C:\DOOMDATA to C:\ZDOOMDAT and added
+  support for using that directory to store zdoom.cfg.
+- Fixed bug that caused using -devparm or -cdrom to crash the game during
+  startup. (They referenced the Strings[] table before it was fully
+  initialized.)
+
+September 19, 1998
+- Turned off screenwiping when moving between levels in a hub (but only if
+  the level the player just left has LEVEL_NOINTERMISSION set).
+- Fixed a savegame bug I had added with hubs that caused the game to
+  forget the player's state.
+- Added noise cvar to control display of sound debugging info.
+- Added turn180 command to quickly turn the player around.
+- Added support for the ACS thingsound(), sectorsound(), and ambientsound()
+  commands.
+- Changed every reference to S_StartSound so that they refer to sounds
+  by name rather than id and specify priority information (since it's
+  no longer a part of the sfxinfo).
+
+September 18, 1998
+- Finished S_ParseSndInfo so that it has no maximum number of sounds it
+  can define and works with more than just ambient sounds.
+- Changed w_wad.c back to using the buffered I/O functions again. (I had
+  done this a long time ago, but thanks to some mistakes on my part, I
+  ended up putting taking it out. Now it's back for good. :-) It doesn't
+  seem to have any effect on disk performance, but it will let me use
+  MikMod functions to load samples and MODs directly from the wad.
+- Played around with MikMod some. With the assembly mixer, its
+  performance seems to be about the same as MIDAS', so I will
+  probably switch to it at some point.
+
+September 17, 1998
+- Improved support for analog joysticks by using their full range of
+  motion instead of treating them like digital devices.
+
+September 15, 1998
+- Added support for world vars and controlling scripts on other maps.
+- Added the hub clusterdef flag and supporting code.
+- Figured out what the problem with hub savegames was: Instead
+  of writing out a copy of the snapshots for each level with one,
+  I wrote out a copy of the current level's snapshot for each
+  level with a snapshot. Whoops! Easy fix.
+
+September 14, 1998
+- Worked with supporting hubs. For maps that belong to a hub,
+  whenever you exit the level, the game makes a mini-savegame
+  of the level. When you return, the world state is based on
+  the mini-savegame. Theoretically, saving games to disk should
+  be as simple as storing each of these "snapshots" along with
+  some extra info, but I couldn't get it to work. The current
+  level worked, but trying to go to a previously visited level
+  after loading the savegame crashed the game.
+
+September 13, 1998
+- Redid my ACS code a bit so that scripts are now kept track of
+  through a private linked list rather than thinkers. The only
+  real advantage this offers is that I have complete control
+  over when scripts get executed, so a script that executes a
+  scriptwait command will be guaranteed to run in the same tic
+  that the script it's waiting on terminates.
+
+September 12, 1998
+- Replaced my visplanes code with Lee Killough's hashing method
+  and got a noticable performance boost in high visplane areas
+  (even those with <128!).
+
+September 4, 1998
+- Added weapnext and weapprev commands courtesy of
+  Papst Johannes Jörg IV. [which were later completely
+  rewritten by me]
+- Add support for suspending and resuming scripts (easy when
+  you know you can only have one copy running at a time).
+- Added checks to ensure that only one instance of a script is
+  running at a time (like Hexen).
+
+September 3, 1998
+- Took out the stuff for sliding doors. You want it, then
+  fake it with a script.
+- Ran around in hexen.wad for a while and fixed a few bugs.
+- Added support for ACS scripts (except for the sound p-codes
+  and polywait).
+
+September 2, 1998
+- Added support for monsters remembering their previous target
+  from BOOM.
+- Made the mobj's targettic a counter that decrements to zero
+  instead of a time relative to gametic (so that it works properly
+  across savegames).
+- Added more mobj flags bits and consolidated invisible into it.
+- Implemented all the Thing_* line specials.
+- Added support for stairs that reset and/or have delays and the
+  sync stair builders.
+
+September 1, 1998
+- Fixed problem with several plat types that didn't deactivate
+  themselves.
+- Fixed bug that caused Plat_UpWaitDownStay to act like
+  Plat_PerpetualRaise.
+- Made NOINTERMISSION levels work by moving the check for it later
+  in G_DoCompleted().
+- Added HealThing special to match DamageThing.
+- Added full support for the Teleport_NewMap special. Levelnum is
+  actually used for something in the MAPINFO now, too.
+
+August 31, 1998
+- Implemented Hexen's thing specials that don't use tids.
+
+August 30, 1998
+- Added support for Hexen pillars.
+- Finished ceilings.
+- Finished floors.
+- Added compression of .tch files and significantly rewrote the
+  associated part of v_video.c in the process. Not quite the savings
+  I would have liked: only about 57%.
+- Tried using the LZ(77?) code from the Doom utilities to compress save
+  games, but it was too slow to be practical. I now use minilzo which
+  seems to compress about the same but is a *lot* faster. As an example
+  of the kind of savings this offers, the size of a savegame on one
+  level shrank to 20% of its original size.
+- Used BOOM's code to remove the savegame size limit and fix some other
+  savegame bugs.
+- Used Killough's global boss brain state.
+- Tweaked I_FatalError() so that if something really bad happens, you
+  shouldn't end up in an infinite recursion sequence because Printf()
+  gets called somewhere during the exit sequence.
+- Implemented Floor_Waggle. Unfortunately, it's not the same as Hexen's
+  since I couldn't find any decent documentation about it and also had
+  a hard time determining just how every different parameter affected it
+  by watching it in a test level. It's close, but not the same.
+
+August 29, 1998
+- Added support for normal (not sync) Hexen stairs.
+- Added support for Hexen's phased lighting.
+
+August 26, 1998
+- Continued on floors.
+
+August 25, 1998
+- Started getting moving floors working again.
+
+August 21, 1998
+- Got plats working again.
+- Switched to using a linked list to keep track of active ceilings and
+  plats. This is similar to the way BOOM does it, except I store the
+  list pointers in the active entities themselves rather than seperately.
+
+August 20, 1998
+- Fixed a savegame bug I had introduced. They got saved as "version 115"
+  instead of zdoomsv?.dsg.
+
+August 8, 1998 - August 15, 1998
+- Did some work converting to Hexen-like line specials. Sorry, I was too
+  lazy to record the specific changes.
+
+August 7, 1998
+- Incorporated BOOM's Pain Elemental Lost Soul shooting fix.
+- Incorporated some of BOOM's changes to p_map.c.
+- Incorporated Killough's changes to p_sight.c.
+
+August 6, 1998
+- Added snd_surround cvar to control use of surround sounds. If "0", then
+  anything that would otherwise have been played surround is played
+  identically from both speakers instead.
+- Added cvar_defflags variable to hold any flags automatically applied to
+  new cvars, the intended purpose being to allow all cvars in a config
+  file to be flagged as CVAR_ARCHIVE. Useful if one port of ZDoom has cvars
+  that another doesn't, but you still want them to share the same config
+  file.
+
+August 5, 1998
+- Finished keyboard handler and tried to create a mouse handler for the
+  DOS port.
+- Switched to using PTC Mode IDs to describe video modes instead of
+  bpp since the DOS version of PTC has multiple modes with the same bpp.
+
+August 4, 1998
+- Created partial keyboard handler for DOS port.
+
+July 28, 1998
+- Fixed use of config files in paths containing spaces. (I had forgotten to
+  enclose the pathname in quotes when constructing the exec command string.)
+- Added calls to FixPathSeperator() in a bunch of places where it was needed.
+
+July 27, 1998
+- Uploaded a quick fix to 1.14a that lets it load save games again.
+- Renamed the project and workspace to zdoom (rather than doom).
+- Created a version info resource for ZDoom and moved the system-specific
+  files into a new win32 directory in the code tree.
+
 July 26, 1998
+- Uploaded 1.14a to notgod.com along with a source patch for 1.14->1.14a.
 - If FONTA?? is available, it is now used in deference to STCFN??? (i.e.
   -file heretic)
 - Renamed all the WICHAR?? in zdoom.wad to FONTB?? to match the naming
@@ -9,7 +632,7 @@ July 23, 1998
   soon and stuck it into ZDoom without really thinking about it. In BOOM (and
   DOOM) lnames[] is dynamically allocated. In ZDoom, it's static since it
   only needs to contain two items (the patch of the level just left and the
-  patch of the level being entered).
+  patch of the level being entered). Fixed.
 - Using the changemap command no longer says you are leaving the map you're
   entering when no title patch is provided. (Unless they're one and the same.)
 
@@ -82,6 +705,8 @@ July 14, 1998
 - Fixed bug that caused the bunny scroller to crash: Using 0 instead of
   &screens[0] in the calls to F_DrawPatchCol().
 - Added support for the ML_PASSUSE flag from BOOM.
+- Decided using a default texture for unknowns was too complicated to bother
+  with at this point, so I took it back out. (Left in for flats, though.)
 
 July 13, 1998
 - Fixed IDKFA cheat to give the correct amount of armor.
@@ -246,7 +871,7 @@ June 23, 1998
 - Added spynext and spyprev commands. Spynext is equivalent to pressing F12
   in the original Doom.
 - Added +showscores action. It gets bound to \ by default.
-- Save games now hold copies of ever serverinfo cvar and the level locals.
+- Save games now hold copies of every serverinfo cvar and the level locals.
   With Doom 1, they also contain a list of visited levels.
 - The game now keeps a cumulative frag count for each player which is the same
   as what gets displayed on the status bar during a deathmatch.
@@ -1150,9 +1775,6 @@ March 16, 1998
   realize that ylookup and columnofs are now pointers instead of
   arrays.
 
-March 15, 1998
-- Nothing.
-
 March 14, 1998
 - mb_used changed to a float, so the heap doesn't need to be an
   integral number of megs in size.
@@ -1267,9 +1889,6 @@ March 9, 1998
   revealed at all. It ought to be marginally faster, too (although
   it probably won't make a bit of difference during gameplay).
 
-March 8, 1998
-- Did nothing. Stupid parental restrictions on Sunday activities.
-
 March 7, 1998
 - Still working on MaxVisPlanes bug. This is proving to be more
   elusive than I had expected, since VC++ is being most unhelpful.
diff --git a/code/TODO b/code/docs/TODO
similarity index 100%
rename from code/TODO
rename to code/docs/TODO
diff --git a/code/doom.dsp b/code/doom.dsp
deleted file mode 100644
index 4faa674676..0000000000
--- a/code/doom.dsp
+++ /dev/null
@@ -1,1473 +0,0 @@
-# Microsoft Developer Studio Project File - Name="doom" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=doom - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "doom.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "doom.mak" CFG="doom - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "doom - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "doom - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE 
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib f:\games\doom\midas\lib\win32\vcretail\midas.lib wsock32.lib E:\ptc\library\win32\vc5.x\release.lib winmm.lib /nologo /subsystem:windows /pdb:none /map /machine:I386 /nodefaultlib:"libc" /out:"../zdoom.exe"
-# SUBTRACT LINK32 /verbose /profile /debug
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FAs /YX /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ddraw.lib winmm.lib dinput.lib dxguid.lib f:\games\doom\midas\lib\win32\vcretail\midas.lib wsock32.lib e:\ptc\library\win32\vc5.x\debug.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcmt" /out:"../doomdbg.exe"
-# SUBTRACT LINK32 /profile
-
-!ENDIF 
-
-# Begin Target
-
-# Name "doom - Win32 Release"
-# Name "doom - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "*.c; *.cpp"
-# Begin Source File
-
-SOURCE=.\am_map.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\c_bind.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\c_cmds.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\c_consol.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\c_cvars.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\c_dispch.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\c_varini.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cmdlib.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_dehack.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_items.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_main.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_net.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_netinf.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_proto.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\doomdef.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\doomstat.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\dstrings.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\dxcrap.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\f_finale.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\f_wipe.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\g_game.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\g_level.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\hu_lib.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\hu_stuff.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\i_input.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\i_main.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\i_music.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\i_net.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\i_sound.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\i_system.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\i_video.cpp
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\info.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\m_alloc.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\m_argv.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\m_bbox.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\m_cheat.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\m_fixed.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\m_menu.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\m_misc.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\m_option.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\m_random.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\m_swap.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\p_ceilng.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\p_doors.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\p_enemy.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\p_floor.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\p_inter.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\p_lights.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\p_map.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\p_maputl.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\p_mobj.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\p_plats.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\p_pspr.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\p_saveg.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\p_setup.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\p_sight.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\p_spec.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\p_switch.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\p_telept.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\p_tick.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\p_user.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\Qmus2mid.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_bsp.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_data.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_draw.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_main.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_plane.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_segs.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_sky.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_things.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\s_sound.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\sounds.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\st_lib.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\st_new.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\st_stuff.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\tables.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\v_draw.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\v_palett.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\v_text.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\v_video.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\vectors.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\w_wad.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\wi_stuff.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\z_zone.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# ADD CPP /FAs
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "*.H"
-# Begin Source File
-
-SOURCE=.\am_map.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\c_bind.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\c_cmds.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\c_consol.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\c_cvars.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\c_dispch.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cmdlib.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_dehack.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_englsh.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_event.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_french.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_items.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_main.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_net.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_netinf.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_player.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_proto.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_textur.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_think.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\d_ticcmd.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\doomdata.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\doomdef.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\doomstat.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\doomtype.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\dstrings.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\f_finale.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\f_wipe.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\g_game.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\g_level.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\hu_lib.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\hu_stuff.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\i_input.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\i_music.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\i_net.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\i_sound.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\i_system.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\i_video.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Info.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\m_alloc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\m_argv.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\m_bbox.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\m_cheat.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\m_fixed.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\m_menu.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\m_misc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\m_random.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\m_swap.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\p_inter.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\p_local.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\p_mobj.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\p_pspr.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\p_saveg.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\p_setup.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\p_spec.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\p_tick.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Qmus2mid.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_bsp.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_data.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_defs.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_draw.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_local.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_main.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_plane.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_segs.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_sky.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_state.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\r_things.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\s_sound.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sounds.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\st_lib.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\st_stuff.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Tables.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\v_palett.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\v_text.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\v_video.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\vectors.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\w_wad.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\wi_stuff.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\z_zone.h
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=..\commands.txt
-# End Source File
-# Begin Source File
-
-SOURCE=.\doom.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\icon1.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\misc.nas
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# Begin Custom Build - Executing NASM...
-IntDir=.\Release
-InputPath=.\misc.nas
-InputName=misc
-
-"$(IntDir)/$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	d:\nasm\nasm -o $(IntDir)\$(InputName).obj -f win32 $(InputPath)
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-# Begin Custom Build - Executing NASM...
-IntDir=.\Debug
-InputPath=.\misc.nas
-InputName=misc
-
-"$(IntDir)/$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	d:\nasm\nasm -o $(IntDir)\$(InputName).obj -f win32 $(InputPath)
-
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=".\rh-log.txt"
-# End Source File
-# Begin Source File
-
-SOURCE=.\tmap.nas
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-# Begin Custom Build - Executing NASM...
-IntDir=.\Release
-InputPath=.\tmap.nas
-InputName=tmap
-
-"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	d:\nasm\nasm -o $(IntDir)\$(InputName).obj -f win32 $(InputPath)
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-# Begin Custom Build - Executing NASM...
-IntDir=.\Debug
-InputPath=.\tmap.nas
-InputName=tmap
-
-"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	d:\nasm\nasm -o $(IntDir)\$(InputName).obj -f win32 $(InputPath)
-
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/code/doom.mak b/code/doom.mak
deleted file mode 100644
index 8e505a598d..0000000000
--- a/code/doom.mak
+++ /dev/null
@@ -1,7876 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on doom.dsp
-!IF "$(CFG)" == ""
-CFG=doom - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to doom - Win32 Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "doom - Win32 Release" && "$(CFG)" != "doom - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "doom.mak" CFG="doom - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "doom - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "doom - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "..\zdoom.exe"
-
-!ELSE 
-
-ALL : "..\zdoom.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\am_map.obj"
-	-@erase "$(INTDIR)\c_bind.obj"
-	-@erase "$(INTDIR)\c_cmds.obj"
-	-@erase "$(INTDIR)\c_consol.obj"
-	-@erase "$(INTDIR)\c_cvars.obj"
-	-@erase "$(INTDIR)\c_dispch.obj"
-	-@erase "$(INTDIR)\c_varini.obj"
-	-@erase "$(INTDIR)\cmdlib.obj"
-	-@erase "$(INTDIR)\d_dehack.obj"
-	-@erase "$(INTDIR)\d_items.obj"
-	-@erase "$(INTDIR)\d_main.obj"
-	-@erase "$(INTDIR)\d_net.obj"
-	-@erase "$(INTDIR)\d_netinf.obj"
-	-@erase "$(INTDIR)\d_proto.obj"
-	-@erase "$(INTDIR)\doom.res"
-	-@erase "$(INTDIR)\doomdef.obj"
-	-@erase "$(INTDIR)\doomstat.obj"
-	-@erase "$(INTDIR)\dstrings.obj"
-	-@erase "$(INTDIR)\dxcrap.obj"
-	-@erase "$(INTDIR)\f_finale.obj"
-	-@erase "$(INTDIR)\f_wipe.obj"
-	-@erase "$(INTDIR)\g_game.obj"
-	-@erase "$(INTDIR)\g_level.obj"
-	-@erase "$(INTDIR)\hu_lib.obj"
-	-@erase "$(INTDIR)\hu_stuff.obj"
-	-@erase "$(INTDIR)\i_input.obj"
-	-@erase "$(INTDIR)\i_main.obj"
-	-@erase "$(INTDIR)\i_music.obj"
-	-@erase "$(INTDIR)\i_net.obj"
-	-@erase "$(INTDIR)\i_sound.obj"
-	-@erase "$(INTDIR)\i_system.obj"
-	-@erase "$(INTDIR)\i_video.obj"
-	-@erase "$(INTDIR)\info.obj"
-	-@erase "$(INTDIR)\m_alloc.obj"
-	-@erase "$(INTDIR)\m_argv.obj"
-	-@erase "$(INTDIR)\m_bbox.obj"
-	-@erase "$(INTDIR)\m_cheat.obj"
-	-@erase "$(INTDIR)\m_fixed.obj"
-	-@erase "$(INTDIR)\m_menu.obj"
-	-@erase "$(INTDIR)\m_misc.obj"
-	-@erase "$(INTDIR)\m_option.obj"
-	-@erase "$(INTDIR)\m_random.obj"
-	-@erase "$(INTDIR)\m_swap.obj"
-	-@erase "$(INTDIR)\p_ceilng.obj"
-	-@erase "$(INTDIR)\p_doors.obj"
-	-@erase "$(INTDIR)\p_enemy.obj"
-	-@erase "$(INTDIR)\p_floor.obj"
-	-@erase "$(INTDIR)\p_inter.obj"
-	-@erase "$(INTDIR)\p_lights.obj"
-	-@erase "$(INTDIR)\p_map.obj"
-	-@erase "$(INTDIR)\p_maputl.obj"
-	-@erase "$(INTDIR)\p_mobj.obj"
-	-@erase "$(INTDIR)\p_plats.obj"
-	-@erase "$(INTDIR)\p_pspr.obj"
-	-@erase "$(INTDIR)\p_saveg.obj"
-	-@erase "$(INTDIR)\p_setup.obj"
-	-@erase "$(INTDIR)\p_sight.obj"
-	-@erase "$(INTDIR)\p_spec.obj"
-	-@erase "$(INTDIR)\p_switch.obj"
-	-@erase "$(INTDIR)\p_telept.obj"
-	-@erase "$(INTDIR)\p_tick.obj"
-	-@erase "$(INTDIR)\p_user.obj"
-	-@erase "$(INTDIR)\Qmus2mid.obj"
-	-@erase "$(INTDIR)\r_bsp.obj"
-	-@erase "$(INTDIR)\r_data.obj"
-	-@erase "$(INTDIR)\r_draw.obj"
-	-@erase "$(INTDIR)\r_main.obj"
-	-@erase "$(INTDIR)\r_plane.obj"
-	-@erase "$(INTDIR)\r_segs.obj"
-	-@erase "$(INTDIR)\r_sky.obj"
-	-@erase "$(INTDIR)\r_things.obj"
-	-@erase "$(INTDIR)\s_sound.obj"
-	-@erase "$(INTDIR)\sounds.obj"
-	-@erase "$(INTDIR)\st_lib.obj"
-	-@erase "$(INTDIR)\st_new.obj"
-	-@erase "$(INTDIR)\st_stuff.obj"
-	-@erase "$(INTDIR)\tables.obj"
-	-@erase "$(INTDIR)\v_draw.obj"
-	-@erase "$(INTDIR)\v_palett.obj"
-	-@erase "$(INTDIR)\v_text.obj"
-	-@erase "$(INTDIR)\v_video.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vectors.obj"
-	-@erase "$(INTDIR)\w_wad.obj"
-	-@erase "$(INTDIR)\wi_stuff.obj"
-	-@erase "$(INTDIR)\z_zone.obj"
-	-@erase "$(OUTDIR)\zdoom.map"
-	-@erase "..\zdoom.exe"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D "NDEBUG"\
- /D "_WINDOWS" /Fp"$(INTDIR)\doom.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD\
- /c 
-CPP_OBJS=.\Release/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\doom.res" /d "NDEBUG" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\doom.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
- odbccp32.lib f:\games\doom\midas\lib\win32\vcretail\midas.lib wsock32.lib\
- E:\ptc\library\win32\vc5.x\release.lib winmm.lib /nologo /subsystem:windows\
- /pdb:none /map:"$(INTDIR)\zdoom.map" /machine:I386 /nodefaultlib:"libc"\
- /out:"../zdoom.exe" 
-LINK32_OBJS= \
-	"$(INTDIR)\am_map.obj" \
-	"$(INTDIR)\c_bind.obj" \
-	"$(INTDIR)\c_cmds.obj" \
-	"$(INTDIR)\c_consol.obj" \
-	"$(INTDIR)\c_cvars.obj" \
-	"$(INTDIR)\c_dispch.obj" \
-	"$(INTDIR)\c_varini.obj" \
-	"$(INTDIR)\cmdlib.obj" \
-	"$(INTDIR)\d_dehack.obj" \
-	"$(INTDIR)\d_items.obj" \
-	"$(INTDIR)\d_main.obj" \
-	"$(INTDIR)\d_net.obj" \
-	"$(INTDIR)\d_netinf.obj" \
-	"$(INTDIR)\d_proto.obj" \
-	"$(INTDIR)\doom.res" \
-	"$(INTDIR)\doomdef.obj" \
-	"$(INTDIR)\doomstat.obj" \
-	"$(INTDIR)\dstrings.obj" \
-	"$(INTDIR)\dxcrap.obj" \
-	"$(INTDIR)\f_finale.obj" \
-	"$(INTDIR)\f_wipe.obj" \
-	"$(INTDIR)\g_game.obj" \
-	"$(INTDIR)\g_level.obj" \
-	"$(INTDIR)\hu_lib.obj" \
-	"$(INTDIR)\hu_stuff.obj" \
-	"$(INTDIR)\i_input.obj" \
-	"$(INTDIR)\i_main.obj" \
-	"$(INTDIR)\i_music.obj" \
-	"$(INTDIR)\i_net.obj" \
-	"$(INTDIR)\i_sound.obj" \
-	"$(INTDIR)\i_system.obj" \
-	"$(INTDIR)\i_video.obj" \
-	"$(INTDIR)\info.obj" \
-	"$(INTDIR)\m_alloc.obj" \
-	"$(INTDIR)\m_argv.obj" \
-	"$(INTDIR)\m_bbox.obj" \
-	"$(INTDIR)\m_cheat.obj" \
-	"$(INTDIR)\m_fixed.obj" \
-	"$(INTDIR)\m_menu.obj" \
-	"$(INTDIR)\m_misc.obj" \
-	"$(INTDIR)\m_option.obj" \
-	"$(INTDIR)\m_random.obj" \
-	"$(INTDIR)\m_swap.obj" \
-	"$(INTDIR)\misc.obj" \
-	"$(INTDIR)\p_ceilng.obj" \
-	"$(INTDIR)\p_doors.obj" \
-	"$(INTDIR)\p_enemy.obj" \
-	"$(INTDIR)\p_floor.obj" \
-	"$(INTDIR)\p_inter.obj" \
-	"$(INTDIR)\p_lights.obj" \
-	"$(INTDIR)\p_map.obj" \
-	"$(INTDIR)\p_maputl.obj" \
-	"$(INTDIR)\p_mobj.obj" \
-	"$(INTDIR)\p_plats.obj" \
-	"$(INTDIR)\p_pspr.obj" \
-	"$(INTDIR)\p_saveg.obj" \
-	"$(INTDIR)\p_setup.obj" \
-	"$(INTDIR)\p_sight.obj" \
-	"$(INTDIR)\p_spec.obj" \
-	"$(INTDIR)\p_switch.obj" \
-	"$(INTDIR)\p_telept.obj" \
-	"$(INTDIR)\p_tick.obj" \
-	"$(INTDIR)\p_user.obj" \
-	"$(INTDIR)\Qmus2mid.obj" \
-	"$(INTDIR)\r_bsp.obj" \
-	"$(INTDIR)\r_data.obj" \
-	"$(INTDIR)\r_draw.obj" \
-	"$(INTDIR)\r_main.obj" \
-	"$(INTDIR)\r_plane.obj" \
-	"$(INTDIR)\r_segs.obj" \
-	"$(INTDIR)\r_sky.obj" \
-	"$(INTDIR)\r_things.obj" \
-	"$(INTDIR)\s_sound.obj" \
-	"$(INTDIR)\sounds.obj" \
-	"$(INTDIR)\st_lib.obj" \
-	"$(INTDIR)\st_new.obj" \
-	"$(INTDIR)\st_stuff.obj" \
-	"$(INTDIR)\tables.obj" \
-	"$(INTDIR)\tmap.obj" \
-	"$(INTDIR)\v_draw.obj" \
-	"$(INTDIR)\v_palett.obj" \
-	"$(INTDIR)\v_text.obj" \
-	"$(INTDIR)\v_video.obj" \
-	"$(INTDIR)\vectors.obj" \
-	"$(INTDIR)\w_wad.obj" \
-	"$(INTDIR)\wi_stuff.obj" \
-	"$(INTDIR)\z_zone.obj"
-
-"..\zdoom.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "..\doomdbg.exe"
-
-!ELSE 
-
-ALL : "..\doomdbg.exe"
-
-!ENDIF 
-
-CLEAN :
-	-@erase "$(INTDIR)\am_map.obj"
-	-@erase "$(INTDIR)\c_bind.obj"
-	-@erase "$(INTDIR)\c_cmds.obj"
-	-@erase "$(INTDIR)\c_consol.obj"
-	-@erase "$(INTDIR)\c_cvars.obj"
-	-@erase "$(INTDIR)\c_dispch.obj"
-	-@erase "$(INTDIR)\c_varini.obj"
-	-@erase "$(INTDIR)\cmdlib.obj"
-	-@erase "$(INTDIR)\d_dehack.obj"
-	-@erase "$(INTDIR)\d_items.obj"
-	-@erase "$(INTDIR)\d_main.obj"
-	-@erase "$(INTDIR)\d_net.obj"
-	-@erase "$(INTDIR)\d_netinf.obj"
-	-@erase "$(INTDIR)\d_proto.obj"
-	-@erase "$(INTDIR)\doom.res"
-	-@erase "$(INTDIR)\doomdef.obj"
-	-@erase "$(INTDIR)\doomstat.obj"
-	-@erase "$(INTDIR)\dstrings.obj"
-	-@erase "$(INTDIR)\dxcrap.obj"
-	-@erase "$(INTDIR)\f_finale.obj"
-	-@erase "$(INTDIR)\f_wipe.obj"
-	-@erase "$(INTDIR)\g_game.obj"
-	-@erase "$(INTDIR)\g_level.obj"
-	-@erase "$(INTDIR)\hu_lib.obj"
-	-@erase "$(INTDIR)\hu_stuff.obj"
-	-@erase "$(INTDIR)\i_input.obj"
-	-@erase "$(INTDIR)\i_main.obj"
-	-@erase "$(INTDIR)\i_music.obj"
-	-@erase "$(INTDIR)\i_net.obj"
-	-@erase "$(INTDIR)\i_sound.obj"
-	-@erase "$(INTDIR)\i_system.obj"
-	-@erase "$(INTDIR)\i_video.obj"
-	-@erase "$(INTDIR)\info.obj"
-	-@erase "$(INTDIR)\m_alloc.obj"
-	-@erase "$(INTDIR)\m_argv.obj"
-	-@erase "$(INTDIR)\m_bbox.obj"
-	-@erase "$(INTDIR)\m_cheat.obj"
-	-@erase "$(INTDIR)\m_fixed.obj"
-	-@erase "$(INTDIR)\m_menu.obj"
-	-@erase "$(INTDIR)\m_misc.obj"
-	-@erase "$(INTDIR)\m_option.obj"
-	-@erase "$(INTDIR)\m_random.obj"
-	-@erase "$(INTDIR)\m_swap.obj"
-	-@erase "$(INTDIR)\p_ceilng.obj"
-	-@erase "$(INTDIR)\p_doors.obj"
-	-@erase "$(INTDIR)\p_enemy.obj"
-	-@erase "$(INTDIR)\p_floor.obj"
-	-@erase "$(INTDIR)\p_inter.obj"
-	-@erase "$(INTDIR)\p_lights.obj"
-	-@erase "$(INTDIR)\p_map.obj"
-	-@erase "$(INTDIR)\p_maputl.obj"
-	-@erase "$(INTDIR)\p_mobj.obj"
-	-@erase "$(INTDIR)\p_plats.obj"
-	-@erase "$(INTDIR)\p_pspr.obj"
-	-@erase "$(INTDIR)\p_saveg.obj"
-	-@erase "$(INTDIR)\p_setup.obj"
-	-@erase "$(INTDIR)\p_sight.obj"
-	-@erase "$(INTDIR)\p_spec.obj"
-	-@erase "$(INTDIR)\p_switch.obj"
-	-@erase "$(INTDIR)\p_telept.obj"
-	-@erase "$(INTDIR)\p_tick.obj"
-	-@erase "$(INTDIR)\p_user.obj"
-	-@erase "$(INTDIR)\Qmus2mid.obj"
-	-@erase "$(INTDIR)\r_bsp.obj"
-	-@erase "$(INTDIR)\r_data.obj"
-	-@erase "$(INTDIR)\r_draw.obj"
-	-@erase "$(INTDIR)\r_main.obj"
-	-@erase "$(INTDIR)\r_plane.obj"
-	-@erase "$(INTDIR)\r_segs.obj"
-	-@erase "$(INTDIR)\r_sky.obj"
-	-@erase "$(INTDIR)\r_things.obj"
-	-@erase "$(INTDIR)\s_sound.obj"
-	-@erase "$(INTDIR)\sounds.obj"
-	-@erase "$(INTDIR)\st_lib.obj"
-	-@erase "$(INTDIR)\st_new.obj"
-	-@erase "$(INTDIR)\st_stuff.obj"
-	-@erase "$(INTDIR)\tables.obj"
-	-@erase "$(INTDIR)\v_draw.obj"
-	-@erase "$(INTDIR)\v_palett.obj"
-	-@erase "$(INTDIR)\v_text.obj"
-	-@erase "$(INTDIR)\v_video.obj"
-	-@erase "$(INTDIR)\vc50.idb"
-	-@erase "$(INTDIR)\vc50.pdb"
-	-@erase "$(INTDIR)\vectors.obj"
-	-@erase "$(INTDIR)\w_wad.obj"
-	-@erase "$(INTDIR)\wi_stuff.obj"
-	-@erase "$(INTDIR)\z_zone.obj"
-	-@erase "$(OUTDIR)\doomdbg.pdb"
-	-@erase "..\doomdbg.exe"
-	-@erase "..\doomdbg.ilk"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32" /D\
- "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-CPP_OBJS=.\Debug/
-CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 
-RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\doom.res" /d "_DEBUG" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\doom.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
- odbccp32.lib ddraw.lib winmm.lib dinput.lib dxguid.lib\
- f:\games\doom\midas\lib\win32\vcretail\midas.lib wsock32.lib\
- e:\ptc\library\win32\vc5.x\debug.lib /nologo /subsystem:windows\
- /incremental:yes /pdb:"$(OUTDIR)\doomdbg.pdb" /debug /machine:I386\
- /nodefaultlib:"libcmt" /out:"../doomdbg.exe" 
-LINK32_OBJS= \
-	"$(INTDIR)\am_map.obj" \
-	"$(INTDIR)\c_bind.obj" \
-	"$(INTDIR)\c_cmds.obj" \
-	"$(INTDIR)\c_consol.obj" \
-	"$(INTDIR)\c_cvars.obj" \
-	"$(INTDIR)\c_dispch.obj" \
-	"$(INTDIR)\c_varini.obj" \
-	"$(INTDIR)\cmdlib.obj" \
-	"$(INTDIR)\d_dehack.obj" \
-	"$(INTDIR)\d_items.obj" \
-	"$(INTDIR)\d_main.obj" \
-	"$(INTDIR)\d_net.obj" \
-	"$(INTDIR)\d_netinf.obj" \
-	"$(INTDIR)\d_proto.obj" \
-	"$(INTDIR)\doom.res" \
-	"$(INTDIR)\doomdef.obj" \
-	"$(INTDIR)\doomstat.obj" \
-	"$(INTDIR)\dstrings.obj" \
-	"$(INTDIR)\dxcrap.obj" \
-	"$(INTDIR)\f_finale.obj" \
-	"$(INTDIR)\f_wipe.obj" \
-	"$(INTDIR)\g_game.obj" \
-	"$(INTDIR)\g_level.obj" \
-	"$(INTDIR)\hu_lib.obj" \
-	"$(INTDIR)\hu_stuff.obj" \
-	"$(INTDIR)\i_input.obj" \
-	"$(INTDIR)\i_main.obj" \
-	"$(INTDIR)\i_music.obj" \
-	"$(INTDIR)\i_net.obj" \
-	"$(INTDIR)\i_sound.obj" \
-	"$(INTDIR)\i_system.obj" \
-	"$(INTDIR)\i_video.obj" \
-	"$(INTDIR)\info.obj" \
-	"$(INTDIR)\m_alloc.obj" \
-	"$(INTDIR)\m_argv.obj" \
-	"$(INTDIR)\m_bbox.obj" \
-	"$(INTDIR)\m_cheat.obj" \
-	"$(INTDIR)\m_fixed.obj" \
-	"$(INTDIR)\m_menu.obj" \
-	"$(INTDIR)\m_misc.obj" \
-	"$(INTDIR)\m_option.obj" \
-	"$(INTDIR)\m_random.obj" \
-	"$(INTDIR)\m_swap.obj" \
-	"$(INTDIR)\misc.obj" \
-	"$(INTDIR)\p_ceilng.obj" \
-	"$(INTDIR)\p_doors.obj" \
-	"$(INTDIR)\p_enemy.obj" \
-	"$(INTDIR)\p_floor.obj" \
-	"$(INTDIR)\p_inter.obj" \
-	"$(INTDIR)\p_lights.obj" \
-	"$(INTDIR)\p_map.obj" \
-	"$(INTDIR)\p_maputl.obj" \
-	"$(INTDIR)\p_mobj.obj" \
-	"$(INTDIR)\p_plats.obj" \
-	"$(INTDIR)\p_pspr.obj" \
-	"$(INTDIR)\p_saveg.obj" \
-	"$(INTDIR)\p_setup.obj" \
-	"$(INTDIR)\p_sight.obj" \
-	"$(INTDIR)\p_spec.obj" \
-	"$(INTDIR)\p_switch.obj" \
-	"$(INTDIR)\p_telept.obj" \
-	"$(INTDIR)\p_tick.obj" \
-	"$(INTDIR)\p_user.obj" \
-	"$(INTDIR)\Qmus2mid.obj" \
-	"$(INTDIR)\r_bsp.obj" \
-	"$(INTDIR)\r_data.obj" \
-	"$(INTDIR)\r_draw.obj" \
-	"$(INTDIR)\r_main.obj" \
-	"$(INTDIR)\r_plane.obj" \
-	"$(INTDIR)\r_segs.obj" \
-	"$(INTDIR)\r_sky.obj" \
-	"$(INTDIR)\r_things.obj" \
-	"$(INTDIR)\s_sound.obj" \
-	"$(INTDIR)\sounds.obj" \
-	"$(INTDIR)\st_lib.obj" \
-	"$(INTDIR)\st_new.obj" \
-	"$(INTDIR)\st_stuff.obj" \
-	"$(INTDIR)\tables.obj" \
-	"$(INTDIR)\tmap.obj" \
-	"$(INTDIR)\v_draw.obj" \
-	"$(INTDIR)\v_palett.obj" \
-	"$(INTDIR)\v_text.obj" \
-	"$(INTDIR)\v_video.obj" \
-	"$(INTDIR)\vectors.obj" \
-	"$(INTDIR)\w_wad.obj" \
-	"$(INTDIR)\wi_stuff.obj" \
-	"$(INTDIR)\z_zone.obj"
-
-"..\doomdbg.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(CFG)" == "doom - Win32 Release" || "$(CFG)" == "doom - Win32 Debug"
-SOURCE=.\am_map.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_AM_MA=\
-	".\am_map.h"\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_cheat.h"\
-	".\m_fixed.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\st_stuff.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_text.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\am_map.obj" : $(SOURCE) $(DEP_CPP_AM_MA) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_AM_MA=\
-	".\am_map.h"\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_cheat.h"\
-	".\m_fixed.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\st_stuff.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_text.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\am_map.obj" : $(SOURCE) $(DEP_CPP_AM_MA) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\c_bind.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_C_BIN=\
-	".\c_bind.h"\
-	".\c_dispch.h"\
-	".\cmdlib.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	
-
-"$(INTDIR)\c_bind.obj" : $(SOURCE) $(DEP_CPP_C_BIN) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_C_BIN=\
-	".\c_bind.h"\
-	".\c_dispch.h"\
-	".\cmdlib.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	
-
-"$(INTDIR)\c_bind.obj" : $(SOURCE) $(DEP_CPP_C_BIN) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\c_cmds.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_C_CMD=\
-	".\c_cmds.h"\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\c_dispch.h"\
-	".\cmdlib.h"\
-	".\d_englsh.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_game.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\p_inter.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-
-"$(INTDIR)\c_cmds.obj" : $(SOURCE) $(DEP_CPP_C_CMD) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_C_CMD=\
-	".\c_cmds.h"\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\c_dispch.h"\
-	".\cmdlib.h"\
-	".\d_englsh.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_game.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\p_inter.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-
-"$(INTDIR)\c_cmds.obj" : $(SOURCE) $(DEP_CPP_C_CMD) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\c_consol.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_C_CON=\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\c_dispch.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\g_level.h"\
-	".\hu_stuff.h"\
-	".\i_input.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_fixed.h"\
-	".\m_swap.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_main.h"\
-	".\r_state.h"\
-	".\st_stuff.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_text.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-
-"$(INTDIR)\c_consol.obj" : $(SOURCE) $(DEP_CPP_C_CON) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_C_CON=\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\c_dispch.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\g_level.h"\
-	".\hu_stuff.h"\
-	".\i_input.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_fixed.h"\
-	".\m_swap.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_main.h"\
-	".\r_state.h"\
-	".\st_stuff.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_text.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-
-"$(INTDIR)\c_consol.obj" : $(SOURCE) $(DEP_CPP_C_CON) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\c_cvars.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_C_CVA=\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\c_cvars.obj" : $(SOURCE) $(DEP_CPP_C_CVA) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_C_CVA=\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\c_cvars.obj" : $(SOURCE) $(DEP_CPP_C_CVA) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\c_dispch.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_C_DIS=\
-	".\c_cmds.h"\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\c_dispch.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_argv.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\Tables.h"\
-	
-
-"$(INTDIR)\c_dispch.obj" : $(SOURCE) $(DEP_CPP_C_DIS) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_C_DIS=\
-	".\c_cmds.h"\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\c_dispch.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_argv.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\Tables.h"\
-	
-
-"$(INTDIR)\c_dispch.obj" : $(SOURCE) $(DEP_CPP_C_DIS) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\c_varini.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_C_VAR=\
-	".\c_cmds.h"\
-	".\c_cvars.h"\
-	".\cmdlib.h"\
-	".\d_items.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\Tables.h"\
-	
-
-"$(INTDIR)\c_varini.obj" : $(SOURCE) $(DEP_CPP_C_VAR) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_C_VAR=\
-	".\c_cmds.h"\
-	".\c_cvars.h"\
-	".\cmdlib.h"\
-	".\d_items.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\Tables.h"\
-	
-
-"$(INTDIR)\c_varini.obj" : $(SOURCE) $(DEP_CPP_C_VAR) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\cmdlib.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_CMDLI=\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_proto.h"\
-	".\d_ticcmd.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\i_system.h"\
-	".\m_alloc.h"\
-	".\m_fixed.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\cmdlib.obj" : $(SOURCE) $(DEP_CPP_CMDLI) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_CMDLI=\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_proto.h"\
-	".\d_ticcmd.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\i_system.h"\
-	".\m_alloc.h"\
-	".\m_fixed.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\cmdlib.obj" : $(SOURCE) $(DEP_CPP_CMDLI) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\d_dehack.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_D_DEH=\
-	".\c_cvars.h"\
-	".\cmdlib.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\g_level.h"\
-	".\Info.h"\
-	".\m_cheat.h"\
-	".\m_fixed.h"\
-	".\m_misc.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	".\w_wad.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\d_dehack.obj" : $(SOURCE) $(DEP_CPP_D_DEH) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_D_DEH=\
-	".\c_cvars.h"\
-	".\cmdlib.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\g_level.h"\
-	".\Info.h"\
-	".\m_cheat.h"\
-	".\m_fixed.h"\
-	".\m_misc.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	".\w_wad.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\d_dehack.obj" : $(SOURCE) $(DEP_CPP_D_DEH) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\d_items.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_D_ITE=\
-	".\d_englsh.h"\
-	".\d_items.h"\
-	".\d_think.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\Info.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\d_items.obj" : $(SOURCE) $(DEP_CPP_D_ITE) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_D_ITE=\
-	".\d_englsh.h"\
-	".\d_items.h"\
-	".\d_think.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\Info.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\d_items.obj" : $(SOURCE) $(DEP_CPP_D_ITE) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\d_main.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_D_MAI=\
-	".\am_map.h"\
-	".\c_cmds.h"\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\c_dispch.h"\
-	".\cmdlib.h"\
-	".\d_dehack.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_main.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\f_finale.h"\
-	".\f_wipe.h"\
-	".\g_game.h"\
-	".\g_level.h"\
-	".\hu_stuff.h"\
-	".\i_sound.h"\
-	".\i_system.h"\
-	".\i_video.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_argv.h"\
-	".\m_fixed.h"\
-	".\m_menu.h"\
-	".\m_misc.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_setup.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_sky.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\st_stuff.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\wi_stuff.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\d_main.obj" : $(SOURCE) $(DEP_CPP_D_MAI) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_D_MAI=\
-	".\am_map.h"\
-	".\c_cmds.h"\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\c_dispch.h"\
-	".\cmdlib.h"\
-	".\d_dehack.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_main.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\f_finale.h"\
-	".\f_wipe.h"\
-	".\g_game.h"\
-	".\g_level.h"\
-	".\hu_stuff.h"\
-	".\i_sound.h"\
-	".\i_system.h"\
-	".\i_video.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_argv.h"\
-	".\m_fixed.h"\
-	".\m_menu.h"\
-	".\m_misc.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_setup.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_sky.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\st_stuff.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\wi_stuff.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\d_main.obj" : $(SOURCE) $(DEP_CPP_D_MAI) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\d_net.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_D_NET=\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_game.h"\
-	".\g_level.h"\
-	".\i_net.h"\
-	".\i_system.h"\
-	".\i_video.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_cheat.h"\
-	".\m_fixed.h"\
-	".\m_menu.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_state.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\d_net.obj" : $(SOURCE) $(DEP_CPP_D_NET) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_D_NET=\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_game.h"\
-	".\g_level.h"\
-	".\i_net.h"\
-	".\i_system.h"\
-	".\i_video.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_cheat.h"\
-	".\m_fixed.h"\
-	".\m_menu.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_state.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\d_net.obj" : $(SOURCE) $(DEP_CPP_D_NET) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\d_netinf.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_D_NETI=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_state.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	
-
-"$(INTDIR)\d_netinf.obj" : $(SOURCE) $(DEP_CPP_D_NETI) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_D_NETI=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_state.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	
-
-"$(INTDIR)\d_netinf.obj" : $(SOURCE) $(DEP_CPP_D_NETI) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\d_proto.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_D_PRO=\
-	".\c_cvars.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\Tables.h"\
-	".\z_zone.h"\
-	
-
-"$(INTDIR)\d_proto.obj" : $(SOURCE) $(DEP_CPP_D_PRO) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_D_PRO=\
-	".\c_cvars.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\Tables.h"\
-	".\z_zone.h"\
-	
-
-"$(INTDIR)\d_proto.obj" : $(SOURCE) $(DEP_CPP_D_PRO) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\doomdef.c
-DEP_CPP_DOOMD=\
-	".\doomdef.h"\
-	
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\doomdef.obj" : $(SOURCE) $(DEP_CPP_DOOMD) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\doomdef.obj" : $(SOURCE) $(DEP_CPP_DOOMD) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\doomstat.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_DOOMS=\
-	".\c_cvars.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\doomstat.obj" : $(SOURCE) $(DEP_CPP_DOOMS) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_DOOMS=\
-	".\c_cvars.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\doomstat.obj" : $(SOURCE) $(DEP_CPP_DOOMS) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\dstrings.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_DSTRI=\
-	".\c_cvars.h"\
-	".\cmdlib.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\g_level.h"\
-	".\Info.h"\
-	".\m_argv.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\Tables.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\dstrings.obj" : $(SOURCE) $(DEP_CPP_DSTRI) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_DSTRI=\
-	".\c_cvars.h"\
-	".\cmdlib.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\g_level.h"\
-	".\Info.h"\
-	".\m_argv.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\Tables.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\dstrings.obj" : $(SOURCE) $(DEP_CPP_DSTRI) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\dxcrap.c
-DEP_CPP_DXCRA=\
-	"e:\dxsdk\sdk\inc\dinput.h"\
-	
-
-"$(INTDIR)\dxcrap.obj" : $(SOURCE) $(DEP_CPP_DXCRA) "$(INTDIR)"
-
-
-SOURCE=.\f_finale.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_F_FIN=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\g_level.h"\
-	".\hu_stuff.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\m_swap.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_state.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\f_finale.obj" : $(SOURCE) $(DEP_CPP_F_FIN) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_F_FIN=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\g_level.h"\
-	".\hu_stuff.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\m_swap.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_state.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\f_finale.obj" : $(SOURCE) $(DEP_CPP_F_FIN) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\f_wipe.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_F_WIP=\
-	".\c_cvars.h"\
-	".\d_items.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\f_wipe.h"\
-	".\i_video.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_fixed.h"\
-	".\m_random.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_state.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\f_wipe.obj" : $(SOURCE) $(DEP_CPP_F_WIP) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_F_WIP=\
-	".\c_cvars.h"\
-	".\d_items.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\f_wipe.h"\
-	".\i_video.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_fixed.h"\
-	".\m_random.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_state.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\f_wipe.obj" : $(SOURCE) $(DEP_CPP_F_WIP) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\g_game.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_G_GAM=\
-	".\am_map.h"\
-	".\c_bind.h"\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\c_dispch.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_main.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\f_finale.h"\
-	".\g_game.h"\
-	".\g_level.h"\
-	".\hu_stuff.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_argv.h"\
-	".\m_fixed.h"\
-	".\m_menu.h"\
-	".\m_misc.h"\
-	".\m_random.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_saveg.h"\
-	".\p_setup.h"\
-	".\p_spec.h"\
-	".\p_tick.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_sky.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\st_stuff.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\wi_stuff.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\g_game.obj" : $(SOURCE) $(DEP_CPP_G_GAM) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_G_GAM=\
-	".\am_map.h"\
-	".\c_bind.h"\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\c_dispch.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_main.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\f_finale.h"\
-	".\g_game.h"\
-	".\g_level.h"\
-	".\hu_stuff.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_argv.h"\
-	".\m_fixed.h"\
-	".\m_menu.h"\
-	".\m_misc.h"\
-	".\m_random.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_saveg.h"\
-	".\p_setup.h"\
-	".\p_spec.h"\
-	".\p_tick.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_sky.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\st_stuff.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\wi_stuff.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\g_game.obj" : $(SOURCE) $(DEP_CPP_G_GAM) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\g_level.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_G_LEV=\
-	".\am_map.h"\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\c_dispch.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_main.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\f_finale.h"\
-	".\g_game.h"\
-	".\g_level.h"\
-	".\hu_stuff.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_fixed.h"\
-	".\m_random.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_setup.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_sky.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\st_stuff.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\wi_stuff.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\g_level.obj" : $(SOURCE) $(DEP_CPP_G_LEV) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_G_LEV=\
-	".\am_map.h"\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\c_dispch.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_main.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\f_finale.h"\
-	".\g_game.h"\
-	".\g_level.h"\
-	".\hu_stuff.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_fixed.h"\
-	".\m_random.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_setup.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_sky.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\st_stuff.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\wi_stuff.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\g_level.obj" : $(SOURCE) $(DEP_CPP_G_LEV) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\hu_lib.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_HU_LI=\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\hu_lib.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\m_swap.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\hu_lib.obj" : $(SOURCE) $(DEP_CPP_HU_LI) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_HU_LI=\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\hu_lib.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\m_swap.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\hu_lib.obj" : $(SOURCE) $(DEP_CPP_HU_LI) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\hu_stuff.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_HU_ST=\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\c_dispch.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\g_level.h"\
-	".\hu_lib.h"\
-	".\hu_stuff.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\m_swap.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_state.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\st_stuff.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_text.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\hu_stuff.obj" : $(SOURCE) $(DEP_CPP_HU_ST) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_HU_ST=\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\c_dispch.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\g_level.h"\
-	".\hu_lib.h"\
-	".\hu_stuff.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\m_swap.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_state.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\st_stuff.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_text.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\hu_stuff.obj" : $(SOURCE) $(DEP_CPP_HU_ST) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\i_input.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_I_INP=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_main.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_input.h"\
-	".\i_music.h"\
-	".\i_system.h"\
-	".\i_video.h"\
-	".\Info.h"\
-	".\m_argv.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_state.h"\
-	".\s_sound.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	"e:\dxsdk\sdk\inc\dinput.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\i_input.obj" : $(SOURCE) $(DEP_CPP_I_INP) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_I_INP=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_main.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_input.h"\
-	".\i_music.h"\
-	".\i_system.h"\
-	".\i_video.h"\
-	".\Info.h"\
-	".\m_argv.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_state.h"\
-	".\s_sound.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	"e:\dxsdk\sdk\inc\dinput.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\i_input.obj" : $(SOURCE) $(DEP_CPP_I_INP) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\i_main.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_I_MAI=\
-	".\c_consol.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_main.h"\
-	".\d_proto.h"\
-	".\d_ticcmd.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\i_system.h"\
-	".\m_argv.h"\
-	".\m_fixed.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\i_main.obj" : $(SOURCE) $(DEP_CPP_I_MAI) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_I_MAI=\
-	".\c_consol.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_main.h"\
-	".\d_proto.h"\
-	".\d_ticcmd.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\i_system.h"\
-	".\m_argv.h"\
-	".\m_fixed.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\i_main.obj" : $(SOURCE) $(DEP_CPP_I_MAI) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\i_music.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_I_MUS=\
-	"..\midas\include\midasdll.h"\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_music.h"\
-	".\Info.h"\
-	".\m_argv.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\Tables.h"\
-	".\w_wad.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\i_music.obj" : $(SOURCE) $(DEP_CPP_I_MUS) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_I_MUS=\
-	"..\midas\include\midasdll.h"\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_music.h"\
-	".\Info.h"\
-	".\m_argv.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\Tables.h"\
-	".\w_wad.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\i_music.obj" : $(SOURCE) $(DEP_CPP_I_MUS) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\i_net.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_I_NET=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_net.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_argv.h"\
-	".\m_fixed.h"\
-	".\m_swap.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\i_net.obj" : $(SOURCE) $(DEP_CPP_I_NET) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_I_NET=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_net.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_argv.h"\
-	".\m_fixed.h"\
-	".\m_swap.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\i_net.obj" : $(SOURCE) $(DEP_CPP_I_NET) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\i_sound.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_I_SOU=\
-	"..\midas\include\midasdll.h"\
-	"..\midas\src\midas\dma.h"\
-	"..\midas\src\midas\errors.h"\
-	"..\midas\src\midas\file.h"\
-	"..\midas\src\midas\gmplayer.h"\
-	"..\midas\src\midas\lang.h"\
-	"..\midas\src\midas\madpcm.h"\
-	"..\midas\src\midas\mglobals.h"\
-	"..\midas\src\midas\midas.h"\
-	"..\midas\src\midas\midasfx.h"\
-	"..\midas\src\midas\midasstr.h"\
-	"..\midas\src\midas\mmem.h"\
-	"..\midas\src\midas\mpoll.h"\
-	"..\midas\src\midas\mtypes.h"\
-	"..\midas\src\midas\mutils.h"\
-	"..\midas\src\midas\rawfile.h"\
-	"..\midas\src\midas\sdevice.h"\
-	"..\midas\src\midas\timer.h"\
-	"..\midas\src\midas\waveread.h"\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_music.h"\
-	".\i_sound.h"\
-	".\i_system.h"\
-	".\i_video.h"\
-	".\Info.h"\
-	".\m_argv.h"\
-	".\m_fixed.h"\
-	".\m_misc.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_state.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\i_sound.obj" : $(SOURCE) $(DEP_CPP_I_SOU) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_I_SOU=\
-	"..\midas\include\midasdll.h"\
-	"..\midas\src\midas\dma.h"\
-	"..\midas\src\midas\errors.h"\
-	"..\midas\src\midas\file.h"\
-	"..\midas\src\midas\gmplayer.h"\
-	"..\midas\src\midas\lang.h"\
-	"..\midas\src\midas\madpcm.h"\
-	"..\midas\src\midas\mglobals.h"\
-	"..\midas\src\midas\midas.h"\
-	"..\midas\src\midas\midasfx.h"\
-	"..\midas\src\midas\midasstr.h"\
-	"..\midas\src\midas\mmem.h"\
-	"..\midas\src\midas\mpoll.h"\
-	"..\midas\src\midas\mtypes.h"\
-	"..\midas\src\midas\mutils.h"\
-	"..\midas\src\midas\rawfile.h"\
-	"..\midas\src\midas\sdevice.h"\
-	"..\midas\src\midas\timer.h"\
-	"..\midas\src\midas\waveread.h"\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_music.h"\
-	".\i_sound.h"\
-	".\i_system.h"\
-	".\i_video.h"\
-	".\Info.h"\
-	".\m_argv.h"\
-	".\m_fixed.h"\
-	".\m_misc.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_state.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\i_sound.obj" : $(SOURCE) $(DEP_CPP_I_SOU) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\i_system.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_I_SYS=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_game.h"\
-	".\g_level.h"\
-	".\i_input.h"\
-	".\i_music.h"\
-	".\i_sound.h"\
-	".\i_system.h"\
-	".\i_video.h"\
-	".\Info.h"\
-	".\m_argv.h"\
-	".\m_fixed.h"\
-	".\m_misc.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_state.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\i_system.obj" : $(SOURCE) $(DEP_CPP_I_SYS) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_I_SYS=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_game.h"\
-	".\g_level.h"\
-	".\i_input.h"\
-	".\i_music.h"\
-	".\i_sound.h"\
-	".\i_system.h"\
-	".\i_video.h"\
-	".\Info.h"\
-	".\m_argv.h"\
-	".\m_fixed.h"\
-	".\m_misc.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_state.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\i_system.obj" : $(SOURCE) $(DEP_CPP_I_SYS) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\i_video.cpp
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_I_VID=\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\c_dispch.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_main.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_input.h"\
-	".\i_system.h"\
-	".\i_video.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_argv.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_state.h"\
-	".\st_stuff.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_text.h"\
-	".\v_video.h"\
-	".\z_zone.h"\
-	"e:\ptc\source\classes.h"\
-	"e:\ptc\source\clear.h"\
-	"e:\ptc\source\clipper.h"\
-	"e:\ptc\source\code.h"\
-	"e:\ptc\source\color.h"\
-	"e:\ptc\source\config.h"\
-	"e:\ptc\source\effects.h"\
-	"e:\ptc\source\file.h"\
-	"e:\ptc\source\format.h"\
-	"e:\ptc\source\globals.h"\
-	"e:\ptc\source\idummy.h"\
-	"e:\ptc\source\iface.h"\
-	"e:\ptc\source\image.h"\
-	"e:\ptc\source\isoft.h"\
-	"e:\ptc\source\lang.h"\
-	"e:\ptc\source\list.h"\
-	"e:\ptc\source\loader.h"\
-	"e:\ptc\source\misc.h"\
-	"e:\ptc\source\native.h"\
-	"e:\ptc\source\palette.h"\
-	"e:\ptc\source\ptc.h"\
-	"e:\ptc\source\raster.h"\
-	"e:\ptc\source\rect.h"\
-	"e:\ptc\source\surface.h"\
-	"e:\ptc\source\tga.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\i_video.obj" : $(SOURCE) $(DEP_CPP_I_VID) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_I_VID=\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\c_dispch.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_main.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_input.h"\
-	".\i_system.h"\
-	".\i_video.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_argv.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_state.h"\
-	".\st_stuff.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_text.h"\
-	".\v_video.h"\
-	".\z_zone.h"\
-	"e:\ptc\source\classes.h"\
-	"e:\ptc\source\clear.h"\
-	"e:\ptc\source\clipper.h"\
-	"e:\ptc\source\code.h"\
-	"e:\ptc\source\color.h"\
-	"e:\ptc\source\config.h"\
-	"e:\ptc\source\effects.h"\
-	"e:\ptc\source\file.h"\
-	"e:\ptc\source\format.h"\
-	"e:\ptc\source\globals.h"\
-	"e:\ptc\source\idummy.h"\
-	"e:\ptc\source\iface.h"\
-	"e:\ptc\source\image.h"\
-	"e:\ptc\source\isoft.h"\
-	"e:\ptc\source\lang.h"\
-	"e:\ptc\source\list.h"\
-	"e:\ptc\source\loader.h"\
-	"e:\ptc\source\misc.h"\
-	"e:\ptc\source\native.h"\
-	"e:\ptc\source\palette.h"\
-	"e:\ptc\source\ptc.h"\
-	"e:\ptc\source\raster.h"\
-	"e:\ptc\source\rect.h"\
-	"e:\ptc\source\surface.h"\
-	"e:\ptc\source\tga.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\i_video.obj" : $(SOURCE) $(DEP_CPP_I_VID) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\info.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_INFO_=\
-	".\d_think.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\info.obj" : $(SOURCE) $(DEP_CPP_INFO_) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_INFO_=\
-	".\d_think.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\info.obj" : $(SOURCE) $(DEP_CPP_INFO_) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\m_alloc.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_M_ALL=\
-	".\d_event.h"\
-	".\d_proto.h"\
-	".\d_ticcmd.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\i_system.h"\
-	".\m_alloc.h"\
-	".\m_fixed.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\m_alloc.obj" : $(SOURCE) $(DEP_CPP_M_ALL) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_M_ALL=\
-	".\d_event.h"\
-	".\d_proto.h"\
-	".\d_ticcmd.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\i_system.h"\
-	".\m_alloc.h"\
-	".\m_fixed.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\m_alloc.obj" : $(SOURCE) $(DEP_CPP_M_ALL) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\m_argv.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\m_argv.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\m_argv.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\m_bbox.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_M_BBO=\
-	".\doomtype.h"\
-	".\m_bbox.h"\
-	".\m_fixed.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\m_bbox.obj" : $(SOURCE) $(DEP_CPP_M_BBO) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_M_BBO=\
-	".\doomtype.h"\
-	".\m_bbox.h"\
-	".\m_fixed.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\m_bbox.obj" : $(SOURCE) $(DEP_CPP_M_BBO) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\m_cheat.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_M_CHE=\
-	".\c_cvars.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\g_level.h"\
-	".\Info.h"\
-	".\m_cheat.h"\
-	".\m_fixed.h"\
-	".\p_inter.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\m_cheat.obj" : $(SOURCE) $(DEP_CPP_M_CHE) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_M_CHE=\
-	".\c_cvars.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\g_level.h"\
-	".\Info.h"\
-	".\m_cheat.h"\
-	".\m_fixed.h"\
-	".\p_inter.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\m_cheat.obj" : $(SOURCE) $(DEP_CPP_M_CHE) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\m_fixed.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_M_FIX=\
-	".\d_event.h"\
-	".\d_proto.h"\
-	".\d_ticcmd.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\i_system.h"\
-	".\m_fixed.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\m_fixed.obj" : $(SOURCE) $(DEP_CPP_M_FIX) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_M_FIX=\
-	".\d_event.h"\
-	".\d_proto.h"\
-	".\d_ticcmd.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\i_system.h"\
-	".\m_fixed.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\m_fixed.obj" : $(SOURCE) $(DEP_CPP_M_FIX) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\m_menu.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_M_MEN=\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\c_dispch.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_main.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\g_game.h"\
-	".\g_level.h"\
-	".\hu_stuff.h"\
-	".\i_input.h"\
-	".\i_system.h"\
-	".\i_video.h"\
-	".\Info.h"\
-	".\m_argv.h"\
-	".\m_fixed.h"\
-	".\m_menu.h"\
-	".\m_swap.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_text.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\m_menu.obj" : $(SOURCE) $(DEP_CPP_M_MEN) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_M_MEN=\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\c_dispch.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_main.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\g_game.h"\
-	".\g_level.h"\
-	".\hu_stuff.h"\
-	".\i_input.h"\
-	".\i_system.h"\
-	".\i_video.h"\
-	".\Info.h"\
-	".\m_argv.h"\
-	".\m_fixed.h"\
-	".\m_menu.h"\
-	".\m_swap.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_text.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\m_menu.obj" : $(SOURCE) $(DEP_CPP_M_MEN) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\m_misc.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_M_MIS=\
-	".\c_bind.h"\
-	".\c_cvars.h"\
-	".\c_dispch.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\g_game.h"\
-	".\g_level.h"\
-	".\hu_stuff.h"\
-	".\i_system.h"\
-	".\i_video.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_argv.h"\
-	".\m_fixed.h"\
-	".\m_misc.h"\
-	".\m_swap.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_state.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\m_misc.obj" : $(SOURCE) $(DEP_CPP_M_MIS) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_M_MIS=\
-	".\c_bind.h"\
-	".\c_cvars.h"\
-	".\c_dispch.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\g_game.h"\
-	".\g_level.h"\
-	".\hu_stuff.h"\
-	".\i_system.h"\
-	".\i_video.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_argv.h"\
-	".\m_fixed.h"\
-	".\m_misc.h"\
-	".\m_swap.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_state.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\m_misc.obj" : $(SOURCE) $(DEP_CPP_M_MIS) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\m_option.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_M_OPT=\
-	".\c_bind.h"\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\c_dispch.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_main.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\g_game.h"\
-	".\g_level.h"\
-	".\hu_stuff.h"\
-	".\i_system.h"\
-	".\i_video.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_argv.h"\
-	".\m_fixed.h"\
-	".\m_menu.h"\
-	".\m_misc.h"\
-	".\m_swap.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_text.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-
-"$(INTDIR)\m_option.obj" : $(SOURCE) $(DEP_CPP_M_OPT) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_M_OPT=\
-	".\c_bind.h"\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\c_dispch.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_main.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\g_game.h"\
-	".\g_level.h"\
-	".\hu_stuff.h"\
-	".\i_system.h"\
-	".\i_video.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_argv.h"\
-	".\m_fixed.h"\
-	".\m_menu.h"\
-	".\m_misc.h"\
-	".\m_swap.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_text.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-
-"$(INTDIR)\m_option.obj" : $(SOURCE) $(DEP_CPP_M_OPT) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\m_random.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_M_RAN=\
-	".\c_cvars.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\m_random.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\m_random.obj" : $(SOURCE) $(DEP_CPP_M_RAN) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_M_RAN=\
-	".\c_cvars.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\m_random.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\m_random.obj" : $(SOURCE) $(DEP_CPP_M_RAN) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\m_swap.c
-DEP_CPP_M_SWA=\
-	".\m_swap.h"\
-	
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\m_swap.obj" : $(SOURCE) $(DEP_CPP_M_SWA) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\m_swap.obj" : $(SOURCE) $(DEP_CPP_M_SWA) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\p_ceilng.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_P_CEI=\
-	".\c_cvars.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_fixed.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_ceilng.obj" : $(SOURCE) $(DEP_CPP_P_CEI) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_P_CEI=\
-	".\c_cvars.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_fixed.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_ceilng.obj" : $(SOURCE) $(DEP_CPP_P_CEI) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\p_doors.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_P_DOO=\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\g_level.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_doors.obj" : $(SOURCE) $(DEP_CPP_P_DOO) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_P_DOO=\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\g_level.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_doors.obj" : $(SOURCE) $(DEP_CPP_P_DOO) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\p_enemy.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_P_ENE=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_game.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\m_random.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_enemy.obj" : $(SOURCE) $(DEP_CPP_P_ENE) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_P_ENE=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_game.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\m_random.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_enemy.obj" : $(SOURCE) $(DEP_CPP_P_ENE) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\p_floor.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_P_FLO=\
-	".\c_cvars.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_floor.obj" : $(SOURCE) $(DEP_CPP_P_FLO) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_P_FLO=\
-	".\c_cvars.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_floor.obj" : $(SOURCE) $(DEP_CPP_P_FLO) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\p_inter.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_P_INT=\
-	".\am_map.h"\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\m_random.h"\
-	".\p_inter.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_inter.obj" : $(SOURCE) $(DEP_CPP_P_INT) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_P_INT=\
-	".\am_map.h"\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\m_random.h"\
-	".\p_inter.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_inter.obj" : $(SOURCE) $(DEP_CPP_P_INT) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\p_lights.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_P_LIG=\
-	".\c_cvars.h"\
-	".\d_items.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\m_random.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\Tables.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_lights.obj" : $(SOURCE) $(DEP_CPP_P_LIG) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_P_LIG=\
-	".\c_cvars.h"\
-	".\d_items.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\m_random.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\Tables.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_lights.obj" : $(SOURCE) $(DEP_CPP_P_LIG) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\p_map.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_P_MAP=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_bbox.h"\
-	".\m_fixed.h"\
-	".\m_random.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	".\vectors.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_map.obj" : $(SOURCE) $(DEP_CPP_P_MAP) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_P_MAP=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_bbox.h"\
-	".\m_fixed.h"\
-	".\m_random.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	".\vectors.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_map.obj" : $(SOURCE) $(DEP_CPP_P_MAP) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\p_maputl.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_P_MAPU=\
-	".\c_cvars.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\Info.h"\
-	".\m_bbox.h"\
-	".\m_fixed.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_maputl.obj" : $(SOURCE) $(DEP_CPP_P_MAPU) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_P_MAPU=\
-	".\c_cvars.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\Info.h"\
-	".\m_bbox.h"\
-	".\m_fixed.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_maputl.obj" : $(SOURCE) $(DEP_CPP_P_MAPU) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\p_mobj.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_P_MOB=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\hu_stuff.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_fixed.h"\
-	".\m_random.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\st_stuff.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_mobj.obj" : $(SOURCE) $(DEP_CPP_P_MOB) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_P_MOB=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\hu_stuff.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_fixed.h"\
-	".\m_random.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\st_stuff.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_mobj.obj" : $(SOURCE) $(DEP_CPP_P_MOB) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\p_plats.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_P_PLA=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_fixed.h"\
-	".\m_random.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_plats.obj" : $(SOURCE) $(DEP_CPP_P_PLA) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_P_PLA=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_fixed.h"\
-	".\m_random.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_plats.obj" : $(SOURCE) $(DEP_CPP_P_PLA) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\p_pspr.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_P_PSP=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\m_random.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_pspr.obj" : $(SOURCE) $(DEP_CPP_P_PSP) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_P_PSP=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\m_random.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_pspr.obj" : $(SOURCE) $(DEP_CPP_P_PSP) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\p_saveg.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_P_SAV=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\m_random.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_saveg.obj" : $(SOURCE) $(DEP_CPP_P_SAV) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_P_SAV=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\m_random.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_saveg.obj" : $(SOURCE) $(DEP_CPP_P_SAV) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\p_setup.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_P_SET=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_game.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_bbox.h"\
-	".\m_fixed.h"\
-	".\m_swap.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\Tables.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_setup.obj" : $(SOURCE) $(DEP_CPP_P_SET) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_P_SET=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_game.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_bbox.h"\
-	".\m_fixed.h"\
-	".\m_swap.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\Tables.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_setup.obj" : $(SOURCE) $(DEP_CPP_P_SET) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\p_sight.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_P_SIG=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\m_random.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_sight.obj" : $(SOURCE) $(DEP_CPP_P_SIG) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_P_SIG=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\m_random.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_sight.obj" : $(SOURCE) $(DEP_CPP_P_SIG) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\p_spec.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_P_SPE=\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_game.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_argv.h"\
-	".\m_fixed.h"\
-	".\m_random.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_sky.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_spec.obj" : $(SOURCE) $(DEP_CPP_P_SPE) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_P_SPE=\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_game.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_argv.h"\
-	".\m_fixed.h"\
-	".\m_random.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_sky.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_spec.obj" : $(SOURCE) $(DEP_CPP_P_SPE) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\p_switch.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_P_SWI=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_game.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_switch.obj" : $(SOURCE) $(DEP_CPP_P_SWI) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_P_SWI=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_game.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_switch.obj" : $(SOURCE) $(DEP_CPP_P_SWI) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\p_telept.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_P_TEL=\
-	".\c_cvars.h"\
-	".\d_items.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_telept.obj" : $(SOURCE) $(DEP_CPP_P_TEL) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_P_TEL=\
-	".\c_cvars.h"\
-	".\d_items.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_telept.obj" : $(SOURCE) $(DEP_CPP_P_TEL) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\p_tick.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_P_TIC=\
-	".\c_cvars.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\Tables.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_tick.obj" : $(SOURCE) $(DEP_CPP_P_TIC) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_P_TIC=\
-	".\c_cvars.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\Tables.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_tick.obj" : $(SOURCE) $(DEP_CPP_P_TIC) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\p_user.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_P_USE=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_user.obj" : $(SOURCE) $(DEP_CPP_P_USE) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_P_USE=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\p_user.obj" : $(SOURCE) $(DEP_CPP_P_USE) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\Qmus2mid.c
-DEP_CPP_QMUS2=\
-	".\m_alloc.h"\
-	".\Qmus2mid.h"\
-	
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\Qmus2mid.obj" : $(SOURCE) $(DEP_CPP_QMUS2) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\Qmus2mid.obj" : $(SOURCE) $(DEP_CPP_QMUS2) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\r_bsp.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_R_BSP=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_bbox.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\r_bsp.obj" : $(SOURCE) $(DEP_CPP_R_BSP) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_R_BSP=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_bbox.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\r_bsp.obj" : $(SOURCE) $(DEP_CPP_R_BSP) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\r_data.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_R_DAT=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\m_swap.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_sky.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\r_data.obj" : $(SOURCE) $(DEP_CPP_R_DAT) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_R_DAT=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\m_swap.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_sky.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\r_data.obj" : $(SOURCE) $(DEP_CPP_R_DAT) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\r_draw.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_R_DRA=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\st_stuff.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\r_draw.obj" : $(SOURCE) $(DEP_CPP_R_DRA) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_R_DRA=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\st_stuff.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\r_draw.obj" : $(SOURCE) $(DEP_CPP_R_DRA) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\r_main.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_R_MAI=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_bbox.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_sky.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\st_stuff.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\r_main.obj" : $(SOURCE) $(DEP_CPP_R_MAI) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_R_MAI=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_bbox.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_sky.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\st_stuff.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\r_main.obj" : $(SOURCE) $(DEP_CPP_R_MAI) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\r_plane.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_R_PLA=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_sky.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\r_plane.obj" : $(SOURCE) $(DEP_CPP_R_PLA) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_R_PLA=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_sky.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\r_plane.obj" : $(SOURCE) $(DEP_CPP_R_PLA) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\r_segs.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_R_SEG=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_sky.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\r_segs.obj" : $(SOURCE) $(DEP_CPP_R_SEG) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_R_SEG=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_sky.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\r_segs.obj" : $(SOURCE) $(DEP_CPP_R_SEG) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\r_sky.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_R_SKY=\
-	".\c_cvars.h"\
-	".\d_items.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_sky.h"\
-	".\r_state.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\r_sky.obj" : $(SOURCE) $(DEP_CPP_R_SKY) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_R_SKY=\
-	".\c_cvars.h"\
-	".\d_items.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_sky.h"\
-	".\r_state.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\r_sky.obj" : $(SOURCE) $(DEP_CPP_R_SKY) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\r_things.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_R_THI=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_argv.h"\
-	".\m_fixed.h"\
-	".\m_swap.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\r_things.obj" : $(SOURCE) $(DEP_CPP_R_THI) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_R_THI=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_argv.h"\
-	".\m_fixed.h"\
-	".\m_swap.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\r_things.obj" : $(SOURCE) $(DEP_CPP_R_THI) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\s_sound.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_S_SOU=\
-	".\c_cvars.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_music.h"\
-	".\i_sound.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_fixed.h"\
-	".\m_random.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\s_sound.obj" : $(SOURCE) $(DEP_CPP_S_SOU) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_S_SOU=\
-	".\c_cvars.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_music.h"\
-	".\i_sound.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_fixed.h"\
-	".\m_random.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\s_sound.obj" : $(SOURCE) $(DEP_CPP_S_SOU) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\sounds.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_SOUND=\
-	".\doomtype.h"\
-	".\sounds.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\sounds.obj" : $(SOURCE) $(DEP_CPP_SOUND) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_SOUND=\
-	".\doomtype.h"\
-	".\sounds.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\sounds.obj" : $(SOURCE) $(DEP_CPP_SOUND) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\st_lib.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_ST_LI=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\m_swap.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\st_lib.h"\
-	".\st_stuff.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\st_lib.obj" : $(SOURCE) $(DEP_CPP_ST_LI) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_ST_LI=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\m_swap.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\st_lib.h"\
-	".\st_stuff.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\st_lib.obj" : $(SOURCE) $(DEP_CPP_ST_LI) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\st_new.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_ST_NE=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\m_swap.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_state.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\st_new.obj" : $(SOURCE) $(DEP_CPP_ST_NE) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_ST_NE=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\m_swap.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_state.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\st_new.obj" : $(SOURCE) $(DEP_CPP_ST_NE) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\st_stuff.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_ST_ST=\
-	".\am_map.h"\
-	".\c_cmds.h"\
-	".\c_cvars.h"\
-	".\c_dispch.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\g_game.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\i_video.h"\
-	".\Info.h"\
-	".\m_cheat.h"\
-	".\m_fixed.h"\
-	".\m_random.h"\
-	".\p_inter.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\st_lib.h"\
-	".\st_stuff.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\st_stuff.obj" : $(SOURCE) $(DEP_CPP_ST_ST) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_ST_ST=\
-	".\am_map.h"\
-	".\c_cmds.h"\
-	".\c_cvars.h"\
-	".\c_dispch.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\dstrings.h"\
-	".\g_game.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\i_video.h"\
-	".\Info.h"\
-	".\m_cheat.h"\
-	".\m_fixed.h"\
-	".\m_random.h"\
-	".\p_inter.h"\
-	".\p_local.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\p_spec.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\st_lib.h"\
-	".\st_stuff.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\st_stuff.obj" : $(SOURCE) $(DEP_CPP_ST_ST) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\tables.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_TABLE=\
-	".\m_fixed.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\tables.obj" : $(SOURCE) $(DEP_CPP_TABLE) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_TABLE=\
-	".\m_fixed.h"\
-	".\Tables.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\tables.obj" : $(SOURCE) $(DEP_CPP_TABLE) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\v_draw.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_V_DRA=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\i_system.h"\
-	".\i_video.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\m_swap.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_state.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	
-
-"$(INTDIR)\v_draw.obj" : $(SOURCE) $(DEP_CPP_V_DRA) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_V_DRA=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\i_system.h"\
-	".\i_video.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\m_swap.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_state.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	
-
-"$(INTDIR)\v_draw.obj" : $(SOURCE) $(DEP_CPP_V_DRA) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\v_palett.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_V_PAL=\
-	".\c_cvars.h"\
-	".\c_dispch.h"\
-	".\d_items.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_video.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_main.h"\
-	".\r_state.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-
-"$(INTDIR)\v_palett.obj" : $(SOURCE) $(DEP_CPP_V_PAL) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_V_PAL=\
-	".\c_cvars.h"\
-	".\c_dispch.h"\
-	".\d_items.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_video.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_main.h"\
-	".\r_state.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-
-"$(INTDIR)\v_palett.obj" : $(SOURCE) $(DEP_CPP_V_PAL) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\v_text.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_V_TEX=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\hu_stuff.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\m_swap.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_state.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_text.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-
-"$(INTDIR)\v_text.obj" : $(SOURCE) $(DEP_CPP_V_TEX) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_V_TEX=\
-	".\c_cvars.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\hu_stuff.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\m_swap.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_state.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_text.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-
-"$(INTDIR)\v_text.obj" : $(SOURCE) $(DEP_CPP_V_TEX) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\v_video.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_V_VID=\
-	".\c_cvars.h"\
-	".\c_dispch.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\hu_stuff.h"\
-	".\i_system.h"\
-	".\i_video.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_argv.h"\
-	".\m_bbox.h"\
-	".\m_fixed.h"\
-	".\m_swap.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_text.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\v_video.obj" : $(SOURCE) $(DEP_CPP_V_VID) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_V_VID=\
-	".\c_cvars.h"\
-	".\c_dispch.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\hu_stuff.h"\
-	".\i_system.h"\
-	".\i_video.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_argv.h"\
-	".\m_bbox.h"\
-	".\m_fixed.h"\
-	".\m_swap.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_text.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\v_video.obj" : $(SOURCE) $(DEP_CPP_V_VID) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\vectors.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_VECTO=\
-	".\d_think.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\Tables.h"\
-	".\vectors.h"\
-	
-
-"$(INTDIR)\vectors.obj" : $(SOURCE) $(DEP_CPP_VECTO) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_VECTO=\
-	".\d_think.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\p_mobj.h"\
-	".\Tables.h"\
-	".\vectors.h"\
-	
-
-"$(INTDIR)\vectors.obj" : $(SOURCE) $(DEP_CPP_VECTO) "$(INTDIR)"
-
-
-!ENDIF 
-
-SOURCE=.\w_wad.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_W_WAD=\
-	".\c_cvars.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_argv.h"\
-	".\m_fixed.h"\
-	".\m_swap.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\Tables.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\w_wad.obj" : $(SOURCE) $(DEP_CPP_W_WAD) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_W_WAD=\
-	".\c_cvars.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_level.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_alloc.h"\
-	".\m_argv.h"\
-	".\m_fixed.h"\
-	".\m_swap.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\Tables.h"\
-	".\w_wad.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\w_wad.obj" : $(SOURCE) $(DEP_CPP_W_WAD) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\wi_stuff.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_WI_ST=\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_game.h"\
-	".\g_level.h"\
-	".\hu_stuff.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\m_random.h"\
-	".\m_swap.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\wi_stuff.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\wi_stuff.obj" : $(SOURCE) $(DEP_CPP_WI_ST) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_WI_ST=\
-	".\c_consol.h"\
-	".\c_cvars.h"\
-	".\cmdlib.h"\
-	".\d_event.h"\
-	".\d_items.h"\
-	".\d_net.h"\
-	".\d_netinf.h"\
-	".\d_player.h"\
-	".\d_proto.h"\
-	".\d_think.h"\
-	".\d_ticcmd.h"\
-	".\doomdata.h"\
-	".\doomdef.h"\
-	".\doomstat.h"\
-	".\doomtype.h"\
-	".\g_game.h"\
-	".\g_level.h"\
-	".\hu_stuff.h"\
-	".\i_system.h"\
-	".\Info.h"\
-	".\m_fixed.h"\
-	".\m_random.h"\
-	".\m_swap.h"\
-	".\p_mobj.h"\
-	".\p_pspr.h"\
-	".\r_bsp.h"\
-	".\r_data.h"\
-	".\r_defs.h"\
-	".\r_draw.h"\
-	".\r_local.h"\
-	".\r_main.h"\
-	".\r_plane.h"\
-	".\r_segs.h"\
-	".\r_state.h"\
-	".\r_things.h"\
-	".\s_sound.h"\
-	".\sounds.h"\
-	".\Tables.h"\
-	".\v_palett.h"\
-	".\v_video.h"\
-	".\w_wad.h"\
-	".\wi_stuff.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\wi_stuff.obj" : $(SOURCE) $(DEP_CPP_WI_ST) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\z_zone.c
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-DEP_CPP_Z_ZON=\
-	".\d_event.h"\
-	".\d_proto.h"\
-	".\d_ticcmd.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\i_system.h"\
-	".\m_fixed.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MT /W3 /GX /O2 /I "e:\ptc\source" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\z_zone.obj" : $(SOURCE) $(DEP_CPP_Z_ZON) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-DEP_CPP_Z_ZON=\
-	".\d_event.h"\
-	".\d_proto.h"\
-	".\d_ticcmd.h"\
-	".\doomdef.h"\
-	".\doomtype.h"\
-	".\i_system.h"\
-	".\m_fixed.h"\
-	".\z_zone.h"\
-	
-CPP_SWITCHES=/nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "e:\ptc\source" /D "WIN32"\
- /D "_DEBUG" /D "_WINDOWS" /FAs /Fa"$(INTDIR)\\" /Fp"$(INTDIR)\doom.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-"$(INTDIR)\z_zone.obj" : $(SOURCE) $(DEP_CPP_Z_ZON) "$(INTDIR)"
-	$(CPP) @<<
-  $(CPP_SWITCHES) $(SOURCE)
-<<
-
-
-!ENDIF 
-
-SOURCE=.\doom.rc
-DEP_RSC_DOOM_=\
-	".\icon1.ico"\
-	
-
-"$(INTDIR)\doom.res" : $(SOURCE) $(DEP_RSC_DOOM_) "$(INTDIR)"
-	$(RSC) $(RSC_PROJ) $(SOURCE)
-
-
-SOURCE=.\misc.nas
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-IntDir=.\Release
-InputPath=.\misc.nas
-InputName=misc
-
-"$(IntDir)/$(InputName).obj"	 : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	d:\nasm\nasm -o $(IntDir)\$(InputName).obj -f win32 $(InputPath)
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-IntDir=.\Debug
-InputPath=.\misc.nas
-InputName=misc
-
-"$(IntDir)/$(InputName).obj"	 : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	d:\nasm\nasm -o $(IntDir)\$(InputName).obj -f win32 $(InputPath)
-
-!ENDIF 
-
-SOURCE=.\tmap.nas
-
-!IF  "$(CFG)" == "doom - Win32 Release"
-
-IntDir=.\Release
-InputPath=.\tmap.nas
-InputName=tmap
-
-"$(IntDir)\$(InputName).obj"	 : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	d:\nasm\nasm -o $(IntDir)\$(InputName).obj -f win32 $(InputPath)
-
-!ELSEIF  "$(CFG)" == "doom - Win32 Debug"
-
-IntDir=.\Debug
-InputPath=.\tmap.nas
-InputName=tmap
-
-"$(IntDir)\$(InputName).obj"	 : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	d:\nasm\nasm -o $(IntDir)\$(InputName).obj -f win32 $(InputPath)
-
-!ENDIF 
-
-
-!ENDIF 
-
diff --git a/code/doomdata.h b/code/doomdata.h
index 6ab2a293fe..6ec9fd9a66 100644
--- a/code/doomdata.h
+++ b/code/doomdata.h
@@ -116,8 +116,7 @@ typedef struct
 // Blocks monsters only.
 #define ML_BLOCKMONSTERS			0x0002
 
-// Backside will not be present at all
-//	if not two sided.
+// Backside will not be present at all if not two sided.
 #define ML_TWOSIDED 				0x0004
 
 // If a texture is pegged, the texture will have
@@ -160,11 +159,16 @@ typedef struct
 #define ML_ACTIVATEPUSH				0x1000
 #define ML_ACTIVATEPROJECTILECROSS	0x1400
 
+// [RH] Monsters (as well as players) can active the line
+#define ML_MONSTERSCANACTIVATE		0x2000
+
 // [RH] BOOM's ML_PASSUSE flag (conflicts with ML_REPEATABLE)
 #define ML_PASSUSEORG				0x0200
 // [RH] Remapped to work with Hexen-style LineDefs.
-#define ML_PASSUSE					0x2000
+#define ML_PASSUSE					0x4000
 
+// [RH] Line blocks everything
+#define ML_BLOCKEVERYTHING			0x8000
 
 // Sector definition, from editing.
 typedef struct
@@ -241,7 +245,7 @@ typedef struct
 // [RH] Hexen-compatible MapThing.
 typedef struct
 {
-	short		thingid;
+	unsigned short thingid;
 	short		x;
 	short		y;
 	short		z;
diff --git a/code/french.txt b/code/french.txt
deleted file mode 100644
index 17e2482d1d..0000000000
--- a/code/french.txt
+++ /dev/null
@@ -1,727 +0,0 @@
-[Language = French]
-
-#D_DEVSTR
-MODE DEVELOPPEMENT ON.\n
-#D_CDROM
-VERSION CD-ROM: DEFAULT.CFG DANS C:\\DOOMDATA\n
-
-#PRESSKEY
-APPUYEZ SUR UNE TOUCHE.
-#PRESSYN
-APPUYEZ SUR Y OU N
-#QUITMSG
-VOUS VOULEZ VRAIMENT\nQUITTER CE SUPER JEU?
-#LOADMSG
-VOUS NE POUVEZ PAS CHARGER\nUN JEU EN RESEAU!\n\nAPPUYEZ SUR UNE TOUCHE.
-#QLOADNET
-CHARGEMENT RAPIDE INTERDIT EN RESEAU!\n\nAPPUYEZ SUR UNE TOUCHE.
-#QSAVESPOT
-VOUS N'AVEZ PAS CHOISI UN EMPLACEMENT!\n\nAPPUYEZ SUR UNE TOUCHE.
-#SAVEDEAD
-VOUS NE POUVEZ PAS SAUVER SI VOUS NE JOUEZ PAS!\n\nAPPUYEZ SUR UNE TOUCHE.
-#QSPROMPT
-SAUVEGARDE RAPIDE DANS LE FICHIER\n\n'%s'?\n\nAPPUYEZ SUR Y OU N
-#QLPROMPT
-VOULEZ-VOUS CHARGER LA SAUVEGARDE\n\n'%s'?\n\nAPPUYEZ SUR Y OU N
-
-#NEWGAME
-VOUS NE POUVEZ PAS LANCER\n\
-UN NOUVEAU JEU SUR RESEAU.\n\nAPPUYEZ SUR UNE TOUCHE.
-
-#NIGHTMARE
-VOUS CONFIRMEZ? CE NIVEAU EST\n\
-VRAIMENT IMPITOYABLE!\n\nAPPUYEZ SUR Y OU N
-
-#SWSTRING
-CECI EST UNE VERSION SHAREWARE DE DOOM.\n\n\
-VOUS DEVRIEZ COMMANDER LA TRILOGIE COMPLETE.\n\nAPPUYEZ SUR UNE TOUCHE.
-
-#MSGOFF
-MESSAGES OFF
-#MSGON
-MESSAGES ON
-#NETEND
-VOUS NE POUVEZ PAS METTRE FIN A UN JEU SUR RESEAU!\n\nAPPUYEZ SUR UNE TOUCHE.
-#ENDGAME
-VOUS VOULEZ VRAIMENT METTRE FIN AU JEU?\n\nAPPUYEZ SUR Y OU N
-
-#DOSY
-(APPUYEZ SUR Y POUR REVENIR AU OS.)
-
-#EMPTYSTRING
-EMPLACEMENT VIDE
-
-#GOTARMOR
-ARMURE RECUPEREE.
-#GOTMEGA
-MEGA-ARMURE RECUPEREE!
-#GOTHTHBONUS
-BONUS DE SANTE RECUPERE.
-#GOTARMBONUS
-BONUS D'ARMURE RECUPERE.
-#GOTSTIM
-STIMPACK RECUPERE.
-#GOTMEDINEED
-MEDIKIT RECUPERE. VOUS EN AVEZ VRAIMENT BESOIN!
-#GOTMEDIKIT
-MEDIKIT RECUPERE.
-#GOTSUPER
-SUPERCHARGE!
-
-#GOTBLUECARD
-CARTE MAGNETIQUE BLEUE RECUPEREE.
-#GOTYELWCARD
-CARTE MAGNETIQUE JAUNE RECUPEREE.
-#GOTREDCARD
-CARTE MAGNETIQUE ROUGE RECUPEREE.
-#GOTBLUESKUL
-CLEF CRANE BLEUE RECUPEREE.
-#GOTYELWSKUL
-CLEF CRANE JAUNE RECUPEREE.
-#GOTREDSKULL
-CLEF CRANE ROUGE RECUPEREE.
-
-#GOTINVUL
-INVULNERABILITE!
-#GOTBERSERK
-BERSERK!
-#GOTINVIS
-INVISIBILITE PARTIELLE!
-#GOTSUIT
-COMBINAISON ANTI-RADIATIONS!
-#GOTMAP
-CARTE INFORMATIQUE!
-#GOTVISOR
-VISEUR A AMPLIFICATION DE LUMIERE!
-#GOTMSPHERE
-MEGASPHERE!
-
-#GOTCLIP
-CHARGEUR RECUPERE.
-#GOTCLIPBOX
-BOITE DE BALLES RECUPEREE.
-#GOTROCKET
-ROQUETTE RECUPEREE.
-#GOTROCKBOX
-CAISSE DE ROQUETTES RECUPEREE.
-#GOTCELL
-CELLULE D'ENERGIE RECUPEREE.
-#GOTCELLBOX
-PACK DE CELLULES D'ENERGIE RECUPERE.
-#GOTSHELLS
-4 CARTOUCHES RECUPEREES.
-#GOTSHELLBOX
-BOITE DE CARTOUCHES RECUPEREE.
-#GOTBACKPACK
-SAC PLEIN DE MUNITIONS RECUPERE!
-
-#GOTBFG9000
-VOUS AVEZ UN BFG9000!  OH, OUI!
-#GOTCHAINGUN
-VOUS AVEZ LA MITRAILLEUSE!
-#GOTCHAINSAW
-UNE TRONCONNEUSE!
-#GOTLAUNCHER
-VOUS AVEZ UN LANCE-ROQUETTES!
-#GOTPLASMA
-VOUS AVEZ UN FUSIL A PLASMA!
-#GOTSHOTGUN
-VOUS AVEZ UN FUSIL!
-#GOTSHOTGUN2
-VOUS AVEZ UN SUPER FUSIL!
-
-#
-# P_Doors.C
-#
-#PD_BLUE0
-IL VOUS FAUT UNE CLEF BLEUE
-#PD_RED0
-IL VOUS FAUT UNE CLEF ROUGE
-#PD_YELLOW0
-IL VOUS FAUT UNE CLEF JAUNE
-#PD_BLUEK
-IL VOUS FAUT UNE CLEF BLEUE
-#PD_REDK
-IL VOUS FAUT UNE CLEF ROUGE
-#PD_YELLOWK
-IL VOUS FAUT UNE CLEF JAUNE
-
-
-#
-#	G_game.C
-#
-#GGSAVED
-JEU SAUVEGARDE.
-
-#
-#	HU_stuff.C
-#
-#HUSTR_MSGU
-[MESSAGE NON ENVOYE]
-
-# Doom 1 level names
-E1M1: HANGAR
-E1M2: USINE NUCLEAIRE
-E1M3: RAFFINERIE DE TOXINES
-E1M4: CENTRE DE CONTROLE
-E1M5: LABORATOIRE PHOBOS
-E1M6: TRAITEMENT CENTRAL
-E1M7: CENTRE INFORMATIQUE
-E1M8: ANOMALIE PHOBOS
-E1M9: BASE MILITAIRE
-
-E2M1: ANOMALIE DEIMOS
-E2M2: ZONE DE CONFINEMENT
-E2M3: RAFFINERIE
-E2M4: LABORATOIRE DEIMOS
-E2M5: CENTRE DE CONTROLE
-E2M6: HALLS DES DAMNES
-E2M7: CUVES DE REPRODUCTION
-E2M8: TOUR DE BABEL
-E2M9: FORTERESSE DU MYSTERE
-
-E3M1: DONJON DE L'ENFER
-E3M2: BOURBIER DU DESESPOIR
-E3M3: PANDEMONIUM
-E3M4: MAISON DE LA DOULEUR
-E3M5: CATHEDRALE PROFANE
-E3M6: MONT EREBUS
-E3M7: LIMBES
-E3M8: DIS
-E3M9: CLAPIERS
-
-E4M1: Hell Beneath
-E4M2: Perfect Hatred
-E4M3: Sever The Wicked
-E4M4: Unruly Evil
-E4M5: They Will Repent
-E4M6: Against Thee Wickedly
-E4M7: And Hell Followed
-E4M8: Unto The Cruel
-E4M9: Fear
-
-# Doom 2 level names
-NIVEAU 1: ENTREE
-NIVEAU 2: HALLS SOUTERRAINS
-NIVEAU 3: LE FEU NOURRI
-NIVEAU 4: LE FOYER
-NIVEAU 5: LES EGOUTS
-NIVEAU 6: LE BROYEUR
-NIVEAU 7: L'HERBE DE LA MORT
-NIVEAU 8: RUSES ET PIEGES
-NIVEAU 9: LE PUITS
-NIVEAU 10: BASE DE RAVITAILLEMENT
-NIVEAU 11: LE CERCLE DE LA MORT!
-
-NIVEAU 12: L'USINE
-NIVEAU 13: LE CENTRE VILLE
-NIVEAU 14: LES ANTRES PROFONDES
-NIVEAU 15: LA ZONE INDUSTRIELLE
-NIVEAU 16: LA BANLIEUE
-NIVEAU 17: LES IMMEUBLES
-NIVEAU 18: LA COUR
-NIVEAU 19: LA CITADELLE
-NIVEAU 20: JE T'AI EU!
-
-NIVEAU 21: LE NIRVANA
-NIVEAU 22: LES CATACOMBES
-NIVEAU 23: LA GRANDE FETE
-NIVEAU 24: LE GOUFFRE
-NIVEAU 25: LES CHUTES DE SANG
-NIVEAU 26: LES MINES ABANDONNEES
-NIVEAU 27: CHEZ LES MONSTRES
-NIVEAU 28: LE MONDE DE L'ESPRIT
-NIVEAU 29: LA LIMITE
-NIVEAU 30: L'ICONE DU PECHE
-
-NIVEAU 31: WOLFENSTEIN
-NIVEAU 32: LE MASSACRE
-
-# Plutonia level names
-level 1: congo
-level 2: well of souls
-level 3: aztec
-level 4: caged
-level 5: ghost town
-level 6: baron's lair
-level 7: caughtyard
-level 8: realm
-level 9: abattoire
-level 10: onslaught
-level 11: hunted
-
-level 12: speed
-level 13: the crypt
-level 14: genesis
-level 15: the twilight
-level 16: the omen
-level 17: compound
-level 18: neurosphere
-level 19: nme
-level 20: the death domain
-
-level 21: slayer
-level 22: impossible mission
-level 23: tombstone
-level 24: the final frontier
-level 25: the temple of darkness
-level 26: bunker
-level 27: anti-christ
-level 28: the sewers
-level 29: odyssey of noises
-level 30: the gateway of hell
-
-level 31: cyberden
-level 32: go 2 it
-
-# Evilution level names
-level 1: system control
-level 2: human bbq
-level 3: power control
-level 4: wormhole
-level 5: hanger
-level 6: open season
-level 7: prison
-level 8: metal
-level 9: stronghold
-level 10: redemption
-level 11: storage facility
-
-level 12: crater
-level 13: nukage processing
-level 14: steel works
-level 15: dead zone
-level 16: deepest reaches
-level 17: processing area
-level 18: mill
-level 19: shipping/respawning
-level 20: central processing
-
-level 21: administration center
-level 22: habitat
-level 23: lunar mining project
-level 24: quarry
-level 25: baron's den
-level 26: ballistyx
-level 27: mount pain
-level 28: heck
-level 29: river styx
-level 30: last call
-
-level 31: pharaoh
-level 32: caribbean
-
-#HUSTR_TALKTOSELF1-HUSTR_TALKTOSELF5
-VOUS PARLEZ TOUT SEUL
-QUI EST LA?
-VOUS VOUS FAITES PEUR
-VOUS COMMENCEZ A DELIRER
-VOUS ETES LARGUE...
-
-#HUSTR_MESSAGESENT
-[MESSAGE ENVOYE]
-
-#
-#	AM_map.C
-#
-
-#AMSTR_FOLLOWON
-MODE POURSUITE ON
-#AMSTR_FOLLOWOFF
-MODE POURSUITE OFF
-
-#AMSTR_GRIDON
-GRILLE ON
-#AMSTR_GRIDOFF
-GRILLE OFF
-
-#AMSTR_MARKEDSPOT
-REPERE MARQUE
-#AMSTR_MARKSCLEARED
-REPERES EFFACES
-
-#
-#	ST_stuff.C
-#
-
-#STSTR_MUS
-CHANGEMENT DE MUSIQUE
-#STSTR_NOMUS
-IMPOSSIBLE SELECTION
-#STSTR_DQDON
-INVULNERABILITE ON 
-#STSTR_DQDOFF
-INVULNERABILITE OFF
-
-#STSTR_KFAADDED
-ARMEMENT MAXIMUM!
-#STSTR_FAADDED
-ARMES (SAUF CLEFS) AJOUTEES
-
-#STSTR_NCON
-BARRIERES ON
-#STSTR_NCOFF
-BARRIERES OFF
-
-#STSTR_BEHOLD
-inVuln, Str, Inviso, Rad, Allmap, or Lite-amp
-#STSTR_BEHOLDX
-AMELIORATION ACTIVEE
-
-#STSTR_CHOPPERS
-... DOESN'T SUCK - GM
-#STSTR_CLEV
-CHANGEMENT DE NIVEAU...
-
-#
-#	F_Finale.C
-#
-#E1TEXT
-APRES AVOIR VAINCU LES GROS MECHANTS\n\
-ET NETTOYE LA BASE LUNAIRE, VOUS AVEZ\n\
-GAGNE, NON? PAS VRAI? OU EST DONC VOTRE\n\
- RECOMPENSE ET VOTRE BILLET DE\n\
-RETOUR? QU'EST-QUE CA VEUT DIRE?CE\
-N'EST PAS LA FIN ESPEREE!\n\
-\n\
-CA SENT LA VIANDE PUTREFIEE, MAIS\n\
-ON DIRAIT LA BASE DEIMOS. VOUS ETES\n\
-APPAREMMENT BLOQUE AUX PORTES DE L'ENFER.\n\
-LA SEULE ISSUE EST DE L'AUTRE COTE.\n\
-\n\
-POUR VIVRE LA SUITE DE DOOM, JOUEZ\n\
-A 'AUX PORTES DE L'ENFER' ET A\n\
-L'EPISODE SUIVANT, 'L'ENFER'!\n
-
-#E2TEXT
-VOUS AVEZ REUSSI. L'INFAME DEMON\n\
-QUI CONTROLAIT LA BASE LUNAIRE DE\n\
-DEIMOS EST MORT, ET VOUS AVEZ\n\
-TRIOMPHE! MAIS... OU ETES-VOUS?\n\
-VOUS GRIMPEZ JUSQU'AU BORD DE LA\n\
-LUNE ET VOUS DECOUVREZ L'ATROCE\n\
-VERITE.\n\
-\n\
-DEIMOS EST AU-DESSUS DE L'ENFER!\n\
-VOUS SAVEZ QUE PERSONNE NE S'EN\n\
-EST JAMAIS ECHAPPE, MAIS CES FUMIERS\n\
-VONT REGRETTER DE VOUS AVOIR CONNU!\n\
-VOUS REDESCENDEZ RAPIDEMENT VERS\n\
-LA SURFACE DE L'ENFER.\n\
-\n\
-VOICI MAINTENANT LE CHAPITRE FINAL DE\n\
-DOOM! -- L'ENFER.
-
-#E3TEXT
-LE DEMON ARACHNEEN ET REPUGNANT\n\
-QUI A DIRIGE L'INVASION DES BASES\n\
-LUNAIRES ET SEME LA MORT VIENT DE SE\n\
-FAIRE PULVERISER UNE FOIS POUR TOUTES.\n\
-\n\
-UNE PORTE SECRETE S'OUVRE. VOUS ENTREZ.\n\
-VOUS AVEZ PROUVE QUE VOUS POUVIEZ\n\
-RESISTER AUX HORREURS DE L'ENFER.\n\
-IL SAIT ETRE BEAU JOUEUR, ET LORSQUE\n\
-VOUS SORTEZ, VOUS REVOYEZ LES VERTES\n\
-PRAIRIES DE LA TERRE, VOTRE PLANETE.\n\
-\n\
-VOUS VOUS DEMANDEZ CE QUI S'EST PASSE\n\
-SUR TERRE PENDANT QUE VOUS AVEZ\n\
-COMBATTU LE DEMON. HEUREUSEMENT,\n\
-AUCUN GERME DU MAL N'A FRANCHI\n\
-CETTE PORTE AVEC VOUS...
-
-#E4TEXT
-the spider mastermind must have sent forth\n\
-its legions of hellspawn before your\n\
-final confrontation with that terrible\n\
-beast from hell.  but you stepped forward\n\
-and brought forth eternal damnation and\n\
-suffering upon the horde as a true hero\n\
-would in the face of something so evil.\n\
-\n\
-besides, someone was gonna pay for what\n\
-happened to daisy, your pet rabbit.\n\
-\n\
-but now, you see spread before you more\n\
-potential pain and gibbitude as a nation\n\
-of demons run amok among our cities.\n\
-\n\
-next stop, hell on earth!
-
-
-# after level 6, put this:
-
-#C1TEXT
-VOUS ETES AU PLUS PROFOND DE L'ASTROPORT\n\
-INFESTE DE MONSTRES, MAIS QUELQUE CHOSE\n\
-NE VA PAS. ILS ONT APPORTE LEUR PROPRE\n\
-REALITE, ET LA TECHNOLOGIE DE L'ASTROPORT\n\
-EST AFFECTEE PAR LEUR PRESENCE.\n\
-\n\
-DEVANT VOUS, VOUS VOYEZ UN POSTE AVANCE\n\
-DE L'ENFER, UNE ZONE FORTIFIEE. SI VOUS\n\
-POUVEZ PASSER, VOUS POURREZ PENETRER AU\n\
-COEUR DE LA BASE HANTEE ET TROUVER \n\
-L'INTERRUPTEUR DE CONTROLE QUI GARDE LA \n\
-POPULATION DE LA TERRE EN OTAGE.
-
-# After level 11, put this:
-
-#C2TEXT
-VOUS AVEZ GAGNE! VOTRE VICTOIRE A PERMIS\n\
-A L'HUMANITE D'EVACUER LA TERRE ET \n\
-D'ECHAPPER AU CAUCHEMAR. VOUS ETES \n\
-MAINTENANT LE DERNIER HUMAIN A LA SURFACE \n\
-DE LA PLANETE. VOUS ETES ENTOURE DE \n\
-MUTANTS CANNIBALES, D'EXTRATERRESTRES \n\
-CARNIVORES ET D'ESPRITS DU MAL. VOUS \n\
-ATTENDEZ CALMEMENT LA MORT, HEUREUX \n\
-D'AVOIR PU SAUVER VOTRE RACE.\n\
-MAIS UN MESSAGE VOUS PARVIENT SOUDAIN\n\
-DE L'ESPACE: \"NOS CAPTEURS ONT LOCALISE\n\
-LA SOURCE DE L'INVASION EXTRATERRESTRE.\n\
-SI VOUS Y ALLEZ, VOUS POURREZ PEUT-ETRE\n\
-LES ARRETER. LEUR BASE EST SITUEE AU COEUR\n\
-DE VOTRE VILLE NATALE, PRES DE L'ASTROPORT.\n\
-VOUS VOUS RELEVEZ LENTEMENT ET PENIBLEMENT\n\
-ET VOUS REPARTEZ POUR LE FRONT.
-
-
-# After level 20, put this:
-
-#C3TEXT
-VOUS ETES AU COEUR DE LA CITE CORROMPUE,\n\
-ENTOURE PAR LES CADAVRES DE VOS ENNEMIS.\n\
-VOUS NE VOYEZ PAS COMMENT DETRUIRE LA PORTE\n\
-DES CREATURES DE CE COTE. VOUS SERREZ\n\
-LES DENTS ET PLONGEZ DANS L'OUVERTURE.\n\
-\n\
-IL DOIT Y AVOIR UN MOYEN DE LA FERMER\n\
-DE L'AUTRE COTE. VOUS ACCEPTEZ DE\n\
-TRAVERSER L'ENFER POUR LE FAIRE?
-
-
-# After level 29, put this:
-
-#C4TEXT
-LE VISAGE HORRIBLE D'UN DEMON D'UNE\n\
-TAILLE INCROYABLE S'EFFONDRE DEVANT\n\
-VOUS LORSQUE VOUS TIREZ UNE SALVE DE\n\
-ROQUETTES DANS SON CERVEAU. LE MONSTRE\n\
-SE RATATINE, SES MEMBRES DECHIQUETES\n\
-SE REPANDANT SUR DES CENTAINES DE\n\
-KILOMETRES A LA SURFACE DE L'ENFER.\n\
-\n\
-VOUS AVEZ REUSSI. L'INVASION N'AURA.\n\
-PAS LIEU. LA TERRE EST SAUVEE. L'ENFER\n\
-EST ANEANTI. EN VOUS DEMANDANT OU IRONT\n\
-MAINTENANT LES DAMNES, VOUS ESSUYEZ\n\
-VOTRE FRONT COUVERT DE SUEUR ET REPARTEZ\n\
-VERS LA TERRE. SA RECONSTRUCTION SERA\n\
-BEAUCOUP PLUS DROLE QUE SA DESTRUCTION.\n
-
-
-
-# Before level 31, put this:
-
-#C5TEXT
-FELICITATIONS! VOUS AVEZ TROUVE LE\n\
-NIVEAU SECRET! IL SEMBLE AVOIR ETE\n\
-CONSTRUIT PAR LES HUMAINS. VOUS VOUS\n\
-DEMANDEZ QUELS PEUVENT ETRE LES\n\
-HABITANTS DE CE COIN PERDU DE L'ENFER.
-
-
-# Before level 32, put this:
-
-#C6TEXT
-FELICITATIONS! VOUS AVEZ DECOUVERT\n\
-LE NIVEAU SUPER SECRET! VOUS FERIEZ\n\
-MIEUX DE FONCER DANS CELUI-LA!\n
-
-
-# after map 06
-
-#P1TEXT
-You gloat over the steaming carcass of the\n\
-Guardian.  With its death, you've wrested\n\
-the Accelerator from the stinking claws\n\
-of Hell.  You relax and glance around the\n\
-room.  Damn!  There was supposed to be at\n\
-least one working prototype, but you can't\n\
-see it. The demons must have taken it.\n\
-\n\
-You must find the prototype, or all your\n\
-struggles will have been wasted. Keep\n\
-moving, keep fighting, keep killing.\n\
-Oh yes, keep living, too.
-
-
-# after map 11
-
-#P2TEXT
-Even the deadly Arch-Vile labyrinth could\n\
-not stop you, and you've gotten to the\n\
-prototype Accelerator which is soon\n\
-efficiently and permanently deactivated.\n\
-\n\
-You're good at that kind of thing.
-
-
-# after map 20
-
-#P3TEXT
-You've bashed and battered your way into\n\
-the heart of the devil-hive.  Time for a\n\
-Search-and-Destroy mission, aimed at the\n\
-Gatekeeper, whose foul offspring is\n\
-cascading to Earth.  Yeah, he's bad. But\n\
-you know who's worse!\n\
-\n\
-Grinning evilly, you check your gear, and\n\
-get ready to give the bastard a little Hell\n\
-of your own making!
-
-# after mp 30
-
-#P4TEXT
-The Gatekeeper's evil face is splattered\n\
-all over the place.  As its tattered corpse\n\
-collapses, an inverted Gate forms and\n\
-sucks down the shards of the last\n\
-prototype Accelerator, not to mention the\n\
-few remaining demons.  You're done. Hell\n\
-has gone back to pounding bad dead folks \n\
-instead of good live ones.  Remember to\n\
-tell your grandkids to put a rocket\n\
-launcher in your coffin. If you go to Hell\n\
-when you die, you'll need it for some\n\
-final cleaning-up ...
-
-# before map 31
-
-#P5TEXT
-You've found the second-hardest level we\n\
-got. Hope you have a saved game a level or\n\
-two previous.  If not, be prepared to die\n\
-aplenty. For master marines only.
-
-# before map 32
-
-#P6TEXT
-Betcha wondered just what WAS the hardest\n\
-level we had ready for ya?  Now you know.\n\
-No one gets out alive.
-
-
-#T1TEXT
-You've fought your way out of the infested\n\
-experimental labs.   It seems that UAC has\n\
-once again gulped it down.  With their\n\
-high turnover, it must be hard for poor\n\
-old UAC to buy corporate health insurance\n\
-nowadays..\n\
-\n\
-Ahead lies the military complex, now\n\
-swarming with diseased horrors hot to get\n\
-their teeth into you. With luck, the\n\
-complex still has some warlike ordnance\n\
-laying around.
-
-
-#T2TEXT
-You hear the grinding of heavy machinery\n\
-ahead.  You sure hope they're not stamping\n\
-out new hellspawn, but you're ready to\n\
-ream out a whole herd if you have to.\n\
-They might be planning a blood feast, but\n\
-you feel about as mean as two thousand\n\
-maniacs packed into one mad killer.\n\
-\n\
-You don't plan to go down easy.
-
-
-#T3TEXT
-The vista opening ahead looks real damn\n\
-familiar. Smells familiar, too -- like\n\
-fried excrement. You didn't like this\n\
-place before, and you sure as hell ain't\n\
-planning to like it now. The more you\n\
-brood on it, the madder you get.\n\
-Hefting your gun, an evil grin trickles\n\
-onto your face. Time to take some names.
-
-#T4TEXT
-Suddenly, all is silent, from one horizon\n\
-to the other. The agonizing echo of Hell\n\
-fades away, the nightmare sky turns to\n\
-blue, the heaps of monster corpses start \n\
-to evaporate along with the evil stench \n\
-that filled the air. Jeeze, maybe you've\n\
-done it. Have you really won?\n\
-\n\
-Something rumbles in the distance.\n\
-A blue light begins to glow inside the\n\
-ruined skull of the demon-spitter.
-
-
-#T5TEXT
-What now? Looks totally different. Kind\n\
-of like King Tut's condo. Well,\n\
-whatever's here can't be any worse\n\
-than usual. Can it?  Or maybe it's best\n\
-to let sleeping gods lie..
-
-
-#T6TEXT
-Time for a vacation. You've burst the\n\
-bowels of hell and by golly you're ready\n\
-for a break. You mutter to yourself,\n\
-Maybe someone else can kick Hell's ass\n\
-next time around. Ahead lies a quiet town,\n\
-with peaceful flowing water, quaint\n\
-buildings, and presumably no Hellspawn.\n\
-\n\
-As you step off the transport, you hear\n\
-the stomp of a cyberdemon's iron shoe.
-
-
-
-#
-# Character cast strings F_FINALE.C
-#
-#CC_ZOMBIE
-ZOMBIE
-#CC_SHOTGUN
-TYPE AU FUSIL
-#CC_HEAVY
-MEC SUPER-ARME
-#CC_IMP
-DIABLOTIN
-#CC_DEMON
-DEMON
-#CC_LOST
-AME PERDUE
-#CC_CACO
-CACODEMON
-#CC_HELL
-CHEVALIER DE L'ENFER
-#CC_BARON
-BARON DE L'ENFER
-#CC_ARACH
-ARACHNOTRON
-#CC_PAIN
-ELEMENTAIRE DE LA DOULEUR
-#CC_REVEN
-REVENANT
-#CC_MANCU
-MANCUBUS
-#CC_ARCH
-ARCHI-INFAME
-#CC_SPIDER
-L'ARAIGNEE CERVEAU
-#CC_CYBER
-LE CYBERDEMON
-#CC_HERO
-NOTRE HEROS
diff --git a/code/lzoconf.h b/code/lzoconf.h
new file mode 100644
index 0000000000..3ae0a12940
--- /dev/null
+++ b/code/lzoconf.h
@@ -0,0 +1,371 @@
+/* lzoconf.h -- configuration for the LZO real-time data compression library
+
+   This file is part of the LZO real-time data compression library.
+
+   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
+
+   The LZO library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   The LZO library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with the LZO library; see the file COPYING.
+   If not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+   Markus F.X.J. Oberhumer
+   <markus.oberhumer@jk.uni-linz.ac.at>
+   http://wildsau.idv.uni-linz.ac.at/mfx/lzo.html
+ */
+
+
+#ifndef __LZOCONF_H
+#define __LZOCONF_H
+
+#define LZO_VERSION             0x1040
+#define LZO_VERSION_STRING      "1.04"
+#define LZO_VERSION_DATE        "Mar 15 1998"
+
+/* internal Autoconf configuration file - only used when building LZO */
+#if defined(LZO_HAVE_CONFIG_H)
+#  include <config.h>
+#endif
+#include <limits.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/***********************************************************************
+// LZO requires a conforming <limits.h>
+************************************************************************/
+
+#if !defined(CHAR_BIT) || (CHAR_BIT != 8)
+#  error "invalid CHAR_BIT"
+#endif
+#if !defined(UCHAR_MAX) || !defined(UINT_MAX) || !defined(ULONG_MAX)
+#  error "check your compiler installation"
+#endif
+#if (USHRT_MAX < 1 ) || (UINT_MAX < 1) || (ULONG_MAX < 1)
+#  error "your limits.h macros are broken"
+#endif
+
+/* workaround a cpp bug under hpux 10.20 */
+#define LZO_0xffffffffL     4294967295ul
+
+
+/***********************************************************************
+// architecture defines
+************************************************************************/
+
+#if !defined(__LZO_WIN) && !defined(__LZO_DOS) && !defined(__LZO_OS2)
+#  if defined(__WINDOWS__) || defined(_WINDOWS) || defined(_Windows)
+#    define __LZO_WIN
+#  elif defined(__WIN32__) || defined(_WIN32) || defined(WIN32)
+#    define __LZO_WIN
+#  elif defined(__NT__) || defined(__NT_DLL__) || defined(__WINDOWS_386__)
+#    define __LZO_WIN
+#  elif defined(__DOS__) || defined(__MSDOS__) || defined(MSDOS)
+#    define __LZO_DOS
+#  elif defined(__OS2__) || defined(__OS2V2__) || defined(OS2)
+#    define __LZO_OS2
+#  elif defined(__palmos__)
+#    define __LZO_PALMOS
+#  elif defined(__TOS__) || defined(__atarist__)
+#    define __LZO_TOS
+#  endif
+#endif
+
+#if (UINT_MAX < LZO_0xffffffffL)
+#  if defined(__LZO_WIN)
+#    define __LZO_WIN16
+#  elif defined(__LZO_DOS)
+#    define __LZO_DOS16
+#  elif defined(__LZO_PALMOS)
+#    define __LZO_PALMOS16
+#  elif defined(__LZO_TOS)
+#    define __LZO_TOS16
+#  else
+#    error "16-bit target not supported - contact me for porting hints"
+#  endif
+#endif
+
+#if !defined(__LZO_i386)
+#  if defined(__LZO_DOS) || defined(__LZO_WIN16)
+#    define __LZO_i386
+#  elif defined(__i386__) || defined(__386__) || defined(_M_IX86)
+#    define __LZO_i386
+#  endif
+#endif
+
+#if defined(__LZO_STRICT_16BIT)
+#  if (UINT_MAX < LZO_0xffffffffL)
+#    include <lzo16bit.h>
+#  endif
+#endif
+
+
+/***********************************************************************
+// integral and pointer types
+************************************************************************/
+
+/* Integral types with 32 bits or more */
+#if !defined(LZO_UINT32_MAX)
+#  if (UINT_MAX >= LZO_0xffffffffL)
+     typedef unsigned int       lzo_uint32;
+     typedef int                lzo_int32;
+#    define LZO_UINT32_MAX      UINT_MAX
+#    define LZO_INT32_MAX       INT_MAX
+#    define LZO_INT32_MIN       INT_MIN
+#  elif (ULONG_MAX >= LZO_0xffffffffL)
+     typedef unsigned long      lzo_uint32;
+     typedef long               lzo_int32;
+#    define LZO_UINT32_MAX      ULONG_MAX
+#    define LZO_INT32_MAX       LONG_MAX
+#    define LZO_INT32_MIN       LONG_MIN
+#  else
+#    error "lzo_uint32"
+#  endif
+#endif
+
+/* lzo_uint is used like size_t */
+#if !defined(LZO_UINT_MAX)
+#  if (UINT_MAX >= LZO_0xffffffffL)
+     typedef unsigned int       lzo_uint;
+     typedef int                lzo_int;
+#    define LZO_UINT_MAX        UINT_MAX
+#    define LZO_INT_MAX         INT_MAX
+#    define LZO_INT_MIN         INT_MIN
+#  elif (ULONG_MAX >= LZO_0xffffffffL)
+     typedef unsigned long      lzo_uint;
+     typedef long               lzo_int;
+#    define LZO_UINT_MAX        ULONG_MAX
+#    define LZO_INT_MAX         LONG_MAX
+#    define LZO_INT_MIN         LONG_MIN
+#  else
+#    error "lzo_uint"
+#  endif
+#endif
+
+
+/* Memory model that allows to access memory at offsets of lzo_uint.
+ * `Huge' pointers (16-bit DOS/Windows) are somewhat slow, but they
+ * work fine and I really don't care about 16-bit compiler
+ * optimizations nowadays.
+ */
+#if !defined(__LZO_MMODEL)
+#  if (LZO_UINT_MAX <= UINT_MAX)
+#    define __LZO_MMODEL
+#  elif defined(__LZO_DOS16) || defined(__LZO_WIN16)
+#    define __LZO_MMODEL        __huge
+#    define LZO_999_UNSUPPORTED
+#  elif defined(__LZO_PALMOS16) || defined(__LZO_TOS16)
+#    define __LZO_MMODEL
+#  else
+#    error "__LZO_MMODEL"
+#  endif
+#endif
+
+/* no typedef here because of const-pointer issues */
+#define lzo_byte                unsigned char __LZO_MMODEL
+#define lzo_bytep               unsigned char __LZO_MMODEL *
+#define lzo_charp               char __LZO_MMODEL *
+#define lzo_voidp               void __LZO_MMODEL *
+#define lzo_shortp              short __LZO_MMODEL *
+#define lzo_ushortp             unsigned short __LZO_MMODEL *
+#define lzo_uint32p             lzo_uint32 __LZO_MMODEL *
+#define lzo_int32p              lzo_int32 __LZO_MMODEL *
+#define lzo_uintp               lzo_uint __LZO_MMODEL *
+#define lzo_intp                lzo_int __LZO_MMODEL *
+#define lzo_voidpp              lzo_voidp __LZO_MMODEL *
+#define lzo_bytepp              lzo_bytep __LZO_MMODEL *
+
+typedef int lzo_bool;
+
+#ifndef lzo_sizeof_dict_t
+#  define lzo_sizeof_dict_t     sizeof(lzo_bytep)
+#endif
+
+
+/***********************************************************************
+// function types
+************************************************************************/
+
+/* linkage */
+#if !defined(__LZO_EXTERN_C)
+#  ifdef __cplusplus
+#    define __LZO_EXTERN_C      extern "C"
+#  else
+#    define __LZO_EXTERN_C      extern
+#  endif
+#endif
+
+/* calling conventions */
+#if !defined(__LZO_CDECL)
+#  if defined(__LZO_DOS16) || defined(__LZO_WIN16)
+#    define __LZO_CDECL         __far __cdecl
+#  elif defined(__LZO_i386) && defined(_MSC_VER)
+#    define __LZO_CDECL         __cdecl
+#  elif defined(__LZO_i386) && defined(__WATCOMC__)
+#    define __LZO_CDECL         __near __cdecl
+#  else
+#    define __LZO_CDECL
+#  endif
+#endif
+#if !defined(__LZO_ENTRY)
+#  define __LZO_ENTRY           __LZO_CDECL
+#endif
+
+/* DLL export information */
+#if !defined(__LZO_EXPORT1)
+#  define __LZO_EXPORT1
+#endif
+#if !defined(__LZO_EXPORT2)
+#  define __LZO_EXPORT2
+#endif
+
+/* calling convention for C functions */
+#if !defined(LZO_PUBLIC)
+#  define LZO_PUBLIC(_rettype)  __LZO_EXPORT1 _rettype __LZO_EXPORT2 __LZO_ENTRY
+#endif
+#if !defined(LZO_EXTERN)
+#  define LZO_EXTERN(_rettype)  __LZO_EXTERN_C LZO_PUBLIC(_rettype)
+#endif
+#if !defined(LZO_PRIVATE)
+#  define LZO_PRIVATE(_rettype) static _rettype __LZO_ENTRY
+#endif
+
+/* cdecl calling convention for assembler functions */
+#if !defined(LZO_PUBLIC_CDECL)
+#  define LZO_PUBLIC_CDECL(_rettype) \
+                __LZO_EXPORT1 _rettype __LZO_EXPORT2 __LZO_CDECL
+#endif
+#if !defined(LZO_EXTERN_CDECL)
+#  define LZO_EXTERN_CDECL(_rettype)  __LZO_EXTERN_C LZO_PUBLIC_CDECL(_rettype)
+#endif
+
+
+typedef int
+(__LZO_ENTRY *lzo_compress_t)   ( const lzo_byte *src, lzo_uint  src_len,
+                                        lzo_byte *dst, lzo_uint *dst_len,
+                                        lzo_voidp wrkmem );
+
+typedef int
+(__LZO_ENTRY *lzo_decompress_t) ( const lzo_byte *src, lzo_uint  src_len,
+                                        lzo_byte *dst, lzo_uint *dst_len,
+                                        lzo_voidp wrkmem );
+
+typedef int
+(__LZO_ENTRY *lzo_optimize_t)   (       lzo_byte *src, lzo_uint  src_len,
+                                        lzo_byte *dst, lzo_uint *dst_len,
+                                        lzo_voidp wrkmem );
+
+typedef int
+(__LZO_ENTRY *lzo_compress_dict_t)(const lzo_byte *src, lzo_uint  src_len,
+                                        lzo_byte *dst, lzo_uint *dst_len,
+                                        lzo_voidp wrkmem,
+                                  const lzo_byte *dict, lzo_uint dict_len );
+
+typedef int
+(__LZO_ENTRY *lzo_decompress_dict_t)(const lzo_byte *src, lzo_uint  src_len,
+                                        lzo_byte *dst, lzo_uint *dst_len,
+                                        lzo_voidp wrkmem,
+                                  const lzo_byte *dict, lzo_uint dict_len );
+
+
+/* a progress indicator callback function */
+typedef void (__LZO_ENTRY *lzo_progress_callback_t) (lzo_uint, lzo_uint);
+
+
+/***********************************************************************
+// error codes and prototypes
+************************************************************************/
+
+/* Error codes for the compression/decompression functions. Negative
+ * values are errors, positive values will be used for special but
+ * normal events.
+ */
+#define LZO_E_OK                    0
+#define LZO_E_ERROR                 (-1)
+#define LZO_E_OUT_OF_MEMORY         (-2)    /* not used right now */
+#define LZO_E_NOT_COMPRESSIBLE      (-3)    /* not used right now */
+#define LZO_E_INPUT_OVERRUN         (-4)
+#define LZO_E_OUTPUT_OVERRUN        (-5)
+#define LZO_E_LOOKBEHIND_OVERRUN    (-6)
+#define LZO_E_EOF_NOT_FOUND         (-7)
+#define LZO_E_INPUT_NOT_CONSUMED    (-8)
+
+
+/* lzo_init() should be the first function you call.
+ * Check the return code !
+ *
+ * lzo_init() is a macro to allow checking that the library and the
+ * compiler's view of various types are consistent.
+ */
+#define lzo_init() __lzo_init2(LZO_VERSION,(int)sizeof(short),(int)sizeof(int),\
+    (int)sizeof(long),(int)sizeof(lzo_uint32),(int)sizeof(lzo_uint),\
+    (int)lzo_sizeof_dict_t,(int)sizeof(char *),(int)sizeof(lzo_voidp),\
+    (int)sizeof(lzo_compress_t))
+LZO_EXTERN(int) __lzo_init2(unsigned,int,int,int,int,int,int,int,int,int);
+
+/* version functions (useful for shared libraries) */
+LZO_EXTERN(unsigned) lzo_version(void);
+LZO_EXTERN(const char *) lzo_version_string(void);
+LZO_EXTERN(const char *) lzo_version_date(void);
+LZO_EXTERN(const lzo_charp) _lzo_version_string(void);
+LZO_EXTERN(const lzo_charp) _lzo_version_date(void);
+
+/* string functions */
+LZO_EXTERN(int)
+lzo_memcmp(const lzo_voidp _s1, const lzo_voidp _s2, lzo_uint _len);
+LZO_EXTERN(lzo_voidp)
+lzo_memcpy(lzo_voidp _dest, const lzo_voidp _src, lzo_uint _len);
+LZO_EXTERN(lzo_voidp)
+lzo_memmove(lzo_voidp _dest, const lzo_voidp _src, lzo_uint _len);
+LZO_EXTERN(lzo_voidp)
+lzo_memset(lzo_voidp _s, int _c, lzo_uint _len);
+
+/* checksum functions */
+LZO_EXTERN(lzo_uint32)
+lzo_adler32(lzo_uint32 _adler, const lzo_byte *_buf, lzo_uint _len);
+LZO_EXTERN(lzo_uint32)
+lzo_crc32(lzo_uint32 _c, const lzo_byte *_buf, lzo_uint _len);
+
+/* memory allocation functions */
+LZO_EXTERN(lzo_bytep) lzo_alloc(lzo_uint _nelems, lzo_uint _size);
+LZO_EXTERN(lzo_bytep) lzo_malloc(lzo_uint _size);
+LZO_EXTERN(void) lzo_free(lzo_voidp _ptr);
+
+extern lzo_bytep (__LZO_ENTRY *lzo_alloc_hook) (lzo_uint,lzo_uint);
+extern void (__LZO_ENTRY *lzo_free_hook) (lzo_voidp);
+
+/* misc. */
+LZO_EXTERN(lzo_bool) lzo_assert(int _expr);
+LZO_EXTERN(int) _lzo_config_check(void);
+typedef union { lzo_bytep p; lzo_uint u; } __lzo_pu_u;
+typedef union { lzo_bytep p; lzo_uint32 u32; } __lzo_pu32_u;
+
+/* align a char pointer on a boundary that is a multiple of `size' */
+LZO_EXTERN(unsigned) __lzo_align_gap(const lzo_voidp _ptr, lzo_uint _size);
+#define LZO_PTR_ALIGN_UP(_ptr,_size) \
+    ((_ptr) + (lzo_uint) __lzo_align_gap((const lzo_voidp)(_ptr),(lzo_uint)(_size)))
+
+/* depracted - backward compatibility */
+#define LZO_ALIGN(_ptr,_size) LZO_PTR_ALIGN_UP(_ptr,_size)
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* already included */
+
diff --git a/code/m_alloc.c b/code/m_alloc.c
index 7885e50e4f..1ebe1f53c3 100644
--- a/code/m_alloc.c
+++ b/code/m_alloc.c
@@ -6,7 +6,7 @@ void *Malloc (size_t size)
 	void *zone = malloc (size);
 
 	if (!zone)
-		I_FatalError ("Could not malloc %d bytes", size);
+		I_FatalError ("Could not malloc %ld bytes", size);
 
 	return zone;
 }
@@ -16,7 +16,7 @@ void *Calloc (size_t num, size_t size)
 	void *zone = calloc (num, size);
 
 	if (!zone)
-		I_FatalError ("Could not calloc %d bytes", num * size);
+		I_FatalError ("Could not calloc %ld bytes", num * size);
 
 	return zone;
 }
@@ -26,7 +26,7 @@ void *Realloc (void *memblock, size_t size)
 	void *zone = realloc (memblock, size);
 
 	if (!zone)
-		I_FatalError ("Could not realloc %d bytes", size);
+		I_FatalError ("Could not realloc %ld bytes", size);
 
 	return zone;
 }
\ No newline at end of file
diff --git a/code/m_option.c b/code/m_option.c
index 34d73335fd..0eb93d6e26 100644
--- a/code/m_option.c
+++ b/code/m_option.c
@@ -43,8 +43,6 @@
 #include "m_misc.h"
 
 // Data.
-#include "sounds.h"
-
 #include "m_menu.h"
 
 //
@@ -79,90 +77,22 @@ void M_ClearMenus (void);
 
 
 
-typedef struct oldmenu_s
-{
-	short				numitems;		// # of menu items
-	struct oldmenu_s*	prevMenu;		// previous menu
-	void		* 		menuitems;		// menu items
-	void				(*routine)();	// draw routine
-	short				x;
-	short				y;				// x,y of menu
-	short				lastOn; 		// last item user was on in menu
-} oldmenu_t;
-
 extern oldmenu_t MainDef;
 extern short	 itemOn;
 extern oldmenu_t *currentMenu;
 
 
-typedef enum {
-	whitetext,
-	redtext,
-	more,
-	slider,
-	discrete,
-	control,
-	screenres,
-	bitflag,
-} itemtype;
-
-typedef struct menuitem_s {
-	itemtype		  type;
-	char			 *label;
-	union {
-		cvar_t			**cvar;
-		int				  selmode;
-		int				  flagmask;
-	} a;
-	union {
-		float			  min;		/* aka numvalues aka invflag */
-		int				  key1;
-		char			 *res1;
-	} b;
-	union {
-		float			  max;
-		int				  key2;
-		char			 *res2;
-	} c;
-	union {
-		float			  step;
-		char			 *res3;
-	} d;
-	union {
-		struct value_s	 *values;
-		char			 *command;
-		void			(*cfunc)(cvar_t *cvar, float newval);
-		void			(*mfunc)(void);
-		int				  highlight;
-		int				 *flagint;
-	} e;
-} menuitem_t;
-
-typedef struct menu_s {
-	char			title[8];
-	int				lastOn;
-	int				numitems;
-	int				indent;
-	menuitem_t	   *items;
-	struct menu_s  *prevmenu;
-} menu_t;
-
-typedef struct value_s {
-	float		value;
-	char		*name;
-} value_t;
-
-value_t YesNo[] = {
+value_t YesNo[2] = {
 	{ 0.0, "No" },
 	{ 1.0, "Yes" }
 };
 
-value_t NoYes[] = {
+value_t NoYes[2] = {
 	{ 0.0, "Yes" },
 	{ 1.0, "No" }
 };
 
-value_t OnOff[] = {
+value_t OnOff[2] = {
 	{ 0.0, "Off" },
 	{ 1.0, "On" }
 };
@@ -186,6 +116,8 @@ static void GoToConsole (void);
 void Reset2Defaults (void);
 void Reset2Saved (void);
 
+extern cvar_t *snd_MidiVolume;
+
 static void SetVidMode (void);
 
 menuitem_t OptionItems[] = {
@@ -196,7 +128,8 @@ menuitem_t OptionItems[] = {
 	{ more,		"Set video mode",		NULL,					0.0, 0.0,	0.0, (value_t *)SetVidMode },
 	{ redtext,	" ",					NULL,					0.0, 0.0,	0.0, NULL },
 	{ slider,	"Mouse speed",			&mouseSensitivity,		0.5, 2.5,	0.1, NULL },
-	{ slider,	"MOD Music volume",		&snd_MusicVolume,		0.0, 64.0,	1.0, NULL },
+	{ slider,	"MIDI music volume",	&snd_MidiVolume,		0.0, 1.0,	0.05, NULL },
+	{ slider,	"MOD music volume",		&snd_MusicVolume,		0.0, 64.0,	1.0, NULL },
 	{ slider,	"Sound volume",			&snd_SfxVolume,			0.0, 15.0,	1.0, NULL },
 	{ discrete,	"Always Run",			&cl_run,				2.0, 0.0,	0.0, OnOff },
 	{ discrete, "Always Mouselook",		&freelook,				2.0, 0.0,	0.0, OnOff },
@@ -228,7 +161,8 @@ menuitem_t ControlsItems[] = {
 	{ whitetext,"ENTER to change, BACKSPACE to clear", NULL, 0.0, 0.0, 0.0, NULL },
 	{ whitetext," ", NULL, 0.0, 0.0, 0.0, NULL },
 	{ control,	"Attack",				NULL, 0.0, 0.0, 0.0, (value_t *)"+attack" },
-//	{ control,	"Next Weapon",			NULL, 0.0, 0.0, 0.0, (value_t *)"weapnext" },
+	{ control,	"Next Weapon",			NULL, 0.0, 0.0, 0.0, (value_t *)"weapnext" },	// Was already here
+	{ control,	"Previous Weapon",		NULL, 0.0, 0.0, 0.0, (value_t *)"weapprev" },	// TIJ
 	{ control,	"Use / Open",			NULL, 0.0, 0.0, 0.0, (value_t *)"+use" },
 	{ control,	"Jump",					NULL, 0.0, 0.0, 0.0, (value_t *)"+jump" },
 	{ control,	"Walk forward",			NULL, 0.0, 0.0, 0.0, (value_t *)"+forward" },
@@ -250,7 +184,8 @@ menuitem_t ControlsItems[] = {
 menu_t ControlsMenu = {
 	"M_CONTRO",
 	2,
-	19,
+	21,	// TIJ	Was: 19
+		//		Now: 21 (2 more Control menu items: Prev and Next Weapon)
 	0,
 	ControlsItems,
 	&OptionMenu
@@ -317,33 +252,35 @@ menu_t VideoMenu = {
  *=======================================*/
 
 extern BOOL setmodeneeded;
-extern int	NewWidth, NewHeight, NewBpp;
+extern int NewWidth, NewHeight, NewID;
+extern int DisplayID;
+extern char *IdStrings[22];
 
 int testingmode;		// Holds time to revert to old mode
-int OldWidth, OldHeight, OldBpp;
+int OldWidth, OldHeight, OldID;
 float OldFS;
 
-static void BuildModesList (int hiwidth, int hiheight, int hibpp);
+static void BuildModesList (int hiwidth, int hiheight, int hi_id);
 static BOOL GetSelectedSize (int line, int *width, int *height);
-static void SetModesMenu (int w, int h, int bpp);
+static void SetModesMenu (int w, int h, int id);
 
 // Found in i_video.c.
-void I_StartModeIterator (int bpp);
+void I_StartModeIterator (int id);
 BOOL I_NextMode (int *width, int *height);
 
-extern cvar_t *vid_defwidth, *vid_defheight, *vid_defbpp;
+extern cvar_t *vid_defwidth, *vid_defheight, *vid_defid;
 
 static cvar_t DummyDepthCvar, DummyFSCvar;
 static cvar_t *DummyDepthPtr, *DummyFSPtr;
 extern cvar_t *fullscreen;
 
-static value_t Depths[4];
+static value_t Depths[22];
 
 static char VMEnterText[] = "Press ENTER to set mode";
 static char VMTestText[] = "T to test mode for 5 seconds";
 
 menuitem_t ModesItems[] = {
-	{ discrete, "Screen depth",			(cvar_t **)&DummyDepthPtr,0.0, 0.0,0.0, Depths },
+	{ discrete, "Screen mode",			(cvar_t **)&DummyDepthPtr,0.0, 0.0,0.0, Depths },
 	{ redtext,	" ",					NULL,					0.0, 0.0,	0.0, NULL },
 	{ discrete, "Fullscreen",			(cvar_t **)&DummyFSPtr,	2.0, 0.0,	0.0, YesNo },
 	{ redtext,	" ",					NULL,					0.0, 0.0,	0.0, NULL },
@@ -356,7 +293,7 @@ menuitem_t ModesItems[] = {
 	{ screenres,NULL,					NULL,					0.0, 0.0,	0.0, NULL },
 	{ screenres,NULL,					NULL,					0.0, 0.0,	0.0, NULL },
 	{ screenres,NULL,					NULL,					0.0, 0.0,	0.0, NULL },
-	{ whitetext,"Note: Only 8 bpp modes are fully supported",NULL,0.0, 0.0,	0.0, NULL },
+	{ whitetext,"Note: Only 8 bpp modes are supported",NULL,	0.0, 0.0,	0.0, NULL },
 	{ redtext,  VMEnterText,			NULL,					0.0, 0.0,	0.0, NULL },
 	{ redtext,	" ",					NULL,					0.0, 0.0,	0.0, NULL },
 	{ redtext,  VMTestText,				NULL,					0.0, 0.0,	0.0, NULL },
@@ -381,6 +318,16 @@ menu_t ModesMenu = {
 	&OptionMenu
 };
 
+extern byte IdTobpp[22];
+
+static int IdToBpp (int id) {
+	id -= 1000;
+	if (id < 0 || id > 21)
+		return 0;
+	else
+		return IdTobpp[id];
+}
+
 
 /*=======================================
  *
@@ -391,7 +338,7 @@ menu_t ModesMenu = {
 static cvar_t *flagsvar;
 
 static menuitem_t DMFlagsItems[] = {
-	{ bitflag,	"Falling damage",		(cvar_t **)DF_YES_FALLING_LOTS, 0, 0, 0, (value_t *)&dmflags },
+	{ bitflag,	"Falling damage",		(cvar_t **)DF_YES_FALLING,		0, 0, 0, (value_t *)&dmflags },
 	{ bitflag,	"Weapons stay (DM)",	(cvar_t **)DF_WEAPONS_STAY,		0, 0, 0, (value_t *)&dmflags },
 	{ bitflag,	"Allow powerups (DM)",	(cvar_t **)DF_NO_ITEMS,			1, 0, 0, (value_t *)&dmflags },
 	{ bitflag,	"Allow health (DM)",	(cvar_t **)DF_NO_HEALTH,		1, 0, 0, (value_t *)&dmflags },
@@ -406,13 +353,16 @@ static menuitem_t DMFlagsItems[] = {
 	{ bitflag,	"Powerups respawn",		(cvar_t **)DF_ITEMS_RESPAWN,	0, 0, 0, (value_t *)&dmflags },
 	{ bitflag,	"Fast monsters",		(cvar_t **)DF_FAST_MONSTERS,	0, 0, 0, (value_t *)&dmflags },
 	{ bitflag,	"Allow jump",			(cvar_t **)DF_NO_JUMP,			1, 0, 0, (value_t *)&dmflags },
-	{ bitflag,	"Allow freelook",		(cvar_t **)DF_NO_FREELOOK,		1, 0, 0, (value_t *)&dmflags }
+	{ bitflag,	"Allow freelook",		(cvar_t **)DF_NO_FREELOOK,		1, 0, 0, (value_t *)&dmflags },
+	{ bitflag,	"Friendly fire",		(cvar_t **)DF_NO_FRIENDLY_FIRE,	1, 0, 0, (value_t *)&dmflags },
+	{ redtext,	" ",					NULL,					0.0, 0.0,	0.0, NULL },
+	{ discrete, "Teamplay",				(cvar_t **)&teamplay,	2.0, 0.0,	0.0, OnOff }
 };
 
 static menu_t DMFlagsMenu = {
 	"M_GMPLAY",
 	0,
-	16,
+	19,
 	0,
 	DMFlagsItems,
 	&OptionMenu
@@ -436,39 +386,25 @@ void M_FreeValues (value_t **values, int num)
 //
 //		Set some stuff up for the video modes menu
 //
+static int IDTranslate[22];
+
 void M_OptInit (void)
 {
-	int currval = 0, dummy1, dummy2;
+	int currval = 0, dummy1, dummy2, i;
+	char name[24];
 
 	DummyDepthPtr = &DummyDepthCvar;
 	DummyFSPtr = &DummyFSCvar;
 
-	I_StartModeIterator (8);
-	if (I_NextMode (&dummy1, &dummy2)) {
-		Depths[currval].value = 1.0;
-		Depths[currval].name = "8 bpp (Indexed)";
-		currval++;
-	}
-
-	I_StartModeIterator (32);
-	if (I_NextMode (&dummy1, &dummy2)) {
-		Depths[currval].value = 4.0;
-		Depths[currval].name = "32 bpp (True Color)";
-		currval++;
-	}
-
-	I_StartModeIterator (24);
-	if (I_NextMode (&dummy1, &dummy2)) {
-		Depths[currval].value = 3.0;
-		Depths[currval].name = "24 bpp (True Color)";
-		currval++;
-	}
-
-	I_StartModeIterator (16);
-	if (I_NextMode (&dummy1, &dummy2)) {
-		Depths[currval].value = 2.0;
-		Depths[currval].name = "16 bpp (High Color)";
-		currval++;
+	for (i = 1000; i < 1022; i++) {
+		I_StartModeIterator (i);
+		if (I_NextMode (&dummy1, &dummy2)) {
+			Depths[currval].value = currval;
+			sprintf (name, "%d bit (%s)", IdToBpp (i), IdStrings[i-1000]);
+			Depths[currval].name = copystring (name);
+			IDTranslate[currval] = i;
+			currval++;
+		}
 	}
 
 	ModesItems[VM_DEPTHITEM].b.min = (float)currval;
@@ -505,13 +441,13 @@ void M_SizeDisplay (float diff)
 void Cmd_Sizedown (void *plyr, int argc, char **argv)
 {
 	M_SizeDisplay (-1.0);
-	S_StartSound(ORIGIN_AMBIENT,sfx_stnmov);
+	S_StartSound (ORIGIN_AMBIENT, "plats/pt1_mid", 100);
 }
 
 void Cmd_Sizeup (void *plyr, int argc, char **argv)
 {
 	M_SizeDisplay(1.0);
-	S_StartSound(ORIGIN_AMBIENT,sfx_stnmov);
+	S_StartSound (ORIGIN_AMBIENT, "plats/pt1_mid", 100);
 }
 
 void M_BuildKeyList (menuitem_t *item, int numitems)
@@ -597,7 +533,8 @@ void M_OptDrawer (void)
 	
 	V_DrawPatchClean (160-title->width/2,10,&screens[0],title);
 
-	for (i = 0, y = 20 + title->height; i < CurrentMenu->numitems; i++, y += 8) {
+//	for (i = 0, y = 20 + title->height; i < CurrentMenu->numitems; i++, y += 8)	{
+	for (i = 0, y = 15 + title->height; i < CurrentMenu->numitems; i++, y += 8)	{	// TIJ
 		item = CurrentMenu->items + i;
 
 		if (item->type != screenres) {
@@ -618,6 +555,11 @@ void M_OptDrawer (void)
 					drawer = V_DrawWhiteTextClean;
 					break;
 
+				case listelement:
+					x = CurrentMenu->indent + 14;
+					drawer = V_DrawRedTextClean;
+					break;
+
 				default:
 					x = CurrentMenu->indent - width;
 					drawer = V_DrawRedTextClean;
@@ -774,7 +716,7 @@ BOOL M_OptResponder (event_t *ev)
 				if (CurrentMenu->items[CurrentItem].type == screenres)
 					CurrentMenu->items[CurrentItem].a.selmode = modecol;
 
-				S_StartSound (ORIGIN_AMBIENT, sfx_pstop);
+				S_StartSound (ORIGIN_AMBIENT, "plats/pt1_stop", 100);
 			}
 			break;
 
@@ -800,7 +742,7 @@ BOOL M_OptResponder (event_t *ev)
 				if (CurrentMenu->items[CurrentItem].type == screenres)
 					CurrentMenu->items[CurrentItem].a.selmode = modecol;
 
-				S_StartSound (ORIGIN_AMBIENT, sfx_pstop);
+				S_StartSound (ORIGIN_AMBIENT, "plats/pt1_stop", 100);
 			}
 			break;
 
@@ -818,7 +760,7 @@ BOOL M_OptResponder (event_t *ev)
 						else
 							SetCVarFloat (*item->a.cvar, newval);
 					}
-					S_StartSound(ORIGIN_AMBIENT,sfx_stnmov);
+					S_StartSound (ORIGIN_AMBIENT, "plats/pt1_mid", 100);
 					break;
 
 				case discrete:
@@ -835,9 +777,9 @@ BOOL M_OptResponder (event_t *ev)
 
 						// Hack hack. Rebuild list of resolutions
 						if (item->e.values == Depths)
-							BuildModesList (screens[0].width, screens[0].height, screens[0].Bpp << 3);
+							BuildModesList (screens[0].width, screens[0].height, DisplayID);
 					}
-					S_StartSound(ORIGIN_AMBIENT,sfx_stnmov);
+					S_StartSound (ORIGIN_AMBIENT, "plats/pt1_mid", 100);
 					break;
 
 				case screenres:
@@ -856,7 +798,7 @@ BOOL M_OptResponder (event_t *ev)
 							item->a.selmode = col;
 						}
 					}
-					S_StartSound(ORIGIN_AMBIENT,sfx_pstop);
+					S_StartSound (ORIGIN_AMBIENT, "plats/pt1_stop", 100);
 					break;
 
 				default:
@@ -878,7 +820,7 @@ BOOL M_OptResponder (event_t *ev)
 						else
 							SetCVarFloat (*item->a.cvar, newval);
 					}
-					S_StartSound(ORIGIN_AMBIENT,sfx_stnmov);
+					S_StartSound (ORIGIN_AMBIENT, "plats/pt1_mid", 100);
 					break;
 
 				case discrete:
@@ -895,9 +837,9 @@ BOOL M_OptResponder (event_t *ev)
 
 						// Hack hack. Rebuild list of resolutions
 						if (item->e.values == Depths)
-							BuildModesList (screens[0].width, screens[0].height, screens[0].Bpp << 3);
+							BuildModesList (screens[0].width, screens[0].height, DisplayID);
 					}
-					S_StartSound(ORIGIN_AMBIENT,sfx_stnmov);
+					S_StartSound (ORIGIN_AMBIENT, "plats/pt1_mid", 100);
 					break;
 
 				case screenres:
@@ -918,7 +860,7 @@ BOOL M_OptResponder (event_t *ev)
 							item->a.selmode = col;
 						}
 					}
-					S_StartSound(ORIGIN_AMBIENT,sfx_pstop);
+					S_StartSound (ORIGIN_AMBIENT, "plats/pt1_stop", 100);
 					break;
 
 				default:
@@ -940,13 +882,13 @@ BOOL M_OptResponder (event_t *ev)
 					NewWidth = screens[0].width;
 					NewHeight = screens[0].height;
 				}
-				NewBpp = (int)DummyDepthCvar.value << 3;
+				NewID = IDTranslate[(int)DummyDepthCvar.value];
 				setmodeneeded = true;
-				S_StartSound(ORIGIN_AMBIENT,sfx_pistol);
-				SetModesMenu (NewWidth, NewHeight, NewBpp);
+				S_StartSound (ORIGIN_AMBIENT, "weapons/pistol", 100);
+				SetModesMenu (NewWidth, NewHeight, NewID);
 			} else if (item->type == more && item->e.mfunc) {
 				CurrentMenu->lastOn = CurrentItem;
-				S_StartSound(ORIGIN_AMBIENT,sfx_pistol);
+				S_StartSound (ORIGIN_AMBIENT, "weapons/pistol", 100);
 				item->e.mfunc();
 			} else if (item->type == discrete) {
 				int cur;
@@ -961,15 +903,19 @@ BOOL M_OptResponder (event_t *ev)
 
 				// Hack hack. Rebuild list of resolutions
 				if (item->e.values == Depths)
-					BuildModesList (screens[0].width, screens[0].height, screens[0].Bpp << 3);
+					BuildModesList (screens[0].width, screens[0].height, DisplayID);
 
-				S_StartSound(ORIGIN_AMBIENT,sfx_stnmov);
+				S_StartSound (ORIGIN_AMBIENT, "plats/pt1_mid", 100);
 			} else if (item->type == control) {
 				WaitingForKey = true;
 				OldMessage = CurrentMenu->items[0].label;
 				OldType = CurrentMenu->items[0].type;
 				CurrentMenu->items[0].label = "Press new key for control or ESC to cancel";
 				CurrentMenu->items[0].type = redtext;
+			} else if (item->type == listelement) {
+				CurrentMenu->lastOn = CurrentItem;
+				S_StartSound (ORIGIN_AMBIENT, "weapons/pistol", 100);
+				item->e.lfunc (CurrentItem);
 			} else if (item->type == screenres) {
 			}
 			break;
@@ -979,12 +925,12 @@ BOOL M_OptResponder (event_t *ev)
 			if (CurrentMenu->prevmenu) {
 				CurrentMenu = CurrentMenu->prevmenu;
 				CurrentItem = CurrentMenu->lastOn;
-				S_StartSound (ORIGIN_AMBIENT, sfx_swtchn);
+				S_StartSound (ORIGIN_AMBIENT, "switches/normbutn", 100);
 				return true;
 			} else {
 				currentMenu = &MainDef;
 				itemOn = currentMenu->lastOn;
-				S_StartSound (ORIGIN_AMBIENT, sfx_swtchn);
+				S_StartSound (ORIGIN_AMBIENT, "switches/normbutn", 100);
 				return false;
 			}
 
@@ -1000,19 +946,19 @@ BOOL M_OptResponder (event_t *ev)
 					}
 					OldWidth = screens[0].width;
 					OldHeight = screens[0].height;
-					OldBpp = screens[0].Bpp << 3;
-					NewBpp = (int)DummyDepthCvar.value << 3;
+					OldID = DisplayID;
+					NewID = IDTranslate[(int)DummyDepthCvar.value];
 					setmodeneeded = true;
 					testingmode = I_GetTime() + 5 * TICRATE;
-					S_StartSound(ORIGIN_AMBIENT,sfx_pistol);
-					SetModesMenu (NewWidth, NewHeight, NewBpp);
+					S_StartSound (ORIGIN_AMBIENT, "weapons/pistol", 100);
+					SetModesMenu (NewWidth, NewHeight, NewID);
 				}
 			} else if (ev->data2 == 'd' && CurrentMenu == &ModesMenu) {
 				// Make current resolution the default
 				SetCVarFloat (vid_defwidth, (float)screens[0].width);
 				SetCVarFloat (vid_defheight, (float)screens[0].height);
-				SetCVarFloat (vid_defbpp, (float)(screens[0].Bpp << 3));
-				SetModesMenu (screens[0].width, screens[0].height, screens[0].Bpp << 3);
+				SetCVar (vid_defid, IdStrings[DisplayID-1000]);
+				SetModesMenu (screens[0].width, screens[0].height, DisplayID);
 			}
 			break;
 	}
@@ -1028,8 +974,6 @@ static void GoToConsole (void)
 static void UpdateStuff (void)
 {
 	M_SizeDisplay (0.0);
-	S_SetSfxVolume ((int)snd_SfxVolume->value);
-	S_SetMusicVolume ((int)snd_MusicVolume->value);
 }
 
 void Reset2Defaults (void)
@@ -1044,8 +988,8 @@ void Reset2Saved (void)
 	char *execcommand;
 	char *configfile = GetConfigPath ();
 
-	execcommand = Malloc (strlen (configfile) + 6);
-	sprintf (execcommand, "exec %s", configfile);
+	execcommand = Malloc (strlen (configfile) + 8);
+	sprintf (execcommand, "exec \"%s\"", configfile);
 	free (configfile);
 	AddCommandString (execcommand);
 	free (execcommand);
@@ -1061,7 +1005,7 @@ static void CustomizeControls (void)
 void Cmd_Menu_Keys (void *plyr, int argc, char **argv)
 {
 	M_StartControlPanel ();
-	S_StartSound(ORIGIN_AMBIENT,sfx_swtchn);
+	S_StartSound (ORIGIN_AMBIENT, "switches/normbutn", 100);
 	OptionsActive = true;
 	CustomizeControls();
 }
@@ -1075,7 +1019,7 @@ static void GameplayOptions (void)
 void Cmd_Menu_Gameplay (void *plyr, int argc, char **argv)
 {
 	M_StartControlPanel ();
-	S_StartSound(ORIGIN_AMBIENT,sfx_swtchn);
+	S_StartSound (ORIGIN_AMBIENT, "switches/normbutn", 100);
 	OptionsActive = true;
 	GameplayOptions ();
 }
@@ -1088,20 +1032,20 @@ static void VideoOptions (void)
 void Cmd_Menu_Display (void *plyr, int argc, char **argv)
 {
 	M_StartControlPanel ();
-	S_StartSound(ORIGIN_AMBIENT,sfx_swtchn);
+	S_StartSound (ORIGIN_AMBIENT, "switches/normbutn", 100);
 	OptionsActive = true;
 	M_SwitchMenu (&VideoMenu);
 }
 
-static void BuildModesList (int hiwidth, int hiheight, int hibpp)
+static void BuildModesList (int hiwidth, int hiheight, int hi_id)
 {
 	char strtemp[32], **str;
 	int	 i, c;
-	int	 width, height, showbpp;
+	int	 width, height, showid;
 
-	showbpp = (int)DummyDepthCvar.value << 3;
+	showid = IDTranslate[(int)DummyDepthCvar.value];
 
-	I_StartModeIterator (showbpp);
+	I_StartModeIterator (showid);
 
 	for (i = VM_RESSTART; ModesItems[i].type == screenres; i++) {
 		ModesItems[i].e.highlight = -1;
@@ -1118,7 +1062,7 @@ static void BuildModesList (int hiwidth, int hiheight, int hibpp)
 					break;
 			}
 			if (I_NextMode (&width, &height)) {
-				if (/* hibpp == showbpp && */ width == hiwidth && height == hiheight)
+				if (/* hi_id == showid && */ width == hiwidth && height == hiheight)
 					ModesItems[i].e.highlight = ModesItems[i].a.selmode = c;
 				
 				sprintf (strtemp, "%dx%d", width, height);
@@ -1140,7 +1084,7 @@ static BOOL GetSelectedSize (int line, int *width, int *height)
 	if (ModesItems[line].type != screenres) {
 		return false;
 	} else {
-		I_StartModeIterator ((int)DummyDepthCvar.value * 8);
+		I_StartModeIterator (IDTranslate[(int)DummyDepthCvar.value]);
 
 		stopat = (line - VM_RESSTART) * 3 + ModesItems[line].a.selmode + 1;
 
@@ -1152,11 +1096,23 @@ static BOOL GetSelectedSize (int line, int *width, int *height)
 	return true;
 }
 
-static void SetModesMenu (int w, int h, int bpp)
+static int FindId (int id)
+{
+	int i;
+
+	for (i = 0; i < 22; i++) {
+		if (IDTranslate[i] == id)
+			return i;
+	}
+
+	return 0;
+}
+
+static void SetModesMenu (int w, int h, int id)
 {
 	char strtemp[64];
 
-	SetCVarFloat (&DummyDepthCvar, (float)(bpp >> 3));
+	SetCVarFloat (&DummyDepthCvar, (float)FindId (id));
 	SetCVarFloat (&DummyFSCvar, fullscreen->value);
 
 	if (!testingmode) {
@@ -1165,39 +1121,39 @@ static void SetModesMenu (int w, int h, int bpp)
 		ModesItems[VM_ENTERLINE].label = VMEnterText;
 		ModesItems[VM_TESTLINE].label = VMTestText;
 
-		sprintf (strtemp, "D to make %dx%dx%d the default", w, h, bpp);
+		sprintf (strtemp, "D to make %dx%d (%s) the default", w, h, IdStrings[id-1000]);
 		ReplaceString (&ModesItems[VM_MAKEDEFLINE].label, strtemp);
 
-		sprintf (strtemp, "Current default is %dx%dx%d",
+		sprintf (strtemp, "Current default is %dx%d (%s)",
 				 (int)vid_defwidth->value,
 				 (int)vid_defheight->value,
-				 (int)vid_defbpp->value);
+				 vid_defid->string);
 		ReplaceString (&ModesItems[VM_CURDEFLINE].label, strtemp);
 	} else {
-		sprintf (strtemp, "TESTING %dx%dx%d", w, h, bpp);
+		sprintf (strtemp, "TESTING %dx%d (%s)", w, h, IdStrings[id-1000]);
 		ModesItems[VM_ENTERLINE].label = copystring (strtemp);
 		ModesItems[VM_TESTLINE].label = "Please wait 5 seconds...";
 		ModesItems[VM_MAKEDEFLINE].label = copystring (" ");
 		ModesItems[VM_CURDEFLINE].label = copystring (" ");
 	}
 
-	BuildModesList (w, h, bpp);
+	BuildModesList (w, h, id);
 }
 
 void M_RestoreMode (void)
 {
 	NewWidth = OldWidth;
 	NewHeight = OldHeight;
-	NewBpp = OldBpp;
+	NewID = OldID;
 	setmodeneeded = true;
 	testingmode = 0;
 	SetCVarFloat (fullscreen, OldFS);
-	SetModesMenu (OldWidth, OldHeight, (int)DummyDepthCvar.value << 3);
+	SetModesMenu (OldWidth, OldHeight, OldID);
 }
 
 static void SetVidMode (void)
 {
-	SetModesMenu (screens[0].width, screens[0].height, screens[0].Bpp << 3);
+	SetModesMenu (screens[0].width, screens[0].height, DisplayID);
 	if (ModesMenu.items[ModesMenu.lastOn].type == screenres) {
 		if (ModesMenu.items[ModesMenu.lastOn].a.selmode == -1) {
 			ModesMenu.items[ModesMenu.lastOn].a.selmode++;
@@ -1209,7 +1165,7 @@ static void SetVidMode (void)
 void Cmd_Menu_Video (void *plyr, int argc, char **argv)
 {
 	M_StartControlPanel ();
-	S_StartSound(ORIGIN_AMBIENT,sfx_swtchn);
+	S_StartSound (ORIGIN_AMBIENT, "switches/normbutn", 100);
 	OptionsActive = true;
 	SetVidMode ();
 }
diff --git a/code/m_random.h b/code/m_random.h
index e78bd38db4..0822fe805b 100644
--- a/code/m_random.h
+++ b/code/m_random.h
@@ -101,6 +101,12 @@ typedef enum {
 	pr_throwgib,				// 49
 	pr_vel4dmg,					// 50
 	pr_gengib,					// 51
+	pr_acs,						// 52
+	pr_animatepictures,			// 53
+	pr_obituary,				// 54
+	pr_quake,					// 55
+	pr_playerscream,			// 56
+	pr_playerpain,				// 57
 	// Start new entries -- add new entries below
 
 	// End of new entries
diff --git a/code/minilzo.c b/code/minilzo.c
new file mode 100644
index 0000000000..9371064c57
--- /dev/null
+++ b/code/minilzo.c
@@ -0,0 +1,2835 @@
+/* minilzo.c -- mini subset of the LZO real-time data compression library
+
+   This file is part of the LZO real-time data compression library.
+
+   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
+
+   The LZO library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   The LZO library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with the LZO library; see the file COPYING.
+   If not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+   Markus F.X.J. Oberhumer
+   <markus.oberhumer@jk.uni-linz.ac.at>
+   http://wildsau.idv.uni-linz.ac.at/mfx/lzo.html
+ */
+
+/*
+ * NOTE:
+ *   the full LZO package can be found at
+ *   http://wildsau.idv.uni-linz.ac.at/mfx/lzo.html
+ */
+
+#define __LZO_IN_MINILZO
+
+#ifdef MINILZO_HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#undef LZO_HAVE_CONFIG_H
+#include "minilzo.h"
+
+#if !defined(MINILZO_VERSION) || (MINILZO_VERSION != 0x1040)
+#  error "version mismatch in miniLZO source files"
+#endif
+
+#ifdef MINILZO_HAVE_CONFIG_H
+#  define LZO_HAVE_CONFIG_H
+#endif
+
+#if !defined(LZO_NO_SYS_TYPES_H)
+#  include <sys/types.h>
+#endif
+#include <stdio.h>
+
+#ifndef __LZO_CONF_H
+#define __LZO_CONF_H
+
+#if !defined(__LZO_IN_MINILZO)
+#  ifndef __LZOCONF_H
+#    include <lzoconf.h>
+#  endif
+#endif
+
+#if !defined(LZO_HAVE_CONFIG_H)
+#  include <stddef.h>
+#  include <string.h>
+#  if !defined(NO_STDLIB_H)
+#    include <stdlib.h>
+#  endif
+#  define HAVE_MEMCMP
+#  define HAVE_MEMCPY
+#  define HAVE_MEMMOVE
+#  define HAVE_MEMSET
+#else
+#  include <sys/types.h>
+#  if defined(STDC_HEADERS)
+#    include <string.h>
+#    include <stdlib.h>
+#  endif
+#  if defined(HAVE_STDDEF_H)
+#    include <stddef.h>
+#  endif
+#  if defined(HAVE_MEMORY_H)
+#    include <memory.h>
+#  endif
+#endif
+
+#if defined(__LZO_DOS16) || defined(__LZO_WIN16)
+#  define HAVE_MALLOC_H
+#  define HAVE_HALLOC
+#endif
+
+#undef NDEBUG
+#if !defined(LZO_DEBUG)
+#  define NDEBUG
+#endif
+#if defined(LZO_DEBUG) || !defined(NDEBUG)
+#  if !defined(NO_STDIO_H)
+#    include <stdio.h>
+#  endif
+#endif
+#include <assert.h>
+
+#if defined(__BOUNDS_CHECKING_ON)
+#  include <unchecked.h>
+#else
+#  define BOUNDS_CHECKING_OFF_DURING(stmt)      stmt
+#  define BOUNDS_CHECKING_OFF_IN_EXPR(expr)     (expr)
+#endif
+
+#if !defined(LZO_UNUSED)
+#  define LZO_UNUSED(parm)  (parm = parm)
+#endif
+
+#if !defined(__inline__) && !defined(__GNUC__)
+#  if defined(__cplusplus)
+#    define __inline__      inline
+#  else
+#    define __inline__
+#  endif
+#endif
+
+#if defined(NO_MEMCMP)
+#  undef HAVE_MEMCMP
+#endif
+
+#if !defined(HAVE_MEMCMP)
+#  undef memcmp
+#  define memcmp    lzo_memcmp
+#endif
+#if !defined(HAVE_MEMCPY)
+#  undef memcpy
+#  define memcpy    lzo_memcpy
+#endif
+#if !defined(HAVE_MEMMOVE)
+#  undef memmove
+#  define memmove   lzo_memmove
+#endif
+#if !defined(HAVE_MEMSET)
+#  undef memset
+#  define memset    lzo_memset
+#endif
+
+#if 1
+#  define LZO_BYTE(x)       ((unsigned char) (x))
+#else
+#  define LZO_BYTE(x)       ((unsigned char) ((x) & 0xff))
+#endif
+#if 0
+#  define LZO_USHORT(x)     ((unsigned short) (x))
+#else
+#  define LZO_USHORT(x)     ((unsigned short) ((x) & 0xffff))
+#endif
+
+#define LZO_MAX(a,b)        ((a) >= (b) ? (a) : (b))
+#define LZO_MIN(a,b)        ((a) <= (b) ? (a) : (b))
+#define LZO_MAX3(a,b,c)     ((a) >= (b) ? LZO_MAX(a,c) : LZO_MAX(b,c))
+#define LZO_MIN3(a,b,c)     ((a) <= (b) ? LZO_MIN(a,c) : LZO_MIN(b,c))
+
+#define lzo_sizeof(type)    ((lzo_uint) (sizeof(type)))
+
+#define LZO_HIGH(array)     ((lzo_uint) (sizeof(array)/sizeof(*(array))))
+
+#define LZO_SIZE(bits)      (1u << (bits))
+#define LZO_MASK(bits)      (LZO_SIZE(bits) - 1)
+
+#define LZO_LSIZE(bits)     (1ul << (bits))
+#define LZO_LMASK(bits)     (LZO_LSIZE(bits) - 1)
+
+#define LZO_USIZE(bits)     ((lzo_uint) 1 << (bits))
+#define LZO_UMASK(bits)     (LZO_USIZE(bits) - 1)
+
+#define LZO_STYPE_MAX(b)    (((1l  << (8*(b)-2)) - 1l)  + (1l  << (8*(b)-2)))
+#define LZO_UTYPE_MAX(b)    (((1ul << (8*(b)-1)) - 1ul) + (1ul << (8*(b)-1)))
+
+#if !defined(SIZEOF_UNSIGNED)
+#  if (UINT_MAX == 0xffff)
+#    define SIZEOF_UNSIGNED         2
+#  elif (UINT_MAX == LZO_0xffffffffL)
+#    define SIZEOF_UNSIGNED         4
+#  elif (UINT_MAX >= LZO_0xffffffffL)
+#    define SIZEOF_UNSIGNED         8
+#  else
+#    error SIZEOF_UNSIGNED
+#  endif
+#endif
+
+#if !defined(SIZEOF_UNSIGNED_LONG)
+#  if (ULONG_MAX == LZO_0xffffffffL)
+#    define SIZEOF_UNSIGNED_LONG    4
+#  elif (ULONG_MAX >= LZO_0xffffffffL)
+#    define SIZEOF_UNSIGNED_LONG    8
+#  else
+#    error SIZEOF_UNSIGNED_LONG
+#  endif
+#endif
+
+#if !defined(SIZEOF_SIZE_T)
+#  define SIZEOF_SIZE_T             SIZEOF_UNSIGNED
+#endif
+#if !defined(SIZE_T_MAX)
+#  define SIZE_T_MAX                LZO_UTYPE_MAX(SIZEOF_SIZE_T)
+#endif
+
+#if 1 && defined(__LZO_i386) && (UINT_MAX == LZO_0xffffffffL)
+#  if !defined(LZO_UNALIGNED_OK_2) && (USHRT_MAX == 0xffff)
+#    define LZO_UNALIGNED_OK_2
+#  endif
+#  if !defined(LZO_UNALIGNED_OK_4) && (LZO_UINT32_MAX == LZO_0xffffffffL)
+#    define LZO_UNALIGNED_OK_4
+#  endif
+#endif
+
+#if defined(LZO_UNALIGNED_OK_2) || defined(LZO_UNALIGNED_OK_4)
+#  if !defined(LZO_UNALIGNED_OK)
+#    define LZO_UNALIGNED_OK
+#  endif
+#endif
+
+#if defined(__LZO_NO_UNALIGNED)
+#  undef LZO_UNALIGNED_OK
+#  undef LZO_UNALIGNED_OK_2
+#  undef LZO_UNALIGNED_OK_4
+#endif
+
+#if defined(LZO_UNALIGNED_OK_2) && (USHRT_MAX != 0xffff)
+#  error "LZO_UNALIGNED_OK_2 must not be defined on this system"
+#endif
+#if defined(LZO_UNALIGNED_OK_4) && (LZO_UINT32_MAX != LZO_0xffffffffL)
+#  error "LZO_UNALIGNED_OK_4 must not be defined on this system"
+#endif
+
+#if defined(__LZO_NO_ALIGNED)
+#  undef LZO_ALIGNED_OK_4
+#endif
+
+#if defined(LZO_ALIGNED_OK_4) && (LZO_UINT32_MAX != LZO_0xffffffffL)
+#  error "LZO_ALIGNED_OK_4 must not be defined on this system"
+#endif
+
+#define LZO_LITTLE_ENDIAN       1234
+#define LZO_BIG_ENDIAN          4321
+#define LZO_PDP_ENDIAN          3412
+
+#if !defined(LZO_BYTE_ORDER)
+#  if defined(MFX_BYTE_ORDER)
+#    define LZO_BYTE_ORDER      MFX_BYTE_ORDER
+#  elif defined(__LZO_i386)
+#    define LZO_BYTE_ORDER      LZO_LITTLE_ENDIAN
+#  elif defined(BYTE_ORDER)
+#    define LZO_BYTE_ORDER      BYTE_ORDER
+#  elif defined(__BYTE_ORDER)
+#    define LZO_BYTE_ORDER      __BYTE_ORDER
+#  endif
+#endif
+
+#if defined(LZO_BYTE_ORDER)
+#  if (LZO_BYTE_ORDER != LZO_LITTLE_ENDIAN) && \
+      (LZO_BYTE_ORDER != LZO_BIG_ENDIAN)
+#    error "invalid LZO_BYTE_ORDER"
+#  endif
+#endif
+
+#if defined(LZO_UNALIGNED_OK) && !defined(LZO_BYTE_ORDER)
+#  error "LZO_BYTE_ORDER is not defined"
+#endif
+
+#define LZO_OPTIMIZE_GNUC_i386_IS_BUGGY
+
+#if defined(NDEBUG) && !defined(LZO_DEBUG) && !defined(__BOUNDS_CHECKING_ON)
+#  if defined(__GNUC__) && defined(__i386__)
+#    if !defined(LZO_OPTIMIZE_GNUC_i386_IS_BUGGY)
+#      define LZO_OPTIMIZE_GNUC_i386
+#    endif
+#  endif
+#endif
+
+__LZO_EXTERN_C int __lzo_init_done;
+__LZO_EXTERN_C const lzo_byte __lzo_copyright[];
+LZO_EXTERN(const lzo_byte *) lzo_copyright(void);
+__LZO_EXTERN_C const lzo_uint32 _lzo_crc32_table[256];
+
+#define _LZO_STRINGIZE(x)           #x
+#define _LZO_MEXPAND(x)             _LZO_STRINGIZE(x)
+
+#define _LZO_CONCAT2(a,b)           a ## b
+#define _LZO_CONCAT3(a,b,c)         a ## b ## c
+#define _LZO_CONCAT4(a,b,c,d)       a ## b ## c ## d
+#define _LZO_CONCAT5(a,b,c,d,e)     a ## b ## c ## d ## e
+
+#define _LZO_ECONCAT2(a,b)          _LZO_CONCAT2(a,b)
+#define _LZO_ECONCAT3(a,b,c)        _LZO_CONCAT3(a,b,c)
+#define _LZO_ECONCAT4(a,b,c,d)      _LZO_CONCAT4(a,b,c,d)
+#define _LZO_ECONCAT5(a,b,c,d,e)    _LZO_CONCAT5(a,b,c,d,e)
+
+#if 0
+
+#define __LZO_IS_COMPRESS_QUERY(i,il,o,ol,w)    ((lzo_voidp)(o) == (w))
+#define __LZO_QUERY_COMPRESS(i,il,o,ol,w,n,s) \
+		(*ol = (n)*(s), LZO_E_OK)
+
+#define __LZO_IS_DECOMPRESS_QUERY(i,il,o,ol,w)  ((lzo_voidp)(o) == (w))
+#define __LZO_QUERY_DECOMPRESS(i,il,o,ol,w,n,s) \
+		(*ol = (n)*(s), LZO_E_OK)
+
+#define __LZO_IS_OPTIMIZE_QUERY(i,il,o,ol,w)    ((lzo_voidp)(o) == (w))
+#define __LZO_QUERY_OPTIMIZE(i,il,o,ol,w,n,s) \
+		(*ol = (n)*(s), LZO_E_OK)
+
+#endif
+
+#ifndef __LZO_PTR_H
+#define __LZO_PTR_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(__LZO_DOS16) || defined(__LZO_WIN16)
+#  include <dos.h>
+#  if 1 && defined(__WATCOMC__)
+#    include <i86.h>
+     __LZO_EXTERN_C unsigned char _HShift;
+#    define __LZO_HShift    _HShift
+#  elif 1 && defined(_MSC_VER)
+     __LZO_EXTERN_C unsigned short __near _AHSHIFT;
+#    define __LZO_HShift    ((unsigned) &_AHSHIFT)
+#  elif defined(__LZO_WIN16)
+#    define __LZO_HShift    3
+#  else
+#    define __LZO_HShift    12
+#  endif
+#  if !defined(_FP_SEG) && defined(FP_SEG)
+#    define _FP_SEG         FP_SEG
+#  endif
+#  if !defined(_FP_OFF) && defined(FP_OFF)
+#    define _FP_OFF         FP_OFF
+#  endif
+#endif
+
+#if (UINT_MAX >= LZO_0xffffffffL)
+   typedef ptrdiff_t            lzo_ptrdiff_t;
+#else
+   typedef long                 lzo_ptrdiff_t;
+#endif
+
+#if !defined(__LZO_HAVE_PTR_T)
+#  if defined(lzo_ptr_t)
+#    define __LZO_HAVE_PTR_T
+#  endif
+#endif
+#if !defined(__LZO_HAVE_PTR_T)
+#  if defined(SIZEOF_CHAR_P) && defined(SIZEOF_UNSIGNED_LONG)
+#    if (SIZEOF_CHAR_P == SIZEOF_UNSIGNED_LONG)
+       typedef unsigned long    lzo_ptr_t;
+       typedef long             lzo_sptr_t;
+#      define __LZO_HAVE_PTR_T
+#    endif
+#  endif
+#endif
+#if !defined(__LZO_HAVE_PTR_T)
+#  if defined(SIZEOF_CHAR_P) && defined(SIZEOF_UNSIGNED)
+#    if (SIZEOF_CHAR_P == SIZEOF_UNSIGNED)
+       typedef unsigned int     lzo_ptr_t;
+       typedef int              lzo_sptr_t;
+#      define __LZO_HAVE_PTR_T
+#    endif
+#  endif
+#endif
+#if !defined(__LZO_HAVE_PTR_T)
+#  if defined(SIZEOF_CHAR_P) && defined(SIZEOF_UNSIGNED_SHORT)
+#    if (SIZEOF_CHAR_P == SIZEOF_UNSIGNED_SHORT)
+       typedef unsigned short   lzo_ptr_t;
+       typedef short            lzo_sptr_t;
+#      define __LZO_HAVE_PTR_T
+#    endif
+#  endif
+#endif
+#if !defined(__LZO_HAVE_PTR_T)
+#  if defined(LZO_HAVE_CONFIG_H) || defined(SIZEOF_CHAR_P)
+#    error "no suitable type for lzo_ptr_t"
+#  else
+     typedef unsigned long      lzo_ptr_t;
+     typedef long               lzo_sptr_t;
+#    define __LZO_HAVE_PTR_T
+#  endif
+#endif
+
+#if defined(__LZO_DOS16) || defined(__LZO_WIN16)
+#define PTR(a)              ((lzo_bytep) (a))
+#define PTR_ALIGNED_4(a)    ((_FP_OFF(a) & 3) == 0)
+#define PTR_ALIGNED2_4(a,b) (((_FP_OFF(a) | _FP_OFF(b)) & 3) == 0)
+#else
+#define PTR(a)              ((lzo_ptr_t) (a))
+#define PTR_LINEAR(a)       PTR(a)
+#define PTR_ALIGNED_4(a)    ((PTR_LINEAR(a) & 3) == 0)
+#define PTR_ALIGNED_8(a)    ((PTR_LINEAR(a) & 7) == 0)
+#define PTR_ALIGNED2_4(a,b) (((PTR_LINEAR(a) | PTR_LINEAR(b)) & 3) == 0)
+#define PTR_ALIGNED2_8(a,b) (((PTR_LINEAR(a) | PTR_LINEAR(b)) & 7) == 0)
+#endif
+
+#define PTR_LT(a,b)         (PTR(a) < PTR(b))
+#define PTR_GE(a,b)         (PTR(a) >= PTR(b))
+#define PTR_DIFF(a,b)       ((lzo_ptrdiff_t) (PTR(a) - PTR(b)))
+
+LZO_EXTERN(lzo_ptr_t)
+__lzo_ptr_linear(const lzo_voidp ptr);
+
+typedef union
+{
+    char            a_char;
+    unsigned char   a_uchar;
+    short           a_short;
+    unsigned short  a_ushort;
+    int             a_int;
+    unsigned int    a_uint;
+    long            a_long;
+    unsigned long   a_ulong;
+    lzo_int         a_lzo_int;
+    lzo_uint        a_lzo_uint;
+    lzo_int32       a_lzo_int32;
+    lzo_uint32      a_lzo_uint32;
+    ptrdiff_t       a_ptrdiff_t;
+    lzo_ptrdiff_t   a_lzo_ptrdiff_t;
+    lzo_ptr_t       a_lzo_ptr_t;
+    char *          a_charp;
+    lzo_bytep       a_lzo_bytep;
+    lzo_bytepp      a_lzo_bytepp;
+}
+lzo_align_t;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+#define LZO_DETERMINISTIC
+
+#define LZO_DICT_USE_PTR
+#if defined(__LZO_DOS16) || defined(__LZO_WIN16) || defined(__LZO_STRICT_16BIT)
+#  undef LZO_DICT_USE_PTR
+#endif
+
+#if defined(LZO_DICT_USE_PTR)
+#  define lzo_dict_t    const lzo_bytep
+#  define lzo_dict_p    lzo_dict_t __LZO_MMODEL *
+#else
+#  define lzo_dict_t    lzo_uint
+#  define lzo_dict_p    lzo_dict_t __LZO_MMODEL *
+#endif
+
+#if !defined(lzo_moff_t)
+#define lzo_moff_t      lzo_uint
+#endif
+
+#endif
+
+LZO_PUBLIC(lzo_ptr_t)
+__lzo_ptr_linear(const lzo_voidp ptr)
+{
+    lzo_ptr_t p;
+
+#if defined(__LZO_DOS16) || defined(__LZO_WIN16)
+    p = (((lzo_ptr_t)(_FP_SEG(ptr))) << (16 - __LZO_HShift)) + (_FP_OFF(ptr));
+#else
+    p = PTR_LINEAR(ptr);
+#endif
+
+    return p;
+}
+
+LZO_PUBLIC(unsigned)
+__lzo_align_gap(const lzo_voidp ptr, lzo_uint size)
+{
+    lzo_ptr_t p, s, n;
+
+    assert(size > 0);
+
+    p = __lzo_ptr_linear(ptr);
+    s = (lzo_ptr_t) (size - 1);
+#if 0
+    assert((size & (size - 1)) == 0);
+    n = ((p + s) & ~s) - p;
+#else
+    n = (((p + s) / size) * size) - p;
+#endif
+
+    assert((long)n >= 0);
+    assert(n <= s);
+
+    return (unsigned)n;
+}
+
+#ifndef __LZO_UTIL_H
+#define __LZO_UTIL_H
+
+#ifndef __LZO_CONF_H
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if 1 && defined(HAVE_MEMCPY)
+#if !defined(__LZO_DOS16) && !defined(__LZO_WIN16)
+
+#define MEMCPY8_DS(dest,src,len) \
+    memcpy(dest,src,len); \
+    dest += len; \
+    src += len
+
+#endif
+#endif
+
+#if 0 && !defined(MEMCPY8_DS)
+
+#define MEMCPY8_DS(dest,src,len) \
+    { do { \
+	*dest++ = *src++; \
+	*dest++ = *src++; \
+	*dest++ = *src++; \
+	*dest++ = *src++; \
+	*dest++ = *src++; \
+	*dest++ = *src++; \
+	*dest++ = *src++; \
+	*dest++ = *src++; \
+	len -= 8; \
+    } while (len > 0); }
+
+#endif
+
+#if !defined(MEMCPY8_DS)
+
+#define MEMCPY8_DS(dest,src,len) \
+    { register lzo_uint __l = (len) / 8; \
+    do { \
+	*dest++ = *src++; \
+	*dest++ = *src++; \
+	*dest++ = *src++; \
+	*dest++ = *src++; \
+	*dest++ = *src++; \
+	*dest++ = *src++; \
+	*dest++ = *src++; \
+	*dest++ = *src++; \
+    } while (--__l > 0); }
+
+#endif
+
+#define MEMCPY_DS(dest,src,len) \
+    do *dest++ = *src++; \
+    while (--len > 0)
+
+#define MEMMOVE_DS(dest,src,len) \
+    do *dest++ = *src++; \
+    while (--len > 0)
+
+#if 0 && defined(LZO_OPTIMIZE_GNUC_i386)
+
+#define BZERO8_PTR(s,l,n) \
+__asm__ __volatile__( \
+    "movl  %0,%%eax \n"             \
+    "movl  %1,%%edi \n"             \
+    "movl  %2,%%ecx \n"             \
+    "cld \n"                        \
+    "rep \n"                        \
+    "stosl %%eax,(%%edi) \n"        \
+    :               \
+    :"g" (0),"g" (s),"g" (n)        \
+    :"eax","edi","ecx", "memory", "cc" \
+)
+
+#elif (LZO_UINT_MAX <= SIZE_T_MAX) && defined(HAVE_MEMSET)
+
+#define BZERO8_PTR(s,l,n) \
+    memset((lzo_voidp)(s),0,(lzo_uint)(l)*(n))
+
+#else
+
+#define BZERO8_PTR(s,l,n) \
+    lzo_memset((lzo_voidp)(s),0,(lzo_uint)(l)*(n))
+
+#endif
+
+#if 0
+#if defined(__GNUC__) && defined(__i386__)
+
+unsigned char lzo_rotr8(unsigned char value, int shift);
+extern __inline__ unsigned char lzo_rotr8(unsigned char value, int shift)
+{
+    unsigned char result;
+
+    __asm__ __volatile__ ("movb %b1, %b0; rorb %b2, %b0"
+			: "=a"(result) : "g"(value), "c"(shift));
+    return result;
+}
+
+unsigned short lzo_rotr16(unsigned short value, int shift);
+extern __inline__ unsigned short lzo_rotr16(unsigned short value, int shift)
+{
+    unsigned short result;
+
+    __asm__ __volatile__ ("movw %b1, %b0; rorw %b2, %b0"
+			: "=a"(result) : "g"(value), "c"(shift));
+    return result;
+}
+
+#endif
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+LZO_PUBLIC(lzo_bool)
+lzo_assert(int expr)
+{
+    return (expr) ? 1 : 0;
+}
+
+/* If you use the LZO library in a product, you *must* keep this
+ * copyright string in the executable of your product.
+ */
+
+const lzo_byte __lzo_copyright[] =
+    "\n\n\n"
+    "LZO real-time data compression library.\n"
+    "Copyright (C) 1996, 1997, 1998 Markus Franz Xaver Johannes Oberhumer\n"
+    "<markus.oberhumer@jk.uni-linz.ac.at>\n"
+    "http://wildsau.idv.uni-linz.ac.at/mfx/lzo.html\n"
+    "\n"
+    "LZO version: v" LZO_VERSION_STRING ", " LZO_VERSION_DATE "\n"
+    "LZO build date: " __DATE__ " " __TIME__ "\n\n"
+    "LZO special compilation options:\n"
+#ifdef __cplusplus
+    " __cplusplus\n"
+#endif
+#ifdef __pic__
+    " __pic__\n"
+#endif
+#ifdef __PIC__
+    " __PIC__\n"
+#endif
+#if (UINT_MAX < LZO_0xffffffffL)
+    " 16BIT\n"
+#endif
+#if defined(__LZO_STRICT_16BIT)
+    " __LZO_STRICT_16BIT\n"
+#endif
+#if (UINT_MAX > LZO_0xffffffffL)
+    " UINT_MAX=" _LZO_MEXPAND(UINT_MAX) "\n"
+#endif
+#if (ULONG_MAX > LZO_0xffffffffL)
+    " ULONG_MAX=" _LZO_MEXPAND(ULONG_MAX) "\n"
+#endif
+#if defined(LZO_BYTE_ORDER)
+    " LZO_BYTE_ORDER=" _LZO_MEXPAND(LZO_BYTE_ORDER) "\n"
+#endif
+#if defined(LZO_UNALIGNED_OK_2)
+    " LZO_UNALIGNED_OK_2\n"
+#endif
+#if defined(LZO_UNALIGNED_OK_4)
+    " LZO_UNALIGNED_OK_4\n"
+#endif
+#if defined(LZO_ALIGNED_OK_4)
+    " LZO_ALIGNED_OK_4\n"
+#endif
+#if defined(LZO_DICT_USE_PTR)
+    " LZO_DICT_USE_PTR\n"
+#endif
+#if defined(__LZO_QUERY_COMPRESS)
+    " __LZO_QUERY_COMPRESS\n"
+#endif
+#if defined(__LZO_QUERY_DECOMPRESS)
+    " __LZO_QUERY_DECOMPRESS\n"
+#endif
+#if defined(__LZO_IN_MINILZO)
+    " __LZO_IN_MINILZO\n"
+#endif
+    "\n\n"
+    "$Id: LZO " LZO_VERSION_STRING " built " __DATE__ " " __TIME__
+#if defined(__GNUC__) && defined(__VERSION__)
+    " by gcc " __VERSION__
+#elif defined(__BORLANDC__)
+    " by Borland C " _LZO_MEXPAND(__BORLANDC__)
+#elif defined(_MSC_VER)
+    " by Microsoft C " _LZO_MEXPAND(_MSC_VER)
+#elif defined(__PUREC__)
+    " by Pure C " _LZO_MEXPAND(__PUREC__)
+#elif defined(__SC__)
+    " by Symantec C " _LZO_MEXPAND(__SC__)
+#elif defined(__TURBOC__)
+    " by Turbo C " _LZO_MEXPAND(__TURBOC__)
+#elif defined(__WATCOMC__)
+    " by Watcom C " _LZO_MEXPAND(__WATCOMC__)
+#endif
+    " $\n"
+    "$Copyright: LZO (C) 1996, 1997, 1998 Markus Franz Xaver Johannes Oberhumer $\n";
+
+LZO_PUBLIC(const lzo_byte *)
+lzo_copyright(void)
+{
+    return __lzo_copyright;
+}
+
+LZO_PUBLIC(unsigned)
+lzo_version(void)
+{
+    return LZO_VERSION;
+}
+
+LZO_PUBLIC(const char *)
+lzo_version_string(void)
+{
+    return LZO_VERSION_STRING;
+}
+
+LZO_PUBLIC(const char *)
+lzo_version_date(void)
+{
+    return LZO_VERSION_DATE;
+}
+
+LZO_PUBLIC(const lzo_charp)
+_lzo_version_string(void)
+{
+    return LZO_VERSION_STRING;
+}
+
+LZO_PUBLIC(const lzo_charp)
+_lzo_version_date(void)
+{
+    return LZO_VERSION_DATE;
+}
+
+#define LZO_BASE 65521u
+#define LZO_NMAX 5552
+
+#define LZO_DO1(buf,i)  {s1 += buf[i]; s2 += s1;}
+#define LZO_DO2(buf,i)  LZO_DO1(buf,i); LZO_DO1(buf,i+1);
+#define LZO_DO4(buf,i)  LZO_DO2(buf,i); LZO_DO2(buf,i+2);
+#define LZO_DO8(buf,i)  LZO_DO4(buf,i); LZO_DO4(buf,i+4);
+#define LZO_DO16(buf,i) LZO_DO8(buf,i); LZO_DO8(buf,i+8);
+
+LZO_PUBLIC(lzo_uint32)
+lzo_adler32(lzo_uint32 adler, const lzo_byte *buf, lzo_uint len)
+{
+    lzo_uint32 s1 = adler & 0xffff;
+    lzo_uint32 s2 = (adler >> 16) & 0xffff;
+    int k;
+
+    if (buf == NULL)
+	return 1;
+
+    while (len > 0)
+    {
+	k = len < LZO_NMAX ? (int) len : LZO_NMAX;
+	len -= k;
+	if (k >= 16) do
+	{
+	    LZO_DO16(buf,0);
+	    buf += 16;
+	    k -= 16;
+	} while (k >= 16);
+	if (k != 0) do
+	{
+	    s1 += *buf++;
+	    s2 += s1;
+	} while (--k > 0);
+	s1 %= LZO_BASE;
+	s2 %= LZO_BASE;
+    }
+    return (s2 << 16) | s1;
+}
+
+LZO_PUBLIC(int)
+lzo_memcmp(const lzo_voidp s1, const lzo_voidp s2, lzo_uint len)
+{
+#if (LZO_UINT_MAX <= SIZE_T_MAX) && defined(HAVE_MEMCMP)
+    return memcmp(s1,s2,len);
+#else
+    const lzo_byte *p1 = (const lzo_byte *) s1;
+    const lzo_byte *p2 = (const lzo_byte *) s2;
+    int d;
+
+    if (len > 0) do
+    {
+	d = *p1 - *p2;
+	if (d != 0)
+	    return d;
+	p1++;
+	p2++;
+    }
+    while (--len > 0);
+    return 0;
+#endif
+}
+
+LZO_PUBLIC(lzo_voidp)
+lzo_memcpy(lzo_voidp dest, const lzo_voidp src, lzo_uint len)
+{
+#if (LZO_UINT_MAX <= SIZE_T_MAX) && defined(HAVE_MEMCPY)
+    return memcpy(dest,src,len);
+#else
+    lzo_byte *p1 = (lzo_byte *) dest;
+    const lzo_byte *p2 = (const lzo_byte *) src;
+
+    if (len <= 0 || p1 == p2)
+	return dest;
+    do
+	*p1++ = *p2++;
+    while (--len > 0);
+    return dest;
+#endif
+}
+
+LZO_PUBLIC(lzo_voidp)
+lzo_memmove(lzo_voidp dest, const lzo_voidp src, lzo_uint len)
+{
+#if (LZO_UINT_MAX <= SIZE_T_MAX) && defined(HAVE_MEMMOVE)
+    return memmove(dest,src,len);
+#else
+    lzo_byte *p1 = (lzo_byte *) dest;
+    const lzo_byte *p2 = (const lzo_byte *) src;
+
+    if (len <= 0 || p1 == p2)
+	return dest;
+
+    if (p1 < p2)
+    {
+	do
+	    *p1++ = *p2++;
+	while (--len > 0);
+    }
+    else
+    {
+	p1 += len;
+	p2 += len;
+	do
+	    *--p1 = *--p2;
+	while (--len > 0);
+    }
+    return dest;
+#endif
+}
+
+LZO_PUBLIC(lzo_voidp)
+lzo_memset(lzo_voidp s, int c, lzo_uint len)
+{
+#if (LZO_UINT_MAX <= SIZE_T_MAX) && defined(HAVE_MEMSET)
+    return memset(s,c,len);
+#else
+    lzo_byte *p = (lzo_byte *) s;
+
+    if (len > 0) do
+	*p++ = LZO_BYTE(c);
+    while (--len > 0);
+    return s;
+#endif
+}
+
+#include <stdio.h>
+
+#if 0
+#  define IS_SIGNED(type)       (((type) (1ul << (8 * sizeof(type) - 1))) < 0)
+#  define IS_UNSIGNED(type)     (((type) (1ul << (8 * sizeof(type) - 1))) > 0)
+#else
+#  define IS_SIGNED(type)       (((type) (-1)) < ((type) 0))
+#  define IS_UNSIGNED(type)     (((type) (-1)) > ((type) 0))
+#endif
+
+static lzo_bool schedule_insns_bug(void);
+static lzo_bool strength_reduce_bug(int *);
+
+#if 0 || defined(LZO_DEBUG)
+static lzo_bool __lzo_assert_fail(const char *s, unsigned line)
+{
+#if defined(__palmos__)
+    printf("LZO assertion failed in line %u: '%s'\n",line,s);
+#else
+    fprintf(stderr,"LZO assertion failed in line %u: '%s'\n",line,s);
+#endif
+    return 0;
+}
+#  define __lzo_assert(x)   ((x) ? 1 : __lzo_assert_fail(#x,__LINE__))
+#else
+#  define __lzo_assert(x)   ((x) ? 1 : 0)
+#endif
+
+static lzo_bool basic_integral_check(void)
+{
+    lzo_bool r = 1;
+    lzo_bool sanity;
+
+    r &= __lzo_assert(CHAR_BIT == 8);
+    r &= __lzo_assert(sizeof(char) == 1);
+    r &= __lzo_assert(sizeof(short) >= 2);
+    r &= __lzo_assert(sizeof(long) >= 4);
+    r &= __lzo_assert(sizeof(int) >= sizeof(short));
+    r &= __lzo_assert(sizeof(long) >= sizeof(int));
+
+    r &= __lzo_assert(sizeof(lzo_uint32) >= 4);
+    r &= __lzo_assert(sizeof(lzo_uint32) >= sizeof(unsigned));
+#if defined(__LZO_STRICT_16BIT)
+    r &= __lzo_assert(sizeof(lzo_uint) == 2);
+#else
+    r &= __lzo_assert(sizeof(lzo_uint) >= 4);
+    r &= __lzo_assert(sizeof(lzo_uint) >= sizeof(unsigned));
+#endif
+
+#if defined(SIZEOF_UNSIGNED)
+    r &= __lzo_assert(SIZEOF_UNSIGNED == sizeof(unsigned));
+#endif
+#if defined(SIZEOF_UNSIGNED_LONG)
+    r &= __lzo_assert(SIZEOF_UNSIGNED_LONG == sizeof(unsigned long));
+#endif
+#if defined(SIZEOF_UNSIGNED_SHORT)
+    r &= __lzo_assert(SIZEOF_UNSIGNED_SHORT == sizeof(unsigned short));
+#endif
+#if !defined(__LZO_IN_MINILZO)
+#if defined(SIZEOF_SIZE_T)
+    r &= __lzo_assert(SIZEOF_SIZE_T == sizeof(size_t));
+#endif
+#endif
+
+    sanity = IS_UNSIGNED(unsigned short) && IS_UNSIGNED(unsigned) &&
+	     IS_UNSIGNED(unsigned long) &&
+	     IS_SIGNED(short) && IS_SIGNED(int) && IS_SIGNED(long);
+    if (sanity)
+    {
+	r &= __lzo_assert(IS_UNSIGNED(lzo_uint32));
+	r &= __lzo_assert(IS_UNSIGNED(lzo_uint));
+	r &= __lzo_assert(IS_SIGNED(lzo_int32));
+	r &= __lzo_assert(IS_SIGNED(lzo_int));
+
+	r &= __lzo_assert(INT_MAX    == LZO_STYPE_MAX(sizeof(int)));
+	r &= __lzo_assert(UINT_MAX   == LZO_UTYPE_MAX(sizeof(unsigned)));
+	r &= __lzo_assert(LONG_MAX   == LZO_STYPE_MAX(sizeof(long)));
+	r &= __lzo_assert(ULONG_MAX  == LZO_UTYPE_MAX(sizeof(unsigned long)));
+	r &= __lzo_assert(SHRT_MAX   == LZO_STYPE_MAX(sizeof(short)));
+	r &= __lzo_assert(USHRT_MAX  == LZO_UTYPE_MAX(sizeof(unsigned short)));
+	r &= __lzo_assert(LZO_UINT32_MAX == LZO_UTYPE_MAX(sizeof(lzo_uint32)));
+	r &= __lzo_assert(LZO_UINT_MAX   == LZO_UTYPE_MAX(sizeof(lzo_uint)));
+#if !defined(__LZO_IN_MINILZO)
+	r &= __lzo_assert(SIZE_T_MAX     == LZO_UTYPE_MAX(sizeof(size_t)));
+#endif
+    }
+
+#if 0
+    r &= __lzo_assert(LZO_BYTE(257) == 1);
+    r &= __lzo_assert(LZO_USHORT(65537L) == 1);
+#endif
+
+    return r;
+}
+
+static lzo_bool basic_ptr_check(void)
+{
+    lzo_bool r = 1;
+    lzo_bool sanity;
+
+    r &= __lzo_assert(sizeof(char *) >= sizeof(int));
+    r &= __lzo_assert(sizeof(lzo_byte *) >= sizeof(char *));
+
+    r &= __lzo_assert(sizeof(lzo_voidp) == sizeof(lzo_byte *));
+    r &= __lzo_assert(sizeof(lzo_voidp) == sizeof(lzo_voidpp));
+    r &= __lzo_assert(sizeof(lzo_voidp) == sizeof(lzo_bytepp));
+    r &= __lzo_assert(sizeof(lzo_voidp) >= sizeof(lzo_uint));
+
+    r &= __lzo_assert(sizeof(lzo_ptr_t) == sizeof(lzo_voidp));
+    r &= __lzo_assert(sizeof(lzo_ptr_t) >= sizeof(lzo_uint));
+
+    r &= __lzo_assert(sizeof(lzo_ptrdiff_t) >= 4);
+    r &= __lzo_assert(sizeof(lzo_ptrdiff_t) >= sizeof(ptrdiff_t));
+
+#if defined(SIZEOF_CHAR_P)
+    r &= __lzo_assert(SIZEOF_CHAR_P == sizeof(char *));
+#endif
+#if defined(SIZEOF_PTRDIFF_T)
+    r &= __lzo_assert(SIZEOF_PTRDIFF_T == sizeof(ptrdiff_t));
+#endif
+
+    sanity = IS_UNSIGNED(unsigned short) && IS_UNSIGNED(unsigned) &&
+	     IS_UNSIGNED(unsigned long) &&
+	     IS_SIGNED(short) && IS_SIGNED(int) && IS_SIGNED(long);
+    if (sanity)
+    {
+	r &= __lzo_assert(IS_UNSIGNED(lzo_ptr_t));
+	r &= __lzo_assert(IS_UNSIGNED(lzo_moff_t));
+	r &= __lzo_assert(IS_SIGNED(lzo_ptrdiff_t));
+	r &= __lzo_assert(IS_SIGNED(lzo_sptr_t));
+    }
+
+    return r;
+}
+
+static lzo_bool ptr_check(void)
+{
+    lzo_bool r = 1;
+    int i;
+    char _wrkmem[10 * sizeof(lzo_byte *) + sizeof(lzo_align_t)];
+    lzo_byte *wrkmem;
+    const lzo_bytepp dict;
+    unsigned char x[4 * sizeof(lzo_align_t)];
+    long d;
+    lzo_align_t a;
+
+    for (i = 0; i < (int) sizeof(x); i++)
+	x[i] = LZO_BYTE(i);
+
+    wrkmem = (lzo_byte *) LZO_PTR_ALIGN_UP(_wrkmem,sizeof(lzo_align_t));
+    dict = (const lzo_bytepp) wrkmem;
+
+    d = (long) ((lzo_bytep) dict - (lzo_bytep) _wrkmem);
+    r &= __lzo_assert(d >= 0);
+    r &= __lzo_assert(d < (long) sizeof(lzo_align_t));
+
+    memset(&a,0xff,sizeof(a));
+    r &= __lzo_assert(a.a_ushort == USHRT_MAX);
+    r &= __lzo_assert(a.a_uint == UINT_MAX);
+    r &= __lzo_assert(a.a_ulong == ULONG_MAX);
+    r &= __lzo_assert(a.a_lzo_uint == LZO_UINT_MAX);
+
+    if (r == 1)
+    {
+	for (i = 0; i < 8; i++)
+	    r &= __lzo_assert((lzo_voidp) (&dict[i]) == (lzo_voidp) (&wrkmem[i * sizeof(lzo_byte *)]));
+    }
+
+    memset(&a,0,sizeof(a));
+    r &= __lzo_assert(a.a_charp == NULL);
+    r &= __lzo_assert(a.a_lzo_bytep == NULL);
+    r &= __lzo_assert(NULL == 0);
+    if (r == 1)
+    {
+	for (i = 0; i < 10; i++)
+	    dict[i] = wrkmem;
+	BZERO8_PTR(dict+1,sizeof(dict[0]),8);
+	r &= __lzo_assert(dict[0] == wrkmem);
+	for (i = 1; i < 9; i++)
+	    r &= __lzo_assert(dict[i] == NULL);
+	r &= __lzo_assert(dict[9] == wrkmem);
+    }
+
+    if (r == 1)
+    {
+	unsigned k = 1;
+	const unsigned n = (unsigned) sizeof(lzo_uint32);
+	lzo_byte *p0;
+	lzo_byte *p1;
+
+	k += __lzo_align_gap(&x[k],n);
+	p0 = (lzo_bytep) &x[k];
+#if defined(PTR_LINEAR)
+	r &= __lzo_assert((PTR_LINEAR(p0) & (n-1)) == 0);
+#else
+	r &= __lzo_assert(n == 4);
+	r &= __lzo_assert(PTR_ALIGNED_4(p0));
+#endif
+
+	r &= __lzo_assert(k >= 1);
+	p1 = (lzo_bytep) &x[1];
+	r &= __lzo_assert(PTR_GE(p0,p1));
+
+	r &= __lzo_assert(k < 1+n);
+	p1 = (lzo_bytep) &x[1+n];
+	r &= __lzo_assert(PTR_LT(p0,p1));
+
+	if (r == 1)
+	{
+	    lzo_uint32 v0 = * (lzo_uint32 *) &x[k];
+	    lzo_uint32 v1 = * (lzo_uint32 *) &x[k+n];
+
+	    r &= __lzo_assert(v0 > 0);
+	    r &= __lzo_assert(v1 > 0);
+	}
+    }
+
+    return r;
+}
+
+LZO_PUBLIC(int)
+_lzo_config_check(void)
+{
+    lzo_bool r = 1;
+    int i;
+    lzo_uint32 adler;
+    union {
+	lzo_uint32 a;
+	unsigned short b;
+	lzo_uint32 aa[4];
+	unsigned char x[4*sizeof(lzo_align_t)];
+    } u;
+
+#if 0
+    r &= __lzo_assert((const void *)&u == (const void *)&u.a);
+    r &= __lzo_assert((const void *)&u == (const void *)&u.b);
+    r &= __lzo_assert((const void *)&u == (const void *)&u.x[0]);
+    r &= __lzo_assert((const void *)&u == (const void *)&u.aa[0]);
+#endif
+
+    r &= basic_integral_check();
+    r &= basic_ptr_check();
+    if (r != 1)
+	return LZO_E_ERROR;
+
+    for (i = 0; i < (int) sizeof(u.x); i++)
+	u.x[i] = LZO_BYTE(i);
+
+#if 0
+    r &= __lzo_assert( (int) (unsigned char) ((char) -1) == 255);
+#endif
+
+#if defined(LZO_BYTE_ORDER)
+    if (r == 1)
+    {
+#  if (LZO_BYTE_ORDER == LZO_LITTLE_ENDIAN)
+	lzo_uint32 a = (lzo_uint32) (u.a & LZO_0xffffffffL);
+	unsigned short b = (unsigned short) (u.b & 0xffff);
+	r &= __lzo_assert(a == 0x03020100L);
+	r &= __lzo_assert(b == 0x0100);
+#  elif (LZO_BYTE_ORDER == LZO_BIG_ENDIAN)
+	lzo_uint32 a = u.a >> (8 * sizeof(u.a) - 32);
+	unsigned short b = u.b >> (8 * sizeof(u.b) - 16);
+	r &= __lzo_assert(a == 0x00010203L);
+	r &= __lzo_assert(b == 0x0001);
+#  else
+#    error invalid LZO_BYTE_ORDER
+#  endif
+    }
+#endif
+
+#if defined(LZO_UNALIGNED_OK_2)
+    r &= __lzo_assert(sizeof(short) == 2);
+    if (r == 1)
+    {
+	unsigned short b[4];
+
+	for (i = 0; i < 4; i++)
+	    b[i] = * (const unsigned short *) &u.x[i];
+
+#  if (LZO_BYTE_ORDER == LZO_LITTLE_ENDIAN)
+	r &= __lzo_assert(b[0] == 0x0100);
+	r &= __lzo_assert(b[1] == 0x0201);
+	r &= __lzo_assert(b[2] == 0x0302);
+	r &= __lzo_assert(b[3] == 0x0403);
+#  elif (LZO_BYTE_ORDER == LZO_BIG_ENDIAN)
+	r &= __lzo_assert(b[0] == 0x0001);
+	r &= __lzo_assert(b[1] == 0x0102);
+	r &= __lzo_assert(b[2] == 0x0203);
+	r &= __lzo_assert(b[3] == 0x0304);
+#  endif
+    }
+#endif
+
+#if defined(LZO_UNALIGNED_OK_4)
+    r &= __lzo_assert(sizeof(lzo_uint32) == 4);
+    if (r == 1)
+    {
+	lzo_uint32 a[4];
+
+	for (i = 0; i < 4; i++)
+	    a[i] = * (const lzo_uint32 *) &u.x[i];
+
+#  if (LZO_BYTE_ORDER == LZO_LITTLE_ENDIAN)
+	r &= __lzo_assert(a[0] == 0x03020100L);
+	r &= __lzo_assert(a[1] == 0x04030201L);
+	r &= __lzo_assert(a[2] == 0x05040302L);
+	r &= __lzo_assert(a[3] == 0x06050403L);
+#  elif (LZO_BYTE_ORDER == LZO_BIG_ENDIAN)
+	r &= __lzo_assert(a[0] == 0x00010203L);
+	r &= __lzo_assert(a[1] == 0x01020304L);
+	r &= __lzo_assert(a[2] == 0x02030405L);
+	r &= __lzo_assert(a[3] == 0x03040506L);
+#  endif
+    }
+#endif
+
+#if defined(LZO_ALIGNED_OK_4)
+    r &= __lzo_assert(sizeof(lzo_uint32) == 4);
+#endif
+
+    r &= __lzo_assert(lzo_sizeof_dict_t == sizeof(lzo_dict_t));
+
+    if (r == 1)
+    {
+	adler = lzo_adler32(0, NULL, 0);
+	adler = lzo_adler32(adler, lzo_copyright(), 200);
+	r &= __lzo_assert(adler == 0xfc1c43c4L);
+    }
+
+    if (r == 1)
+    {
+	r &= __lzo_assert(!schedule_insns_bug());
+    }
+
+    if (r == 1)
+    {
+	static int x[3];
+	static unsigned xn = 3;
+	register unsigned j;
+
+	for (j = 0; j < xn; j++)
+	    x[j] = (int)j - 3;
+	r &= __lzo_assert(!strength_reduce_bug(x));
+    }
+
+    if (r == 1)
+    {
+	r &= ptr_check();
+    }
+
+    return r == 1 ? LZO_E_OK : LZO_E_ERROR;
+}
+
+static lzo_bool schedule_insns_bug(void)
+{
+    const int clone[] = {1, 2, 0};
+    const int *q;
+    q = clone;
+    if (*q)
+	return 0;
+    return 1;
+}
+
+static lzo_bool strength_reduce_bug(int *x)
+{
+    return x[0] != -3 || x[1] != -2 || x[2] != -1;
+}
+
+int __lzo_init_done = 0;
+
+LZO_PUBLIC(int)
+__lzo_init2(unsigned v, int s1, int s2, int s3, int s4, int s5,
+			int s6, int s7, int s8, int s9)
+{
+    int r;
+
+    __lzo_init_done = 1;
+
+    if (v == 0)
+	return LZO_E_ERROR;
+
+    r = (s1 == -1 || s1 == (int) sizeof(short)) &&
+	(s2 == -1 || s2 == (int) sizeof(int)) &&
+	(s3 == -1 || s3 == (int) sizeof(long)) &&
+	(s4 == -1 || s4 == (int) sizeof(lzo_uint32)) &&
+	(s5 == -1 || s5 == (int) sizeof(lzo_uint)) &&
+	(s6 == -1 || s6 == (int) lzo_sizeof_dict_t) &&
+	(s7 == -1 || s7 == (int) sizeof(char *)) &&
+	(s8 == -1 || s8 == (int) sizeof(lzo_voidp)) &&
+	(s9 == -1 || s9 == (int) sizeof(lzo_compress_t));
+    if (!r)
+	return LZO_E_ERROR;
+
+    r = _lzo_config_check();
+    if (r != LZO_E_OK)
+	return r;
+
+    return r;
+}
+
+#if !defined(__LZO_IN_MINILZO)
+
+LZO_EXTERN(int)
+__lzo_init(unsigned v,int s1,int s2,int s3,int s4,int s5,int s6,int s7);
+
+LZO_PUBLIC(int)
+__lzo_init(unsigned v,int s1,int s2,int s3,int s4,int s5,int s6,int s7)
+{
+    if (v == 0 || v > 0x1010)
+	return LZO_E_ERROR;
+    return __lzo_init2(v,s1,s2,s3,s4,s5,-1,-1,s6,s7);
+}
+
+#endif
+
+#define do_compress         _lzo1x_1_do_compress
+
+#define LZO_NEED_DICT_H
+#define D_BITS          14
+#define D_INDEX1(d,p)       d = DM((0x21*DX3(p,5,5,6)) >> 5)
+#define D_INDEX2(d,p)       d = (d & (D_MASK & 0x7ff)) ^ (D_HIGH | 0x1f)
+
+#ifndef __LZO_CONFIG1X_H
+#define __LZO_CONFIG1X_H
+
+#if !defined(LZO1X) && !defined(LZO1Y) && !defined(LZO1Z)
+#  define LZO1X
+#endif
+
+#if !defined(__LZO_IN_MINILZO)
+#include <lzo1x.h>
+#endif
+
+#define LZO_EOF_CODE
+#undef LZO_DETERMINISTIC
+
+#define M1_MAX_OFFSET   0x0400
+#ifndef M2_MAX_OFFSET
+#define M2_MAX_OFFSET   0x0800
+#endif
+#define M3_MAX_OFFSET   0x4000
+#define M4_MAX_OFFSET   0xbfff
+
+#define MX_MAX_OFFSET   (M1_MAX_OFFSET + M2_MAX_OFFSET)
+
+#define M1_MIN_LEN      2
+#define M1_MAX_LEN      2
+#define M2_MIN_LEN      3
+#ifndef M2_MAX_LEN
+#define M2_MAX_LEN      8
+#endif
+#define M3_MIN_LEN      3
+#define M3_MAX_LEN      33
+#define M4_MIN_LEN      3
+#define M4_MAX_LEN      9
+
+#define M1_MARKER       0
+#define M2_MARKER       64
+#define M3_MARKER       32
+#define M4_MARKER       16
+
+#ifndef MIN_LOOKAHEAD
+#define MIN_LOOKAHEAD       (M2_MAX_LEN + 1)
+#endif
+
+#if defined(LZO_NEED_DICT_H)
+
+#ifndef LZO_HASH
+#define LZO_HASH            LZO_HASH_LZO_INCREMENTAL_B
+#endif
+#define DL_MIN_LEN          M2_MIN_LEN
+
+#ifndef __LZO_DICT_H
+#define __LZO_DICT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if !defined(D_BITS) && defined(DBITS)
+#  define D_BITS        DBITS
+#endif
+#if !defined(D_BITS)
+#  error D_BITS is not defined
+#endif
+#if (D_BITS < 16)
+#  define D_SIZE        LZO_SIZE(D_BITS)
+#  define D_MASK        LZO_MASK(D_BITS)
+#else
+#  define D_SIZE        LZO_USIZE(D_BITS)
+#  define D_MASK        LZO_UMASK(D_BITS)
+#endif
+#define D_HIGH          ((D_MASK >> 1) + 1)
+
+#if !defined(DD_BITS)
+#  define DD_BITS       0
+#endif
+#define DD_SIZE         LZO_SIZE(DD_BITS)
+#define DD_MASK         LZO_MASK(DD_BITS)
+
+#if !defined(DL_BITS)
+#  define DL_BITS       (D_BITS - DD_BITS)
+#endif
+#if (DL_BITS < 16)
+#  define DL_SIZE       LZO_SIZE(DL_BITS)
+#  define DL_MASK       LZO_MASK(DL_BITS)
+#else
+#  define DL_SIZE       LZO_USIZE(DL_BITS)
+#  define DL_MASK       LZO_UMASK(DL_BITS)
+#endif
+
+#if (D_BITS != DL_BITS + DD_BITS)
+#  error D_BITS does not match
+#endif
+#if (D_BITS < 8 || D_BITS > 18)
+#  error invalid D_BITS
+#endif
+#if (DL_BITS < 8 || DL_BITS > 20)
+#  error invalid DL_BITS
+#endif
+#if (DD_BITS < 0 || DD_BITS > 6)
+#  error invalid DD_BITS
+#endif
+
+#if !defined(DL_MIN_LEN)
+#  define DL_MIN_LEN    3
+#endif
+#if !defined(DL_SHIFT)
+#  define DL_SHIFT      ((DL_BITS + (DL_MIN_LEN - 1)) / DL_MIN_LEN)
+#endif
+
+#define LZO_HASH_GZIP                   1
+#define LZO_HASH_GZIP_INCREMENTAL       2
+#define LZO_HASH_LZO_INCREMENTAL_A      3
+#define LZO_HASH_LZO_INCREMENTAL_B      4
+
+#if !defined(LZO_HASH)
+#  error choose a hashing strategy
+#endif
+
+#if (DL_MIN_LEN == 3)
+#  define _DV2_A(p,shift1,shift2) \
+	(((( (lzo_uint32)((p)[0]) << shift1) ^ (p)[1]) << shift2) ^ (p)[2])
+#  define _DV2_B(p,shift1,shift2) \
+	(((( (lzo_uint32)((p)[2]) << shift1) ^ (p)[1]) << shift2) ^ (p)[0])
+#  define _DV3_B(p,shift1,shift2,shift3) \
+	((_DV2_B((p)+1,shift1,shift2) << (shift3)) ^ (p)[0])
+#elif (DL_MIN_LEN == 2)
+#  define _DV2_A(p,shift1,shift2) \
+	(( (lzo_uint32)(p[0]) << shift1) ^ p[1])
+#  define _DV2_B(p,shift1,shift2) \
+	(( (lzo_uint32)(p[1]) << shift1) ^ p[2])
+#else
+#  error invalid DL_MIN_LEN
+#endif
+#define _DV_A(p,shift)      _DV2_A(p,shift,shift)
+#define _DV_B(p,shift)      _DV2_B(p,shift,shift)
+#define DA2(p,s1,s2) \
+	(((((lzo_uint32)((p)[2]) << (s2)) + (p)[1]) << (s1)) + (p)[0])
+#define DS2(p,s1,s2) \
+	(((((lzo_uint32)((p)[2]) << (s2)) - (p)[1]) << (s1)) - (p)[0])
+#define DX2(p,s1,s2) \
+	(((((lzo_uint32)((p)[2]) << (s2)) ^ (p)[1]) << (s1)) ^ (p)[0])
+#define DA3(p,s1,s2,s3) ((DA2((p)+1,s2,s3) << (s1)) + (p)[0])
+#define DS3(p,s1,s2,s3) ((DS2((p)+1,s2,s3) << (s1)) - (p)[0])
+#define DX3(p,s1,s2,s3) ((DX2((p)+1,s2,s3) << (s1)) ^ (p)[0])
+#define DMS(v,s)        ((lzo_uint) (((v) & (D_MASK >> (s))) << (s)))
+#define DM(v)           DMS(v,0)
+
+#if (LZO_HASH == LZO_HASH_GZIP)
+#  define _DINDEX(dv,p)     (_DV_A((p),DL_SHIFT))
+
+#elif (LZO_HASH == LZO_HASH_GZIP_INCREMENTAL)
+#  define __LZO_HASH_INCREMENTAL
+#  define DVAL_FIRST(dv,p)  dv = _DV_A((p),DL_SHIFT)
+#  define DVAL_NEXT(dv,p)   dv = (((dv) << DL_SHIFT) ^ p[2])
+#  define _DINDEX(dv,p)     (dv)
+#  define DVAL_LOOKAHEAD    DL_MIN_LEN
+
+#elif (LZO_HASH == LZO_HASH_LZO_INCREMENTAL_A)
+#  define __LZO_HASH_INCREMENTAL
+#  define DVAL_FIRST(dv,p)  dv = _DV_A((p),5)
+#  define DVAL_NEXT(dv,p) \
+		dv ^= (lzo_uint32)(p[-1]) << (2*5); dv = (((dv) << 5) ^ p[2])
+#  define _DINDEX(dv,p)     ((0x9f5f * (dv)) >> 5)
+#  define DVAL_LOOKAHEAD    DL_MIN_LEN
+
+#elif (LZO_HASH == LZO_HASH_LZO_INCREMENTAL_B)
+#  define __LZO_HASH_INCREMENTAL
+#  define DVAL_FIRST(dv,p)  dv = _DV_B((p),5)
+#  define DVAL_NEXT(dv,p) \
+		dv ^= p[-1]; dv = (((dv) >> 5) ^ ((lzo_uint32)(p[2]) << (2*5)))
+#  define _DINDEX(dv,p)     ((0x9f5f * (dv)) >> 5)
+#  define DVAL_LOOKAHEAD    DL_MIN_LEN
+
+#else
+#  error choose a hashing strategy
+#endif
+
+#ifndef DINDEX
+#define DINDEX(dv,p)        ((lzo_uint)((_DINDEX(dv,p)) & DL_MASK) << DD_BITS)
+#endif
+#if !defined(DINDEX1) && defined(D_INDEX1)
+#define DINDEX1             D_INDEX1
+#endif
+#if !defined(DINDEX2) && defined(D_INDEX2)
+#define DINDEX2             D_INDEX2
+#endif
+
+#if !defined(__LZO_HASH_INCREMENTAL)
+#  define DVAL_FIRST(dv,p)  ((void) 0)
+#  define DVAL_NEXT(dv,p)   ((void) 0)
+#  define DVAL_LOOKAHEAD    0
+#endif
+
+#if !defined(DVAL_ASSERT)
+#if defined(__LZO_HASH_INCREMENTAL) && !defined(NDEBUG)
+static void DVAL_ASSERT(lzo_uint32 dv, const lzo_byte *p)
+{
+    lzo_uint32 df;
+    DVAL_FIRST(df,(p));
+    assert(DINDEX(dv,p) == DINDEX(df,p));
+}
+#else
+#  define DVAL_ASSERT(dv,p) ((void) 0)
+#endif
+#endif
+
+#if defined(LZO_DICT_USE_PTR)
+#  define DENTRY(p,in)                          (p)
+#  define GINDEX(m_pos,m_off,dict,dindex,in)    m_pos = dict[dindex]
+#else
+#  define DENTRY(p,in)                          ((lzo_uint) ((p)-(in)))
+#  define GINDEX(m_pos,m_off,dict,dindex,in)    m_off = dict[dindex]
+#endif
+
+#if (DD_BITS == 0)
+
+#  define UPDATE_D(dict,drun,dv,p,in)       dict[ DINDEX(dv,p) ] = DENTRY(p,in)
+#  define UPDATE_I(dict,drun,index,p,in)    dict[index] = DENTRY(p,in)
+#  define UPDATE_P(ptr,drun,p,in)           (ptr)[0] = DENTRY(p,in)
+
+#else
+
+#  define UPDATE_D(dict,drun,dv,p,in)   \
+	dict[ DINDEX(dv,p) + drun++ ] = DENTRY(p,in); drun &= DD_MASK
+#  define UPDATE_I(dict,drun,index,p,in)    \
+	dict[ (index) + drun++ ] = DENTRY(p,in); drun &= DD_MASK
+#  define UPDATE_P(ptr,drun,p,in)   \
+	(ptr) [ drun++ ] = DENTRY(p,in); drun &= DD_MASK
+
+#endif
+
+#if defined(LZO_DICT_USE_PTR)
+
+#define LZO_CHECK_MPOS_DET(m_pos,m_off,in,ip,max_offset) \
+	(m_pos == NULL || (m_off = (lzo_moff_t) (ip - m_pos)) > max_offset)
+
+#define LZO_CHECK_MPOS_NON_DET(m_pos,m_off,in,ip,max_offset) \
+    (BOUNDS_CHECKING_OFF_IN_EXPR( \
+	(PTR_LT(m_pos,in) || \
+	 (m_off = (lzo_moff_t) PTR_DIFF(ip,m_pos)) <= 0 || \
+	  m_off > max_offset) ))
+
+#else
+
+#define LZO_CHECK_MPOS_DET(m_pos,m_off,in,ip,max_offset) \
+	(m_off == 0 || \
+	 ((m_off = (lzo_moff_t) ((ip)-(in)) - m_off) > max_offset) || \
+	 (m_pos = (ip) - (m_off), 0) )
+
+#define LZO_CHECK_MPOS_NON_DET(m_pos,m_off,in,ip,max_offset) \
+	((lzo_moff_t) ((ip)-(in)) <= m_off || \
+	 ((m_off = (lzo_moff_t) ((ip)-(in)) - m_off) > max_offset) || \
+	 (m_pos = (ip) - (m_off), 0) )
+
+#endif
+
+#if defined(LZO_DETERMINISTIC)
+#  define LZO_CHECK_MPOS    LZO_CHECK_MPOS_DET
+#else
+#  define LZO_CHECK_MPOS    LZO_CHECK_MPOS_NON_DET
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+#endif
+
+#endif
+
+#define DO_COMPRESS     lzo1x_1_compress
+
+static
+lzo_uint do_compress     ( const lzo_byte *in , lzo_uint  in_len,
+				 lzo_byte *out, lzo_uint *out_len,
+				 lzo_voidp wrkmem )
+{
+#if 0 && defined(__GNUC__) && defined(__i386__)
+    register const lzo_byte *ip __asm__("%esi");
+#else
+    register const lzo_byte *ip;
+#endif
+    lzo_byte *op;
+    const lzo_byte * const in_end = in + in_len;
+    const lzo_byte * const ip_end = in + in_len - M2_MAX_LEN - 5;
+    const lzo_byte *ii;
+    lzo_dict_p const dict = (lzo_dict_p) wrkmem;
+
+    op = out;
+    ip = in;
+    ii = ip;
+
+    ip += 4;
+    for (;;)
+    {
+#if 0 && defined(__GNUC__) && defined(__i386__)
+	register const lzo_byte *m_pos __asm__("%edi");
+#else
+	register const lzo_byte *m_pos;
+#endif
+	lzo_moff_t m_off;
+	lzo_uint m_len;
+	lzo_uint dindex;
+
+	DINDEX1(dindex,ip);
+	GINDEX(m_pos,m_off,dict,dindex,in);
+	if (LZO_CHECK_MPOS_NON_DET(m_pos,m_off,in,ip,M4_MAX_OFFSET))
+	    goto literal;
+#if 1
+	if (m_off <= M2_MAX_OFFSET || m_pos[3] == ip[3])
+	    goto try_match;
+	DINDEX2(dindex,ip);
+#endif
+	GINDEX(m_pos,m_off,dict,dindex,in);
+	if (LZO_CHECK_MPOS_NON_DET(m_pos,m_off,in,ip,M4_MAX_OFFSET))
+	    goto literal;
+	if (m_off <= M2_MAX_OFFSET || m_pos[3] == ip[3])
+	    goto try_match;
+	goto literal;
+
+try_match:
+#if 1 && defined(LZO_UNALIGNED_OK_2)
+	if (* (const lzo_ushortp) m_pos != * (const lzo_ushortp) ip)
+#else
+	if (m_pos[0] != ip[0] || m_pos[1] != ip[1])
+#endif
+	{
+	}
+	else
+	{
+	    if (m_pos[2] == ip[2])
+	    {
+#if 0
+		if (m_off <= M2_MAX_OFFSET)
+		    goto match;
+		if (lit <= 3)
+		    goto match;
+		if (lit == 3)
+		{
+		    assert(op - 2 > out); op[-2] |= LZO_BYTE(3);
+		    *op++ = *ii++; *op++ = *ii++; *op++ = *ii++;
+		    goto code_match;
+		}
+		if (m_pos[3] == ip[3])
+#endif
+		    goto match;
+	    }
+	    else
+	    {
+#if 0
+#if 0
+		if (m_off <= M1_MAX_OFFSET && lit > 0 && lit <= 3)
+#else
+		if (m_off <= M1_MAX_OFFSET && lit == 3)
+#endif
+		{
+		    register lzo_uint t;
+
+		    t = lit;
+		    assert(op - 2 > out); op[-2] |= LZO_BYTE(t);
+		    do *op++ = *ii++; while (--t > 0);
+		    assert(ii == ip);
+		    m_off -= 1;
+		    *op++ = LZO_BYTE(M1_MARKER | ((m_off & 3) << 2));
+		    *op++ = LZO_BYTE(m_off >> 2);
+		    ip += 2;
+		    goto match_done;
+		}
+#endif
+	    }
+	}
+
+literal:
+	UPDATE_I(dict,0,dindex,ip,in);
+	++ip;
+	if (ip >= ip_end)
+	    break;
+	continue;
+
+match:
+	UPDATE_I(dict,0,dindex,ip,in);
+	if (ip - ii > 0)
+	{
+	    register lzo_uint t = ip - ii;
+
+	    if (t <= 3)
+	    {
+		assert(op - 2 > out);
+		op[-2] |= LZO_BYTE(t);
+	    }
+	    else if (t <= 18)
+		*op++ = LZO_BYTE(t - 3);
+	    else
+	    {
+		register lzo_uint tt = t - 18;
+
+		*op++ = 0;
+		while (tt > 255)
+		{
+		    tt -= 255;
+		    *op++ = 0;
+		}
+		assert(tt > 0);
+		*op++ = LZO_BYTE(tt);
+	    }
+	    do *op++ = *ii++; while (--t > 0);
+	}
+
+	assert(ii == ip);
+	ip += 3;
+	if (m_pos[3] != *ip++ || m_pos[4] != *ip++ || m_pos[5] != *ip++ ||
+	    m_pos[6] != *ip++ || m_pos[7] != *ip++ || m_pos[8] != *ip++
+#ifdef LZO1Y
+	    || m_pos[ 9] != *ip++ || m_pos[10] != *ip++ || m_pos[11] != *ip++
+	    || m_pos[12] != *ip++ || m_pos[13] != *ip++ || m_pos[14] != *ip++
+#endif
+	   )
+	{
+	    --ip;
+	    m_len = ip - ii;
+	    assert(m_len >= 3); assert(m_len <= M2_MAX_LEN);
+
+	    if (m_off <= M2_MAX_OFFSET)
+	    {
+		m_off -= 1;
+#if defined(LZO1X)
+		*op++ = LZO_BYTE(((m_len - 1) << 5) | ((m_off & 7) << 2));
+		*op++ = LZO_BYTE(m_off >> 3);
+#elif defined(LZO1Y)
+		*op++ = LZO_BYTE(((m_len + 1) << 4) | ((m_off & 3) << 2));
+		*op++ = LZO_BYTE(m_off >> 2);
+#endif
+	    }
+	    else if (m_off <= M3_MAX_OFFSET)
+	    {
+		m_off -= 1;
+		*op++ = LZO_BYTE(M3_MARKER | (m_len - 2));
+		goto m3_m4_offset;
+	    }
+	    else
+#if defined(LZO1X)
+	    {
+		m_off -= 0x4000;
+		assert(m_off > 0); assert(m_off <= 0x7fff);
+		*op++ = LZO_BYTE(M4_MARKER |
+				 ((m_off & 0x4000) >> 11) | (m_len - 2));
+		goto m3_m4_offset;
+	    }
+#elif defined(LZO1Y)
+		goto m4_match;
+#endif
+	}
+	else
+	{
+	    {
+		const lzo_byte *end = in_end;
+		const lzo_byte *m = m_pos + M2_MAX_LEN + 1;
+		while (ip < end && *m == *ip)
+		    m++, ip++;
+		m_len = (ip - ii);
+	    }
+	    assert(m_len > M2_MAX_LEN);
+
+	    if (m_off <= M3_MAX_OFFSET)
+	    {
+		m_off -= 1;
+		if (m_len <= 33)
+		    *op++ = LZO_BYTE(M3_MARKER | (m_len - 2));
+		else
+		{
+		    m_len -= 33;
+		    *op++ = M3_MARKER | 0;
+		    goto m3_m4_len;
+		}
+	    }
+	    else
+	    {
+#if defined(LZO1Y)
+m4_match:
+#endif
+		m_off -= 0x4000;
+		assert(m_off > 0); assert(m_off <= 0x7fff);
+		if (m_len <= M4_MAX_LEN)
+		    *op++ = LZO_BYTE(M4_MARKER |
+				     ((m_off & 0x4000) >> 11) | (m_len - 2));
+		else
+		{
+		    m_len -= M4_MAX_LEN;
+		    *op++ = LZO_BYTE(M4_MARKER | ((m_off & 0x4000) >> 11));
+m3_m4_len:
+		    while (m_len > 255)
+		    {
+			m_len -= 255;
+			*op++ = 0;
+		    }
+		    assert(m_len > 0);
+		    *op++ = LZO_BYTE(m_len);
+		}
+	    }
+
+m3_m4_offset:
+	    *op++ = LZO_BYTE((m_off & 63) << 2);
+	    *op++ = LZO_BYTE(m_off >> 6);
+	}
+
+#if 0
+match_done:
+#endif
+	ii = ip;
+	if (ip >= ip_end)
+	    break;
+    }
+
+    *out_len = op - out;
+    return (lzo_uint) (in_end - ii);
+}
+
+LZO_PUBLIC(int)
+DO_COMPRESS      ( const lzo_byte *in , lzo_uint  in_len,
+			 lzo_byte *out, lzo_uint *out_len,
+			 lzo_voidp wrkmem )
+{
+    lzo_byte *op = out;
+    lzo_uint t;
+
+#if defined(__LZO_QUERY_COMPRESS)
+    if (__LZO_IS_COMPRESS_QUERY(in,in_len,out,out_len,wrkmem))
+	return __LZO_QUERY_COMPRESS(in,in_len,out,out_len,wrkmem,D_SIZE,lzo_sizeof(lzo_dict_t));
+#endif
+
+    if (in_len <= M2_MAX_LEN + 5)
+	t = in_len;
+    else
+    {
+	t = do_compress(in,in_len,op,out_len,wrkmem);
+	op += *out_len;
+    }
+
+    if (t > 0)
+    {
+	const lzo_byte *ii = in + in_len - t;
+
+	if (op == out && t <= 238)
+	    *op++ = LZO_BYTE(17 + t);
+	else if (t <= 3)
+	    op[-2] |= LZO_BYTE(t);
+	else if (t <= 18)
+	    *op++ = LZO_BYTE(t - 3);
+	else
+	{
+	    lzo_uint tt = t - 18;
+
+	    *op++ = 0;
+	    while (tt > 255)
+	    {
+		tt -= 255;
+		*op++ = 0;
+	    }
+	    assert(tt > 0);
+	    *op++ = LZO_BYTE(tt);
+	}
+	do *op++ = *ii++; while (--t > 0);
+    }
+
+    *op++ = M4_MARKER | 1;
+    *op++ = 0;
+    *op++ = 0;
+
+    *out_len = op - out;
+    return LZO_E_OK;
+}
+
+#undef do_compress
+#undef DO_COMPRESS
+#undef LZO_HASH
+
+#undef LZO_TEST_DECOMPRESS_OVERRUN
+#undef LZO_TEST_DECOMPRESS_OVERRUN_INPUT
+#undef LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT
+#undef LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND
+#undef DO_DECOMPRESS
+#define DO_DECOMPRESS       lzo1x_decompress
+
+#if defined(LZO_TEST_DECOMPRESS_OVERRUN)
+#  if !defined(LZO_TEST_DECOMPRESS_OVERRUN_INPUT)
+#    define LZO_TEST_DECOMPRESS_OVERRUN_INPUT       2
+#  endif
+#  if !defined(LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT)
+#    define LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT      2
+#  endif
+#  if !defined(LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND)
+#    define LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND
+#  endif
+#endif
+
+#undef TEST_IP
+#undef TEST_OP
+#undef TEST_LOOKBEHIND
+#undef NEED_IP
+#undef NEED_OP
+#undef HAVE_TEST_IP
+#undef HAVE_TEST_OP
+#undef HAVE_NEED_IP
+#undef HAVE_NEED_OP
+#undef HAVE_ANY_IP
+#undef HAVE_ANY_OP
+
+#if defined(LZO_TEST_DECOMPRESS_OVERRUN_INPUT)
+#  if (LZO_TEST_DECOMPRESS_OVERRUN_INPUT >= 1)
+#    define TEST_IP             (ip < ip_end)
+#  endif
+#  if (LZO_TEST_DECOMPRESS_OVERRUN_INPUT >= 2)
+#    define NEED_IP(x) \
+	    if ((lzo_uint)(ip_end - ip) < (lzo_uint)(x))  goto input_overrun
+#  endif
+#endif
+
+#if defined(LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT)
+#  if (LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT >= 1)
+#    define TEST_OP             (op <= op_end)
+#  endif
+#  if (LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT >= 2)
+#    undef TEST_OP
+#    define NEED_OP(x) \
+	    if ((lzo_uint)(op_end - op) < (lzo_uint)(x))  goto output_overrun
+#  endif
+#endif
+
+#if defined(LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND)
+#  define TEST_LOOKBEHIND(m_pos,out)    if (m_pos < out) goto lookbehind_overrun
+#else
+#  define TEST_LOOKBEHIND(m_pos,op)     ((void) 0)
+#endif
+
+#if !defined(LZO_EOF_CODE) && !defined(TEST_IP)
+#  define TEST_IP               (ip < ip_end)
+#endif
+
+#if defined(TEST_IP)
+#  define HAVE_TEST_IP
+#else
+#  define TEST_IP               1
+#endif
+#if defined(TEST_OP)
+#  define HAVE_TEST_OP
+#else
+#  define TEST_OP               1
+#endif
+
+#if defined(NEED_IP)
+#  define HAVE_NEED_IP
+#else
+#  define NEED_IP(x)            ((void) 0)
+#endif
+#if defined(NEED_OP)
+#  define HAVE_NEED_OP
+#else
+#  define NEED_OP(x)            ((void) 0)
+#endif
+
+#if defined(HAVE_TEST_IP) || defined(HAVE_NEED_IP)
+#  define HAVE_ANY_IP
+#endif
+#if defined(HAVE_TEST_OP) || defined(HAVE_NEED_OP)
+#  define HAVE_ANY_OP
+#endif
+
+#if defined(DO_DECOMPRESS)
+LZO_PUBLIC(int)
+DO_DECOMPRESS  ( const lzo_byte *in , lzo_uint  in_len,
+		       lzo_byte *out, lzo_uint *out_len,
+		       lzo_voidp wrkmem )
+#endif
+{
+    register lzo_byte *op;
+    register const lzo_byte *ip;
+    register lzo_uint t;
+#if defined(COPY_DICT)
+    lzo_uint m_off;
+    const lzo_byte *dict_end;
+#else
+    register const lzo_byte *m_pos;
+#endif
+
+    const lzo_byte * const ip_end = in + in_len;
+#if defined(HAVE_ANY_OP)
+    lzo_byte * const op_end = out + *out_len;
+#endif
+#if defined(LZO1Z)
+    lzo_uint last_m_off = 0;
+#endif
+
+    LZO_UNUSED(wrkmem);
+
+#if defined(__LZO_QUERY_DECOMPRESS)
+    if (__LZO_IS_DECOMPRESS_QUERY(in,in_len,out,out_len,wrkmem))
+	return __LZO_QUERY_DECOMPRESS(in,in_len,out,out_len,wrkmem,0,0);
+#endif
+
+#if defined(COPY_DICT)
+    if (dict)
+    {
+	if (dict_len > M4_MAX_OFFSET)
+	{
+	    dict += dict_len - M4_MAX_OFFSET;
+	    dict_len = M4_MAX_OFFSET;
+	}
+	dict_end = dict + dict_len;
+    }
+    else
+    {
+	dict_len = 0;
+	dict_end = NULL;
+    }
+#endif
+
+    *out_len = 0;
+
+    op = out;
+    ip = in;
+
+    if (*ip > 17)
+    {
+	t = *ip++ - 17;
+	if (t < 4)
+	    goto match_next;
+	assert(t > 0); NEED_OP(t); NEED_IP(t+1);
+	do *op++ = *ip++; while (--t > 0);
+	goto first_literal_run;
+    }
+
+    while (TEST_IP && TEST_OP)
+    {
+	t = *ip++;
+	if (t >= 16)
+	    goto match;
+	if (t == 0)
+	{
+	    NEED_IP(1);
+	    while (*ip == 0)
+	    {
+		t += 255;
+		ip++;
+		NEED_IP(1);
+	    }
+	    t += 15 + *ip++;
+	}
+	assert(t > 0); NEED_OP(t+3); NEED_IP(t+4);
+#if defined(LZO_UNALIGNED_OK_4) || defined(LZO_ALIGNED_OK_4)
+#if !defined(LZO_UNALIGNED_OK_4)
+	if (PTR_ALIGNED2_4(op,ip))
+	{
+#endif
+	* (lzo_uint32p) op = * (const lzo_uint32p) ip;
+	op += 4; ip += 4;
+	if (--t > 0)
+	{
+	    if (t >= 4)
+	    {
+		do {
+		    * (lzo_uint32p) op = * (const lzo_uint32p) ip;
+		    op += 4; ip += 4; t -= 4;
+		} while (t >= 4);
+		if (t > 0) do *op++ = *ip++; while (--t > 0);
+	    }
+	    else
+		do *op++ = *ip++; while (--t > 0);
+	}
+#if !defined(LZO_UNALIGNED_OK_4)
+	}
+	else
+#endif
+#endif
+#if !defined(LZO_UNALIGNED_OK_4)
+	{
+	    *op++ = *ip++; *op++ = *ip++; *op++ = *ip++;
+	    do *op++ = *ip++; while (--t > 0);
+	}
+#endif
+
+first_literal_run:
+
+	t = *ip++;
+	if (t >= 16)
+	    goto match;
+#if defined(COPY_DICT)
+#if defined(LZO1Z)
+	m_off = (1 + M2_MAX_OFFSET) + (t << 6) + (*ip++ >> 2);
+	last_m_off = m_off;
+#else
+	m_off = (1 + M2_MAX_OFFSET) + (t >> 2) + (*ip++ << 2);
+#endif
+	NEED_OP(3);
+	t = 3; COPY_DICT(t,m_off)
+#else
+#if defined(LZO1Z)
+	t = (1 + M2_MAX_OFFSET) + (t << 6) + (*ip++ >> 2);
+	m_pos = op - t;
+	last_m_off = t;
+#else
+	m_pos = op - (1 + M2_MAX_OFFSET);
+	m_pos -= t >> 2;
+	m_pos -= *ip++ << 2;
+#endif
+	TEST_LOOKBEHIND(m_pos,out); NEED_OP(3);
+	*op++ = *m_pos++; *op++ = *m_pos++; *op++ = *m_pos;
+#endif
+	goto match_done;
+
+	while (TEST_IP && TEST_OP)
+	{
+match:
+	    if (t >= 64)
+	    {
+#if defined(COPY_DICT)
+#if defined(LZO1X)
+		m_off = 1 + ((t >> 2) & 7) + (*ip++ << 3);
+		t = (t >> 5) - 1;
+#elif defined(LZO1Y)
+		m_off = 1 + ((t >> 2) & 3) + (*ip++ << 2);
+		t = (t >> 4) - 3;
+#elif defined(LZO1Z)
+		m_off = t & 0x1f;
+		if (m_off >= 0x1c)
+		    m_off = last_m_off;
+		else
+		{
+		    m_off = 1 + (m_off << 6) + (*ip++ >> 2);
+		    last_m_off = m_off;
+		}
+		t = (t >> 5) - 1;
+#endif
+#else
+#if defined(LZO1X)
+		m_pos = op - 1;
+		m_pos -= (t >> 2) & 7;
+		m_pos -= *ip++ << 3;
+		t = (t >> 5) - 1;
+#elif defined(LZO1Y)
+		m_pos = op - 1;
+		m_pos -= (t >> 2) & 3;
+		m_pos -= *ip++ << 2;
+		t = (t >> 4) - 3;
+#elif defined(LZO1Z)
+		{
+		    lzo_uint off = t & 0x1f;
+		    m_pos = op;
+		    if (off >= 0x1c)
+		    {
+			assert(last_m_off > 0);
+			m_pos -= last_m_off;
+		    }
+		    else
+		    {
+			off = 1 + (off << 6) + (*ip++ >> 2);
+			m_pos -= off;
+			last_m_off = off;
+		    }
+		}
+		t = (t >> 5) - 1;
+#endif
+		TEST_LOOKBEHIND(m_pos,out); assert(t > 0); NEED_OP(t+3-1);
+		goto copy_match;
+#endif
+	    }
+	    else if (t >= 32)
+	    {
+		t &= 31;
+		if (t == 0)
+		{
+		    NEED_IP(1);
+		    while (*ip == 0)
+		    {
+			t += 255;
+			ip++;
+			NEED_IP(1);
+		    }
+		    t += 31 + *ip++;
+		}
+#if defined(COPY_DICT)
+#if defined(LZO1Z)
+		m_off = 1 + (ip[0] << 6) + (ip[1] >> 2);
+		last_m_off = m_off;
+#else
+		m_off = 1 + (ip[0] >> 2) + (ip[1] << 6);
+#endif
+#else
+#if defined(LZO1Z)
+		{
+		    lzo_uint off = 1 + (ip[0] << 6) + (ip[1] >> 2);
+		    m_pos = op - off;
+		    last_m_off = off;
+		}
+#elif defined(LZO_UNALIGNED_OK_2) && (LZO_BYTE_ORDER == LZO_LITTLE_ENDIAN)
+		m_pos = op - 1;
+		m_pos -= (* (const lzo_ushortp) ip) >> 2;
+#else
+		m_pos = op - 1;
+		m_pos -= (ip[0] >> 2) + (ip[1] << 6);
+#endif
+#endif
+		ip += 2;
+	    }
+	    else if (t >= 16)
+	    {
+#if defined(COPY_DICT)
+		m_off = (t & 8) << 11;
+#else
+		m_pos = op;
+		m_pos -= (t & 8) << 11;
+#endif
+		t &= 7;
+		if (t == 0)
+		{
+		    NEED_IP(1);
+		    while (*ip == 0)
+		    {
+			t += 255;
+			ip++;
+			NEED_IP(1);
+		    }
+		    t += 7 + *ip++;
+		}
+#if defined(COPY_DICT)
+#if defined(LZO1Z)
+		m_off += (ip[0] << 6) + (ip[1] >> 2);
+#else
+		m_off += (ip[0] >> 2) + (ip[1] << 6);
+#endif
+		ip += 2;
+		if (m_off == 0)
+		    goto eof_found;
+		m_off += 0x4000;
+#if defined(LZO1Z)
+		last_m_off = m_off;
+#endif
+#else
+#if defined(LZO1Z)
+		m_pos -= (ip[0] << 6) + (ip[1] >> 2);
+#elif defined(LZO_UNALIGNED_OK_2) && (LZO_BYTE_ORDER == LZO_LITTLE_ENDIAN)
+		m_pos -= (* (const lzo_ushortp) ip) >> 2;
+#else
+		m_pos -= (ip[0] >> 2) + (ip[1] << 6);
+#endif
+		ip += 2;
+		if (m_pos == op)
+		    goto eof_found;
+		m_pos -= 0x4000;
+#if defined(LZO1Z)
+		last_m_off = op - m_pos;
+#endif
+#endif
+	    }
+	    else
+	    {
+#if defined(COPY_DICT)
+#if defined(LZO1Z)
+		m_off = 1 + (t << 6) + (*ip++ >> 2);
+		last_m_off = m_off;
+#else
+		m_off = 1 + (t >> 2) + (*ip++ << 2);
+#endif
+		NEED_OP(2);
+		t = 2; COPY_DICT(t,m_off)
+#else
+#if defined(LZO1Z)
+		t = 1 + (t << 6) + (*ip++ >> 2);
+		m_pos = op - t;
+		last_m_off = t;
+#else
+		m_pos = op - 1;
+		m_pos -= t >> 2;
+		m_pos -= *ip++ << 2;
+#endif
+		TEST_LOOKBEHIND(m_pos,out); NEED_OP(2);
+		*op++ = *m_pos++; *op++ = *m_pos;
+#endif
+		goto match_done;
+	    }
+
+#if defined(COPY_DICT)
+
+	    NEED_OP(t+3-1);
+	    t += 3-1; COPY_DICT(t,m_off)
+
+#else
+
+	    TEST_LOOKBEHIND(m_pos,out); assert(t > 0); NEED_OP(t+3-1);
+#if defined(LZO_UNALIGNED_OK_4) || defined(LZO_ALIGNED_OK_4)
+#if !defined(LZO_UNALIGNED_OK_4)
+	    if (t >= 2 * 4 - (3 - 1) && PTR_ALIGNED2_4(op,m_pos))
+	    {
+		assert((op - m_pos) >= 4);
+#else
+	    if (t >= 2 * 4 - (3 - 1) && (op - m_pos) >= 4)
+	    {
+#endif
+		* (lzo_uint32p) op = * (const lzo_uint32p) m_pos;
+		op += 4; m_pos += 4; t -= 4 - (3 - 1);
+		do {
+		    * (lzo_uint32p) op = * (const lzo_uint32p) m_pos;
+		    op += 4; m_pos += 4; t -= 4;
+		} while (t >= 4);
+		if (t > 0) do *op++ = *m_pos++; while (--t > 0);
+	    }
+	    else
+#endif
+	    {
+copy_match:
+		*op++ = *m_pos++; *op++ = *m_pos++;
+		do *op++ = *m_pos++; while (--t > 0);
+	    }
+
+#endif
+
+match_done:
+#if defined(LZO1Z)
+	    t = ip[-1] & 3;
+#else
+	    t = ip[-2] & 3;
+#endif
+	    if (t == 0)
+		break;
+
+match_next:
+	    assert(t > 0); NEED_OP(t); NEED_IP(t+1);
+	    do *op++ = *ip++; while (--t > 0);
+	    t = *ip++;
+	}
+    }
+
+#if defined(HAVE_TEST_IP) || defined(HAVE_TEST_OP)
+    *out_len = op - out;
+    return LZO_E_EOF_NOT_FOUND;
+#endif
+
+eof_found:
+    assert(t == 1);
+    *out_len = op - out;
+    return (ip == ip_end ? LZO_E_OK :
+	   (ip < ip_end  ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN));
+
+#if defined(HAVE_NEED_IP)
+input_overrun:
+    *out_len = op - out;
+    return LZO_E_INPUT_OVERRUN;
+#endif
+
+#if defined(HAVE_NEED_OP)
+output_overrun:
+    *out_len = op - out;
+    return LZO_E_OUTPUT_OVERRUN;
+#endif
+
+#if defined(LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND)
+lookbehind_overrun:
+    *out_len = op - out;
+    return LZO_E_LOOKBEHIND_OVERRUN;
+#endif
+}
+
+#define LZO_TEST_DECOMPRESS_OVERRUN
+#undef DO_DECOMPRESS
+#define DO_DECOMPRESS       lzo1x_decompress_safe
+
+#if defined(LZO_TEST_DECOMPRESS_OVERRUN)
+#  if !defined(LZO_TEST_DECOMPRESS_OVERRUN_INPUT)
+#    define LZO_TEST_DECOMPRESS_OVERRUN_INPUT       2
+#  endif
+#  if !defined(LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT)
+#    define LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT      2
+#  endif
+#  if !defined(LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND)
+#    define LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND
+#  endif
+#endif
+
+#undef TEST_IP
+#undef TEST_OP
+#undef TEST_LOOKBEHIND
+#undef NEED_IP
+#undef NEED_OP
+#undef HAVE_TEST_IP
+#undef HAVE_TEST_OP
+#undef HAVE_NEED_IP
+#undef HAVE_NEED_OP
+#undef HAVE_ANY_IP
+#undef HAVE_ANY_OP
+
+#if defined(LZO_TEST_DECOMPRESS_OVERRUN_INPUT)
+#  if (LZO_TEST_DECOMPRESS_OVERRUN_INPUT >= 1)
+#    define TEST_IP             (ip < ip_end)
+#  endif
+#  if (LZO_TEST_DECOMPRESS_OVERRUN_INPUT >= 2)
+#    define NEED_IP(x) \
+	    if ((lzo_uint)(ip_end - ip) < (lzo_uint)(x))  goto input_overrun
+#  endif
+#endif
+
+#if defined(LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT)
+#  if (LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT >= 1)
+#    define TEST_OP             (op <= op_end)
+#  endif
+#  if (LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT >= 2)
+#    undef TEST_OP
+#    define NEED_OP(x) \
+	    if ((lzo_uint)(op_end - op) < (lzo_uint)(x))  goto output_overrun
+#  endif
+#endif
+
+#if defined(LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND)
+#  define TEST_LOOKBEHIND(m_pos,out)    if (m_pos < out) goto lookbehind_overrun
+#else
+#  define TEST_LOOKBEHIND(m_pos,op)     ((void) 0)
+#endif
+
+#if !defined(LZO_EOF_CODE) && !defined(TEST_IP)
+#  define TEST_IP               (ip < ip_end)
+#endif
+
+#if defined(TEST_IP)
+#  define HAVE_TEST_IP
+#else
+#  define TEST_IP               1
+#endif
+#if defined(TEST_OP)
+#  define HAVE_TEST_OP
+#else
+#  define TEST_OP               1
+#endif
+
+#if defined(NEED_IP)
+#  define HAVE_NEED_IP
+#else
+#  define NEED_IP(x)            ((void) 0)
+#endif
+#if defined(NEED_OP)
+#  define HAVE_NEED_OP
+#else
+#  define NEED_OP(x)            ((void) 0)
+#endif
+
+#if defined(HAVE_TEST_IP) || defined(HAVE_NEED_IP)
+#  define HAVE_ANY_IP
+#endif
+#if defined(HAVE_TEST_OP) || defined(HAVE_NEED_OP)
+#  define HAVE_ANY_OP
+#endif
+
+#if defined(DO_DECOMPRESS)
+LZO_PUBLIC(int)
+DO_DECOMPRESS  ( const lzo_byte *in , lzo_uint  in_len,
+		       lzo_byte *out, lzo_uint *out_len,
+		       lzo_voidp wrkmem )
+#endif
+{
+    register lzo_byte *op;
+    register const lzo_byte *ip;
+    register lzo_uint t;
+#if defined(COPY_DICT)
+    lzo_uint m_off;
+    const lzo_byte *dict_end;
+#else
+    register const lzo_byte *m_pos;
+#endif
+
+    const lzo_byte * const ip_end = in + in_len;
+#if defined(HAVE_ANY_OP)
+    lzo_byte * const op_end = out + *out_len;
+#endif
+#if defined(LZO1Z)
+    lzo_uint last_m_off = 0;
+#endif
+
+    LZO_UNUSED(wrkmem);
+
+#if defined(__LZO_QUERY_DECOMPRESS)
+    if (__LZO_IS_DECOMPRESS_QUERY(in,in_len,out,out_len,wrkmem))
+	return __LZO_QUERY_DECOMPRESS(in,in_len,out,out_len,wrkmem,0,0);
+#endif
+
+#if defined(COPY_DICT)
+    if (dict)
+    {
+	if (dict_len > M4_MAX_OFFSET)
+	{
+	    dict += dict_len - M4_MAX_OFFSET;
+	    dict_len = M4_MAX_OFFSET;
+	}
+	dict_end = dict + dict_len;
+    }
+    else
+    {
+	dict_len = 0;
+	dict_end = NULL;
+    }
+#endif
+
+    *out_len = 0;
+
+    op = out;
+    ip = in;
+
+    if (*ip > 17)
+    {
+	t = *ip++ - 17;
+	if (t < 4)
+	    goto match_next;
+	assert(t > 0); NEED_OP(t); NEED_IP(t+1);
+	do *op++ = *ip++; while (--t > 0);
+	goto first_literal_run;
+    }
+
+    while (TEST_IP && TEST_OP)
+    {
+	t = *ip++;
+	if (t >= 16)
+	    goto match;
+	if (t == 0)
+	{
+	    NEED_IP(1);
+	    while (*ip == 0)
+	    {
+		t += 255;
+		ip++;
+		NEED_IP(1);
+	    }
+	    t += 15 + *ip++;
+	}
+	assert(t > 0); NEED_OP(t+3); NEED_IP(t+4);
+#if defined(LZO_UNALIGNED_OK_4) || defined(LZO_ALIGNED_OK_4)
+#if !defined(LZO_UNALIGNED_OK_4)
+	if (PTR_ALIGNED2_4(op,ip))
+	{
+#endif
+	* (lzo_uint32p) op = * (const lzo_uint32p) ip;
+	op += 4; ip += 4;
+	if (--t > 0)
+	{
+	    if (t >= 4)
+	    {
+		do {
+		    * (lzo_uint32p) op = * (const lzo_uint32p) ip;
+		    op += 4; ip += 4; t -= 4;
+		} while (t >= 4);
+		if (t > 0) do *op++ = *ip++; while (--t > 0);
+	    }
+	    else
+		do *op++ = *ip++; while (--t > 0);
+	}
+#if !defined(LZO_UNALIGNED_OK_4)
+	}
+	else
+#endif
+#endif
+#if !defined(LZO_UNALIGNED_OK_4)
+	{
+	    *op++ = *ip++; *op++ = *ip++; *op++ = *ip++;
+	    do *op++ = *ip++; while (--t > 0);
+	}
+#endif
+
+first_literal_run:
+
+	t = *ip++;
+	if (t >= 16)
+	    goto match;
+#if defined(COPY_DICT)
+#if defined(LZO1Z)
+	m_off = (1 + M2_MAX_OFFSET) + (t << 6) + (*ip++ >> 2);
+	last_m_off = m_off;
+#else
+	m_off = (1 + M2_MAX_OFFSET) + (t >> 2) + (*ip++ << 2);
+#endif
+	NEED_OP(3);
+	t = 3; COPY_DICT(t,m_off)
+#else
+#if defined(LZO1Z)
+	t = (1 + M2_MAX_OFFSET) + (t << 6) + (*ip++ >> 2);
+	m_pos = op - t;
+	last_m_off = t;
+#else
+	m_pos = op - (1 + M2_MAX_OFFSET);
+	m_pos -= t >> 2;
+	m_pos -= *ip++ << 2;
+#endif
+	TEST_LOOKBEHIND(m_pos,out); NEED_OP(3);
+	*op++ = *m_pos++; *op++ = *m_pos++; *op++ = *m_pos;
+#endif
+	goto match_done;
+
+	while (TEST_IP && TEST_OP)
+	{
+match:
+	    if (t >= 64)
+	    {
+#if defined(COPY_DICT)
+#if defined(LZO1X)
+		m_off = 1 + ((t >> 2) & 7) + (*ip++ << 3);
+		t = (t >> 5) - 1;
+#elif defined(LZO1Y)
+		m_off = 1 + ((t >> 2) & 3) + (*ip++ << 2);
+		t = (t >> 4) - 3;
+#elif defined(LZO1Z)
+		m_off = t & 0x1f;
+		if (m_off >= 0x1c)
+		    m_off = last_m_off;
+		else
+		{
+		    m_off = 1 + (m_off << 6) + (*ip++ >> 2);
+		    last_m_off = m_off;
+		}
+		t = (t >> 5) - 1;
+#endif
+#else
+#if defined(LZO1X)
+		m_pos = op - 1;
+		m_pos -= (t >> 2) & 7;
+		m_pos -= *ip++ << 3;
+		t = (t >> 5) - 1;
+#elif defined(LZO1Y)
+		m_pos = op - 1;
+		m_pos -= (t >> 2) & 3;
+		m_pos -= *ip++ << 2;
+		t = (t >> 4) - 3;
+#elif defined(LZO1Z)
+		{
+		    lzo_uint off = t & 0x1f;
+		    m_pos = op;
+		    if (off >= 0x1c)
+		    {
+			assert(last_m_off > 0);
+			m_pos -= last_m_off;
+		    }
+		    else
+		    {
+			off = 1 + (off << 6) + (*ip++ >> 2);
+			m_pos -= off;
+			last_m_off = off;
+		    }
+		}
+		t = (t >> 5) - 1;
+#endif
+		TEST_LOOKBEHIND(m_pos,out); assert(t > 0); NEED_OP(t+3-1);
+		goto copy_match;
+#endif
+	    }
+	    else if (t >= 32)
+	    {
+		t &= 31;
+		if (t == 0)
+		{
+		    NEED_IP(1);
+		    while (*ip == 0)
+		    {
+			t += 255;
+			ip++;
+			NEED_IP(1);
+		    }
+		    t += 31 + *ip++;
+		}
+#if defined(COPY_DICT)
+#if defined(LZO1Z)
+		m_off = 1 + (ip[0] << 6) + (ip[1] >> 2);
+		last_m_off = m_off;
+#else
+		m_off = 1 + (ip[0] >> 2) + (ip[1] << 6);
+#endif
+#else
+#if defined(LZO1Z)
+		{
+		    lzo_uint off = 1 + (ip[0] << 6) + (ip[1] >> 2);
+		    m_pos = op - off;
+		    last_m_off = off;
+		}
+#elif defined(LZO_UNALIGNED_OK_2) && (LZO_BYTE_ORDER == LZO_LITTLE_ENDIAN)
+		m_pos = op - 1;
+		m_pos -= (* (const lzo_ushortp) ip) >> 2;
+#else
+		m_pos = op - 1;
+		m_pos -= (ip[0] >> 2) + (ip[1] << 6);
+#endif
+#endif
+		ip += 2;
+	    }
+	    else if (t >= 16)
+	    {
+#if defined(COPY_DICT)
+		m_off = (t & 8) << 11;
+#else
+		m_pos = op;
+		m_pos -= (t & 8) << 11;
+#endif
+		t &= 7;
+		if (t == 0)
+		{
+		    NEED_IP(1);
+		    while (*ip == 0)
+		    {
+			t += 255;
+			ip++;
+			NEED_IP(1);
+		    }
+		    t += 7 + *ip++;
+		}
+#if defined(COPY_DICT)
+#if defined(LZO1Z)
+		m_off += (ip[0] << 6) + (ip[1] >> 2);
+#else
+		m_off += (ip[0] >> 2) + (ip[1] << 6);
+#endif
+		ip += 2;
+		if (m_off == 0)
+		    goto eof_found;
+		m_off += 0x4000;
+#if defined(LZO1Z)
+		last_m_off = m_off;
+#endif
+#else
+#if defined(LZO1Z)
+		m_pos -= (ip[0] << 6) + (ip[1] >> 2);
+#elif defined(LZO_UNALIGNED_OK_2) && (LZO_BYTE_ORDER == LZO_LITTLE_ENDIAN)
+		m_pos -= (* (const lzo_ushortp) ip) >> 2;
+#else
+		m_pos -= (ip[0] >> 2) + (ip[1] << 6);
+#endif
+		ip += 2;
+		if (m_pos == op)
+		    goto eof_found;
+		m_pos -= 0x4000;
+#if defined(LZO1Z)
+		last_m_off = op - m_pos;
+#endif
+#endif
+	    }
+	    else
+	    {
+#if defined(COPY_DICT)
+#if defined(LZO1Z)
+		m_off = 1 + (t << 6) + (*ip++ >> 2);
+		last_m_off = m_off;
+#else
+		m_off = 1 + (t >> 2) + (*ip++ << 2);
+#endif
+		NEED_OP(2);
+		t = 2; COPY_DICT(t,m_off)
+#else
+#if defined(LZO1Z)
+		t = 1 + (t << 6) + (*ip++ >> 2);
+		m_pos = op - t;
+		last_m_off = t;
+#else
+		m_pos = op - 1;
+		m_pos -= t >> 2;
+		m_pos -= *ip++ << 2;
+#endif
+		TEST_LOOKBEHIND(m_pos,out); NEED_OP(2);
+		*op++ = *m_pos++; *op++ = *m_pos;
+#endif
+		goto match_done;
+	    }
+
+#if defined(COPY_DICT)
+
+	    NEED_OP(t+3-1);
+	    t += 3-1; COPY_DICT(t,m_off)
+
+#else
+
+	    TEST_LOOKBEHIND(m_pos,out); assert(t > 0); NEED_OP(t+3-1);
+#if defined(LZO_UNALIGNED_OK_4) || defined(LZO_ALIGNED_OK_4)
+#if !defined(LZO_UNALIGNED_OK_4)
+	    if (t >= 2 * 4 - (3 - 1) && PTR_ALIGNED2_4(op,m_pos))
+	    {
+		assert((op - m_pos) >= 4);
+#else
+	    if (t >= 2 * 4 - (3 - 1) && (op - m_pos) >= 4)
+	    {
+#endif
+		* (lzo_uint32p) op = * (const lzo_uint32p) m_pos;
+		op += 4; m_pos += 4; t -= 4 - (3 - 1);
+		do {
+		    * (lzo_uint32p) op = * (const lzo_uint32p) m_pos;
+		    op += 4; m_pos += 4; t -= 4;
+		} while (t >= 4);
+		if (t > 0) do *op++ = *m_pos++; while (--t > 0);
+	    }
+	    else
+#endif
+	    {
+copy_match:
+		*op++ = *m_pos++; *op++ = *m_pos++;
+		do *op++ = *m_pos++; while (--t > 0);
+	    }
+
+#endif
+
+match_done:
+#if defined(LZO1Z)
+	    t = ip[-1] & 3;
+#else
+	    t = ip[-2] & 3;
+#endif
+	    if (t == 0)
+		break;
+
+match_next:
+	    assert(t > 0); NEED_OP(t); NEED_IP(t+1);
+	    do *op++ = *ip++; while (--t > 0);
+	    t = *ip++;
+	}
+    }
+
+#if defined(HAVE_TEST_IP) || defined(HAVE_TEST_OP)
+    *out_len = op - out;
+    return LZO_E_EOF_NOT_FOUND;
+#endif
+
+eof_found:
+    assert(t == 1);
+    *out_len = op - out;
+    return (ip == ip_end ? LZO_E_OK :
+	   (ip < ip_end  ? LZO_E_INPUT_NOT_CONSUMED : LZO_E_INPUT_OVERRUN));
+
+#if defined(HAVE_NEED_IP)
+input_overrun:
+    *out_len = op - out;
+    return LZO_E_INPUT_OVERRUN;
+#endif
+
+#if defined(HAVE_NEED_OP)
+output_overrun:
+    *out_len = op - out;
+    return LZO_E_OUTPUT_OVERRUN;
+#endif
+
+#if defined(LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND)
+lookbehind_overrun:
+    *out_len = op - out;
+    return LZO_E_LOOKBEHIND_OVERRUN;
+#endif
+}
+
+/***** End of minilzo.c *****/
+
diff --git a/code/minilzo.h b/code/minilzo.h
new file mode 100644
index 0000000000..9490797b6f
--- /dev/null
+++ b/code/minilzo.h
@@ -0,0 +1,95 @@
+/* minilzo.h -- mini subset of the LZO real-time data compression library
+
+   This file is part of the LZO real-time data compression library.
+
+   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
+
+   The LZO library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of
+   the License, or (at your option) any later version.
+
+   The LZO library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with the LZO library; see the file COPYING.
+   If not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+   Markus F.X.J. Oberhumer
+   <markus.oberhumer@jk.uni-linz.ac.at>
+   http://wildsau.idv.uni-linz.ac.at/mfx/lzo.html
+ */
+
+/*
+ * NOTE:
+ *   the full LZO package can be found at
+ *   http://wildsau.idv.uni-linz.ac.at/mfx/lzo.html
+ */
+
+
+#ifndef __MINILZO_H
+#define __MINILZO_H
+
+#define MINILZO_VERSION         0x1040
+
+#ifdef __LZOCONF_H
+#  error "you cannot use both LZO and miniLZO"
+#endif
+
+#undef LZO_HAVE_CONFIG_H
+#include "lzoconf.h"
+
+#if !defined(LZO_VERSION) || (LZO_VERSION != MINILZO_VERSION)
+#  error "version mismatch in header files"
+#endif
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/***********************************************************************
+//
+************************************************************************/
+
+/* Memory required for the wrkmem parameter.
+ * When the required size is 0, you can also pass a NULL pointer.
+ */
+
+#define LZO1X_MEM_COMPRESS      LZO1X_1_MEM_COMPRESS
+#define LZO1X_1_MEM_COMPRESS    ((lzo_uint32) (16384L * lzo_sizeof_dict_t))
+#define LZO1X_MEM_DECOMPRESS    (0)
+
+
+/* compression */
+LZO_EXTERN(int)
+lzo1x_1_compress        ( const lzo_byte *src, lzo_uint  src_len,
+                                lzo_byte *dst, lzo_uint *dst_len,
+                                lzo_voidp wrkmem );
+
+/* decompression */
+LZO_EXTERN(int)
+lzo1x_decompress        ( const lzo_byte *src, lzo_uint  src_len,
+                                lzo_byte *dst, lzo_uint *dst_len,
+                                lzo_voidp wrkmem /* NOT USED */ );
+
+/* safe decompression with overrun testing */
+LZO_EXTERN(int)
+lzo1x_decompress_safe   ( const lzo_byte *src, lzo_uint  src_len,
+                                lzo_byte *dst, lzo_uint *dst_len,
+                                lzo_voidp wrkmem /* NOT USED */ );
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* already included */
+
diff --git a/code/p_acs.c b/code/p_acs.c
new file mode 100644
index 0000000000..ec4a7af885
--- /dev/null
+++ b/code/p_acs.c
@@ -0,0 +1,1060 @@
+// [RH] p_acs.c: New file to handle ACS scripts
+
+#include "z_zone.h"
+#include "doomdef.h"
+#include "p_local.h"
+#include "p_spec.h"
+#include "g_level.h"
+#include "s_sound.h"
+#include "p_acs.h"
+#include "p_saveg.h"
+#include "p_lnspec.h"
+#include "m_random.h"
+#include "doomstat.h"
+#include "c_consol.h"
+
+
+script_t *LastScript;
+script_t *Scripts;
+script_t *RunningScripts[256];
+
+
+#define NEXTWORD	(*(script->pc)++)
+#define STACK(a)	(script->stack[script->sp - (a)])
+
+void P_ClearScripts (void)
+{
+	int i;
+
+	for (i = 0; i < 256; i++)
+		RunningScripts[i] = NULL;
+
+	Scripts = NULL;
+}
+
+static int *P_FindScript (int script)
+{
+	// This is based on what I did for GetActionBit().
+	// There's probably a better way that doesn't need
+	// to use smalltimes, but I don't really care right now.
+
+	int min = 0;
+	int max = level.scripts[0] - 1;
+	int mid = level.scripts[0] / 2;
+	int smalltimes = 0;
+
+	do {
+		int thisone = level.scripts[mid*3+1] % 1000;
+
+		if (thisone == script) {
+			return level.scripts + mid*3 + 1;
+		} else if (thisone < script) {
+			min = mid;
+		} else if (thisone > script) {
+			max = mid;
+		}
+		if (max - min > 1) {
+			mid = (max - min) / 2 + min;
+		} else if (!smalltimes) {
+			smalltimes++;
+			mid = (max - mid) + min;
+		} else {
+			break;
+		}
+	} while (max - min > 0);
+
+	if ((level.scripts[mid*3+1] % 1000) == script) 
+		return level.scripts + mid*3 + 1;
+
+	return NULL;
+}
+
+static void unlinkScript (script_t *script)
+{
+	if (LastScript == script)
+		LastScript = script->prev;
+	if (Scripts == script)
+		Scripts = script->next;
+	if (script->prev)
+		script->prev->next = script->next;
+	if (script->next)
+		script->next->prev = script->prev;
+}
+
+static void linkScript (script_t *script)
+{
+	script->next = Scripts;
+	if (Scripts)
+		Scripts->prev = script;
+	script->prev = NULL;
+	Scripts = script;
+	if (LastScript == NULL)
+		LastScript = script;
+}
+
+static void putScriptLast (script_t *script)
+{
+	if (LastScript == script)
+		return;
+
+	unlinkScript (script);
+	if (Scripts == NULL) {
+		linkScript (script);
+	} else {
+		if (LastScript)
+			LastScript->next = script;
+		script->prev = LastScript;
+		script->next = NULL;
+		LastScript = script;
+	}
+}
+
+static void putScriptFirst (script_t *script)
+{
+	if (Scripts == script)
+		return;
+
+	unlinkScript (script);
+	linkScript (script);
+}
+
+static __inline void pushToStack (script_t *script, int val)
+{
+	if (script->sp == STACK_SIZE) {
+		Printf ("Stack overflow in script %d\n", script->script);
+		script->state = removeThisThingNow;
+	}
+	STACK(0) = val;
+	script->sp++;
+}
+
+static int acs_Random (int min, int max)
+{
+	int num1, num2, num3, num4;
+	__int64 num;
+
+	num1 = P_Random(pr_acs);
+	num2 = P_Random(pr_acs);
+	num3 = P_Random(pr_acs);
+	num4 = P_Random(pr_acs);
+
+	num = ((num1 << 24) | (num2 << 16) | (num3 << 8) | num4) & 0x7fffffff;
+
+	return (int)(((num) * (max - min) / (0x7fffffff)) + min);
+}
+
+static int acs_ThingCount (int type, int tid)
+{
+	mobj_t *mobj = NULL;
+	int count = 0;
+
+	if (type >= NumSpawnableThings) {
+		return 0;
+	} else if (type > 0) {
+		type = SpawnableThings[type];
+		if (type == 0)
+			return 0;
+	}
+	
+	if (tid) {
+		while ( (mobj = P_FindMobjByTid (mobj, tid)) ) {
+			if ((type == 0) || (mobj->type == type && mobj->health > 0))
+				count++;
+		}
+	} else {
+		thinker_t *currentthinker=&thinkercap;
+
+		while ((currentthinker=currentthinker->next)!=&thinkercap)
+			if (currentthinker->function.acp1 == (actionf_p1) P_MobjThinker)
+				if ((type == 0) ||
+					(((mobj_t *)currentthinker)->type == type
+					 && ((mobj_t *)currentthinker)->health > 0))
+					count++;
+	}
+	return count;
+}
+
+static void acs_ChangeFlat (int tag, int name, int floorOrCeiling)
+{
+	int flat, secnum = -1;
+
+	if (name >= level.strings[0])
+		return;
+
+	flat = R_FlatNumForName (level.behavior + level.strings[name+1]);
+
+	while ((secnum = P_FindSectorFromTag (tag, secnum)) >= 0) {
+		if (floorOrCeiling == 0)
+			sectors[secnum].floorpic = flat;
+		else
+			sectors[secnum].ceilingpic = flat;
+	}
+}
+
+int CountPlayers (void)
+{
+	int count = 0, i;
+
+	for (i = 0; i < MAXPLAYERS; i++)
+		if (playeringame[i])
+			count++;
+	
+	return count;
+}
+
+static void acs_SetLineTexture (int lineid, int side, int position, int name)
+{
+	int texture, linenum = -1;
+
+	if (name >= level.strings[0])
+		return;
+
+	side = (side) ? 1 : 0;
+
+	texture = R_TextureNumForName (level.behavior + level.strings[name+1]);
+
+	while ((linenum = P_FindLineFromID (lineid, linenum)) >= 0) {
+		side_t *sidedef;
+
+		if (lines[linenum].sidenum[side] == -1)
+			continue;
+		sidedef = sides + lines[linenum].sidenum[side];
+
+		switch (position) {
+			case TEXTURE_TOP:
+				sidedef->toptexture = texture;
+				break;
+			case TEXTURE_MIDDLE:
+				sidedef->midtexture = texture;
+				break;
+			case TEXTURE_BOTTOM:
+				sidedef->bottomtexture = texture;
+				break;
+			default:
+				break;
+		}
+
+	}
+}
+
+static void T_ACS (script_t *script)
+{
+	int runaway = 0;	// used to prevent infinite loops
+	int pcd;
+
+	switch (script->state) {
+		case delayed:
+			// Decrement the delay counter and enter state running
+			// if it hits 0.
+			if (--script->statedata == 0)
+				script->state = running;
+			break;
+
+		case tagwait:
+			// Wait for tagged sector(s) to go inactive, then enter
+			// state running.
+			{
+				int secnum = -1;
+
+				while ((secnum = P_FindSectorFromTag (script->statedata, secnum)) >= 0)
+					if (sectors[secnum].floordata || sectors[secnum].ceilingdata)
+						return;
+
+				// If we got here, none of the tagged sectors were busy
+				script->state = running;
+			}
+			break;
+
+		case polywait:
+			// Wait for polyobj(s) to stop moving, then enter
+			// state running.
+			{
+				// TODO
+				script->state = running;
+			}
+			break;
+
+		case scriptwaitpre:
+			// Wait for a script to start running, then enter
+			// state scriptwait.
+			if (RunningScripts[script->statedata])
+				script->state = scriptwait;
+			break;
+
+		case scriptwait:
+			// Wait for a script to stop running, then enter
+			// state running.
+			if (RunningScripts[script->statedata])
+				return;
+
+			script->state = running;
+			putScriptFirst (script);
+			break;
+	}
+
+	while (script->state == running) {
+		if (++runaway > 500000) {
+			Printf ("Runaway script %d terminated\n", script->script);
+			script->state = removeThisThingNow;
+			break;
+		}
+
+		switch ( (pcd = NEXTWORD) ) {
+			default:
+				Printf ("Unknown P-Code %d in script %d\n", pcd, script->script);
+				// fall through
+			case PCD_TERMINATE:
+				script->state = removeThisThingNow;
+				break;
+
+			case PCD_NOP:
+				break;
+
+			case PCD_SUSPEND:
+				script->state = suspended;
+				break;
+
+			case PCD_PUSHNUMBER:
+				pushToStack (script, NEXTWORD);
+				break;
+
+			case PCD_LSPEC1:
+				LineSpecials[NEXTWORD] (script->activationline, script->activator,
+										STACK(1), 0, 0, 0, 0);
+				script->sp -= 1;
+				break;
+
+			case PCD_LSPEC2:
+				LineSpecials[NEXTWORD] (script->activationline, script->activator,
+										STACK(2), STACK(1), 0, 0, 0);
+				script->sp -= 2;
+				break;
+
+			case PCD_LSPEC3:
+				LineSpecials[NEXTWORD] (script->activationline, script->activator,
+										STACK(3), STACK(2), STACK(1), 0, 0);
+				script->sp -= 3;
+				break;
+
+			case PCD_LSPEC4:
+				LineSpecials[NEXTWORD] (script->activationline, script->activator,
+										STACK(4), STACK(3), STACK(2),
+										STACK(1), 0);
+				script->sp -= 4;
+				break;
+
+			case PCD_LSPEC5:
+				LineSpecials[NEXTWORD] (script->activationline, script->activator,
+										STACK(5), STACK(4), STACK(3),
+										STACK(2), STACK(1));
+				script->sp -= 5;
+				break;
+
+			case PCD_LSPEC1DIRECT:
+				LineSpecials[script->pc[0]] (script->activationline, script->activator,
+											 script->pc[1], 0, 0, 0, 0);
+				script->pc += 2;
+				break;
+
+			case PCD_LSPEC2DIRECT:
+				LineSpecials[script->pc[0]] (script->activationline, script->activator,
+											 script->pc[1], script->pc[2], 0, 0, 0);
+				script->pc += 3;
+				break;
+
+			case PCD_LSPEC3DIRECT:
+				LineSpecials[script->pc[0]] (script->activationline, script->activator,
+											 script->pc[1], script->pc[2], script->pc[3],
+											 0, 0);
+				script->pc += 4;
+				break;
+
+			case PCD_LSPEC4DIRECT:
+				LineSpecials[script->pc[0]] (script->activationline, script->activator,
+											 script->pc[1], script->pc[2], script->pc[3],
+											 script->pc[4], 0);
+				script->pc += 5;
+				break;
+
+			case PCD_LSPEC5DIRECT:
+				LineSpecials[script->pc[0]] (script->activationline, script->activator,
+											 script->pc[1], script->pc[2], script->pc[3],
+											 script->pc[4], script->pc[5]);
+				script->pc += 6;
+				break;
+
+			case PCD_ADD:
+				STACK(2) = STACK(2) + STACK(1);
+				script->sp--;
+				break;
+
+			case PCD_SUBTRACT:
+				STACK(2) = STACK(2) - STACK(1);
+				script->sp--;
+				break;
+
+			case PCD_MULTIPLY:
+				STACK(2) = STACK(2) * STACK(1);
+				script->sp--;
+				break;
+
+			case PCD_DIVIDE:
+				STACK(2) = STACK(2) / STACK(1);
+				script->sp--;
+				break;
+
+			case PCD_MODULUS:
+				STACK(2) = STACK(2) % STACK(1);
+				script->sp--;
+				break;
+
+			case PCD_EQ:
+				STACK(2) = (STACK(2) == STACK(1));
+				script->sp--;
+				break;
+
+			case PCD_NE:
+				STACK(2) = (STACK(2) != STACK(1));
+				script->sp--;
+				break;
+
+			case PCD_LT:
+				STACK(2) = (STACK(2) < STACK(1));
+				script->sp--;
+				break;
+
+			case PCD_GT:
+				STACK(2) = (STACK(2) > STACK(1));
+				script->sp--;
+				break;
+
+			case PCD_LE:
+				STACK(2) = (STACK(2) <= STACK(1));
+				script->sp--;
+				break;
+
+			case PCD_GE:
+				STACK(2) = (STACK(2) >= STACK(1));
+				script->sp--;
+				break;
+
+			case PCD_ASSIGNSCRIPTVAR:
+				script->locals[NEXTWORD] = STACK(1);
+				script->sp--;
+				break;
+
+
+			case PCD_ASSIGNMAPVAR:
+				level.vars[NEXTWORD] = STACK(1);
+				script->sp--;
+				break;
+
+			case PCD_ASSIGNWORLDVAR:
+				WorldVars[NEXTWORD] = STACK(1);
+				script->sp--;
+				break;
+
+			case PCD_PUSHSCRIPTVAR:
+				pushToStack (script, script->locals[NEXTWORD]);
+				break;
+
+			case PCD_PUSHMAPVAR:
+				pushToStack (script, level.vars[NEXTWORD]);
+				break;
+
+			case PCD_PUSHWORLDVAR:
+				pushToStack (script, WorldVars[NEXTWORD]);
+				break;
+
+			case PCD_ADDSCRIPTVAR:
+				script->locals[NEXTWORD] += STACK(1);
+				script->sp--;
+				break;
+
+			case PCD_ADDMAPVAR:
+				level.vars[NEXTWORD] += STACK(1);
+				script->sp--;
+				break;
+
+			case PCD_ADDWORLDVAR:
+				WorldVars[NEXTWORD] += STACK(1);
+				script->sp--;
+				break;
+
+			case PCD_SUBSCRIPTVAR:
+				script->locals[NEXTWORD] -= STACK(1);
+				script->sp--;
+				break;
+
+			case PCD_SUBMAPVAR:
+				level.vars[NEXTWORD] -= STACK(1);
+				script->sp--;
+				break;
+
+			case PCD_SUBWORLDVAR:
+				WorldVars[NEXTWORD] -= STACK(1);
+				script->sp--;
+				break;
+
+			case PCD_MULSCRIPTVAR:
+				script->locals[NEXTWORD] *= STACK(1);
+				script->sp--;
+				break;
+
+			case PCD_MULMAPVAR:
+				level.vars[NEXTWORD] *= STACK(1);
+				script->sp--;
+				break;
+
+			case PCD_MULWORLDVAR:
+				WorldVars[NEXTWORD] *= STACK(1);
+				script->sp--;
+				break;
+
+			case PCD_DIVSCRIPTVAR:
+				script->locals[NEXTWORD] /= STACK(1);
+				script->sp--;
+				break;
+
+			case PCD_DIVMAPVAR:
+				level.vars[NEXTWORD] /= STACK(1);
+				script->sp--;
+				break;
+
+			case PCD_DIVWORLDVAR:
+				WorldVars[NEXTWORD] /= STACK(1);
+				script->sp--;
+				break;
+
+			case PCD_MODSCRIPTVAR:
+				script->locals[NEXTWORD] %= STACK(1);
+				script->sp--;
+				break;
+
+			case PCD_MODMAPVAR:
+				level.vars[NEXTWORD] %= STACK(1);
+				script->sp--;
+				break;
+
+			case PCD_MODWORLDVAR:
+				WorldVars[NEXTWORD] %= STACK(1);
+				script->sp--;
+				break;
+
+			case PCD_INCSCRIPTVAR:
+				script->locals[NEXTWORD]++;
+				break;
+
+			case PCD_INCMAPVAR:
+				level.vars[NEXTWORD]++;
+				break;
+
+			case PCD_INCWORLDVAR:
+				WorldVars[NEXTWORD]++;
+				break;
+
+			case PCD_DECSCRIPTVAR:
+				script->locals[NEXTWORD]--;
+				break;
+
+			case PCD_DECMAPVAR:
+				level.vars[NEXTWORD]--;
+				break;
+
+			case PCD_DECWORLDVAR:
+				WorldVars[NEXTWORD]--;
+				break;
+
+			case PCD_GOTO:
+				script->pc = (int *)(level.behavior + *(script->pc));
+				break;
+
+			case PCD_IFGOTO:
+				if (STACK(1))
+					script->pc = (int *)(level.behavior + *(script->pc));
+				else
+					script->pc++;
+				script->sp--;
+				break;
+
+			case PCD_DROP:
+				script->sp--;
+				break;
+
+			case PCD_DELAY:
+				script->state = delayed;
+				script->statedata = STACK(1);
+				script->sp--;
+				break;
+
+			case PCD_DELAYDIRECT:
+				script->state = delayed;
+				script->statedata = NEXTWORD;
+				break;
+
+			case PCD_RANDOM:
+				STACK(2) = acs_Random (STACK(2), STACK(1));
+				script->sp--;
+				break;
+				
+			case PCD_RANDOMDIRECT:
+				pushToStack (script, acs_Random (script->pc[0], script->pc[1]));
+				script->pc += 2;
+				break;
+
+			case PCD_THINGCOUNT:
+				STACK(2) = acs_ThingCount (STACK(2), STACK(1));
+				script->sp--;
+				break;
+
+			case PCD_THINGCOUNTDIRECT:
+				pushToStack (script, acs_ThingCount (script->pc[0], script->pc[1]));
+				script->pc += 2;
+				break;
+
+			case PCD_TAGWAIT:
+				script->state = tagwait;
+				script->statedata = STACK(1);
+				script->sp--;
+				break;
+
+			case PCD_TAGWAITDIRECT:
+				script->state = tagwait;
+				script->statedata = NEXTWORD;
+				break;
+
+			case PCD_POLYWAIT:
+				script->state = polywait;
+				script->statedata = STACK(1);
+				script->sp--;
+				break;
+
+			case PCD_POLYWAITDIRECT:
+				script->state = polywait;
+				script->statedata = NEXTWORD;
+				break;
+
+			case PCD_CHANGEFLOOR:
+				acs_ChangeFlat (STACK(2), STACK(1), 0);
+				script->sp -= 2;
+				break;
+
+			case PCD_CHANGEFLOORDIRECT:
+				acs_ChangeFlat (script->pc[0], script->pc[1], 0);
+				script->pc += 2;
+				break;
+
+			case PCD_CHANGECEILING:
+				acs_ChangeFlat (STACK(2), STACK(1), 1);
+				script->sp -= 2;
+				break;
+
+			case PCD_CHANGECEILINGDIRECT:
+				acs_ChangeFlat (script->pc[0], script->pc[1], 1);
+				script->pc += 2;
+				break;
+
+			case PCD_RESTART:
+				script->pc = (int *)(level.behavior + (P_FindScript (script->script))[1]);
+				break;
+
+			case PCD_ANDLOGICAL:
+				STACK(2) = (STACK(2) && STACK(1));
+				script->sp--;
+				break;
+
+			case PCD_ORLOGICAL:
+				STACK(2) = (STACK(2) || STACK(1));
+				script->sp--;
+				break;
+
+			case PCD_ANDBITWISE:
+				STACK(2) = (STACK(2) & STACK(1));
+				script->sp--;
+				break;
+
+			case PCD_ORBITWISE:
+				STACK(2) = (STACK(2) | STACK(1));
+				script->sp--;
+				break;
+
+			case PCD_EORBITWISE:
+				STACK(2) = (STACK(2) ^ STACK(1));
+				script->sp--;
+				break;
+
+			case PCD_NEGATELOGICAL:
+				STACK(1) = !STACK(1);
+				break;
+
+			case PCD_LSHIFT:
+				STACK(2) = (STACK(2) << STACK(1));
+				script->sp--;
+				break;
+
+			case PCD_RSHIFT:
+				STACK(2) = (STACK(2) >> STACK(1));
+				script->sp--;
+				break;
+
+			case PCD_UNARYMINUS:
+				STACK(1) = -STACK(1);
+				script->sp--;
+				break;
+
+			case PCD_IFNOTGOTO:
+				if (!STACK(1))
+					script->pc = (int *)(level.behavior + *(script->pc));
+				else
+					script->pc++;
+				script->sp--;
+				break;
+
+			case PCD_LINESIDE:
+				pushToStack (script, script->lineSide);
+				break;
+
+			case PCD_SCRIPTWAIT:
+				script->statedata = STACK(1);
+				if (RunningScripts[script->statedata])
+					script->state = scriptwait;
+				else
+					script->state = scriptwaitpre;
+				script->sp--;
+				putScriptLast (script);
+				break;
+
+			case PCD_SCRIPTWAITDIRECT:
+				script->state = scriptwait;
+				script->statedata = NEXTWORD;
+				putScriptLast (script);
+				break;
+
+			case PCD_CLEARLINESPECIAL:
+				if (script->activationline)
+					script->activationline->special = 0;
+				break;
+
+			case PCD_CASEGOTO:
+				if (STACK(1) == NEXTWORD) {
+					script->pc = (int *)(level.behavior + *(script->pc));
+					script->sp--;
+				} else {
+					script->pc++;
+				}
+				break;
+
+			case PCD_BEGINPRINT:
+				script->stringstart = script->sp;
+				break;
+
+			case PCD_ENDPRINT:
+			case PCD_ENDPRINTBOLD:
+				if (script->activator && script->activator->player == NULL) {
+					script->sp = script->stringstart;
+				} else {
+					char work[4096], *workwhere;
+					int parse = script->stringstart;
+
+					workwhere = work;
+					while (parse < script->sp) {
+						int value = script->stack[parse++];
+						int type = script->stack[parse++];
+
+						switch (type) {
+							case spString:
+								if (value < level.strings[0])
+									workwhere += sprintf (workwhere, "%s",
+										level.strings[value+1] + level.behavior);
+								break;
+
+							case spNumber:
+								workwhere += sprintf (workwhere, "%d", value);
+								break;
+
+							case spChar:
+								workwhere[0] = value;
+								workwhere[1] = 0;
+								workwhere++;
+								break;
+
+							default:
+								break;
+						}
+					}
+					script->sp = script->stringstart;
+					if (pcd == PCD_ENDPRINTBOLD || script->activator == NULL ||
+						(script->activator->player - players == consoleplayer))
+						C_MidPrint (work);
+				}
+				break;
+
+			case PCD_PRINTSTRING:
+				pushToStack (script, spString);
+				break;
+
+			case PCD_PRINTNUMBER:
+				pushToStack (script, spNumber);
+				break;
+
+			case PCD_PRINTCHARACTER:
+				pushToStack (script, spChar);
+				break;
+
+			case PCD_PLAYERCOUNT:
+				pushToStack (script, CountPlayers ());
+				break;
+
+			case PCD_GAMETYPE:
+				if (deathmatch->value)
+					pushToStack (script, GAME_NET_DEATHMATCH);
+				else if (netgame)
+					pushToStack (script, GAME_NET_COOPERATIVE);
+				else
+					pushToStack (script, GAME_SINGLE_PLAYER);
+				break;
+					
+			case PCD_GAMESKILL:
+				pushToStack (script, (int)(gameskill->value));
+				break;
+
+			case PCD_TIMER:
+				pushToStack (script, level.time);
+				break;
+
+			case PCD_SECTORSOUND:
+				if (STACK(2) < level.strings[0] && script->activationline) {
+					S_StartSoundAtVolume (
+						(mobj_t *)&script->activationline->frontsector->soundorg,
+						level.behavior + level.strings[STACK(2)+1],
+						64,
+						STACK(1) * 2);
+				}
+				script->sp -= 2;
+				break;
+
+			case PCD_AMBIENTSOUND:
+				if (STACK(2) < level.strings[0])
+					S_StartAmbient (level.behavior + level.strings[STACK(2)+1],
+									STACK(1) * 2,
+									false);
+				script->sp -= 2;
+				break;
+
+			case PCD_SOUNDSEQUENCE:
+				// TODO
+				script->sp--;
+				break;
+
+			case PCD_SETLINETEXTURE:
+				acs_SetLineTexture (STACK(4), STACK(3), STACK(2), STACK(1));
+				script->sp -= 4;
+				break;
+
+			case PCD_SETLINEBLOCKING:
+				{
+					int line = -1;
+
+					while ((line = P_FindLineFromID (STACK(2), line)) >= 0) {
+						if (STACK(1))
+							lines[line].flags |= ML_BLOCKING;
+						else
+							lines[line].flags &= ~(ML_BLOCKING|ML_BLOCKEVERYTHING);
+					}
+
+					script->sp -= 2;
+				}
+				break;
+
+			case PCD_SETLINESPECIAL:
+				{
+					int linenum = -1;
+
+					while ((linenum = P_FindLineFromID (STACK(7), linenum)) >= 0) {
+						line_t *line = &lines[linenum];
+
+						line->special = STACK(6);
+						line->args[0] = STACK(5);
+						line->args[1] = STACK(4);
+						line->args[2] = STACK(3);
+						line->args[3] = STACK(2);
+						line->args[4] = STACK(1);
+					}
+					script->sp -= 7;
+				}
+				break;
+
+			case PCD_THINGSOUND:
+				if (STACK(2) < level.strings[0])
+				{
+					mobj_t *spot = NULL;
+
+					while ( (spot = P_FindMobjByTid (spot, STACK(3))) )
+						S_StartSoundAtVolume (spot,
+											  level.behavior + level.strings[STACK(2)+1],
+											  32,
+											  STACK(1)*2);
+				}
+				script->sp -= 3;
+				break;
+
+		}
+	}
+
+	if (script->state == removeThisThingNow) {
+		unlinkScript (script);
+		if (RunningScripts[script->script] == script)
+			RunningScripts[script->script] = NULL;
+		Z_Free (script);
+	}
+}
+
+void P_RunScripts (void)
+{
+	script_t *script = Scripts;
+
+	while (script) {
+		T_ACS (script);
+		script = script->next;
+	}
+}
+
+static BOOL P_GetScriptGoing (mobj_t *who, line_t *where, int num, int *code,
+							  int lineSide, int arg0, int arg1, int arg2, int always)
+{
+	script_t *script;
+
+	if (!always)
+		if (RunningScripts[num]) {
+			if (RunningScripts[num]->state == suspended) {
+				RunningScripts[num]->state = running;
+				return true;
+			}
+			return false;
+		}
+
+	script = Z_Malloc (sizeof(*script), PU_LEVACS, 0);
+
+	script->script = num;
+	script->sp = 0;
+	memset (script->locals, 0, sizeof(script->locals));
+	script->locals[0] = arg0;
+	script->locals[1] = arg1;
+	script->locals[2] = arg2;
+	script->pc = code;
+	script->state = running;
+	script->activator = who;
+	script->activationline = where;
+	script->lineSide = lineSide;
+
+	if (!always)
+		RunningScripts[num] = script;
+
+	linkScript (script);
+
+	DPrintf ("Script %d started.\n", num);
+
+	return true;
+}
+
+static void SetScriptState (int script, int state)
+{
+	if (RunningScripts[script])
+		RunningScripts[script]->state = state;
+}
+
+void P_DoDeferedScripts (void)
+{
+	acsdefered_t *def;
+
+	// Handle defered scripts in this step, too
+	def = level.info->defered;
+	while (def) {
+		acsdefered_t *next = def->next;
+		switch (def->type) {
+			case defexecute:
+			case defexealways:
+				P_StartScript (NULL, NULL, def->script, level.mapname, 0,
+							   def->arg0, def->arg1, def->arg2, def->type == defexealways);
+				break;
+			case defsuspend:
+				SetScriptState (def->script, suspended);
+				DPrintf ("Defered suspend of script %d\n", def->script);
+				break;
+			case defterminate:
+				SetScriptState (def->script, removeThisThingNow);
+				DPrintf ("Defered terminate of script %d\n", def->script);
+				break;
+		}
+		Z_Free (def);
+		def = next;
+	}
+	level.info->defered = NULL;
+}
+
+void P_StartOpenScripts (void)
+{
+	int *script;
+	
+	if ( (script = level.scripts) ) {
+		int numscripts = *script++;
+
+		for (; numscripts; numscripts--, script += 3) {
+			if (script[0] >= 1000) {
+				P_GetScriptGoing (NULL, NULL, script[0] - 1000,
+								  (int *)(level.behavior + script[1]), 0, 0, 0, 0, 0);
+			}
+		}
+	}
+}
+
+static void addDefered (level_info_t *i, int type, int script, int arg0, int arg1, int arg2)
+{
+	if (i) {
+		acsdefered_t *def = Z_Malloc (sizeof(*def), PU_STATIC, 0);
+
+		def->next = i->defered;
+		def->type = type;
+		def->script = script;
+		def->arg0 = arg0;
+		def->arg1 = arg1;
+		def->arg2 = arg2;
+		i->defered = def;
+		DPrintf ("Script %d on map %s defered\n", script, i->mapname);
+	}
+}
+
+BOOL P_StartScript (mobj_t *who, line_t *where, int script, char *map, int lineSide,
+					int arg0, int arg1, int arg2, int always)
+{
+	if (!strnicmp (level.mapname, map, 8)) {
+		int *scriptdata = P_FindScript (script);
+
+		if (script) {
+			return P_GetScriptGoing (who, where, script,
+									 (int *)(scriptdata[1] + level.behavior),
+									 lineSide, arg0, arg1, arg2, always);
+		} else
+			Printf ("P_StartScript: Unknown script %d\n", script);
+	} else {
+		addDefered (FindLevelInfo (map), always ? defexealways : defexecute,
+					script, arg0, arg1, arg2);
+	}
+	return false;
+}
+
+void P_SuspendScript (int script, char *map)
+{
+	if (strnicmp (level.mapname, map, 8))
+		addDefered (FindLevelInfo (map), defsuspend, script, 0, 0, 0);
+	else
+		SetScriptState (script, suspended);
+}
+
+void P_TerminateScript (int script, char *map)
+{
+	if (strnicmp (level.mapname, map, 8))
+		addDefered (FindLevelInfo (map), defterminate, script, 0, 0, 0);
+	else
+		SetScriptState (script, removeThisThingNow);
+}
diff --git a/code/p_acs.h b/code/p_acs.h
new file mode 100644
index 0000000000..ec21e8e261
--- /dev/null
+++ b/code/p_acs.h
@@ -0,0 +1,197 @@
+// p_acs.h: ACS Script Stuff
+
+#ifndef __P_ACS_H__
+#define __P_ACS_H__
+
+#define STACK_SIZE	200
+#define LOCAL_SIZE	10
+
+typedef enum
+{
+	running,
+	suspended,
+	delayed,
+	tagwait,
+	polywait,
+	scriptwait,
+	scriptwaitpre,
+	removeThisThingNow
+} scriptstate_e;
+
+typedef enum
+{
+	spString,
+	spNumber,
+	spChar
+} stringpart_e;
+
+typedef struct script_s
+{
+	struct script_s *next, *prev;
+	int				script;
+	int				stack[STACK_SIZE];
+	int				sp;
+	int				locals[LOCAL_SIZE];
+	int				*pc;
+	scriptstate_e	state;
+	int				statedata;
+	mobj_t			*activator;
+	line_t			*activationline;
+	int				lineSide;
+	int				stringstart;
+} script_t;
+
+extern script_t *LastScript;
+extern script_t *Scripts;	// List of all running scripts
+extern script_t *RunningScripts[256];	// Array of all synchronous scripts
+
+void P_RunScripts (void);
+
+// The structure used to control scripts between maps
+struct acsdefered_s
+{
+	struct acsdefered_s *next;
+
+	enum {
+		defexecute,
+		defexealways,
+		defsuspend,
+		defterminate
+	} type;
+	int script;
+	int arg0, arg1, arg2;
+};
+typedef struct acsdefered_s acsdefered_t;
+
+// Known P-codes for ACS scripts
+
+#define PCD_NOP					0
+#define PCD_TERMINATE			1
+#define PCD_SUSPEND				2
+#define PCD_PUSHNUMBER			3
+#define PCD_LSPEC1				4
+#define PCD_LSPEC2				5
+#define PCD_LSPEC3				6
+#define PCD_LSPEC4				7
+#define PCD_LSPEC5				8
+#define PCD_LSPEC1DIRECT		9
+#define PCD_LSPEC2DIRECT		10
+#define PCD_LSPEC3DIRECT		11
+#define PCD_LSPEC4DIRECT		12
+#define PCD_LSPEC5DIRECT		13
+#define PCD_ADD					14
+#define PCD_SUBTRACT			15
+#define PCD_MULTIPLY			16
+#define PCD_DIVIDE				17
+#define PCD_MODULUS				18
+#define PCD_EQ					19
+#define PCD_NE					20
+#define PCD_LT					21
+#define PCD_GT					22
+#define PCD_LE					23
+#define PCD_GE					24
+#define PCD_ASSIGNSCRIPTVAR		25
+#define PCD_ASSIGNMAPVAR		26
+#define PCD_ASSIGNWORLDVAR		27
+#define PCD_PUSHSCRIPTVAR		28
+#define PCD_PUSHMAPVAR			29
+#define PCD_PUSHWORLDVAR		30
+#define PCD_ADDSCRIPTVAR		31
+#define PCD_ADDMAPVAR			32
+#define PCD_ADDWORLDVAR			33
+#define PCD_SUBSCRIPTVAR		34
+#define PCD_SUBMAPVAR			35
+#define PCD_SUBWORLDVAR			36
+#define PCD_MULSCRIPTVAR		37
+#define PCD_MULMAPVAR			38
+#define PCD_MULWORLDVAR			39
+#define PCD_DIVSCRIPTVAR		40
+#define PCD_DIVMAPVAR			41
+#define PCD_DIVWORLDVAR			42
+#define PCD_MODSCRIPTVAR		43
+#define PCD_MODMAPVAR			44
+#define PCD_MODWORLDVAR			45
+#define PCD_INCSCRIPTVAR		46
+#define PCD_INCMAPVAR			47
+#define PCD_INCWORLDVAR			48
+#define PCD_DECSCRIPTVAR		49
+#define PCD_DECMAPVAR			50
+#define PCD_DECWORLDVAR			51
+#define PCD_GOTO				52
+#define PCD_IFGOTO				53
+#define PCD_DROP				54
+#define PCD_DELAY				55
+#define PCD_DELAYDIRECT			56
+#define PCD_RANDOM				57
+#define PCD_RANDOMDIRECT		58
+#define PCD_THINGCOUNT			59
+#define PCD_THINGCOUNTDIRECT	60
+#define PCD_TAGWAIT				61
+#define PCD_TAGWAITDIRECT		62
+#define PCD_POLYWAIT			63
+#define PCD_POLYWAITDIRECT		64
+#define PCD_CHANGEFLOOR			65
+#define PCD_CHANGEFLOORDIRECT	66
+#define PCD_CHANGECEILING		67
+#define PCD_CHANGECEILINGDIRECT	68
+#define PCD_RESTART				69
+#define PCD_ANDLOGICAL			70
+#define PCD_ORLOGICAL			71
+#define PCD_ANDBITWISE			72
+#define PCD_ORBITWISE			73
+#define PCD_EORBITWISE			74
+#define PCD_NEGATELOGICAL		75
+#define PCD_LSHIFT				76
+#define PCD_RSHIFT				77
+#define PCD_UNARYMINUS			78
+#define PCD_IFNOTGOTO			79
+#define PCD_LINESIDE			80
+#define PCD_SCRIPTWAIT			81
+#define PCD_SCRIPTWAITDIRECT	82
+#define PCD_CLEARLINESPECIAL	83
+#define PCD_CASEGOTO			84
+#define PCD_BEGINPRINT			85
+#define PCD_ENDPRINT			86
+#define PCD_PRINTSTRING			87
+#define PCD_PRINTNUMBER			88
+#define PCD_PRINTCHARACTER		89
+#define PCD_PLAYERCOUNT			90
+#define PCD_GAMETYPE			91
+#define PCD_GAMESKILL			92
+#define PCD_TIMER				93
+#define PCD_SECTORSOUND			94
+#define PCD_AMBIENTSOUND		95
+#define PCD_SOUNDSEQUENCE		96
+#define PCD_SETLINETEXTURE		97
+#define PCD_SETLINEBLOCKING		98
+#define PCD_SETLINESPECIAL		99
+#define PCD_THINGSOUND			100
+#define PCD_ENDPRINTBOLD		101
+
+// Some constants used by ACS scripts
+
+#define LINE_FRONT				0
+#define LINE_BACK				1
+
+#define SIDE_FRONT				0
+#define SIDE_BACK				1
+
+#define TEXTURE_TOP				0
+#define TEXTURE_MIDDLE			1
+#define TEXTURE_BOTTOM			2
+
+#define GAME_SINGLE_PLAYER		0
+#define GAME_NET_COOPERATIVE	1
+#define GAME_NET_DEATHMATCH		2
+
+#define CLASS_FIGHTER			0
+#define CLASS_CLERIC			1
+#define CLASS_MAGE				2
+
+#define SKILL_VERY_EASY			0
+#define SKILL_EASY				1
+#define SKILL_NORMAL			2
+#define SKILL_HARD				3
+#define SKILL_VERY_HARD			4
+
+#endif //__P_ACS_H__
\ No newline at end of file
diff --git a/code/p_ceilng.c b/code/p_ceilng.c
deleted file mode 100644
index 5e09276aaa..0000000000
--- a/code/p_ceilng.c
+++ /dev/null
@@ -1,343 +0,0 @@
-// Emacs style mode select	 -*- C++ -*- 
-//-----------------------------------------------------------------------------
-//
-// $Id:$
-//
-// Copyright (C) 1993-1996 by id Software, Inc.
-//
-// This source is available for distribution and/or modification
-// only under the terms of the DOOM Source Code License as
-// published by id Software. All rights reserved.
-//
-// The source is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// FITNESS FOR A PARTICULAR PURPOSE. See the DOOM Source Code License
-// for more details.
-//
-// $Log:$
-//
-// DESCRIPTION:  Ceiling aninmation (lowering, crushing, raising)
-//
-//-----------------------------------------------------------------------------
-
-
-
-#include "m_alloc.h"
-
-#include "z_zone.h"
-#include "doomdef.h"
-#include "p_local.h"
-
-#include "s_sound.h"
-
-// State.
-#include "doomstat.h"
-#include "r_state.h"
-
-// Data.
-#include "sounds.h"
-
-//
-// CEILINGS
-//
-
-
-int				MaxCeilings;
-ceiling_t		**activeceilings;
-
-
-//
-// T_MoveCeiling
-//
-
-void T_MoveCeiling (ceiling_t* ceiling)
-{
-	result_e	res;
-		
-	switch(ceiling->direction)
-	{
-	  case 0:
-		// IN STASIS
-		break;
-	  case 1:
-		// UP
-		res = T_MovePlane(ceiling->sector,
-						  ceiling->speed,
-						  ceiling->topheight,
-						  false,1,ceiling->direction);
-		
-		if (!(level.time&7))
-		{
-			switch(ceiling->type)
-			{
-			  case silentCrushAndRaise:
-				break;
-			  default:
-				S_StartSound((mobj_t *)&ceiling->sector->soundorg,
-							 sfx_stnmov);
-				// ?
-				break;
-			}
-		}
-		
-		if (res == pastdest)
-		{
-			switch(ceiling->type)
-			{
-			  case raiseToHighest:
-				P_RemoveActiveCeiling(ceiling);
-				break;
-				
-			  case silentCrushAndRaise:
-				S_StartSound((mobj_t *)&ceiling->sector->soundorg,
-							 sfx_pstop);
-			  case fastCrushAndRaise:
-			  case crushAndRaise:
-				ceiling->direction = -1;
-				break;
-				
-			  default:
-				break;
-			}
-			
-		}
-		break;
-		
-	  case -1:
-		// DOWN
-		res = T_MovePlane(ceiling->sector,
-						  ceiling->speed,
-						  ceiling->bottomheight,
-						  ceiling->crush,1,ceiling->direction);
-		
-		if (!(level.time&7))
-		{
-			switch(ceiling->type)
-			{
-			  case silentCrushAndRaise: break;
-			  default:
-				S_StartSound((mobj_t *)&ceiling->sector->soundorg,
-							 sfx_stnmov);
-			}
-		}
-		
-		if (res == pastdest)
-		{
-			switch(ceiling->type)
-			{
-			  case silentCrushAndRaise:
-				S_StartSound((mobj_t *)&ceiling->sector->soundorg,
-							 sfx_pstop);
-			  case crushAndRaise:
-				ceiling->speed = CEILSPEED;
-			  case fastCrushAndRaise:
-				ceiling->direction = 1;
-				break;
-
-			  case lowerAndCrush:
-			  case lowerToFloor:
-				P_RemoveActiveCeiling(ceiling);
-				break;
-
-			  default:
-				break;
-			}
-		}
-		else // ( res != pastdest )
-		{
-			if (res == crushed)
-			{
-				switch(ceiling->type)
-				{
-				  case silentCrushAndRaise:
-				  case crushAndRaise:
-				  case lowerAndCrush:
-					ceiling->speed = CEILSPEED / 8;
-					break;
-
-				  default:
-					break;
-				}
-			}
-		}
-		break;
-	}
-}
-
-
-//
-// EV_DoCeiling
-// Move a ceiling up/down and all around!
-//
-int EV_DoCeiling (line_t *line, ceiling_e type)
-{
-	int 		secnum;
-	int 		rtn;
-	sector_t*	sec;
-	ceiling_t*	ceiling;
-		
-	secnum = -1;
-	rtn = 0;
-	
-	//	Reactivate in-stasis ceilings...for certain types.
-	// This restarts a crusher after it has been stopped
-	switch(type)
-	{
-	  case fastCrushAndRaise:
-	  case silentCrushAndRaise:
-	  case crushAndRaise:
-		P_ActivateInStasisCeiling(line);
-	  default:
-		break;
-	}
-		
-	// affects all sectors with the same tag as the linedef
-	while ((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
-	{
-		sec = &sectors[secnum];
-		// if ceiling already moving, don't start a second function on it
-		if (P_SectorActive (ceiling_special,sec))	//jff 2/22/98
-			continue;
-		
-		// new door thinker
-		rtn = 1;
-		ceiling = Z_Malloc (sizeof(*ceiling), PU_LEVSPEC, 0);
-		P_AddThinker (&ceiling->thinker);
-		sec->ceilingdata = ceiling;					//jff 2/22/98
-		ceiling->thinker.function.acp1 = (actionf_p1)T_MoveCeiling;
-		ceiling->sector = sec;
-		ceiling->crush = false;
-		
-		switch(type)
-		{
-		  case fastCrushAndRaise:
-			ceiling->crush = true;
-			ceiling->topheight = sec->ceilingheight;
-			ceiling->bottomheight = sec->floorheight + (8*FRACUNIT);
-			ceiling->direction = -1;
-			ceiling->speed = CEILSPEED * 2;
-			break;
-
-		  case silentCrushAndRaise:
-		  case crushAndRaise:
-			ceiling->crush = true;
-			ceiling->topheight = sec->ceilingheight;
-		  case lowerAndCrush:
-		  case lowerToFloor:
-			ceiling->bottomheight = sec->floorheight;
-			if (type != lowerToFloor)
-				ceiling->bottomheight += 8*FRACUNIT;
-			ceiling->direction = -1;
-			ceiling->speed = CEILSPEED;
-			break;
-
-		  case raiseToHighest:
-			ceiling->topheight = P_FindHighestCeilingSurrounding(sec);
-			ceiling->direction = 1;
-			ceiling->speed = CEILSPEED;
-			break;
-		}
-				
-		ceiling->tag = sec->tag;
-		ceiling->type = type;
-		P_AddActiveCeiling(ceiling);
-	}
-	return rtn;
-}
-
-
-//
-// Add an active ceiling
-//
-void P_AddActiveCeiling(ceiling_t* c)
-{
-	int i;
-	
-	for (i = 0; i < MaxCeilings;i++) {
-		if (activeceilings[i] == NULL) {
-			activeceilings[i] = c;
-			return;
-		}
-	}
-
-	// [RH] If we got here, there was no room in the activeceilings
-	// list, so we need to make some.
-
-	MaxCeilings += 2;
-	activeceilings = Realloc (activeceilings, MaxCeilings * sizeof(ceiling_t *));
-	activeceilings[i] = c;
-	activeceilings[i+1] = NULL;
-	DPrintf ("MaxCeilings increased to %d\n", MaxCeilings);
-}
-
-
-
-//
-// Remove a ceiling's thinker
-//
-void P_RemoveActiveCeiling(ceiling_t* c)
-{
-	int i;
-		
-	for (i = 0;i < MaxCeilings;i++)
-	{
-		if (activeceilings[i] == c)
-		{
-			activeceilings[i]->sector->ceilingdata = NULL;	// [RH]
-			P_RemoveThinker (&activeceilings[i]->thinker);
-			activeceilings[i] = NULL;
-			break;
-		}
-	}
-}
-
-
-
-//
-// Restart a ceiling that's in-stasis
-//
-void P_ActivateInStasisCeiling(line_t* line)
-{
-	int 		i;
-		
-	for (i = 0;i < MaxCeilings;i++)
-	{
-		if (activeceilings[i]
-			&& (activeceilings[i]->tag == line->tag)
-			&& (activeceilings[i]->direction == 0))
-		{
-			activeceilings[i]->direction = activeceilings[i]->olddirection;
-			activeceilings[i]->thinker.function.acp1
-			  = (actionf_p1)T_MoveCeiling;
-		}
-	}
-}
-
-
-
-//
-// EV_CeilingCrushStop
-// Stop a ceiling from crushing!
-//
-int 	EV_CeilingCrushStop(line_t		*line)
-{
-	int 		i;
-	int 		rtn;
-		
-	rtn = 0;
-	for (i = 0;i < MaxCeilings;i++)
-	{
-		if (activeceilings[i]
-			&& (activeceilings[i]->tag == line->tag)
-			&& (activeceilings[i]->direction != 0))
-		{
-			activeceilings[i]->olddirection = activeceilings[i]->direction;
-			activeceilings[i]->thinker.function.acv = (actionf_v)NULL;
-			activeceilings[i]->direction = 0;			// in-stasis
-			rtn = 1;
-		}
-	}
-	
-
-	return rtn;
-}
diff --git a/code/p_lights.c b/code/p_lights.c
deleted file mode 100644
index 2d162bfd28..0000000000
--- a/code/p_lights.c
+++ /dev/null
@@ -1,352 +0,0 @@
-// Emacs style mode select	 -*- C++ -*- 
-//-----------------------------------------------------------------------------
-//
-// $Id:$
-//
-// Copyright (C) 1993-1996 by id Software, Inc.
-//
-// This source is available for distribution and/or modification
-// only under the terms of the DOOM Source Code License as
-// published by id Software. All rights reserved.
-//
-// The source is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// FITNESS FOR A PARTICULAR PURPOSE. See the DOOM Source Code License
-// for more details.
-//
-// $Log:$
-//
-// DESCRIPTION:
-//		Handle Sector base lighting effects.
-//		Muzzle flash?
-//
-//-----------------------------------------------------------------------------
-
-
-
-#include "z_zone.h"
-#include "m_random.h"
-
-#include "doomdef.h"
-#include "p_local.h"
-
-
-// State.
-#include "r_state.h"
-
-//
-// FIRELIGHT FLICKER
-//
-
-//
-// T_FireFlicker
-//
-void T_FireFlicker (fireflicker_t* flick)
-{
-	int amount;
-		
-	if (--flick->count)
-		return;
-		
-	amount = (P_Random (pr_fireflicker) & 3) << 4;
-	
-	if (flick->sector->lightlevel - amount < flick->minlight)
-		flick->sector->lightlevel = (short)flick->minlight;
-	else
-		flick->sector->lightlevel = (short)(flick->maxlight - amount);
-
-	flick->count = 4;
-}
-
-
-
-//
-// P_SpawnFireFlicker
-//
-void P_SpawnFireFlicker (sector_t*		sector)
-{
-	fireflicker_t*		flick;
-		
-	// Note that we are resetting sector attributes.
-	// Nothing special about it during gameplay.
-	sector->special = 0; 
-		
-	flick = Z_Malloc ( sizeof(*flick), PU_LEVSPEC, 0);
-
-	P_AddThinker (&flick->thinker);
-
-	flick->thinker.function.acp1 = (actionf_p1) T_FireFlicker;
-	flick->sector = sector;
-	flick->maxlight = sector->lightlevel;
-	flick->minlight = P_FindMinSurroundingLight(sector,sector->lightlevel)+16;
-	flick->count = 4;
-}
-
-
-
-//
-// BROKEN LIGHT FLASHING
-//
-
-
-//
-// T_LightFlash
-// Do flashing lights.
-//
-void T_LightFlash (lightflash_t* flash)
-{
-	if (--flash->count)
-		return;
-		
-	if (flash->sector->lightlevel == flash->maxlight)
-	{
-		flash-> sector->lightlevel = (short)flash->minlight;
-		flash->count = (P_Random (pr_lightflash) & flash->mintime) + 1;
-	}
-	else
-	{
-		flash-> sector->lightlevel = (short)flash->maxlight;
-		flash->count = (P_Random (pr_lightflash) & flash->maxtime) + 1;
-	}
-
-}
-
-
-
-
-//
-// P_SpawnLightFlash
-// After the map has been loaded, scan each sector
-// for specials that spawn thinkers
-//
-void P_SpawnLightFlash (sector_t*		sector)
-{
-	lightflash_t*		flash;
-
-	// nothing special about it during gameplay
-	sector->special = 0;		
-		
-	flash = Z_Malloc ( sizeof(*flash), PU_LEVSPEC, 0);
-
-	P_AddThinker (&flash->thinker);
-
-	flash->thinker.function.acp1 = (actionf_p1) T_LightFlash;
-	flash->sector = sector;
-	flash->maxlight = sector->lightlevel;
-
-	flash->minlight = P_FindMinSurroundingLight(sector,sector->lightlevel);
-	flash->maxtime = 64;
-	flash->mintime = 7;
-	flash->count = (P_Random (pr_spawnlightflash) & flash->maxtime) + 1;
-}
-
-
-
-//
-// STROBE LIGHT FLASHING
-//
-
-
-//
-// T_StrobeFlash
-//
-void T_StrobeFlash (strobe_t*			flash)
-{
-	if (--flash->count)
-		return;
-		
-	if (flash->sector->lightlevel == flash->minlight)
-	{
-		flash-> sector->lightlevel = (short)flash->maxlight;
-		flash->count = flash->brighttime;
-	}
-	else
-	{
-		flash-> sector->lightlevel = (short)flash->minlight;
-		flash->count =flash->darktime;
-	}
-
-}
-
-
-
-//
-// P_SpawnStrobeFlash
-// After the map has been loaded, scan each sector
-// for specials that spawn thinkers
-//
-void
-P_SpawnStrobeFlash
-( sector_t* 	sector,
-  int			fastOrSlow,
-  int			inSync )
-{
-	strobe_t*	flash;
-		
-	flash = Z_Malloc ( sizeof(*flash), PU_LEVSPEC, 0);
-
-	P_AddThinker (&flash->thinker);
-
-	flash->sector = sector;
-	flash->darktime = fastOrSlow;
-	flash->brighttime = STROBEBRIGHT;
-	flash->thinker.function.acp1 = (actionf_p1) T_StrobeFlash;
-	flash->maxlight = sector->lightlevel;
-	flash->minlight = P_FindMinSurroundingLight(sector, sector->lightlevel);
-				
-	if (flash->minlight == flash->maxlight)
-		flash->minlight = 0;
-
-	// nothing special about it during gameplay
-	sector->special = 0;		
-
-	if (!inSync)
-		flash->count = (P_Random (pr_spawnstrobeflash) & 7) + 1;
-	else
-		flash->count = 1;
-}
-
-
-//
-// Start strobing lights (usually from a trigger)
-//
-void EV_StartLightStrobing (line_t *line)
-{
-	int 		secnum;
-	sector_t*	sec;
-		
-	secnum = -1;
-	while ((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
-	{
-		sec = &sectors[secnum];
-		if (P_SectorActive (lighting_special, sec))	//jff 2/22/98
-			continue;
-		
-		P_SpawnStrobeFlash (sec,SLOWDARK, 0);
-	}
-}
-
-
-
-//
-// TURN LINE'S TAG LIGHTS OFF
-//
-void EV_TurnTagLightsOff(line_t* line)
-{
-	int 				i;
-	int 				j;
-	int 				min;
-	sector_t*			sector;
-	sector_t*			tsec;
-	line_t* 			templine;
-		
-	sector = sectors;
-	
-	for (j = 0;j < numsectors; j++, sector++)
-	{
-		if (sector->tag == line->tag)
-		{
-			min = sector->lightlevel;
-			for (i = 0;i < sector->linecount; i++)
-			{
-				templine = sector->lines[i];
-				tsec = getNextSector(templine,sector);
-				if (!tsec)
-					continue;
-				if (tsec->lightlevel < min)
-					min = tsec->lightlevel;
-			}
-			sector->lightlevel = (short)min;
-		}
-	}
-}
-
-
-//
-// TURN LINE'S TAG LIGHTS ON
-//
-void EV_LightTurnOn (line_t *line, int bright)
-{
-	int 		i;
-	int 		j;
-	sector_t*	sector;
-	sector_t*	temp;
-	line_t* 	templine;
-		
-	sector = sectors;
-		
-	for (i=0;i<numsectors;i++, sector++)
-	{
-		if (sector->tag == line->tag)
-		{
-			// bright = 0 means to search
-			// for highest light level
-			// surrounding sector
-			if (!bright)
-			{
-				for (j = 0;j < sector->linecount; j++)
-				{
-					templine = sector->lines[j];
-					temp = getNextSector(templine,sector);
-
-					if (!temp)
-						continue;
-
-					if (temp->lightlevel > bright)
-						bright = temp->lightlevel;
-				}
-			}
-			sector->lightlevel = (short)bright;
-		}
-	}
-}
-
-	
-//
-// Spawn glowing light
-//
-
-void T_Glow(glow_t* 	g)
-{
-	switch(g->direction)
-	{
-	  case -1:
-		// DOWN
-		g->sector->lightlevel -= GLOWSPEED;
-		if (g->sector->lightlevel <= g->minlight)
-		{
-			g->sector->lightlevel += GLOWSPEED;
-			g->direction = 1;
-		}
-		break;
-		
-	  case 1:
-		// UP
-		g->sector->lightlevel += GLOWSPEED;
-		if (g->sector->lightlevel >= g->maxlight)
-		{
-			g->sector->lightlevel -= GLOWSPEED;
-			g->direction = -1;
-		}
-		break;
-	}
-}
-
-
-void P_SpawnGlowingLight(sector_t*		sector)
-{
-	glow_t* 	g;
-		
-	g = Z_Malloc( sizeof(*g), PU_LEVSPEC, 0);
-
-	P_AddThinker(&g->thinker);
-
-	g->sector = sector;
-	g->minlight = P_FindMinSurroundingLight(sector,sector->lightlevel);
-	g->maxlight = sector->lightlevel;
-	g->thinker.function.acp1 = (actionf_p1) T_Glow;
-	g->direction = -1;
-
-	sector->special = 0;
-}
-
diff --git a/code/p_pillar.c b/code/p_pillar.c
new file mode 100644
index 0000000000..db7a381158
--- /dev/null
+++ b/code/p_pillar.c
@@ -0,0 +1,110 @@
+// [RH] p_pillar.c: New file to handle pillars
+
+#include "z_zone.h"
+#include "doomdef.h"
+#include "p_local.h"
+#include "p_spec.h"
+#include "g_level.h"
+#include "s_sound.h"
+
+void T_Pillar (pillar_t *pillar)
+{
+	int r, s;
+
+	if (pillar->type == pillarBuild) {
+		r = T_MovePlane (pillar->sector, pillar->floorspeed, pillar->floortarget,
+						 pillar->crush, 0, 1);
+		s = T_MovePlane (pillar->sector, pillar->ceilingspeed, pillar->ceilingtarget,
+						 pillar->crush, 1, -1);
+	} else {
+		r = T_MovePlane (pillar->sector, pillar->floorspeed, pillar->floortarget,
+						 pillar->crush, 0, -1);
+		s = T_MovePlane (pillar->sector, pillar->ceilingspeed, pillar->ceilingtarget,
+						 pillar->crush, 1, 1);
+	}
+
+	if (!(level.time&7))
+		S_StartSound ((mobj_t *)&pillar->sector->soundorg, "plats/pt1_mid", 119);
+
+	if (r == pastdest && s == pastdest) {
+		pillar->sector->floordata = NULL;
+		pillar->sector->ceilingdata = NULL;
+		P_RemoveThinker (&pillar->thinker);
+		S_StartSound ((mobj_t *)&pillar->sector->soundorg, "plats/pt1_stop", 100);
+	}
+}
+
+BOOL EV_DoPillar (pillar_e type, int tag, fixed_t speed, fixed_t height,
+				  fixed_t height2, int crush)
+{
+	BOOL rtn = false;
+	int secnum = -1;
+	pillar_t *pillar;
+
+	while ((secnum = P_FindSectorFromTag (tag, secnum)) >= 0) {
+		sector_t *sec = &sectors[secnum];
+		fixed_t	ceilingdist, floordist;
+
+		if (sec->floordata || sec->ceilingdata)
+			continue;
+
+		if (type == pillarBuild && sec->floorheight == sec->ceilingheight)
+			continue;
+
+		if (type == pillarOpen && sec->floorheight != sec->ceilingheight)
+			continue;
+
+		rtn = true;
+		pillar = Z_Malloc (sizeof(*pillar), PU_LEVSPEC, 0);
+		P_AddThinker (&pillar->thinker);
+		sec->floordata = pillar;
+		sec->ceilingdata = pillar;
+		pillar->thinker.function.acp1 = (actionf_p1) T_Pillar;
+		pillar->type = type;
+		pillar->sector = sec;
+		pillar->crush = crush;
+
+		if (type == pillarBuild) {
+			// If the pillar height is 0, have the floor and ceiling meet halfway
+			if (height == 0) {
+				pillar->floortarget = pillar->ceilingtarget =
+					(sec->ceilingheight - sec->floorheight) / 2 + sec->floorheight;
+				floordist = pillar->floortarget - sec->floorheight;
+			} else {
+				pillar->floortarget = pillar->ceilingtarget =
+					sec->floorheight + height;
+				floordist = height;
+			}
+			ceilingdist = sec->ceilingheight - pillar->ceilingtarget;
+		} else {
+			// If one of the heights is 0, figure it out based on the
+			// surrounding sectors
+			if (height == 0) {
+				pillar->floortarget = P_FindLowestFloorSurrounding (sec);
+				floordist = sec->floorheight - pillar->floortarget;
+			} else {
+				floordist = height;
+				pillar->floortarget = sec->floorheight - height;
+			}
+			if (height2 == 0) {
+				pillar->ceilingtarget = P_FindHighestCeilingSurrounding (sec);
+				ceilingdist = pillar->ceilingtarget - sec->ceilingheight;
+			} else {
+				pillar->ceilingtarget = sec->ceilingheight + height2;
+				ceilingdist = height2;
+			}
+		}
+
+		// The speed parameter applies to whichever part of the pillar
+		// travels the farthest. The other part's speed is then set so
+		// that it arrives at its destination at the same time.
+		if (floordist > ceilingdist) {
+			pillar->floorspeed = speed;
+			pillar->ceilingspeed = FixedDiv (FixedMul (speed, ceilingdist), floordist);
+		} else {
+			pillar->ceilingspeed = speed;
+			pillar->floorspeed = FixedDiv (FixedMul (speed, floordist), ceilingdist);
+		}
+	}
+	return rtn;
+}
\ No newline at end of file
diff --git a/code/p_plats.c b/code/p_plats.c
deleted file mode 100644
index daf1398ca5..0000000000
--- a/code/p_plats.c
+++ /dev/null
@@ -1,322 +0,0 @@
-// Emacs style mode select	 -*- C++ -*- 
-//-----------------------------------------------------------------------------
-//
-// $Id:$
-//
-// Copyright (C) 1993-1996 by id Software, Inc.
-//
-// This source is available for distribution and/or modification
-// only under the terms of the DOOM Source Code License as
-// published by id Software. All rights reserved.
-//
-// The source is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// FITNESS FOR A PARTICULAR PURPOSE. See the DOOM Source Code License
-// for more details.
-//
-// $Log:$
-//
-// DESCRIPTION:
-//		Plats (i.e. elevator platforms) code, raising/lowering.
-//
-//-----------------------------------------------------------------------------
-
-
-
-#include "m_alloc.h"
-
-#include "i_system.h"
-#include "z_zone.h"
-#include "m_random.h"
-
-#include "doomdef.h"
-#include "p_local.h"
-
-#include "s_sound.h"
-
-// State.
-#include "doomstat.h"
-#include "r_state.h"
-
-// Data.
-#include "sounds.h"
-
-
-int				MaxPlats;
-plat_t			**activeplats;
-
-
-
-//
-// Move a plat up and down
-//
-void T_PlatRaise(plat_t* plat)
-{
-	result_e	res;
-		
-	switch(plat->status)
-	{
-	  case up:
-		res = T_MovePlane(plat->sector,
-						  plat->speed,
-						  plat->high,
-						  plat->crush,0,1);
-										
-		if (plat->type == raiseAndChange
-			|| plat->type == raiseToNearestAndChange)
-		{
-			if (!(level.time&7))
-				S_StartSound((mobj_t *)&plat->sector->soundorg,
-							 sfx_stnmov);
-		}
-		
-								
-		if (res == crushed && (!plat->crush))
-		{
-			plat->count = plat->wait;
-			plat->status = down;
-			S_StartSound((mobj_t *)&plat->sector->soundorg,
-						 sfx_pstart);
-		}
-		else
-		{
-			if (res == pastdest)
-			{
-				plat->count = plat->wait;
-				plat->status = waiting;
-				S_StartSound((mobj_t *)&plat->sector->soundorg,
-							 sfx_pstop);
-
-				switch(plat->type)
-				{
-				  case blazeDWUS:
-				  case downWaitUpStay:
-					P_RemoveActivePlat(plat);
-					break;
-					
-				  case raiseAndChange:
-				  case raiseToNearestAndChange:
-					P_RemoveActivePlat(plat);
-					break;
-					
-				  default:
-					break;
-				}
-			}
-		}
-		break;
-		
-	  case		down:
-		res = T_MovePlane(plat->sector,plat->speed,plat->low,false,0,-1);
-
-		if (res == pastdest)
-		{
-			plat->count = plat->wait;
-			plat->status = waiting;
-			S_StartSound((mobj_t *)&plat->sector->soundorg,sfx_pstop);
-		}
-		break;
-		
-	  case		waiting:
-		if (!--plat->count)
-		{
-			if (plat->sector->floorheight == plat->low)
-				plat->status = up;
-			else
-				plat->status = down;
-			S_StartSound((mobj_t *)&plat->sector->soundorg,sfx_pstart);
-		}
-	  case		in_stasis:
-		break;
-	}
-}
-
-
-//
-// Do Platforms
-//	"amount" is only used for SOME platforms.
-//
-int EV_DoPlat (line_t *line, plattype_e type, int amount)
-{
-	plat_t* 	plat;
-	int 		secnum;
-	int 		rtn;
-	sector_t*	sec;
-		
-	secnum = -1;
-	rtn = 0;
-
-	//	Activate all <type> plats that are in_stasis
-	switch (type)
-	{
-	  case perpetualRaise:
-		P_ActivateInStasis(line->tag);
-		break;
-		
-	  default:
-		break;
-	}
-		
-	while ((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
-	{
-		sec = &sectors[secnum];
-
-		if (P_SectorActive (floor_special, sec))	//jff 2/23/98 multiple thinkers
-			continue;
-		
-		// Find lowest & highest floors around sector
-		rtn = 1;
-		plat = Z_Malloc( sizeof(*plat), PU_LEVSPEC, 0);
-		P_AddThinker(&plat->thinker);
-				
-		plat->type = type;
-		plat->sector = sec;
-		plat->sector->floordata = plat;	//jff 2/23/98 multiple thinkers
-		plat->thinker.function.acp1 = (actionf_p1) T_PlatRaise;
-		plat->crush = false;
-		plat->tag = line->tag;
-
-		//jff 1/26/98 Avoid raise plat bouncing a head off a ceiling and then
-		//going down forever -- default low to plat height when triggered
-		plat->low = sec->floorheight;
-
-		switch(type)
-		{
-		  case raiseToNearestAndChange:
-			plat->speed = PLATSPEED/2;
-			sec->floorpic = sides[line->sidenum[0]].sector->floorpic;
-			plat->high = P_FindNextHighestFloor(sec,sec->floorheight);
-			plat->wait = 0;
-			plat->status = up;
-			// NO MORE DAMAGE, IF APPLICABLE
-			sec->special = 0;			
-
-			S_StartSound((mobj_t *)&sec->soundorg,sfx_stnmov);
-			break;
-			
-		  case raiseAndChange:
-			plat->speed = PLATSPEED/2;
-			sec->floorpic = sides[line->sidenum[0]].sector->floorpic;
-			plat->high = sec->floorheight + amount*FRACUNIT;
-			plat->wait = 0;
-			plat->status = up;
-
-			S_StartSound((mobj_t *)&sec->soundorg,sfx_stnmov);
-			break;
-			
-		  case downWaitUpStay:
-			plat->speed = PLATSPEED * 4;
-			plat->low = P_FindLowestFloorSurrounding(sec);
-
-			if (plat->low > sec->floorheight)
-				plat->low = sec->floorheight;
-
-			plat->high = sec->floorheight;
-			plat->wait = TICRATE * PLATWAIT;
-			plat->status = down;
-			S_StartSound((mobj_t *)&sec->soundorg,sfx_pstart);
-			break;
-			
-		  case blazeDWUS:
-			plat->speed = PLATSPEED * 8;
-			plat->low = P_FindLowestFloorSurrounding(sec);
-
-			if (plat->low > sec->floorheight)
-				plat->low = sec->floorheight;
-
-			plat->high = sec->floorheight;
-			plat->wait = TICRATE * PLATWAIT;
-			plat->status = down;
-			S_StartSound((mobj_t *)&sec->soundorg,sfx_pstart);
-			break;
-			
-		  case perpetualRaise:
-			plat->speed = PLATSPEED;
-			plat->low = P_FindLowestFloorSurrounding(sec);
-
-			if (plat->low > sec->floorheight)
-				plat->low = sec->floorheight;
-
-			plat->high = P_FindHighestFloorSurrounding(sec);
-
-			if (plat->high < sec->floorheight)
-				plat->high = sec->floorheight;
-
-			plat->wait = TICRATE * PLATWAIT;
-			plat->status = P_Random (pr_doplat) & 1;
-
-			S_StartSound((mobj_t *)&sec->soundorg,sfx_pstart);
-			break;
-		}
-		P_AddActivePlat(plat);
-	}
-	return rtn;
-}
-
-
-
-void P_ActivateInStasis(int tag)
-{
-	int i;
-		
-	for (i = 0;i < MaxPlats;i++)
-		if (activeplats[i]
-			&& (activeplats[i])->tag == tag
-			&& (activeplats[i])->status == in_stasis)
-		{
-			(activeplats[i])->status = (activeplats[i])->oldstatus;
-			(activeplats[i])->thinker.function.acp1
-			  = (actionf_p1) T_PlatRaise;
-		}
-}
-
-void EV_StopPlat(line_t* line)
-{
-	int j;
-		
-	for (j = 0;j < MaxPlats;j++)
-		if (activeplats[j]
-			&& ((activeplats[j])->status != in_stasis)
-			&& ((activeplats[j])->tag == line->tag))
-		{
-			(activeplats[j])->oldstatus = (activeplats[j])->status;
-			(activeplats[j])->status = in_stasis;
-			(activeplats[j])->thinker.function.acv = (actionf_v)NULL;
-		}
-}
-
-void P_AddActivePlat(plat_t* plat)
-{
-	int i;
-	
-	for (i = 0;i < MaxPlats;i++)
-		if (activeplats[i] == NULL)
-		{
-			activeplats[i] = plat;
-			return;
-		}
-
-	// [RH] If we got here, there were no free plats;
-	// get some more.
-	MaxPlats += 2;
-	activeplats = Realloc (activeplats, MaxPlats * sizeof(plat_t *));
-	activeplats[i] = plat;
-	activeplats[i+1] = NULL;
-	return;
-}
-
-void P_RemoveActivePlat(plat_t* plat)
-{
-	int i;
-
-	for (i = 0;i < MaxPlats;i++)
-		if (plat == activeplats[i])
-		{
-			(activeplats[i])->sector->floordata = NULL;		// [RH]
-			P_RemoveThinker(&(activeplats[i])->thinker);
-			activeplats[i] = NULL;
-			
-			return;
-		}
-	I_Error ("P_RemoveActivePlat: can't find plat!");
-}
diff --git a/code/p_quake.c b/code/p_quake.c
new file mode 100644
index 0000000000..d906056c75
--- /dev/null
+++ b/code/p_quake.c
@@ -0,0 +1,87 @@
+#include "doomtype.h"
+#include "doomstat.h"
+#include "p_local.h"
+#include "p_mobj.h"
+#include "m_bbox.h"
+#include "m_random.h"
+#include "z_zone.h"
+#include "s_sound.h"
+
+quake_t *ActiveQuakes;
+
+void P_RunQuakes (void)
+{
+	quake_t *quake = ActiveQuakes;
+	quake_t **prev = &ActiveQuakes;
+
+	while (quake) {
+		int i;
+
+		if (level.time % 48 == 0)
+			S_StartSound (quake->quakespot, "world/quake", 200);
+
+		for (i = 0; i < MAXPLAYERS; i++) {
+			if (playeringame[i] && !(players[i].cheats & CF_NOCLIP)) {
+				mobj_t *mo = players[i].mo;
+
+				if (!(level.time & 7) &&
+					 mo->x >= quake->damagebox[BOXLEFT] && mo->x < quake->damagebox[BOXRIGHT] &&
+					 mo->y >= quake->damagebox[BOXTOP] && mo->y < quake->damagebox[BOXBOTTOM]) {
+					int mult = 1024 * quake->intensity;
+					P_DamageMobj (mo, NULL, NULL, quake->intensity / 2, MOD_UNKNOWN);
+					mo->momx += (P_Random (pr_quake)-128) * mult;
+					mo->momy += (P_Random (pr_quake)-128) * mult;
+				}
+
+				if (mo->x >= quake->tremorbox[BOXLEFT] && mo->x < quake->tremorbox[BOXRIGHT] &&
+					 mo->y >= quake->tremorbox[BOXTOP] && mo->y < quake->tremorbox[BOXBOTTOM]) {
+					players[i].xviewshift = ((P_Random (pr_quake)-128) * quake->intensity) / 48;
+				}
+			}
+		}
+		if (--quake->countdown == 0) {
+			*prev = quake->next;
+			Z_Free (quake);
+		} else {
+			prev = &quake->next;
+		}
+		quake = *prev;
+	}
+}
+
+static void setbox (fixed_t *box, mobj_t *c, fixed_t size)
+{
+	if (size) {
+		box[BOXLEFT] = c->x - size + 1;
+		box[BOXRIGHT] = c->x + size;
+		box[BOXTOP] = c->y - size + 1;
+		box[BOXBOTTOM] = c->y + size;
+	} else
+		box[BOXLEFT] = box[BOXRIGHT] = box[BOXTOP] = box[BOXBOTTOM] = 0;
+}
+
+BOOL P_StartQuake (int tid, int intensity, int duration, int damrad, int tremrad)
+{
+	quake_t *quake;
+	mobj_t *center = NULL;
+	BOOL res = false;
+
+	if (intensity > 9)
+		intensity = 9;
+	else if (intensity < 1)
+		intensity = 1;
+
+	while ( (center = P_FindMobjByTid (center, tid)) ) {
+		res = true;
+		quake = Z_Malloc (sizeof(*quake), PU_LEVSPEC, 0);
+		quake->quakespot = center;
+		setbox (quake->tremorbox, center, tremrad * FRACUNIT * 64);
+		setbox (quake->damagebox, center, damrad * FRACUNIT * 64);
+		quake->intensity = intensity;
+		quake->countdown = duration;
+		quake->next = ActiveQuakes;
+		ActiveQuakes = quake;
+	}
+	
+	return res;
+}
\ No newline at end of file
diff --git a/code/p_setup.h b/code/p_setup.h
index 0c63455b32..74fb18f74c 100644
--- a/code/p_setup.h
+++ b/code/p_setup.h
@@ -28,7 +28,9 @@
 // NOT called by W_Ticker. Fixme.
 //
 // [RH] The only parameter used is mapname, so I removed playermask and skill.
-void P_SetupLevel (char *mapname);
+//		On September 1, 1998, I added the position to indicate which set
+//		of single-player start spots should be spawned in the level.
+void P_SetupLevel (char *mapname, int position);
 
 // Called by startup code.
 void P_Init (void);
diff --git a/code/p_telept.c b/code/p_telept.c
index b408ecef2d..607c29f81f 100644
--- a/code/p_telept.c
+++ b/code/p_telept.c
@@ -31,94 +31,274 @@
 #include "p_local.h"
 
 
-// Data.
-#include "sounds.h"
-
 // State.
 #include "r_state.h"
 
 
+extern P_CalcHeight (player_t *player);
+
 
 //
 // TELEPORTATION
 //
-int EV_Teleport (line_t *line, int side, mobj_t *thing)
+// [RH] Changed to look for a destination by ThingID
+BOOL EV_Teleport (int tid, int side, mobj_t *thing)
 {
-	int 		i;
-	int 		tag;
-	mobj_t* 	m;
-	mobj_t* 	fog;
+	mobj_t *m;
 	unsigned	an;
-	thinker_t*	thinker;
-	sector_t*	sector;
 	fixed_t 	oldx;
 	fixed_t 	oldy;
 	fixed_t 	oldz;
+	player_t	*player;
 
 	// don't teleport missiles
-	if (thing->flags & MF_MISSILE)
-		return 0;				
-
 	// Don't teleport if hit back of line,
 	//	so you can get out of teleporter.
-	if (side == 1)				
-		return 0;		
+	if ((thing->flags & MF_MISSILE) || (side == 1))
+		return 0;
 
-	tag = line->tag;
-	for (i = 0; i < numsectors; i++)
-	{
-		if (sectors[ i ].tag == tag )
-		{
-			thinker = thinkercap.next;
-			for (thinker = thinkercap.next;
-				 thinker != &thinkercap;
-				 thinker = thinker->next)
-			{
-				// not a mobj
-				if (thinker->function.acp1 != (actionf_p1)P_MobjThinker)
-					continue;	
+	// [RH] Find destination based on it's TID rather than
+	//		the sector containing it. Also allow for destinations
+	//		that remember their vertical position.
+	if (NULL == (m = P_FindGoal (NULL, tid, MT_TELEPORTMAN)))
+		if (NULL == (m = P_FindGoal (NULL, tid, MT_TELEPORTMAN2)))
+			return false;
 
-				m = (mobj_t *)thinker;
-				
-				// not a teleportman
-				if (m->type != MT_TELEPORTMAN )
-					continue;			
+	// killough 5/12/98: exclude voodoo dolls:
+	player = thing->player;
+	if (player && player->mo != thing)
+		player = NULL;
 
-				sector = m->subsector->sector;
-				// wrong sector
-				if (sector-sectors != i )
-					continue;	
+	oldx = thing->x;
+	oldy = thing->y;
+	oldz = thing->z;
 
-				oldx = thing->x;
-				oldy = thing->y;
-				oldz = thing->z;
-								
-				if (!P_TeleportMove (thing, m->x, m->y, m->z, false))
-					return 0;
-				
-				if (thing->player)
-					thing->player->viewz = thing->z+thing->player->viewheight;
-								
-				// spawn teleport fog at source and destination
-				fog = P_SpawnMobj (oldx, oldy, oldz, MT_TFOG, 0);
-				S_StartSound (fog, sfx_telept);
-				an = m->angle >> ANGLETOFINESHIFT;
-				fog = P_SpawnMobj (m->x+20*finecosine[an], m->y+20*finesine[an]
-								   , thing->z, MT_TFOG, 0);
+	if (!P_TeleportMove (thing, m->x, m->y,
+			m->type == MT_TELEPORTMAN ? m->subsector->sector->floorheight : m->z, false))
+		return false;
 
-				// emit sound, where?
-				S_StartSound (fog, sfx_telept);
-				
-				// don't move for a bit
-				if (thing->player)
-					thing->reactiontime = 18;	
+	if (player)
+		player->viewz = thing->z + thing->player->viewheight;
 
-				thing->angle = m->angle;
-				thing->momx = thing->momy = thing->momz = 0;
-				return 1;
-			}	
-		}
-	}
-	return 0;
+	// spawn teleport fog at source and destination
+	S_StartSound (P_SpawnMobj (oldx, oldy, oldz, MT_TFOG, 0), "misc/teleport", 32);
+	an = m->angle >> ANGLETOFINESHIFT;
+	// emit sound at new spot
+	S_StartSound (P_SpawnMobj (m->x+20*finecosine[an], m->y+20*finesine[an],
+							   thing->z, MT_TFOG, 0), "misc/teleport", 32);
+	
+	// don't move for a bit
+	if (player)
+		thing->reactiontime = 18;
+
+	thing->momx = thing->momy = thing->momz = 0;
+	thing->angle = m->angle;
+
+	return true;
 }
 
+//
+// Silent TELEPORTATION, by Lee Killough
+// Primarily for rooms-over-rooms etc.
+// [RH] Changed to find destination by tid rather than sector
+//
+
+BOOL EV_SilentTeleport (int tid, line_t *line, int side, mobj_t *thing)
+{
+	mobj_t    *m;
+
+	// don't teleport missiles
+	// Don't teleport if hit back of line,
+	// so you can get out of teleporter.
+	// [RH] This could potentially be called without a source linedef
+
+	if (side || thing->flags & MF_MISSILE || !line)
+		return false;
+
+	if (NULL == (m = P_FindGoal (NULL, tid, MT_TELEPORTMAN)))
+		if (NULL == (m = P_FindGoal (NULL, tid, MT_TELEPORTMAN2)))
+			return false;
+
+	{
+		// Height of thing above ground, in case of mid-air teleports:
+		fixed_t z = thing->z - thing->floorz;
+
+		// Get the angle between the exit thing and source linedef.
+		// Rotate 90 degrees, so that walking perpendicularly across
+		// teleporter linedef causes thing to exit in the direction
+		// indicated by the exit thing.
+		angle_t angle =
+			R_PointToAngle2(0, 0, line->dx, line->dy) - m->angle + ANG90;
+
+		// Sine, cosine of angle adjustment
+		fixed_t s = finesine[angle>>ANGLETOFINESHIFT];
+		fixed_t c = finecosine[angle>>ANGLETOFINESHIFT];
+
+		// Momentum of thing crossing teleporter linedef
+		fixed_t momx = thing->momx;
+		fixed_t momy = thing->momy;
+
+		// Whether this is a player, and if so, a pointer to its player_t
+		player_t *player = thing->player;
+
+		// Attempt to teleport, aborting if blocked
+		if (!P_TeleportMove (thing, m->x, m->y, z + m->floorz, false))
+			return 0;
+
+		// Rotate thing according to difference in angles
+		thing->angle += angle;
+
+		// Rotate thing's momentum to come out of exit just like it entered
+		thing->momx = FixedMul(momx, c) - FixedMul(momy, s);
+		thing->momy = FixedMul(momy, c) + FixedMul(momx, s);
+
+		// Adjust player's view, in case there has been a height change
+		// Voodoo dolls are excluded by making sure player->mo == thing.
+		if (player && player->mo == thing)
+		{
+			// Save the current deltaviewheight, used in stepping
+			fixed_t deltaviewheight = player->deltaviewheight;
+
+			// Clear deltaviewheight, since we don't want any changes
+			player->deltaviewheight = 0;
+
+			// Set player's view according to the newly set parameters
+			P_CalcHeight(player);
+
+			// Reset the delta to have the same dynamics as before
+			player->deltaviewheight = deltaviewheight;
+		}
+		return true;
+	}
+	return false;
+}
+
+//
+// Silent linedef-based TELEPORTATION, by Lee Killough
+// Primarily for rooms-over-rooms etc.
+// This is the complete player-preserving kind of teleporter.
+// It has advantages over the teleporter with thing exits.
+//
+
+// maximum fixed_t units to move object to avoid hiccups
+#define FUDGEFACTOR 10
+
+// [RH] Modified to support different source and destination ids.
+BOOL EV_SilentLineTeleport (line_t *line, int side, mobj_t *thing, int id,
+							BOOL reverse)
+{
+	int i;
+	line_t *l;
+
+	if (side || thing->flags & MF_MISSILE || !line)
+		return false;
+
+	for (i = -1; (i = P_FindLineFromID (id, i)) >= 0;)
+		if ((l=lines+i) != line && l->backsector)
+		{
+			// Get the thing's position along the source linedef
+			fixed_t pos = abs(line->dx) > abs(line->dy) ?
+				FixedDiv(thing->x - line->v1->x, line->dx) :
+				FixedDiv(thing->y - line->v1->y, line->dy) ;
+
+			// Get the angle between the two linedefs, for rotating
+			// orientation and momentum. Rotate 180 degrees, and flip
+			// the position across the exit linedef, if reversed.
+			angle_t angle = (reverse ? pos = FRACUNIT-pos, 0 : ANG180) +
+				R_PointToAngle2(0, 0, l->dx, l->dy) -
+				R_PointToAngle2(0, 0, line->dx, line->dy);
+
+			// Interpolate position across the exit linedef
+			fixed_t x = l->v2->x - FixedMul(pos, l->dx);
+			fixed_t y = l->v2->y - FixedMul(pos, l->dy);
+
+			// Sine, cosine of angle adjustment
+			fixed_t s = finesine[angle>>ANGLETOFINESHIFT];
+			fixed_t c = finecosine[angle>>ANGLETOFINESHIFT];
+
+			// Maximum distance thing can be moved away from interpolated
+			// exit, to ensure that it is on the correct side of exit linedef
+			int fudge = FUDGEFACTOR;
+
+			// Whether this is a player, and if so, a pointer to its player_t.
+			// Voodoo dolls are excluded by making sure thing->player->mo==thing.
+			player_t *player = thing->player && thing->player->mo == thing ?
+				thing->player : NULL;
+
+			// Whether walking towards first side of exit linedef steps down
+			int stepdown =
+				l->frontsector->floorheight < l->backsector->floorheight;
+
+			// Height of thing above ground
+			fixed_t z = thing->z - thing->floorz;
+
+			// Side to exit the linedef on positionally.
+			//
+			// Notes:
+			//
+			// This flag concerns exit position, not momentum. Due to
+			// roundoff error, the thing can land on either the left or
+			// the right side of the exit linedef, and steps must be
+			// taken to make sure it does not end up on the wrong side.
+			//
+			// Exit momentum is always towards side 1 in a reversed
+			// teleporter, and always towards side 0 otherwise.
+			//
+			// Exiting positionally on side 1 is always safe, as far
+			// as avoiding oscillations and stuck-in-wall problems,
+			// but may not be optimum for non-reversed teleporters.
+			//
+			// Exiting on side 0 can cause oscillations if momentum
+			// is towards side 1, as it is with reversed teleporters.
+			//
+			// Exiting on side 1 slightly improves player viewing
+			// when going down a step on a non-reversed teleporter.
+
+			int side = reverse || (player && stepdown);
+
+			// Make sure we are on correct side of exit linedef.
+			while (P_PointOnLineSide(x, y, l) != side && --fudge>=0)
+				if (abs(l->dx) > abs(l->dy))
+					y -= l->dx < 0 != side ? -1 : 1;
+				else
+					x += l->dy < 0 != side ? -1 : 1;
+
+			// Attempt to teleport, aborting if blocked
+			// Adjust z position to be same height above ground as before.
+			// Ground level at the exit is measured as the higher of the
+			// two floor heights at the exit linedef.
+			if (!P_TeleportMove (thing, x, y,
+								 z + sides[l->sidenum[stepdown]].sector->floorheight, false))
+				return false;
+
+			// Rotate thing's orientation according to difference in linedef angles
+			thing->angle += angle;
+
+			// Momentum of thing crossing teleporter linedef
+			x = thing->momx;
+			y = thing->momy;
+
+			// Rotate thing's momentum to come out of exit just like it entered
+			thing->momx = FixedMul(x, c) - FixedMul(y, s);
+			thing->momy = FixedMul(y, c) + FixedMul(x, s);
+
+			// Adjust a player's view, in case there has been a height change
+			if (player)
+			{
+				// Save the current deltaviewheight, used in stepping
+				fixed_t deltaviewheight = player->deltaviewheight;
+
+				// Clear deltaviewheight, since we don't want any changes now
+				player->deltaviewheight = 0;
+
+				// Set player's view according to the newly set parameters
+				P_CalcHeight(player);
+
+				// Reset the delta to have the same dynamics as before
+				player->deltaviewheight = deltaviewheight;
+			}
+
+			return true;
+		}
+	return false;
+}
diff --git a/code/p_things.c b/code/p_things.c
new file mode 100644
index 0000000000..e5817c76d8
--- /dev/null
+++ b/code/p_things.c
@@ -0,0 +1,266 @@
+// [RH] new file to deal with general things
+
+#include "doomtype.h"
+#include "p_local.h"
+#include "info.h"
+#include "s_sound.h"
+#include "tables.h"
+#include "doomstat.h"
+
+// List of spawnable things for the Thing_Spawn and Thing_Projectile specials.
+
+int SpawnableThings[] = {
+	0,
+	MT_SHOTGUY,
+	MT_CHAINGUY,
+	MT_BRUISER,
+	MT_POSSESSED,
+	MT_TROOP,
+	MT_BABY,
+	MT_SPIDER,
+	MT_SERGEANT,
+	MT_SHADOWS,
+	MT_TROOPSHOT,
+	MT_CLIP,
+	MT_MISC22,	// Shells
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	MT_HEAD,
+	MT_UNDEAD,
+	MT_BRIDGE,
+	MT_MISC3,	// Armor bonus
+	MT_MISC10,	// Stim pack
+	MT_MISC11,	// Medkit
+	MT_MISC12,	// Soul sphere
+	0,
+	MT_SHOTGUN,
+	MT_CHAINGUN,
+	MT_MISC27,	// Rocket launcher
+	MT_MISC28,	// Plasma gun
+	MT_MISC25,	// BFG
+	MT_MISC26,	// Chainsaw
+	MT_SUPERSHOTGUN,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,	// T_MORPHBLAST
+	0,	// T_ROCK1
+	0,	// T_ROCK2
+	0,	// T_ROCK3
+	0,	// T_DIRT1
+	0,	// T_DIRT2
+	0,	// T_DIRT3
+	0,	// T_DIRT4
+	0,	// T_DIRT5
+	0,	// T_DIRT6
+	MT_PLASMA,
+	0,	// T_POISONDART
+	MT_TRACER,
+	0,	// T_STAINEDGLASS1
+	0,	// T_STAINEDGLASS2
+	0,	// T_STAINEDGLASS3
+	0,	// T_STAINEDGLASS4
+	0,	// T_STAINEDGLASS5
+	0,	// T_STAINEDGLASS6
+	0,	// T_STAINEDGLASS7
+	0,	// T_STAINEDGLASS8
+	0,	// T_STAINEDGLASS9
+	0,	// T_STAINEDGLASS0
+	0,
+	0,
+	0,
+	0,
+	MT_MISC0,	// Green armor
+	MT_MISC1,	// Blue armor
+	0,
+	0,
+	0,
+	0,
+	0,
+	MT_MISC20,	// Energy cell
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	MT_MISC4,	// Blue key card
+	MT_MISC5,	// Red key card
+	MT_MISC6,	// Yellow key card
+	MT_MISC7,	// Yellow skull key
+	MT_MISC8,	// Red skull key
+	MT_MISC9,	// Blue skull key
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	MT_FIRE,
+	0,
+	MT_STEALTHBRUISER,
+	MT_STEALTHKNIGHT,
+	MT_STEALTHZOMBIE,
+	MT_STEALTHSHOTGUY,
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+	MT_SKULL,
+	MT_VILE,
+	MT_FATSO,
+	MT_KNIGHT,
+	MT_CYBORG,
+	MT_PAIN,
+	MT_WOLFSS,
+	MT_STEALTHBABY,
+	MT_STEALTHVILE,
+	MT_STEALTHHEAD,
+	MT_STEALTHCHAINGUY,
+	MT_STEALTHSERGEANT,
+	MT_STEALTHIMP,
+	MT_STEALTHFATSO,
+	MT_STEALTHUNDEAD,
+	MT_BARREL,
+	MT_HEADSHOT,
+	MT_ROCKET,
+	MT_BFG,
+	MT_ARACHPLAZ,
+	MT_BLOOD,
+	MT_PUFF,
+	MT_MEGA,	// Mega sphere
+	MT_INV,
+	MT_MISC13,	// Berserk
+	MT_INS,		// Blur sphere
+	MT_MISC14,	// Rad suit
+	MT_MISC15,	// Computer map
+	MT_MISC16,	// Light amp
+	MT_MISC17,	// Box of ammo
+	MT_MISC18,	// Rocket
+	MT_MISC19,	// Box of rockets
+	MT_MISC21,	// Battery pack
+	MT_MISC23,	// Box of shells
+	MT_MISC24,	// Backpack
+	MT_MISC68,	// Guts
+	MT_MISC71,	// Blood pool
+	MT_MISC84,	// Pool o' blood 1
+	MT_MISC85,	// Pool o' blood 2
+	MT_MISC77,	// Flaming barrel
+	MT_MISC86	// Brains
+};
+
+const int NumSpawnableThings = sizeof(SpawnableThings);
+
+BOOL P_Thing_Spawn (int tid, int type, angle_t angle, BOOL fog)
+{
+	int rtn = 0;
+	int kind;
+	mobj_t *spot = NULL, *mobj;
+
+	if (type >= NumSpawnableThings)
+		return false;
+
+	if ( (kind = SpawnableThings[type]) == 0)
+		return false;
+
+	if ((mobjinfo[kind].flags & MF_COUNTKILL) && (dmflags & DF_NO_MONSTERS))
+		return true;
+
+	while ( (spot = P_FindMobjByTid (spot, tid)) ) {
+		if (spot->type != MT_MAPSPOT && spot->type != MT_MAPSPOTGRAV)
+			continue;
+
+		mobj = P_SpawnMobj (spot->x, spot->y, spot->z, kind, 0);
+
+		if (mobj) {
+			if (P_TeleportMove (mobj, spot->x, spot->y, spot->z, false)) {
+				rtn++;
+				mobj->angle = angle;
+				if (fog)
+					S_StartSound (P_SpawnMobj (spot->x, spot->y, spot->z, MT_TFOG, 0), "misc/teleport", 32);
+			} else {
+				P_RemoveMobj (mobj);
+			}
+		}
+	}
+
+	return rtn != 0;
+}
+
+BOOL P_Thing_Projectile (int tid, int type, angle_t angle,
+						 fixed_t speed, fixed_t vspeed, BOOL gravity)
+{
+	int rtn = 0;
+	int kind;
+	mobj_t *spot = NULL, *mobj;
+
+	if (type >= NumSpawnableThings)
+		return false;
+
+	if ( (kind = SpawnableThings[type]) == 0)
+		return false;
+
+	if ((mobjinfo[kind].flags & MF_COUNTKILL) && (dmflags & DF_NO_MONSTERS))
+		return true;
+
+	while ( (spot = P_FindMobjByTid (spot, tid)) ) {
+		if (spot->type != MT_MAPSPOT && spot->type != MT_MAPSPOTGRAV)
+			continue;
+
+		mobj = P_SpawnMobj (spot->x, spot->y, spot->z, kind, 0);
+
+		if (mobj) {
+			rtn++;
+			mobj->angle = angle;
+			if (gravity)
+				mobj->flags &= ~MF_NOGRAVITY;
+			else
+				mobj->flags |= MF_NOGRAVITY;
+
+			mobj->momx = FixedMul (speed, finecosine[angle>>ANGLETOFINESHIFT]);
+			mobj->momy = FixedMul (speed, finesine[angle>>ANGLETOFINESHIFT]);
+			mobj->momz = vspeed;
+
+			// If thing isn't a missile, then don't keep it around
+			// if there's already something in its spot.
+			if ((mobj->flags & (MF_MISSILE|MF_SOLID) == MF_SOLID)
+				&& !P_TeleportMove (mobj, spot->x, spot->y, spot->z, false)) {
+				P_RemoveMobj (mobj);
+			}
+		}
+	}
+
+	return rtn;
+}
+
+BOOL P_ActivateMobj (mobj_t *mobj)
+{
+	if (mobj->flags & MF_COUNTKILL) {
+		mobj->flags2 &= !(MF2_DORMANT | MF2_INVULNERABLE | MF2_INDESTRUCTABLE);
+		return true;
+	}
+	return false;
+}
+
+BOOL P_DeactivateMobj (mobj_t *mobj)
+{
+	if (mobj->flags & MF_COUNTKILL) {
+		mobj->flags2 |= MF2_DORMANT | MF2_INVULNERABLE | MF2_INDESTRUCTABLE;
+		return true;
+	}
+	return false;
+}
diff --git a/code/r_data.h b/code/r_data.h
index 6f7060611c..5c62d4ad9f 100644
--- a/code/r_data.h
+++ b/code/r_data.h
@@ -47,6 +47,14 @@ int R_FlatNumForName (const char* name);
 int R_TextureNumForName (const char *name);
 int R_CheckTextureNumForName (const char *name);
 
+int R_ColormapNumForName(const char *name);		// killough 4/4/98
+void R_SetDefaultColormap (const char *name);	// [RH] change normal fadetable
+unsigned int R_BlendForColormap (int map);		// [RH] return calculated blend for a colormap
+extern byte *realcolormaps;						// [RH] make the colormaps externally visible
+extern size_t numfakecmaps;
+
+int R_FindSkin (char *name);	// [RH] Find a skin
+
 #endif
 //-----------------------------------------------------------------------------
 //
diff --git a/code/r_state.h b/code/r_state.h
index 5ef02a8a00..7bf93fb3d4 100644
--- a/code/r_state.h
+++ b/code/r_state.h
@@ -37,14 +37,6 @@
 // needed for texture pegging
 extern fixed_t* 		textureheight;
 
-// needed for pre rendering (fracs)
-extern fixed_t* 		spritewidth;
-
-extern fixed_t* 		spriteoffset;
-extern fixed_t* 		spritetopoffset;
-
-extern lighttable_t*	colormaps;
-
 extern int				viewwidth;
 extern int				realviewwidth;
 extern int				viewheight;
@@ -67,6 +59,9 @@ extern int				numspritelumps;
 //
 // Lookup tables for map data.
 //
+extern size_t			numskins;	// [RH]
+extern playerskin_t*	skins;		// [RH]
+
 extern int				numsprites;
 extern spritedef_t* 	sprites;
 
@@ -100,7 +95,7 @@ extern fixed_t			viewy;
 extern fixed_t			viewz;
 
 extern angle_t			viewangle;
-extern player_t*		viewplayer;
+extern mobj_t*			camera;		// [RH] camera instead of viewplayer
 
 
 // ?
diff --git a/code/s_sndseq.c b/code/s_sndseq.c
new file mode 100644
index 0000000000..abe277d4e9
--- /dev/null
+++ b/code/s_sndseq.c
@@ -0,0 +1,86 @@
+#include <string.h>
+#include <stdio.h>
+
+#include "doomtype.h"
+#include "s_sound.h"
+#include "w_wad.h"
+#include "z_zone.h"
+#include "cmdlib.h"
+
+#define SEQ_MASK			0xc0000000
+#define SEQ_END				0x00000000
+#define SEQ_PLAYUNTILDONE	0x40000000
+#define SEQ_PLAYTIME		0x80000000
+#define SEQ_PLAYREPEAT		0xc0000000
+
+#define SEQ_TIMESHIFT		16
+#define SEQ_TIME			0x3fff0000
+#define SEQ_SOUND			0x0000ffff
+
+#define SEQ_NOSOUND			0x0000ffff
+
+typedef struct {
+	char name[MAX_SNDNAME+1];
+	unsigned int script[1];	// + more until end of sequence script
+} sndseq_t;
+
+#define MAX_SEQUENCES	32
+#define MAX_SEQSIZE		128
+static sndseq_t *Sequences[MAX_SEQUENCES];
+
+static int numsequences;
+
+void S_ParseSndSeq (void)
+{
+	int lastlump, lump;
+	char *data;
+	char name[MAX_SNDNAME+1];
+	unsigned int script[MAX_SEQSIZE];
+	int cursize;
+	int curseq = -1;
+	BOOL awaitingname = false;
+
+	lastlump = 0;
+	while ((lump = W_FindLump ("SNDSEQ", &lastlump)) != -1) {
+		data = W_CacheLumpNum (lump, PU_CACHE);
+
+		while ( (data = COM_Parse (data)) ) {
+			if (*com_token == ':') {
+				// Start of new sound sequence
+				awaitingname = true;
+				curseq = numsequences++;
+				cursize = 1;
+				script[0] = SEQ_NOSOUND;
+			} else if (curseq != -1) {
+				if (awaitingname) {
+					strncpy (name, com_token, MAX_SNDNAME);
+					name[MAX_SNDNAME] = 0;
+					awaitingname = false;
+					continue;
+				}
+
+				if (!stricmp (com_token, "playuntildone")) {
+					data = COM_Parse (data);
+					script[cursize++] = SEQ_PLAYUNTILDONE | (S_FindSound (com_token) & SEQ_SOUND);
+				} else if (!stricmp (com_token, "playrepeat")) {
+					data = COM_Parse (data);
+					script[cursize++] = SEQ_PLAYREPEAT | (S_FindSound (com_token) & SEQ_SOUND);
+				} else if (!stricmp (com_token, "stopsound")) {
+					data = COM_Parse (data);
+					script[0] = S_FindSound (com_token);
+				} else if (!stricmp (com_token, "playtime")) {
+					data = COM_Parse (data);
+					script[cursize] = SEQ_PLAYTIME | (S_FindSound (com_token) & SEQ_SOUND);
+					data = COM_Parse (data);
+					script[cursize++] |= (atoi (com_token) << SEQ_TIMESHIFT) & SEQ_TIME;
+				} else if (!stricmp (com_token, "end")) {
+					script[cursize++] = SEQ_END;
+					Sequences[curseq] = Z_Malloc (sizeof(sndseq_t) + sizeof(int)*(cursize-1), PU_STATIC, 0);
+					strcpy (Sequences[curseq]->name, name);
+					memcpy (Sequences[curseq]->script, script, sizeof(int)*cursize);
+					curseq = -1;
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/code/v_draw.c b/code/v_draw.c
index 7ef30d952c..9d848cb6e6 100644
--- a/code/v_draw.c
+++ b/code/v_draw.c
@@ -385,7 +385,7 @@ void V_DrawWrapper (int drawer, int x, int y, screen_t *scrn, patch_t *patch)
 	{
 	  // Printf ("Patch at %d,%d exceeds LFB\n", x,y );
 	  // No I_Error abort - what is up with TNT.WAD?
-	  Printf ("V_DrawWrapper: bad patch (ignored)\n");
+	  DPrintf ("V_DrawWrapper: bad patch (ignored)\n");
 	  return;
 	}
 #endif
@@ -472,9 +472,9 @@ void V_DrawSWrapper (int drawer, int x0, int y0, screen_t *scrn, patch_t *patch,
 		|| y0<0
 		|| y0+destheight> scrn->height)
 	{
-	  //Printf ("Patch at %d,%d exceeds LFB\n", x0,y0 );
-	  Printf ("V_DrawSWrapper: bad patch (ignored)\n");
-	  return;
+		//Printf ("Patch at %d,%d exceeds LFB\n", x0,y0 );
+		DPrintf ("V_DrawSWrapper: bad patch (ignored)\n");
+		return;
 	}
 #endif
 
diff --git a/code/v_palett.c b/code/v_palett.c
index 602b58c4b2..4ef48b90ed 100644
--- a/code/v_palett.c
+++ b/code/v_palett.c
@@ -9,20 +9,15 @@
 #include "i_video.h"
 #include "c_dispch.h"
 #include "g_level.h"
+#include "st_stuff.h"
 
+void BuildColoredLights (byte *maps, int lr, int lg, int lb, int fr, int fg, int fb);
 static void DoBlending (unsigned *from, unsigned *to, unsigned count, int tor, int tog, int tob, int toa);
 static void Cmd_TestBlend (void *plyr, int argc, char **argv);
 static void Cmd_TestFade (void *plyr, int argc, char **argv);
+static void Cmd_TestColor (void *plyr, int argc, char **argv);
 
-struct palmap {
-	union {
-		char	name[8];
-		int		nameint[2];
-	} n;
-	char		palette[8];
-};
-
-struct palmap *Pals[4];
+dyncolormap_t NormalLight;
 
 palette_t DefPal;
 palette_t *FirstPal;
@@ -136,6 +131,7 @@ palette_t *InitPalettes (char *name)
 
 	C_RegisterCommand ("testblend", Cmd_TestBlend);
 	C_RegisterCommand ("testfade", Cmd_TestFade);
+	C_RegisterCommand ("testcolor", Cmd_TestColor);
 
 	if ( (colors = W_CacheLumpName (name, PU_CACHE)) )
 		if (InternalCreatePalette (&DefPal, name, colors, 256,
@@ -297,6 +293,8 @@ void RefreshPalette (palette_t *pal)
 			r = RPART (level.fadeto);
 			g = GPART (level.fadeto);
 			b = BPART (level.fadeto);
+			if (pal->maps.colormaps && pal->maps.colormaps - pal->colormapsbase >= 256)
+				free (pal->maps.colormaps);
 			pal->colormapsbase = Realloc (pal->colormapsbase, (NUMCOLORMAPS + 1) * 256 + 255);
 			pal->maps.colormaps = (byte *)(((int)(pal->colormapsbase) + 255) & ~0xff);
 
@@ -328,6 +326,46 @@ void RefreshPalette (palette_t *pal)
 				}
 			}
 		}
+	} else {
+		if (pal->flags & PALETTEF_SHADE) {
+			r = newgamma[RPART (level.fadeto)];
+			g = newgamma[GPART (level.fadeto)];
+			b = newgamma[BPART (level.fadeto)];
+			if (pal->colormapsbase) {
+				free (pal->colormapsbase);
+				pal->colormapsbase = NULL;
+			}
+			pal->maps.shades = Realloc (pal->colormapsbase, (NUMCOLORMAPS + 1)*256*sizeof(unsigned int) + 255);
+
+			// build normal light mappings
+			for (l = 0; l < NUMCOLORMAPS; l++) {
+				DoBlending (pal->colors,
+							pal->maps.shades + (l << pal->shadeshift),
+							pal->numcolors,
+							r, g, b,
+							l * (256 / NUMCOLORMAPS));
+			}
+
+			// build special maps (e.g. invulnerability)
+			{
+				unsigned *shade = pal->maps.shades + (NUMCOLORMAPS << pal->shadeshift);
+				int grayint;
+
+				for (c = 0; c < pal->numcolors; c++) {
+					grayint = (int)(255.0f * (1.0f -
+						(RPART(pal->colors[c]) * 0.00116796875f +
+						 GPART(pal->colors[c]) * 0.00229296875f +
+						 BPART(pal->colors[c]) * 0.0005625)));
+					*shade++ = MAKERGB (grayint, grayint, grayint);
+				}
+			}
+		}
+	}
+
+	if (pal == &DefPal) {
+		NormalLight.maps = DefPal.maps.colormaps;
+		NormalLight.color = MAKERGB(255,255,255);
+		NormalLight.fade = level.fadeto;
 	}
 }
 
@@ -419,7 +457,11 @@ static void Cmd_TestBlend (void *plyr, int argc, char **argv)
 			amt = 1.0f;
 		else if (amt < 0.0f)
 			amt = 0.0f;
-		V_SetBlend (RPART(color), GPART(color), BPART(color), (int)(amt * 256.0f));
+		//V_SetBlend (RPART(color), GPART(color), BPART(color), (int)(amt * 256.0f));
+		BaseBlendR = RPART(color);
+		BaseBlendG = GPART(color);
+		BaseBlendB = BPART(color);
+		BaseBlendA = amt;
 	}
 }
 
@@ -439,6 +481,7 @@ static void Cmd_TestFade (void *plyr, int argc, char **argv)
 		}
 		level.fadeto = color;
 		RefreshPalettes();
+		NormalLight.maps = DefPal.maps.colormaps;
 	}
 }
 
@@ -513,4 +556,79 @@ void HSVtoRGB (float *r, float *g, float *b, float h, float s, float v)
 		case 4:		*r = t; *g = p; *b = v; break;
 		default:	*r = v; *g = p; *b = q; break;
 	}
-}
\ No newline at end of file
+}
+
+/****** Colored Lighting Stuffs (Sorry, 8-bit only) ******/
+
+// Builds NUMCOLORMAPS colormaps lit with the specified color
+void BuildColoredLights (byte *maps, int lr, int lg, int lb, int r, int g, int b)
+{
+	unsigned int l,c;
+	unsigned int colors[256];
+	byte *shade;
+
+	// The default palette is assumed to contain the maps for white light.
+	if (!screens[0].is8bit || !maps)
+		return;
+
+	// build normal (but colored) light mappings
+	for (l = 0; l < NUMCOLORMAPS; l++) {
+		DoBlending (DefPal.basecolors, colors, DefPal.numcolors, r, g, b, l * (256 / NUMCOLORMAPS));
+
+		shade = maps + 256*l;
+		for (c = 0; c < 256; c++) {
+			*shade++ = BestColor (DefPal.basecolors,
+								  (RPART(colors[c])*lr)/255,
+								  (GPART(colors[c])*lg)/255,
+								  (BPART(colors[c])*lb)/255,
+								  256);
+		}
+	}
+}
+
+dyncolormap_t *GetSpecialLights (int lr, int lg, int lb, int fr, int fg, int fb)
+{
+	unsigned int color = MAKERGB (lr, lg, lb);
+	unsigned int fade = MAKERGB (fr, fg, fb);
+	dyncolormap_t *colormap = &NormalLight;
+
+	// Bah! Simple linear search because I want to get this done.
+	while (colormap) {
+		if (color == colormap->color && fade == colormap->fade)
+			return colormap;
+		else
+			colormap = colormap->next;
+	}
+
+	// Not found. Create it.
+	colormap = Z_Malloc (sizeof(*colormap), PU_LEVEL, 0);
+	colormap->maps = Z_Malloc (NUMCOLORMAPS*256+3+255, PU_LEVEL, 0);
+	colormap->maps = (byte *)(((int)colormap->maps + 255) & ~0xff);
+	colormap->color = color;
+	colormap->fade = fade;
+	colormap->next = NormalLight.next;
+	NormalLight.next = colormap;
+
+	BuildColoredLights (colormap->maps, lr, lg, lb, fr, fg, fb);
+
+	return colormap;
+}
+
+static void Cmd_TestColor (void *plyr, int argc, char **argv)
+{
+	char *colorstring;
+	int color;
+
+	if (argc < 2) {
+		Printf ("testcolor <color>\n");
+	} else {
+		if ( (colorstring = V_GetColorStringByName (argv[1])) ) {
+			color = V_GetColorFromString (NULL, colorstring);
+			free (colorstring);
+		} else {
+			color = V_GetColorFromString (NULL, argv[1]);
+		}
+		BuildColoredLights (NormalLight.maps, RPART(color), GPART(color), BPART(color),
+			RPART(level.fadeto), GPART(level.fadeto), BPART(level.fadeto));
+	}
+}
diff --git a/code/v_palett.h b/code/v_palett.h
index d5bc0f139c..c37d7c294c 100644
--- a/code/v_palett.h
+++ b/code/v_palett.h
@@ -56,6 +56,15 @@ typedef struct palette_s palette_t;
 #define LAP_TEXTURE			(3)
 
 
+struct dyncolormap_s {
+	byte *maps;
+	unsigned int color;
+	unsigned int fade;
+	struct dyncolormap_s *next;
+};
+typedef struct dyncolormap_s dyncolormap_t;
+
+
 // InitPalettes()
 //	input: name:  the name of the default palette lump
 //				  (normally GAMEPAL)
@@ -150,6 +159,7 @@ void V_ForceBlend (int blendr, int blendg, int blendb, int blenda);
 void RGBtoHSV (float r, float g, float b, float *h, float *s, float *v);
 void HSVtoRGB (float *r, float *g, float *b, float h, float s, float v);
 
+dyncolormap_t *GetSpecialLights (int lr, int lg, int lb, int fr, int fg, int fb);
 
 struct cvar_s;
 
diff --git a/code/v_text.c b/code/v_text.c
index 9dfa0c87d8..fefc33f05a 100644
--- a/code/v_text.c
+++ b/code/v_text.c
@@ -85,7 +85,7 @@ void V_InitConChars (byte transcolor)
 extern void STACK_ARGS PrintChar1P (long *charimg, byte *dest, int screenpitch);
 extern void STACK_ARGS PrintChar2P_MMX (long *charimg, byte *dest, int screenpitch);
 
-void V_PrintStr (int x, int y, byte *str, int count, byte ormask)
+void V_PrintStr (int x, int y, byte *str, int count)
 {
 	byte *temp;
 	long *charimg;
@@ -110,7 +110,7 @@ void V_PrintStr (int x, int y, byte *str, int count, byte ormask)
 	temp = screens[0].buffer + y * screens[0].pitch;
 
 	while (count && x <= (screens[0].width - 8)) {
-		charimg = (long *)&ConChars[((*str) | ormask) * 128];
+		charimg = (long *)&ConChars[(*str) * 128];
 		if (screens[0].is8bit) {
 #ifdef USEASM
 			PrintChar1P (charimg, temp + x, screens[0].pitch);
@@ -133,10 +133,11 @@ void V_PrintStr (int x, int y, byte *str, int count, byte ormask)
 
 			writepos = (int *)(temp + (x << 2));
 			for (z = 0; z < 8; z++) {
+#define BYTEIMG ((byte *)charimg)
 #define SPOT(a) \
-	writepos[a] = writepos[a] & \
-				((((byte *)charimg)[a+8]<<16) | ((((byte *)charimg)[a+8]<<8) | \
-				((((byte *)charimg)[a+8]))	  | (V_Palette[((byte *)charimg)[a]])))
+	writepos[a] = (writepos[a] & \
+				 ((BYTEIMG[a+8]<<16)|(BYTEIMG[a+8]<<8)|(BYTEIMG[a+8]))) \
+				 ^ V_Palette[BYTEIMG[a]]
 
 				SPOT(0);
 				SPOT(1);
@@ -147,6 +148,7 @@ void V_PrintStr (int x, int y, byte *str, int count, byte ormask)
 				SPOT(6);
 				SPOT(7);
 #undef SPOT
+#undef BYTEIMG
 				writepos += screens[0].pitch >> 2;
 				charimg += 4;
 			}
@@ -161,7 +163,7 @@ void V_PrintStr (int x, int y, byte *str, int count, byte ormask)
 // V_PrintStr2
 // Same as V_PrintStr but doubles the size of every character.
 //
-void V_PrintStr2 (int x, int y, byte *str, int count, byte ormask)
+void V_PrintStr2 (int x, int y, byte *str, int count)
 {
 	byte *temp;
 	long *charimg;
@@ -186,7 +188,7 @@ void V_PrintStr2 (int x, int y, byte *str, int count, byte ormask)
 	temp = screens[0].buffer + y * screens[0].pitch;
 
 	while (count && x <= (screens[0].width - 16)) {
-		charimg = (long *)&ConChars[((*str) | ormask) * 128];
+		charimg = (long *)&ConChars[(*str) * 128];
 #ifdef USEASM
 		if (UseMMX) {
 			PrintChar2P_MMX (charimg, temp + x, screens[0].pitch);
@@ -525,7 +527,7 @@ int V_StringWidth (byte *string)
 // [RH] Break long lines of text into multiple lines no
 //		longer than maxwidth pixels.
 //
-static void breakit (brokenlines_t *line, const byte *start, const byte *string, int w)
+static void breakit (brokenlines_t *line, const byte *start, const byte *string)
 {
 	// Leave out trailing white space
 	while (string > start && isspace (*(string - 1)))
@@ -534,7 +536,7 @@ static void breakit (brokenlines_t *line, const byte *start, const byte *string,
 	line->string = Z_Malloc (string - start + 1, PU_STATIC, 0);
 	strncpy (line->string, start, string - start);
 	line->string[string - start] = 0;
-	line->width = w;
+	line->width = V_StringWidth (line->string);
 }
 
 brokenlines_t *V_BreakLines (int maxwidth, const byte *string)
@@ -567,7 +569,7 @@ brokenlines_t *V_BreakLines (int maxwidth, const byte *string)
 			if (!space)
 				space = string - 1;
 
-			breakit (&lines[i], start, space, w);
+			breakit (&lines[i], start, space);
 
 			i++;
 			w = 0;
@@ -587,7 +589,7 @@ brokenlines_t *V_BreakLines (int maxwidth, const byte *string)
 
 		while (s < string) {
 			if (!isspace (*s++)) {
-				breakit (&lines[i++], start, string, w);
+				breakit (&lines[i++], start, string);
 				break;
 			}
 		}
diff --git a/code/v_text.h b/code/v_text.h
index 06f1a83e6b..f5e56292da 100644
--- a/code/v_text.h
+++ b/code/v_text.h
@@ -11,8 +11,8 @@ typedef struct brokenlines_s brokenlines_t;
 
 
 // Output a line of text using the console font
-void V_PrintStr (int x, int y, byte *str, int count, byte ormask);
-void V_PrintStr2 (int x, int y, byte *str, int count, byte ormask);
+void V_PrintStr (int x, int y, byte *str, int count);
+void V_PrintStr2 (int x, int y, byte *str, int count);
 
 // Output some text with wad heads-up font
 void V_DrawText (int x, int y, byte *str);
diff --git a/code/version.h b/code/version.h
new file mode 100644
index 0000000000..49fe4cb37e
--- /dev/null
+++ b/code/version.h
@@ -0,0 +1,11 @@
+#ifndef __VERSION_H__
+#define __VERSION_H__
+
+// DOOM version
+enum { VERSION = 116 };
+#define VERSIONSTR "116"
+#define DOTVERSIONSTR "1.16"
+#define GAMEVER (0x0110)
+#define SAVESIG "ZDOOMSAVE116    "	// Needs to be exactly 16 chars long
+
+#endif //__VERSION_H__
\ No newline at end of file
diff --git a/code/w_wad.h b/code/w_wad.h
index d422013826..30ddd0850f 100644
--- a/code/w_wad.h
+++ b/code/w_wad.h
@@ -33,6 +33,14 @@
 #define PWAD_ID (('P')|('W'<<8)|('A'<<16)|('D'<<24))
 #endif
 
+// [RH] Remove limit on number of WAD files
+typedef struct wadlist_s {
+	struct wadlist_s *next;
+	char name[1];	// +size of string
+} wadlist_t;
+extern wadlist_t *wadfiles;
+
+
 //
 // TYPES
 //
@@ -60,7 +68,7 @@ typedef struct
 typedef struct lumpinfo_s
 {
 	char		name[8];
-	int			handle;
+	FILE		*handle;	// [RH] Use stdio routines
 	int			position;
 	int			size;
 
@@ -76,14 +84,15 @@ typedef enum {
 	ns_global = 0,
 	ns_sprites,
 	ns_flats,
-	ns_colormaps
+	ns_colormaps,
+	ns_skinbase = 0x80000000	// Each skin's status bar face gets own namespace
 } namespace_t;
 
 extern	void**		lumpcache;
 extern	lumpinfo_t*	lumpinfo;
 extern	int			numlumps;
 
-void	W_InitMultipleFiles (char** filenames);
+void	W_InitMultipleFiles (wadlist_t** filenames);
 
 #define W_CheckNumForName(name) (W_CheckNumForName)(name, ns_global)
 int		(W_CheckNumForName) (const char *name, int);
@@ -109,9 +118,18 @@ void	W_InitHashChains (void);						// [RH] Set up the lumpinfo hashing
 // [RH] Combine multiple marked ranges of lumps into one.
 void	W_MergeLumps (const char *start, const char *end, int);
 
-// Copy an 8-char string and uppercase it.
+// [RH] Copy an 8-char string and uppercase it.
 void uppercopy (char *to, const char *from);
 
+// [RH] Copies the lump name to to using uppercopy
+void W_GetLumpName (char *to, int lump);
+
+// [RH] Returns file ptr for specified lump
+FILE *W_GetLumpFile (int lump);
+
+// [RH] Put a lump in a certain namespace
+void W_SetLumpNamespace (int lump, int nmspace);
+
 #endif
 //-----------------------------------------------------------------------------
 //
diff --git a/code/I_input.c b/code/win32/I_input.c
similarity index 81%
rename from code/I_input.c
rename to code/win32/I_input.c
index d81c1f822d..fb99c1d6ce 100644
--- a/code/I_input.c
+++ b/code/win32/I_input.c
@@ -1,4 +1,5 @@
-#define DIRECTINPUT_VERSION 0x300
+#define DIRECTINPUT_VERSION 0x300	// We want to support DX 3.0, and
+#define _WIN32_WINNT 0x0400			// we want to support the mouse wheel
 
 #define WIN32_LEAN_AND_MEAN
 #define __BYTEBOOL__
@@ -10,13 +11,14 @@
 
 #include <dinput.h>
 
+#include "doomdef.h"
+#include "doomstat.h"
 #include "m_argv.h"
 #include "i_input.h"
 #include "v_video.h"
 
-#include "i_music.h"
-
 #include "d_main.h"
+#include "c_consol.h"
 #include "c_cvars.h"
 #include "i_system.h"
 #include "i_video.h"
@@ -24,9 +26,9 @@
 #include "s_sound.h"
 
 
-#define DINPUT_BUFFERSIZE           32
+#define DINPUT_BUFFERSIZE	32
 
-extern HINSTANCE		g_hInst;					/* My instance handle */
+extern HINSTANCE g_hInst;
 
 static void KeyRead (void);
 static BOOL DI_Init2 (void);
@@ -37,10 +39,12 @@ static void UngrabMouse_Win32 (void);
 static BOOL I_GetDIMouse (void);
 static void I_GetWin32Mouse (void);
 static void CenterMouse_Win32 (void);
+static void WheelMoved (void);
 
+static BOOL mousepaused;
 static BOOL WindowActive;
 static BOOL MakeMouseEvents;
-
+extern BOOL menuactive;
 extern BOOL vidactive;
 extern HWND Window;
 
@@ -64,25 +68,33 @@ static mousemode_t mousemode;
 extern BOOL paused;
 static BOOL havefocus = FALSE;
 static BOOL noidle = FALSE;
+static int WheelMove;
 
 // Used by the console for making keys repeat
 int KeyRepeatDelay;
 int KeyRepeatRate;
 
-LPDIRECTINPUT			g_pdi;
-LPDIRECTINPUTDEVICE		g_pKey;
-LPDIRECTINPUTDEVICE		g_pMouse;
+static LPDIRECTINPUT			g_pdi;
+static LPDIRECTINPUTDEVICE		g_pKey;
+static LPDIRECTINPUTDEVICE		g_pMouse;
 
 //Other globals
-int GDx,GDy;
+static int GDx,GDy;
 
-extern int ConsoleState;
+extern constate_e ConsoleState;
 
 cvar_t *i_remapkeypad;
-cvar_t *usejoystick;
+
 cvar_t *usemouse;
 cvar_t *in_mouse;
 
+cvar_t *usejoystick;
+cvar_t *joy_speedmultiplier;
+cvar_t *joy_ythreshold;
+cvar_t *joy_ysensitivity;
+cvar_t *joy_xthreshold;
+cvar_t *joy_xsensitivity;
+
 // Convert DIK_* code to ASCII using Qwerty keymap
 static const byte Convert []={
   //  0    1    2    3    4    5    6    7    8    9    A    B    C    D    E    F
@@ -123,24 +135,16 @@ LRESULT CALLBACK WndProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 
 	switch(message) {
 		case WM_DESTROY:
-			PostQuitMessage (0);
+			SetPriorityClass (GetCurrentProcess(), NORMAL_PRIORITY_CLASS);
+			//PostQuitMessage (0);
+			exit (0);
 			break;
 
 		case WM_HOTKEY:
 			break;
 
 		case WM_PAINT:
-			if (!vidactive) {
-				I_PaintConsole ();
-			} else {
-				return DefWindowProc (hWnd, message, wParam, lParam);
-			}
-			break;
-
-		case MM_MCINOTIFY:
-			if (wParam == MCI_NOTIFY_SUCCESSFUL)
-				I_RestartSong ();
-			break;
+			return DefWindowProc (hWnd, message, wParam, lParam);
 
 		case WM_KILLFOCUS:
 			if (g_pKey) IDirectInputDevice_Unacquire (g_pKey);
@@ -171,12 +175,15 @@ LRESULT CALLBACK WndProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 			break;
 
 		case WM_SETFOCUS:
+#ifdef _DEBUG
 			SetPriorityClass (GetCurrentProcess(), NORMAL_PRIORITY_CLASS);
+#else
+			SetPriorityClass (GetCurrentProcess(), HIGH_PRIORITY_CLASS);
+#endif
 			if (g_pKey) IDirectInputDevice_Acquire (g_pKey);
 			havefocus = TRUE;
-			if ((Fullscreen || (!paused && !menuactive)) && g_pMouse) {
-				IDirectInputDevice_Acquire (g_pMouse);
-			}
+			if (g_pMouse && (Fullscreen || !mousepaused))
+				I_ResumeMouse ();
 			if (!paused)
 				S_ResumeSound ();
 			break;
@@ -184,7 +191,8 @@ LRESULT CALLBACK WndProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 		case WM_ACTIVATE:
 			if (LOWORD(wParam)) {
 				WindowActive = TRUE;
-				if (mousemode == win32 && MakeMouseEvents) {
+				if (mousemode == win32 && MakeMouseEvents &&
+					(!mousepaused || Fullscreen)) {
 					GrabMouse_Win32 ();
 				}
 			} else {
@@ -267,6 +275,13 @@ LRESULT CALLBACK WndProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 			}
 			break;
 
+		case WM_MOUSEWHEEL:
+			if (MakeMouseEvents && mousemode == win32) {
+				WheelMove += (short) HIWORD(wParam);
+				WheelMoved ();
+			}
+			break;
+
 		default:
 			return DefWindowProc (hWnd, message, wParam, lParam);
 	}
@@ -293,35 +308,70 @@ static void BuildCvt2Table (void)
 
 /****** Stuff from Andy Bay's myjoy.c ******/
 
-struct {
+static struct {
 	int X,Y,Z,R,U,V;
-}			JoyBias;
-int 		JoyActive;
-JOYINFOEX	JoyStats;
-JOYCAPS 	JoyCaps;
-
+}					JoyBias;
+static int 			JoyActive;
+static int			JoyDevice;
+static JOYINFOEX	JoyStats;
+static JOYCAPS 		JoyCaps;
 
 void JoyFixBias (void)
 {
 	JoyBias.X = (JoyCaps.wXmin + JoyCaps.wXmax) >> 1;
 	JoyBias.Y = (JoyCaps.wYmin + JoyCaps.wYmax) >> 1;
-	JoyBias.Z = (JoyCaps.wZmin + JoyCaps.wZmax) >> 1;
-	JoyBias.R = (JoyCaps.wRmin + JoyCaps.wRmax) >> 1;
-	JoyBias.U = (JoyCaps.wUmin + JoyCaps.wUmax) >> 1;
-	JoyBias.V = (JoyCaps.wVmin + JoyCaps.wVmax) >> 1;
+//	JoyBias.Z = (JoyCaps.wZmin + JoyCaps.wZmax) >> 1;
+//	JoyBias.R = (JoyCaps.wRmin + JoyCaps.wRmax) >> 1;
+//	JoyBias.U = (JoyCaps.wUmin + JoyCaps.wUmax) >> 1;
+//	JoyBias.V = (JoyCaps.wVmin + JoyCaps.wVmax) >> 1;
 }
 
 void DI_JoyCheck (void)
 {
 	event_t joyevent;
+	fixed_t xscale, yscale;
+	int xdead, ydead;
 
 	if (JoyActive) {
 		JoyStats.dwFlags = JOY_RETURNALL;
-		if (joyGetPosEx (0, &JoyStats)) {
+		if (joyGetPosEx (JoyDevice, &JoyStats)) {
 			JoyActive = 0;
 			return;
 		}
+		joyevent.type = ev_joystick;
+		joyevent.data1 = 0;
+		joyevent.data2 = JoyStats.dwXpos - JoyBias.X;
+		joyevent.data3 = JoyStats.dwYpos - JoyBias.Y;
 
+		xdead = (int)((float)JoyBias.X * joy_xthreshold->value);
+		ydead = (int)((float)JoyBias.Y * joy_ythreshold->value);
+		xscale = (int)(16777216 / ((float)JoyBias.X * (1 - joy_xthreshold->value)) * joy_xsensitivity->value * joy_speedmultiplier->value);
+		yscale = (int)(16777216 / ((float)JoyBias.Y * (1 - joy_ythreshold->value)) * joy_ysensitivity->value * joy_speedmultiplier->value);
+
+		if (abs (joyevent.data2) < xdead)
+			joyevent.data2 = 0;
+		else if (joyevent.data2 > 0) {
+			joyevent.data2 = FixedMul (joyevent.data2 - xdead, xscale);
+		} else if (joyevent.data2 < 0) {
+			joyevent.data2 = FixedMul (joyevent.data2 + xdead, xscale);
+		}
+		if (joyevent.data2 > 256)
+			joyevent.data2 = 256;
+		else if (joyevent.data2 < -256)
+			joyevent.data2 = -256;
+
+		if (abs (joyevent.data3) < ydead)
+			joyevent.data3 = 0;
+		else if (joyevent.data3 > 0) {
+			joyevent.data3 = FixedMul (joyevent.data3 - ydead, yscale);
+		} else if (joyevent.data3 < 0) {
+			joyevent.data3 = FixedMul (joyevent.data3 + ydead, yscale);
+		}
+		if (joyevent.data3 > 256)
+			joyevent.data3 = 256;
+		else if (joyevent.data3 < -256)
+			joyevent.data3 = -256;
+/*
 		joyevent.type = ev_joystick;
 		joyevent.data1 = 0;
 		joyevent.data2 = JoyStats.dwXpos - JoyBias.X;
@@ -345,7 +395,7 @@ void DI_JoyCheck (void)
 		}
 		else
 			joyevent.data3 = 0;
-
+*/
 		D_PostEvent (&joyevent);
 
 		{	/* Send out button up/down events */
@@ -374,13 +424,29 @@ void DI_JoyCheck (void)
 
 BOOL DI_InitJoy (void)
 {
-	Printf ("DI_InitJoy: Initialize joystick\n");
+	int i;
+
 	JoyActive = joyGetNumDevs ();
-	if (JoyActive) {
-		JoyStats.dwSize = sizeof(JOYINFOEX);
-		joyGetDevCaps (0, &JoyCaps, sizeof(JOYCAPS));
-		JoyFixBias();
+	JoyStats.dwSize = sizeof(JOYINFOEX);
+	JoyDevice = -1;
+
+	for (i = JOYSTICKID1; i <= JOYSTICKID2; i++) {
+		if (joyGetDevCaps (i, &JoyCaps, sizeof(JOYCAPS)) != JOYERR_NOERROR)
+			continue;
+
+		JoyStats.dwFlags = JOY_RETURNALL;
+		if (joyGetPosEx (i, &JoyStats) != JOYERR_NOERROR)
+			continue;
+
+		JoyDevice = i;
+		break;
 	}
+
+	if (JoyDevice == -1)
+		JoyActive = 0;
+	else
+		JoyFixBias();
+
 	return TRUE;
 }
 
@@ -389,6 +455,7 @@ void I_PauseMouse (void)
 	if (Fullscreen)
 		return;
 
+	mousepaused = TRUE;
 	if (g_pMouse) {
 		IDirectInputDevice_Unacquire (g_pMouse);
 	} else {
@@ -398,6 +465,10 @@ void I_PauseMouse (void)
 
 void I_ResumeMouse (void)
 {
+	if (!Fullscreen && gamestate == GS_FULLCONSOLE)
+		return;
+
+	mousepaused = FALSE;
 	if (!g_pMouse) {
 		GrabMouse_Win32 ();
 	} else {
@@ -525,15 +596,20 @@ BOOL I_InitInput (void *hwnd)
 	DIRECTINPUTCREATE_FUNCTION DirectInputCreateFunction;
 	HRESULT hr;
 
+	atexit (I_ShutdownInput);
+
 	noidle = M_CheckParm ("-noidle");
 
 	in_mouse = cvar ("in_mouse", "0", CVAR_ARCHIVE|CVAR_CALLBACK);
 	in_mouse->u.callback = in_mouse_changed;
 
-	Printf ("I_InitInput: Initialize DirectInput\n");
+	joy_speedmultiplier = cvar ("joy_speedmultiplier", "1", CVAR_ARCHIVE);
+	joy_xsensitivity = cvar ("joy_xsensitivity", "1", CVAR_ARCHIVE);
+	joy_ysensitivity = cvar ("joy_ysensitivity", "-1", CVAR_ARCHIVE);
+	joy_xthreshold = cvar ("joy_xthreshold", "0.15", CVAR_ARCHIVE);
+	joy_ythreshold = cvar ("joy_ythreshold", "0.15", CVAR_ARCHIVE);
 
 	// [RH] Removed dependence on existance of dinput.lib when linking.
-
 	DirectInputInstance = (HMODULE)LoadLibrary ("dinput.dll");
 	if (!DirectInputInstance)
 		I_FatalError ("Sorry, you need Microsoft's DirectX installed.\n\n"
@@ -594,7 +670,18 @@ static void CenterMouse_Win32 (void) {
 	SetCursorPos (PrevX, PrevY);
 }
 
-static int showcount = 1;
+static void SetCursorState (int visible) {
+	int count;
+	BOOL direction = visible;
+	
+	do {
+		count = ShowCursor (direction);
+		if (visible && count > 0)
+			direction = FALSE;
+		else if (!visible && count < -1)
+			direction = TRUE;
+	} while (count != visible - 1);
+}
 
 static void GrabMouse_Win32 (void) {
 	RECT rect;
@@ -602,23 +689,39 @@ static void GrabMouse_Win32 (void) {
 	ClipCursor (NULL);		// helps with Win95?
 	GetWindowRect (Window, &rect);
 	ClipCursor (&rect);
-	if (showcount) {
-		ShowCursor (FALSE);
-		showcount--;
-	}
+	SetCursorState (FALSE);
 	CenterMouse_Win32 ();
 	MakeMouseEvents = TRUE;
 }
 
 static void UngrabMouse_Win32 (void) {
 	ClipCursor (NULL);
-	if (!showcount) {
-		ShowCursor (TRUE);
-		showcount++;
-	}
+	SetCursorState (TRUE);
 	MakeMouseEvents = FALSE;
 }
 
+static void WheelMoved (void)
+{
+	event_t event;
+	int dir;
+
+	event.data2 = event.data3 = 0;
+	if (WheelMove < 0) {
+		dir = WHEEL_DELTA;
+		event.data1 = KEY_MWHEELDOWN;
+	} else {
+		dir = -WHEEL_DELTA;
+		event.data1 = KEY_MWHEELUP;
+	}
+	while (abs (WheelMove) >= WHEEL_DELTA) {
+		event.type = ev_keydown;
+		D_PostEvent (&event);
+		event.type = ev_keyup;
+		D_PostEvent (&event);
+		WheelMove += dir;
+	}
+}
+
 static void MouseRead_Win32 (void) {
 	POINT pt;
 	event_t ev;
@@ -685,6 +788,12 @@ static void MouseRead_DI (void) {
 				GDy += od.dwData;
 				break;
 
+		/* DIMOFS_Z: Mouse wheel motion */
+			case DIMOFS_Z:
+				WheelMove += od.dwData;
+				WheelMoved ();
+				break;
+
 		/* [RH] Mouse button events now mimic keydown/up events */
 			case DIMOFS_BUTTON0:
 				if(od.dwData & 0x80) {
@@ -750,8 +859,6 @@ static BOOL DI_Init2 (void)
 			DINPUT_BUFFERSIZE,				// dwData
 		};
 
-	Printf ("DI_Init2: Initialize keyboard\n");
-
 	BuildCvt2Table ();
 
 	// [RH] The timing values for these SPI_* parameters are described in
@@ -858,7 +965,7 @@ static void KeyRead (void) {
 					default:
 						// Don't remap the keypad if the console is accepting input.
 						if (i_remapkeypad->value &&
-							ConsoleState != 1 && ConsoleState != 2) {
+							ConsoleState != c_falling && ConsoleState != c_down) {
 							switch (key) {
 								case DIK_NUMPAD4:
 									key = DIK_LEFT;
@@ -916,7 +1023,7 @@ void I_GetEvent(void)
 //	while (1) {
 		while (PeekMessage (&mess, NULL, 0, 0, PM_REMOVE)) {
 			if (mess.message == WM_QUIT)
-				I_Quit ();
+				exit (mess.wParam);
 			TranslateMessage (&mess);
 			DispatchMessage (&mess);
 		}
diff --git a/code/I_input.h b/code/win32/I_input.h
similarity index 100%
rename from code/I_input.h
rename to code/win32/I_input.h
diff --git a/code/I_main.c b/code/win32/I_main.c
similarity index 84%
rename from code/I_main.c
rename to code/win32/I_main.c
index 800b7bf47d..5951ff6078 100644
--- a/code/I_main.c
+++ b/code/win32/I_main.c
@@ -35,6 +35,7 @@
 #include "d_main.h"
 #include "i_system.h"
 #include "c_consol.h"
+#include "z_zone.h"
 
 LRESULT CALLBACK WndProc (HWND, UINT, WPARAM, LPARAM);
 
@@ -53,6 +54,8 @@ LONG			WinWidth, WinHeight;
 HFONT			OemFont;
 HDC				WinDC;
 
+extern float mb_used;
+
 int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE nothing, LPSTR cmdline, int nCmdShow)
 {
 	int wantHeight, wantWidth, height, width;
@@ -63,12 +66,27 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE nothing, LPSTR cmdline, int n
 	myargc = __argc;
 	myargv = __argv;
 
+	/*
+	 killough 1/98:
+
+	 This fixes some problems with exit handling
+	 during abnormal situations.
+
+	 The old code called I_Quit() to end program,
+	 while now I_Quit() is installed as an exit
+	 handler and exit() is called to exit, either
+	 normally or abnormally.
+	*/
+
+	Z_Init ();					// 1/18/98 killough: start up memory stuff first
+	atexit (I_Quit);
+
 #ifdef USEASM
 	{
 		// Disable write-protection of code segment
 		// (from Win32 Demo Programming FAQ)
 		DWORD OldRights;
-		BYTE *pBaseOfImage = GetModuleHandle(0);
+		BYTE *pBaseOfImage = (BYTE *)GetModuleHandle(0);
 		IMAGE_OPTIONAL_HEADER *pHeader = (IMAGE_OPTIONAL_HEADER *)
 			(pBaseOfImage + ((IMAGE_DOS_HEADER*)pBaseOfImage)->e_lfanew +
 			sizeof(IMAGE_NT_SIGNATURE) + sizeof(IMAGE_FILE_HEADER));
@@ -77,6 +95,11 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE nothing, LPSTR cmdline, int n
 	}
 #endif
 
+	// Figure out what directory the program resides in.
+    GetModuleFileName (NULL, progdir, 1024);
+    *(strrchr (progdir, '\\') + 1) = 0;
+	FixPathSeperator (progdir);
+
 	height = GetSystemMetrics (SM_CYFIXEDFRAME) * 2 +
 			 GetSystemMetrics (SM_CYCAPTION) + 12 * 32;
 	width  = GetSystemMetrics (SM_CXFIXEDFRAME) * 2 + 8 * 78;
@@ -99,7 +122,7 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE nothing, LPSTR cmdline, int n
 	/* create window */
 	Window = CreateWindow((LPCTSTR)WinClassName,
 			(LPCTSTR) "ZDOOM (" __DATE__ ")",
-			WS_CAPTION | WS_OVERLAPPED | WS_MINIMIZEBOX | WS_SYSMENU,
+			WS_CAPTION | WS_OVERLAPPED,
 			CW_USEDEFAULT, CW_USEDEFAULT, width, height,
 			(HWND)   NULL,
 			(HMENU)  NULL,
@@ -130,7 +153,7 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE nothing, LPSTR cmdline, int n
 	if (wantWidth != cRect.right)
 		width += wantWidth = cRect.right;
 
-	SetWindowPos (Window, 0, 0, 0, width, height, SWP_NOMOVE|SWP_NOZORDER|SWP_SHOWWINDOW);
+	SetWindowPos (Window, 0, 0, 0, width, height, SWP_NOMOVE|SWP_NOZORDER);
 	GetClientRect (Window, &cRect);
 
 	WinWidth = cRect.right;
@@ -138,6 +161,8 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE nothing, LPSTR cmdline, int n
 
 	C_InitConsole (((WinWidth / OemWidth) + 2) * 8, (WinHeight / OemHeight) * 8, false);
 
+	Printf ("Heapsize: %g megabytes\n", mb_used);
+
 	D_DoomMain ();
 
 	return 0;
diff --git a/code/win32/I_music.c b/code/win32/I_music.c
new file mode 100644
index 0000000000..29abdeff6e
--- /dev/null
+++ b/code/win32/I_music.c
@@ -0,0 +1,556 @@
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <mmsystem.h>
+
+#include "m_argv.h"
+#include "i_music.h"
+#include "w_wad.h"
+#include "c_consol.h"
+#include "c_dispch.h"
+#include "z_zone.h"
+#include "mid2strm.h"
+#include "mus2strm.h"
+
+#include "../midas/include/midasdll.h"
+
+#define TYPE_MUS		0
+#define TYPE_MIDI		1
+#define TYPE_MOD		2
+
+#define STATE_STOPPED	0
+#define STATE_PLAYING	1
+#define STATE_PAUSED	2
+
+struct MusInfo {
+	int type;
+	int status;
+	PSTREAMBUF currBuffer;
+	enum {
+		cb_play,
+		cb_die
+	} callbackStatus;
+	union {
+		MIDASmodulePlayHandle handle;
+		HMIDISTRM midiStream;
+	};
+	union {
+		MIDASmodule module;
+		PSTREAMBUF buffers;
+	};
+	BOOL looping;
+};
+typedef struct MusInfo info_t;
+
+static info_t  *currSong;
+static HANDLE	BufferReturnEvent;
+static int		nomusic = 0;
+static char		modName[512];
+static int		musicdies=-1;
+static int		musicvolume;
+static DWORD	midivolume;
+static cvar_t  *snd_mididevice;
+static DWORD	nummididevices;
+static UINT		mididevice;
+
+void I_SetMIDIVolume (float volume)
+{
+	DWORD wooba = (DWORD)(volume * 0xffff) & 0xffff;
+	midivolume = (wooba << 16) | wooba;
+	if (currSong && (currSong->type == TYPE_MIDI || currSong->type == TYPE_MUS))
+		midiOutSetVolume ((HMIDIOUT)currSong->midiStream, midivolume);
+}
+
+void I_SetMusicVolume (int volume)
+{
+	if (volume != 127) {
+		// Internal state variable.
+		musicvolume = volume;
+		// Now set volume on output device.
+		if (currSong && currSong->type == TYPE_MOD)
+			MIDASsetMusicVolume (currSong->handle, musicvolume);
+	}
+}
+
+static void ChangeMIDIDevice (cvar_t *var)
+{
+	UINT oldmididev = mididevice;
+
+	if (((int)var->value >= (signed)nummididevices) || (var->value < -1.0f)) {
+		Printf ("ID out of range. Using MIDI mapper.\n");
+		SetCVarFloat (var, -1.0f);
+		return;
+	} else if (var->value < 0) {
+		mididevice = MIDI_MAPPER;
+	} else {
+		mididevice = (int)var->value;
+	}
+
+	// If a song is playing, move it to the new device.
+	if (oldmididev != mididevice && currSong) {
+		info_t *song = currSong;
+		I_StopSong ((int)song);
+		I_PlaySong ((int)song, song->looping);
+	}
+}
+
+static void ListMIDIDevices (void *plyr, int argc, char **argv)
+{
+	UINT id;
+	MIDIOUTCAPS caps;
+	MMRESULT res;
+
+	if (nummididevices) {
+		Printf ("-1. MIDI Mapper\n");
+	} else {
+		Printf ("No MIDI devices installed.\n");
+		return;
+	}
+
+	for (id = 0; id < nummididevices; id++) {
+		res = midiOutGetDevCaps (id, &caps, sizeof(caps));
+		if (res == MMSYSERR_NODRIVER) {
+			strcpy (caps.szPname, "<Driver not installed>");
+		} else if (res == MMSYSERR_NOMEM) {
+			strcpy (caps.szPname, "<No memory for description>");
+		} else if (res != MMSYSERR_NOERROR) {
+			continue;
+		}
+		Printf ("% 2d. %s\n", id, caps.szPname);
+	}
+}
+
+void I_InitMusic (void)
+{
+	char *temp;
+
+	Printf ("I_InitMusic\n");
+	
+	snd_mididevice = cvar ("snd_mididevice", "-1", CVAR_ARCHIVE|CVAR_CALLBACK);
+	snd_mididevice->u.callback = ChangeMIDIDevice;
+	nummididevices = midiOutGetNumDevs ();
+	ChangeMIDIDevice (snd_mididevice);
+	C_RegisterCommand ("snd_listmididevices", ListMIDIDevices);
+
+	nomusic = !!M_CheckParm("-nomusic") || !!M_CheckParm("-nosound") || !nummididevices;
+
+	if (!nomusic) {
+		if ((BufferReturnEvent = CreateEvent (NULL, FALSE, FALSE, NULL)) == NULL) {
+			Printf ("Could not create MIDI callback event.\nMIDI music will be disabled.\n");
+			nomusic = true;
+		}
+	}
+
+	/* Create temporary file name for MIDAS */
+	temp = getenv("TEMP");
+	if (temp == NULL)
+		temp = ".";
+	strcpy (modName, temp);
+	FixPathSeperator (modName);
+
+	while (modName[strlen(modName)-1] == '/')
+		modName[strlen(modName)-1] = 0;
+
+	strcat (modName, "/doommus.tmp");
+
+	atexit (I_ShutdownMusic);
+}
+
+
+void I_ShutdownMusic(void)
+{
+	if (currSong) {
+		I_UnRegisterSong ((int)currSong);
+		currSong = NULL;
+	}
+	remove (modName);
+	if (BufferReturnEvent)
+		CloseHandle (BufferReturnEvent);
+}
+
+
+static void MCIError (MMRESULT res, const char *descr)
+{
+	char errorStr[256];
+
+	mciGetErrorString (res, errorStr, 255);
+	Printf_Bold ("An error occured while %s:\n", descr);
+	Printf ("%s\n", errorStr);
+}
+
+static void UnprepareMIDIHeaders (info_t *info)
+{
+	PSTREAMBUF buffer = info->buffers;
+
+	while (buffer) {
+		if (buffer->prepared) {
+			MMRESULT res = midiOutUnprepareHeader ((HMIDIOUT)info->midiStream,
+										&buffer->midiHeader, sizeof(buffer->midiHeader));
+			if (res != MMSYSERR_NOERROR)
+				MCIError (res, "unpreparing headers");
+			else
+				buffer->prepared = false;
+		}
+
+		buffer = buffer->pNext;
+	}
+}
+
+static BOOL PrepareMIDIHeaders (info_t *info)
+{
+	MMRESULT res;
+	PSTREAMBUF buffer = info->buffers;
+
+	while (buffer) {
+		if (!buffer->prepared) {
+			memset (&buffer->midiHeader, 0, sizeof(MIDIHDR));
+			buffer->midiHeader.lpData = buffer->pBuffer;
+			buffer->midiHeader.dwBufferLength = CB_STREAMBUF;
+			buffer->midiHeader.dwBytesRecorded = CB_STREAMBUF - buffer->cbLeft;
+			res = midiOutPrepareHeader ((HMIDIOUT)info->midiStream,
+										&buffer->midiHeader, sizeof(MIDIHDR));
+			if (res != MMSYSERR_NOERROR) {
+				MCIError (res, "preparing headers");
+				Printf ("stream: %08p\n", info->midiStream);
+				Printf ("data: %08p\n", buffer->midiHeader.lpData);
+				Printf ("bufflen: %d\n", buffer->midiHeader.dwBufferLength);
+				Printf ("recorded: %d\n", buffer->midiHeader.dwBytesRecorded);
+				Printf ("sizeof: %d\n", sizeof(MIDIHDR));
+				UnprepareMIDIHeaders (info);
+				return false;
+			} else
+				buffer->prepared = true;
+		}
+		buffer = buffer->pNext;
+	}
+
+	return true;
+}
+
+static void SubmitMIDIBuffer (info_t *info)
+{
+	MMRESULT res;
+
+	res = midiStreamOut (info->midiStream,
+						 &info->currBuffer->midiHeader, sizeof(MIDIHDR));
+
+	if (res != MMSYSERR_NOERROR)
+		MCIError (res, "sending MIDI stream");
+
+	info->currBuffer = info->currBuffer->pNext;
+	if (info->currBuffer == NULL && info->looping)
+		info->currBuffer = info->buffers;
+}
+
+static void AllChannelsOff (info_t *info)
+{
+	int i;
+
+	for (i = 0; i < 16; i++)
+		midiOutShortMsg ((HMIDIOUT)info->midiStream, MIDI_NOTEOFF | i | (64<<16) | (60<<8));
+	Sleep (1);
+}
+
+static void CALLBACK MidiProc (HMIDIIN hMidi, UINT uMsg, info_t *info,
+							  DWORD dwParam1, DWORD dwParam2 )
+{
+	switch (uMsg) {
+		case MOM_DONE:
+			if (info->callbackStatus == cb_die)
+				SetEvent (BufferReturnEvent);
+			else {
+				if (info->currBuffer == info->buffers) {
+					// Stop all notes before restarting the song
+					// in case any are left hanging.
+					AllChannelsOff (info);
+				} else if (info->currBuffer == NULL) {
+					SetEvent (BufferReturnEvent);
+					return;
+				}
+				SubmitMIDIBuffer (info);
+			}
+			break;
+	}
+}
+
+void I_PlaySong (int handle, int _looping)
+{
+	info_t *info = (info_t *)handle;
+
+	if (!info || nomusic)
+		return;
+
+	info->status = STATE_STOPPED;
+	info->looping = _looping;
+
+	switch (info->type) {
+		case TYPE_MUS:
+		case TYPE_MIDI: {
+			MMRESULT res;
+
+			// note: midiStreamOpen changes mididevice if it's set to MIDI_MAPPER
+			// (interesting undocumented behavior)
+			if ((res = midiStreamOpen (&info->midiStream,
+									   &mididevice,
+									   (DWORD)1, (DWORD)MidiProc,
+									   (DWORD)info,
+									   CALLBACK_FUNCTION)) == MMSYSERR_NOERROR)
+			{
+				MIDIPROPTIMEDIV timedivProp;
+
+				timedivProp.cbStruct = sizeof(timedivProp);
+				timedivProp.dwTimeDiv = midTimeDiv;
+				res = midiStreamProperty (info->midiStream, (LPBYTE)&timedivProp,
+										  MIDIPROP_SET | MIDIPROP_TIMEDIV);
+				if (res != MMSYSERR_NOERROR)
+					MCIError (res, "setting time division");
+
+				res = midiOutSetVolume ((HMIDIOUT)info->midiStream, midivolume);
+
+				// Preload all instruments into soundcard RAM (if necessary).
+				// On my GUS PnP, this is necessary because it will fail to
+				// play some instruments on some songs until the song loops
+				// if the instrument isn't already in memory. (Why it doesn't
+				// load them when they're needed is beyond me, because it's only
+				// some instruments it doesn't play properly the first time--and
+				// I don't know exactly which ones those are.) The 250 ms delay
+				// between note on and note off is fairly lengthy, so I try and
+				// get the instruments going on multiple channels to reduce the
+				// number of times I have to sleep.
+				{
+					int i, j;
+
+					DPrintf ("MIDI uses instruments:\n");
+					for (i = j = 0; i < 127; i++)
+						if (UsedPatches[i]) {
+							DPrintf (" %d", i);
+							midiOutShortMsg ((HMIDIOUT)info->midiStream,
+											 MIDI_PRGMCHANGE | (i<<8) | j);
+							midiOutShortMsg ((HMIDIOUT)info->midiStream,
+											 MIDI_NOTEON | (60<<8) | (1<<16) | j);
+							if (++j == 10) {
+								Sleep (250);
+								for (j = 0; j < 10; j++)
+									midiOutShortMsg ((HMIDIOUT)info->midiStream,
+													 MIDI_NOTEOFF | (60<<8) | (64<<16) | j);
+								j = 0;
+							}
+						}
+					if (j > 0) {
+						Sleep (250);
+						for (i = 0; i < j; i++)
+							midiOutShortMsg ((HMIDIOUT)info->midiStream,
+											 MIDI_NOTEOFF | (60<<8) | (64<<16) | i);
+					}
+
+				/*
+					DPrintf ("\nMIDI uses percussion keys:\n");
+					for (i = 0; i < 127; i++)
+						if (UsedPatches[i+128]) {
+							DPrintf (" %d", i);
+							midiOutShortMsg ((HMIDIOUT)info->midiStream,
+											 MIDI_NOTEON | (i<<8) | (1<<16) | 10);
+							Sleep (235);
+							midiOutShortMsg ((HMIDIOUT)info->midiStream,
+											 MIDI_NOTEOFF | (i<<8) | (64<<16));
+						}
+				*/
+					DPrintf ("\n");
+				}
+
+				if (PrepareMIDIHeaders (info)) {
+					info->callbackStatus = cb_play;
+					info->currBuffer = info->buffers;
+					SubmitMIDIBuffer (info);
+					res = midiStreamRestart (info->midiStream);
+					if (res == MMSYSERR_NOERROR)
+						info->status = STATE_PLAYING;
+					else {
+						MCIError (res, "starting playback");
+						UnprepareMIDIHeaders (info);
+						midiStreamClose (info->midiStream);
+						info->midiStream = NULL;
+					}
+				} else {
+					UnprepareMIDIHeaders (info);
+					midiStreamClose (info->midiStream);
+					info->midiStream = NULL;
+				}
+			} else {
+				MCIError (res, "opening MIDI stream");
+				if (snd_mididevice->value != -1) {
+					Printf ("Trying again with MIDI mapper\n");
+					SetCVarFloat (snd_mididevice, -1.0f);
+				}
+			}
+
+			break;
+			}
+		case TYPE_MOD:
+			if (info->handle = MIDASplayModule (info->module, _looping)) {
+				MIDASsetMusicVolume (info->handle, musicvolume);
+				info->status = STATE_PLAYING;
+			}
+			break;
+	}
+	currSong = info;
+}
+
+void I_PauseSong (int handle)
+{
+	info_t *info = (info_t *)handle;
+
+	if (!info || info->status != STATE_PLAYING)
+		return;
+
+	switch (info->type) {
+		case TYPE_MUS:
+		case TYPE_MIDI:
+			if (info->midiStream && midiStreamPause (info->midiStream) == MMSYSERR_NOERROR)
+				info->status = STATE_PAUSED;
+			break;
+		case TYPE_MOD:
+			break;
+	}
+}
+
+void I_ResumeSong (int handle)
+{
+	info_t *info = (info_t *)handle;
+
+	if (!info || info->status != STATE_PAUSED)
+		return;
+
+	switch (info->type) {
+		case TYPE_MUS:
+		case TYPE_MIDI:
+			if (info->midiStream && midiStreamRestart (info->midiStream) == MMSYSERR_NOERROR)
+				info->status = STATE_PLAYING;
+			break;
+		case TYPE_MOD:
+			break;
+	}
+}
+
+void I_StopSong (int handle)
+{
+	info_t *info = (info_t *)handle;
+	
+	if (!info || info->status == STATE_STOPPED)
+		return;
+
+	info->status = STATE_STOPPED;
+
+	switch (info->type) {
+		case TYPE_MUS:
+		case TYPE_MIDI:
+			info->callbackStatus = cb_die;
+			if (info->midiStream) {
+				midiStreamStop (info->midiStream);
+				WaitForSingleObject (BufferReturnEvent, INFINITE);
+				midiOutReset ((HMIDIOUT)info->midiStream);
+				UnprepareMIDIHeaders (info);
+				midiStreamClose (info->midiStream);
+				info->midiStream = NULL;
+			}
+			break;
+		case TYPE_MOD:
+			MIDASstopModule (info->handle);
+			info->handle = 0;
+			break;
+	}
+	if (info == currSong)
+		currSong = NULL;
+}
+
+void I_UnRegisterSong (int handle)
+{
+	info_t *info = (info_t *)handle;
+
+	if (info) {
+		I_StopSong (handle);
+		switch (info->type) {
+			case TYPE_MUS:
+				mus2strmCleanup ();
+				info->buffers = NULL;
+				break;
+			case TYPE_MIDI:
+				mid2strmCleanup ();
+				info->buffers = NULL;
+				break;
+			case TYPE_MOD:
+				MIDASfreeModule (info->module);
+				info->module = NULL;
+				break;
+		}
+		free (info);
+	}
+}
+
+int I_RegisterSong (void *data, int musicLen)
+{
+	int ow = 2;
+	info_t *info;
+
+	if (!(info = malloc (sizeof(info_t))))
+		return 0;
+
+	info->status = STATE_STOPPED;
+
+	if (*(int *)data == (('M')|(('U')<<8)|(('S')<<16)|((0x1a)<<24))) {
+		// This is a mus file
+		info->type = TYPE_MUS;
+		if (!(info->buffers = mus2strmConvert ((LPBYTE)data, musicLen))) {
+			free (info);
+			return 0;
+		}
+	} else if (*(int *)data == (('M')|(('T')<<8)|(('h')<<16)|(('d')<<24))) {
+		// This is a midi file
+		info->type = TYPE_MIDI;
+		if (!(info->buffers = mid2strmConvert ((LPBYTE)data, musicLen))) {
+			free (info);
+			return 0;
+		}
+	} else {
+		FILE *f;
+
+		if ((f = fopen (modName, "wb")) == NULL) {
+			Printf ("Unable to open temporary music file %s\n", modName);
+			free (info);
+			return 0;
+		}
+		if (fwrite (data, musicLen, 1, f) != 1) {
+			fclose (f);
+			Printf ("Unable to write temporary music file\n");
+			free (info);
+			return 0;
+		}
+		fclose(f);
+
+		if ( (info->module = MIDASloadModule (modName)) ) {
+			// This is a module
+			info->type = TYPE_MOD;
+		} else {
+			// This is not any known music format
+			// (or could not load mod)
+			free (info);
+			info = NULL;
+			Printf ("midas failed to load song:\n%s\n", MIDASgetErrorMessage(MIDASgetLastError()));
+		}
+		remove (modName);
+	}
+
+	return (int)info;
+}
+
+// Is the song playing?
+int I_QrySongPlaying (int handle)
+{
+	info_t *info = (info_t *)handle;
+
+	if (!info)
+		return 0;
+	else if (info->looping == 1)
+		return 1;
+	else
+		return info->status;
+}
\ No newline at end of file
diff --git a/code/I_music.h b/code/win32/I_music.h
similarity index 87%
rename from code/I_music.h
rename to code/win32/I_music.h
index fd3edd45ac..a8910fdb12 100644
--- a/code/I_music.h
+++ b/code/win32/I_music.h
@@ -11,7 +11,8 @@
 void I_InitMusic(void);
 void I_ShutdownMusic(void);
 // Volume.
-void I_SetMusicVolume(int volume);
+void I_SetMIDIVolume (float volume);
+void I_SetMusicVolume (int volume);
 // PAUSE game handling.
 void I_PauseSong(int handle);
 void I_ResumeSong(int handle);
@@ -30,7 +31,4 @@ void I_StopSong(int handle);
 // See above (register), then think backwards
 void I_UnRegisterSong(int handle);
 
-// Called from WndProc when MIDI is finished
-void I_RestartSong (void);
-
 #endif //__I_MUSIC_H__
\ No newline at end of file
diff --git a/code/I_net.c b/code/win32/I_net.c
similarity index 91%
rename from code/I_net.c
rename to code/win32/I_net.c
index 49013efbb4..ebd36cb7d3 100644
--- a/code/I_net.c
+++ b/code/win32/I_net.c
@@ -80,27 +80,26 @@ typedef int SOCKET;
 #	define IPPORT_USERRESERVED 5000
 #endif
 
-
-void	NetSend (void);
-BOOL	NetListen (void);
+static void	NetSend (void);
+static BOOL	NetListen (void);
 
 
 //
 // NETWORKING
 //
 
-int 	DOOMPORT =		(IPPORT_USERRESERVED +0x1d );
+static int 	DOOMPORT =		(IPPORT_USERRESERVED +0x1d );
 
-int 	sendsocket;
-int 	insocket;
+static int 	sendsocket;
+static int 	insocket;
 
-struct	sockaddr_in 	sendaddress[MAXNETNODES];
+static struct sockaddr_in 	sendaddress[MAXNETNODES];
 
 void	(*netget) (void);
 void	(*netsend) (void);
 
 #ifdef __WIN32__
-char *neterror (void);
+char	*neterror (void);
 #endif
 
 
@@ -115,10 +114,10 @@ int UDPsocket (void)
 	s = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
 #ifdef __WIN32__
 	if ( s == INVALID_SOCKET )
-		I_Error ("can't create socket: %s", neterror());
+		I_FatalError ("can't create socket: %s", neterror());
 #else
 	if (s<0)
-		I_Error ("can't create socket: %s",strerror(errno));
+		I_FatalError ("can't create socket: %s",strerror(errno));
 #endif	  
 				
 	return (int) s;
@@ -140,10 +139,10 @@ void BindToLocalPort (int s, int port)
 	v = bind ((SOCKET) s, (void *)&address, sizeof(address));
 #ifdef __WIN32__
 	if (v == -1)
-		I_Error ("BindToPort: bind: %s", neterror());
+		I_FatalError ("BindToPort: bind: %s", neterror());
 #else
 	if (v == -1)
-		I_Error ("BindToPort: bind: %s", strerror(errno));
+		I_FatalError ("BindToPort: bind: %s", strerror(errno));
 #endif	  
 }
 
@@ -234,19 +233,19 @@ int GetLocalAddress (void)
 	v = gethostname (hostname, sizeof(hostname));
 #ifdef __WIN32__
 	if (v == -1)
-		I_Error ("GetLocalAddress : gethostname: %s", neterror());
+		I_FatalError ("GetLocalAddress : gethostname: %s", neterror());
 #else
 	if (v == -1)
-		I_Error ("GetLocalAddress : gethostname: errno %d",errno);
+		I_FatalError ("GetLocalAddress : gethostname: errno %d",errno);
 #endif	  
 		
 	hostentry = gethostbyname (hostname);
 #ifdef __WIN32__
 	if (!hostentry)
-		I_Error ("GetLocalAddress : gethostbyname: %s", neterror());
+		I_FatalError ("GetLocalAddress : gethostbyname: %s", neterror());
 #else
 	if (!hostentry)
-		I_Error ("GetLocalAddress : gethostbyname: couldn't get local host");
+		I_FatalError ("GetLocalAddress : gethostbyname: couldn't get local host");
 #endif	  
 				
 	return *(int *)hostentry->h_addr_list[0];
@@ -297,9 +296,7 @@ void I_InitNetwork (void)
 	
 	// parse network game options,
 	//	-net <consoleplayer> <host> <host> ...
-	i = M_CheckParm ("-net");
-	if (!i)
-	{
+	if ( !(i = M_CheckParm ("-net")) ) {
 		// single player game
 		netgame = false;
 		doomcom->id = DOOMCOM_ID;
@@ -363,9 +360,9 @@ void I_InitNetwork (void)
 			hostentry = gethostbyname (myargv[i]);
 			if (!hostentry)
 #ifdef __WIN32__
-				I_Error ("gethostbyname: couldn't find %s\n%s", myargv[i], neterror());
+				I_FatalError ("gethostbyname: couldn't find %s\n%s", myargv[i], neterror());
 #else
-				I_Error ("gethostbyname: couldn't find %s\n%s", myargv[i], strerror(errno));
+				I_FatalError ("gethostbyname: couldn't find %s\n%s", myargv[i], strerror(errno));
 #endif
 			sendaddress[doomcom->numnodes].sin_addr.s_addr 
 				= *(int *)hostentry->h_addr_list[0];
diff --git a/code/I_sound.c b/code/win32/I_sound.c
similarity index 78%
rename from code/I_sound.c
rename to code/win32/I_sound.c
index f48c6dabc1..7cdfa1d074 100644
--- a/code/I_sound.c
+++ b/code/win32/I_sound.c
@@ -43,7 +43,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
 
-#include <malloc.h>
+#include "m_alloc.h"
 #include <math.h>
 
 /* We'll need to go below the MIDAS API level a bit */
@@ -92,10 +92,13 @@ static int sfx_ids[NUM_CHANNELS];
 
 // The actual lengths of all sound effects.
 // [RH] I can't see that this is used anywhere.
-static unsigned int lengths[NUMSFX];
+static unsigned int *lengths;
 
 // [RH] The playback frequency of all sound effects.
-static unsigned int frequencies[NUMSFX];
+static unsigned int *frequencies;
+
+// [RH] The size of the lengths and frequencies arrays
+static int snddataslots;
 
 static int wavonly = 0;
 static int primarysound = 0;
@@ -107,63 +110,70 @@ float volmul;
 
 void MIDASerror(void)
 {
-	I_Error ("MIDAS Error: %s", MIDASgetErrorMessage(MIDASgetLastError()));
+	I_FatalError ("MIDAS Error: %s", MIDASgetErrorMessage(MIDASgetLastError()));
 }
 
 
 
 /* Loads a sound and adds it to MIDAS - really returns a MIDAS
    sample handle */
-void *getsfx (char *sfxname, unsigned int *len, int *frequency, unsigned *ms)
+static void *getsfx (sfxinfo_t *sfx, unsigned int *len, int *frequency)
 {
-	unsigned char*		sfx;
+	char				sndtemp[128];
+	byte				*sfxdata;
 	int 				size;
-	char				name[20];
-	int 				sfxlump;
 	
+	int					i;
 	int 				error;
 	static sdSample		smp;
 	unsigned			sampleHandle;
 
 	
-	// Get the sound data from the WAD, allocate lump
-	//	in zone memory.
-	sprintf(name, "ds%s", sfxname);
+	// Get the sound data from the WAD and register it with MIDAS
 
-	// Now, there is a severe problem with the
-	//	sound handling, in it is not (yet/anymore)
-	//	gamemode aware. That means, sounds from
-	//	DOOM II will be requested even with DOOM
-	//	shareware.
-	// The sound list is wired into sounds.c,
-	//	which sets the external variable.
-	// I do not do runtime patches to that
-	//	variable. Instead, we will use a
-	//	default sound for replacement.
-	if ((sfxlump = W_CheckNumForName(name)) == -1)
-		sfxlump = W_GetNumForName("dspistol");
-	
-	size = W_LumpLength( sfxlump );
+	// If the sound doesn't exist, try a generic male sound (if
+	// this is a player sound) or the empty sound.
+	if (sfx->lumpnum == -1) {
+		char *basename;
+		int sfx_id;
 
-	// Debug.
-	// fprintf( stderr, "." );
-	//fprintf( stderr, " -loading  %s (lump %d, %d bytes)\n",
-	//		 sfxname, sfxlump, size );
-	//fflush( stderr );
+		if (!strnicmp (sfx->name, "player/", 7) &&
+			 (basename = strchr (sfx->name + 7, '/'))) {
+			sprintf (sndtemp, "player/male/%s", basename+1);
+			sfx_id = S_FindSound (sndtemp);
+			if (sfx_id != -1)
+				sfx->lumpnum = S_sfx[sfx_id].lumpnum;
+		}
+
+		if (sfx->lumpnum == -1)
+			sfx->lumpnum = W_GetNumForName ("dsempty");
+	}
 	
-	sfx = (unsigned char*)W_CacheLumpNum( sfxlump, PU_STATIC );
+	// See if there is another sound already initialized with this lump. If so,
+	// then set this one up as a link, and don't load the sound again.
+	for (i = 0; i < numsfx; i++)
+		if (S_sfx[i].data && !S_sfx[i].link && S_sfx[i].lumpnum == sfx->lumpnum) {
+			DPrintf ("Linked to %s (%d)\n", S_sfx[i].name, i);
+			sfx->link = S_sfx + i;
+			sfx->ms = S_sfx[i].ms;
+			return S_sfx[i].data;
+		}
+
+	size = W_LumpLength (sfx->lumpnum);
+
+	sfxdata = W_CacheLumpNum (sfx->lumpnum, PU_STATIC);
 
 	/* Add sound to MIDAS: */
 	/* A hack below API level - yeahyeah, we should add support for preparing
 	   samples from memory to the API */
 	
 	/* Build Sound Device sample structure for the sample: */
-	smp.sample = sfx+8;
+	smp.sample = sfxdata+8;
 	smp.samplePos = sdSmpConv;
 	smp.sampleType = MIDAS_SAMPLE_8BIT_MONO;
 	smp.sampleLength = size-8;
 
-	*frequency = ((unsigned short *)sfx)[1];	// Extract sample rate from the sound header
+	*frequency = ((unsigned short *)sfxdata)[1];	// Extract sample rate from the sound header
 	if (*frequency == 0)
 		*frequency = 11025;
 
@@ -178,15 +188,15 @@ void *getsfx (char *sfxname, unsigned int *len, int *frequency, unsigned *ms)
 
 	/* Add the sample to the Sound Device: */
 	if ( (error = midasSD->AddSample(&smp, 1, &sampleHandle)) != OK )
-		I_Error("getsfx: AddSample failed: %s", MIDASgetErrorMessage(error));
+		I_FatalError ("getsfx: AddSample failed: %s", MIDASgetErrorMessage(error));
 
 	// Remove the cached lump.
-	Z_Free( sfx );
+	Z_Free (sfxdata);
 	
 	// Preserve padded length.
 	*len = size-8;
 
-	*ms = ((size - 8)*1000) / (*frequency);
+	sfx->ms = ((size - 8)*1000) / (*frequency);
 
 	/* Return sample handle: (damn ugly) */
 	return (void*) sampleHandle;
@@ -219,17 +229,6 @@ void I_SetSfxVolume(int volume)
 }
 
 
-//
-// Retrieve the raw data lump index
-//	for a given SFX name.
-//
-int I_GetSfxLumpNum(sfxinfo_t* sfx)
-{
-	char namebuf[9];
-	sprintf(namebuf, "ds%s", sfx->name);
-	return W_GetNumForName(namebuf);
-}
-
 //
 // Starting a sound means adding it
 //		to the current list of active sounds
@@ -241,10 +240,12 @@ int I_GetSfxLumpNum(sfxinfo_t* sfx)
 //		is now meaningful (Q: but is it really useful?).
 //		This code is based on the code from BOOM and NTDOOM.
 //
-int I_StartSound (int id, int vol, int sep, int pitch, int priority)
+int I_StartSound (sfxinfo_t *sfx, int vol, int sep, int pitch, int priority)
 {
 	static int handle;
 
+	int id = sfx - S_sfx;
+
 	// move up one slot, with wraparound
 	if (++handle >= NUM_CHANNELS)
 		handle = 0;
@@ -275,7 +276,7 @@ int I_StartSound (int id, int vol, int sep, int pitch, int priority)
 			else if ( pan > MIDAS_PAN_RIGHT) pan = MIDAS_PAN_RIGHT;
 		}
 
-		channels[handle] = MIDASplaySample ((MIDASsample)S_sfx[id].data,
+		channels[handle] = MIDASplaySample ((MIDASsample)sfx->data,
 											MIDAS_CHANNEL_AUTO,
 											priority,
 											PITCH(frequencies[id],pitch),
@@ -367,6 +368,22 @@ void I_UpdateSoundParams (int handle, int vol, int sep, int pitch)
 }
 
 
+void I_LoadSound (struct sfxinfo_struct *sfx)
+{
+	if (!sfx->data) {
+		int i = sfx - S_sfx;
+
+		if (numsfx > snddataslots) {
+			lengths = Realloc (lengths, numsfx * sizeof(*lengths));
+			frequencies = Realloc (frequencies, numsfx * sizeof(*frequencies));
+			snddataslots = numsfx;
+		}
+
+		DPrintf ("loading sound \"%s\" (%d)\n", sfx->name, i);
+		sfx->data = getsfx (sfx, &lengths[i], &frequencies[i]);
+	}
+}
+
 
 
 extern DWORD Window;  /* window handle from i_main.c (actually HWND) */
@@ -380,7 +397,7 @@ BOOL CALLBACK InitBoxCallback (HWND hwndDlg, UINT message, WPARAM wParam, LPARAM
 		"MIDAS could not be initialized.\r\n"
 		"(Reason: %s.)\r\n\r\n"
 		"If another program is using the sound card, you "
-		"can try stoping it and clicking \"Retry.\"\r\n\r\n"
+		"can try stopping it and clicking \"Retry.\"\r\n\r\n"
 		"Otherwise, you can either click \"No Sound\" to use "
 		"ZDoom without sound or click \"Quit\" if you don't "
 		"really want to play ZDoom.";
@@ -409,24 +426,22 @@ BOOL CALLBACK InitBoxCallback (HWND hwndDlg, UINT message, WPARAM wParam, LPARAM
 	return FALSE;
 }
 
-
 void I_InitSound (void)
 {
 	int needchannels;
-	unsigned i;
 
-	// [RH] Parse any SNDINFO lumps
-	//		(This really isn't the place for this.)
-	S_ParseSndInfo();
+	lengths = Malloc (numsfx * sizeof(*lengths));
+	frequencies = Malloc (numsfx * sizeof(*frequencies));
+	snddataslots = numsfx;
 
 	memset (channels, 0, NUM_CHANNELS * sizeof(MIDASsamplePlayHandle));
 
 	I_InitMusic();
 
 	/* Get command line options: */
-	wavonly = !!M_CheckParm("-wavonly");
-	primarysound = !!M_CheckParm("-primarysound");
-	nosound = !!M_CheckParm("-nosfx");
+	wavonly = !!M_CheckParm ("-wavonly");
+	primarysound = !!M_CheckParm ("-primarysound");
+	nosound = !!M_CheckParm ("-nosfx") || !!M_CheckParm ("-nosound");
 	
 	Printf ("I_InitSound: Initializing MIDAS\n");
 	
@@ -459,12 +474,13 @@ void I_InitSound (void)
 				break;
 
 			case IDQUIT:
-				I_Quit ();
+				exit (0);
 				break;
 		}
 	}
 
 	MidasInited = true;
+	atexit (I_ShutdownSound);
 
 	if ( !MIDASstartBackgroundPlay(100) )
 		MIDASerror();
@@ -479,24 +495,6 @@ void I_InitSound (void)
 	if (!MIDASallocAutoEffectChannels (needchannels))
 		MIDASerror ();
 
-	/* Simply preload all sounds and throw them at MIDAS: */
-	Printf("I_InitSound: Loading all sounds\n");
-	for ( i = 1; i < NUMSFX; i++ )
-	{
-		if ( !S_sfx[i].link )
-		{
-			/* Fine, not an alias, just load it */
-			S_sfx[i].data = getsfx(S_sfx[i].name, &lengths[i], &frequencies[i], &S_sfx[i].ms);
-			/* getsfx() actually returns a MIDAS sample handle */
-		}
-		else
-		{
-			/* An alias sound */
-			S_sfx[i].data = S_sfx[i].link->data;
-			lengths[i] = lengths[(S_sfx[i].link - S_sfx)/sizeof(sfxinfo_t)];
-		}
-	}
-
 	// [RH] Don't play sfx really quiet.
 	//		Use less amplification for each new channel added.
 	MIDASsetAmplification ((int)(log((double)needchannels) * 144));
@@ -510,7 +508,8 @@ void I_InitSound (void)
 
 void I_ShutdownSound(void)
 {
-	unsigned i;
+	unsigned i, c = 0;
+	size_t len = 0;
 
 	if (MidasInited) {
 		Printf("I_ShutdownSound: Stopping sounds\n");
@@ -522,9 +521,19 @@ void I_ShutdownSound(void)
 			}
 		}
 
+		I_ShutdownMusic();
+
 		Printf("I_ShutdownSound: Uninitializing MIDAS\n");
 
-		I_ShutdownMusic();
+		// [RH] Free all loaded samples
+		for (i = 0; i < (unsigned)numsfx; i++)
+			if (S_sfx[i].data && !S_sfx[i].link) {
+				MIDASfreeSample ((MIDASsample)S_sfx[i].data);
+				len += lengths[i];
+				c++;
+			}
+		Printf ("%d sounds expunged (%d bytes)\n", c, len);
+
 		if (!MIDASfreeAutoEffectChannels ())
 			MIDASerror ();
 		if ( !MIDASstopBackgroundPlay() )
diff --git a/code/I_SOUND.H b/code/win32/I_sound.h
similarity index 93%
rename from code/I_SOUND.H
rename to code/win32/I_sound.h
index 38804b79ed..76d141a3a8 100644
--- a/code/I_SOUND.H
+++ b/code/win32/I_sound.h
@@ -26,7 +26,7 @@
 #include "doomdef.h"
 
 #include "doomstat.h"
-#include "sounds.h"
+#include "s_sound.h"
 
 
 
@@ -48,14 +48,13 @@ void I_SetSfxVolume(int volume);
 // Initialize channels?
 void I_SetChannels();
 
-// Get raw data lump index for sound descriptor.
-int I_GetSfxLumpNum (sfxinfo_t* sfxinfo );
-
+// load a sound from disk
+void I_LoadSound (struct sfxinfo_struct *sfx);
 
 // Starts a sound in a particular sound channel.
 int
 I_StartSound
-( int			id,
+( struct sfxinfo_struct *sfx,
   int			vol,
   int			sep,
   int			pitch,
diff --git a/code/I_system.c b/code/win32/I_system.c
similarity index 68%
rename from code/I_system.c
rename to code/win32/I_system.c
index dc39fb0ab6..ba58ef6d58 100644
--- a/code/I_system.c
+++ b/code/win32/I_system.c
@@ -23,6 +23,8 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <io.h>
+#include <direct.h>
 #include <string.h>
 
 #include <stdarg.h>
@@ -33,23 +35,28 @@
 #include <windows.h>
 #include <mmsystem.h>
 
+#include "version.h"
 #include "doomdef.h"
+#include "cmdlib.h"
 #include "m_argv.h"
 #include "m_misc.h"
 #include "i_video.h"
 #include "i_sound.h"
 #include "i_music.h"
 
+#include "d_main.h"
 #include "d_net.h"
 #include "g_game.h"
 #include "i_input.h"
-
 #include "i_system.h"
+#include "c_dispch.h"
 
 #ifdef USEASM
 BOOL STACK_ARGS CheckMMX (char *vendorid);
 #endif
 
+static void Cmd_Dir (void *plyr, int argc, char **argv);
+
 extern HWND 			Window;
 extern HDC				WinDC;
 extern LONG 			OemWidth, OemHeight;
@@ -91,21 +98,51 @@ byte* I_ZoneBase (int *size)
 	i = M_CheckParm ("-heapsize");
 	if (i && i < myargc - 1)
 		mb_used = (float)atof (myargv[i + 1]);
-	Printf ("Heapsize: %g megabytes\n", mb_used);
 	*size = (int)(mb_used*1024*1024);
 	return (byte *) malloc (*size);
 }
 
+void I_BeginRead(void)
+{
+}
 
+void I_EndRead(void)
+{
+}
+
+byte*	I_AllocLow(int length)
+{
+	byte*		mem;
+
+	mem = (byte *)malloc (length);
+	if (mem) {
+		memset (mem,0,length);
+	}
+	return mem;
+}
+
+
+static DWORD basetime = 0;
+
+// [RH] Returns time in milliseconds
+unsigned int I_MSTime (void)
+{
+	DWORD tm;
+
+	tm = timeGetTime();
+	if (!basetime)
+		basetime = tm;
+
+	return tm - basetime;
+}
 
 //
 // I_GetTime
-// returns time in 1/70th second tics
+// returns time in 1/35th second tics
 //
 int I_GetTimeReally (void)
 {
 	DWORD tm;
-	static DWORD basetime = 0;
 
 	tm = timeGetTime();
 	if (!basetime)
@@ -114,7 +151,7 @@ int I_GetTimeReally (void)
 	return ((tm-basetime)*TICRATE)/1000;
 }
 
-// [RH] Increments the time count every time it gets.
+// [RH] Increments the time count every time it gets called.
 //		Used only by -fastdemo (just like BOOM).
 int I_GetTimeFake (void)
 {
@@ -147,7 +184,7 @@ void I_DetectOS (void)
 			break;
 		case VER_PLATFORM_WIN32_WINDOWS:
 			OSPlatform = os_Win95;
-			osname = "Windows 95";
+			osname = info.dwMinorVersion > 0 ? "Windows 98" : "Windows 95";
 			break;
 		case VER_PLATFORM_WIN32_NT:
 			OSPlatform = os_WinNT;
@@ -208,105 +245,80 @@ void I_Init (void)
 		I_GetTime = I_GetTimeReally;
 
 	I_InitSound();
-
 	I_InitInput (Window);
-	//	I_InitGraphics();
+	C_RegisterCommand ("dir", Cmd_Dir);
 }
 
 //
 // I_Quit
 //
+static int has_exited;
+
 void I_Quit (void)
 {
-	D_QuitNetGame ();
-	I_ShutdownSound ();
+	has_exited = 1;		/* Prevent infinitely recursive exits -- killough */
+
+	if (demorecording)
+		G_CheckDemoStatus();
 	M_SaveDefaults ();
-	I_ShutdownGraphics ();
 
-	exit(0);
-}
-
-void I_BeginRead(void)
-{
-}
-
-void I_EndRead(void)
-{
-}
-
-byte*	I_AllocLow(int length)
-{
-	byte*		mem;
-
-	mem = (byte *)malloc (length);
-	if (mem) {
-		memset (mem,0,length);
+	if (errortext[0]) {
+		if (Window)
+			ShowWindow (Window, SW_HIDE);
+		MessageBox (Window, errortext, "ZDOOM Fatal Error", MB_OK|MB_ICONSTOP|MB_TASKMODAL);
 	}
-	return mem;
 }
 
 
 //
 // I_Error
 //
-extern BOOL demorecording;
-/*
-void I_Error (char *error, ...)
-{
-	va_list 	argptr;
+extern FILE *Logfile;
+BOOL gameisdead;
 
-	// Message first.
-	va_start (argptr,error);
-	fprintf (stderr, "Error: ");
-	vfprintf (stderr,error,argptr);
-	fprintf (stderr, "\n");
-	va_end (argptr);
-
-	fflush( stderr );
-
-	// Shutdown. Here might be other errors.
-	if (demorecording)
-		G_CheckDemoStatus();
-
-	D_QuitNetGame ();
-	I_ShutdownGraphics();
-	
-	exit(-1);
-}
-*/
 void I_FatalError (char *error, ...)
 {
-	va_list 	argptr;
-	char errtext[1024];
-	int index;
+	gameisdead = true;
 
-	// Message first.
-	va_start (argptr,error);
-	index = sprintf (errtext, "Error: ");
-	index += vsprintf (&errtext[index],error,argptr);
-	sprintf (&errtext[index], "\nGetLastError() = %d", GetLastError());
-	va_end (argptr);
+	if (!errortext[0])		// ignore all but the first message -- killough
+	{
+		int index;
+		va_list argptr;
+		va_start (argptr, error);
+		index = vsprintf (errortext, error, argptr);
+		sprintf (errortext + index, "\nGetLastError = %d", GetLastError());
+		va_end (argptr);
+	}
 
-	// [RH] Record error to log (if logging)
-	Printf ("\n**** DIED WITH FATAL ERROR:\n%s\n", errtext);
+	if (!has_exited)	// If it hasn't exited yet, exit now -- killough
+	{
+		has_exited = 1;	// Prevent infinitely recursive exits -- killough
 
-	// Shutdown. Here might be other errors.
-	if (demorecording)
-		G_CheckDemoStatus();
+		// [RH] Record error to log (if logging)
+		if (Logfile)
+			fprintf (Logfile, "\n**** DIED WITH FATAL ERROR:\n%s\n", errortext);
 
-	D_QuitNetGame ();
-	I_ShutdownGraphics();
-
-	if (Window)
-		ShowWindow (Window, SW_HIDE);
-	MessageBox (Window, errtext, "DOOM Fatal Error", MB_OK|MB_ICONSTOP|MB_TASKMODAL);
-
-	exit(-1);
+		exit(-1);
+	}
 }
 
+void I_Error (char *error, ...)
+{
+	va_list argptr;
 
-static char Title[256] = { 0 };
+	va_start (argptr, error);
+	vsprintf (errortext, error, argptr);
+	va_end (argptr);
 
+	if (errorjmpable)
+		longjmp (errorjmp, 1);
+	else
+		I_FatalError (NULL);
+}
+
+char DoomStartupTitle[256] = { 0 };
+
+/*
 void I_PaintConsole (void)
 {
 	PAINTSTRUCT paint;
@@ -339,27 +351,17 @@ void I_PaintConsole (void)
 		EndPaint (Window, &paint);
 	}
 }
-
+*/
 void I_SetTitleString (const char *title)
 {
-	RECT rect;
-	char temp[80];
 	int i;
 
-	for (i = 0; i < ConCols; i++)
-		Title[i] = ' ';
-	Title[i] = 0;
-	sprintf (temp, "%s v%i.%i", title, VERSION/100, VERSION%100);
-	strcpy (Title + (ConCols - strlen (temp)) / 2, temp);
-
-	rect.top = rect.left = 0;
-	rect.bottom = WinHeight;
-	rect.right = WinWidth;
-	InvalidateRect (Window, &rect, TRUE);
+	for (i = 0; title[i]; i++)
+		DoomStartupTitle[i] = title[i] | 0x80;
 }
 
 void I_PrintStr (int xp, const char *cp, int count, BOOL scroll) {
-	MSG mess;
+/*	MSG mess;
 	RECT rect;
 
 	if (count)
@@ -374,8 +376,59 @@ void I_PrintStr (int xp, const char *cp, int count, BOOL scroll) {
 	}
 	while (PeekMessage (&mess, Window, 0, 0, PM_REMOVE)) {
 		if (mess.message == WM_QUIT)
-			I_Quit ();
+			exit (mess.wParam);
 		TranslateMessage (&mess);
 		DispatchMessage (&mess);
 	}
-}
\ No newline at end of file
+*/
+}
+
+static void Cmd_Dir (void *plyr, int argc, char **argv)
+{
+	char dir[256], curdir[256];
+	char *match;
+	struct _finddata_t c_file;
+	long file;
+
+	if (!getcwd (curdir, 256)) {
+		Printf ("Current path too long\n");
+		return;
+	}
+
+	if (argc == 1 || chdir (argv[1])) {
+		match = argc == 1 ? "./*" : argv[1];
+
+		ExtractFilePath (match, dir);
+		if (dir[0]) {
+			match += strlen (dir);
+		} else {
+			dir[0] = '.';
+			dir[1] = '/';
+			dir[2] = '\0';
+		}
+		if (!match[0])
+			match = "*";
+
+		if (chdir (dir)) {
+			Printf ("%s not found\n", dir);
+			return;
+		}
+	} else {
+		match = "*";
+		strcpy (dir, argv[1]);
+		if (dir[strlen(dir) - 1] != '/')
+			strcat (dir, "/");
+	}
+
+	if ( (file = _findfirst (match, &c_file)) == -1)
+		Printf ("Nothing matching %s%s\n", dir, match);
+	else {
+		Printf ("Listing of %s%s:\n", dir, match);
+		do {
+			Printf ("%s%s\n", c_file.name, c_file.attrib & _A_SUBDIR ? " <dir>" : "");
+		} while (_findnext (file, &c_file) == 0);
+		_findclose (file);
+	}
+
+	chdir (curdir);
+}
diff --git a/code/I_system.h b/code/win32/I_system.h
similarity index 92%
rename from code/I_system.h
rename to code/win32/I_system.h
index 07b379d1ac..db17ed6829 100644
--- a/code/I_system.h
+++ b/code/win32/I_system.h
@@ -84,7 +84,7 @@ void I_StartTic (void);
 // or calls a loadable driver to build it.
 // This ticcmd will then be modified by the gameloop
 // for normal input.
-ticcmd_t* I_BaseTiccmd (void);
+ticcmd_t *I_BaseTiccmd (void);
 
 
 // Called by M_Responder when quit is selected.
@@ -99,8 +99,7 @@ byte* I_AllocLow (int length);
 void I_Tactile (int on, int off, int total);
 
 
-//void I_Error (char *error, ...);
-#define I_Error I_FatalError
+void I_Error (char *error, ...);
 void I_FatalError (char *error, ...);
 
 
@@ -120,6 +119,12 @@ void I_SetTitleString (const char *title);
 void I_PauseMouse (void);
 void I_ResumeMouse (void);
 
+// [RH] Returns millisecond-accurate time
+unsigned int I_MSTime (void);
+
+// [RH] Title string to display at bottom of console during startup
+extern char DoomStartupTitle[256];
+
 #endif
 //-----------------------------------------------------------------------------
 //
diff --git a/code/I_video.cpp b/code/win32/I_video.cpp
similarity index 66%
rename from code/I_video.cpp
rename to code/win32/I_video.cpp
index 142c885874..fb16d276e9 100644
--- a/code/I_video.cpp
+++ b/code/win32/I_video.cpp
@@ -5,14 +5,6 @@
 ** There are two reasons why I switched from DirectDraw to PTC:
 **	  1. PTC makes windowed modes easy without any special work.
 **	  2. PTC makes it easy to support *all* hi- and true-color modes.
-**
-** If you wish to use this file, you need to be sure that the
-** PTC include files are in the include path and that you link
-** with the PTC library. If not, the old DirectDraw code can be found
-** in the file "oldvideo.c". Using it is a bit more complicating than
-** just building ZDoom with that file instead of this one, since all
-** new changes I've made since the switch to PTC have only been added
-** here and not oldvideo.c.
 */
 
 #include "ptc.h"
@@ -44,13 +36,14 @@ extern "C" {
 #include "z_zone.h"
 
 
-extern HWND		Window;
-
+extern HWND Window;
+extern BOOL vidactive;	// Checked to avoid annoying flashes on console
+						// during startup if developer is true.
 extern BOOL setmodeneeded;
-extern int	NewWidth, NewHeight, NewBpp;
+extern int	NewWidth, NewHeight, NewID;
 
 
-cvar_t *I_ShowFPS;
+cvar_t *I_ShowFPS, *ticker;
 cvar_t *win_stretchx;
 cvar_t *win_stretchy;
 cvar_t *fullscreen;
@@ -65,28 +58,45 @@ static char FullscreenIFace[8];
 BOOL Fullscreen;
 
 static struct CmdDispatcher VidCommands[] = {
-	"vid_describecurrentmode",	Cmd_Vid_DescribeCurrentMode,
-	"vid_describemodes",		Cmd_Vid_DescribeModes,
-	NULL
+	{ "vid_describecurrentmode",	Cmd_Vid_DescribeCurrentMode },
+	{ "vid_describemodes",			Cmd_Vid_DescribeModes },
+	{ NULL, }
 };
 
-}
+char *IdStrings[22] = {
+	"ARGB8888",
+	"ABGR8888",
+	"BGRA8888",
+	"RGBA8888",
+	"RGB888",
+	"BGR888",
+	"RGB565",
+	"BGR565",
+	"ARGB1555",
+	"ABGR1555",
+	"INDEX8",
+	"FAKEMODE1A",
+	"FAKEMODE1B",
+	"FAKEMODE1C",
+	"FAKEMODE2A",
+	"FAKEMODE2B",
+	"FAKEMODE2C",
+	"FAKEMODE3A",
+	"FAKEMODE3B",
+	"FAKEMODE3C",
+	"GREY8",
+	"RGB332"
+};
+
+byte IdTobpp[22] = {
+	32, 32, 32, 32, 24, 24, 16, 16, 15, 15, 8,
+	18, 18, 18, 14, 14, 14, 12, 12, 12, 8, 8
+};
 
 
 #define true TRUE
 #define false FALSE
 
-inline int ModeFromBPP (int bpp)
-{
-	if (bpp == 8)
-		return INDEX8;
-	else if (bpp == 16)
-		return VIRTUAL16;
-	else
-		return VIRTUAL32;
-}
-
-
 struct screenchain {
 	screen_t *scr;
 	struct screenchain *next;
@@ -101,12 +111,15 @@ typedef struct modelist_s {
 
 static modelist_t *Modes = NULL;
 
+int DisplayID;
 // Number of bits-per-pixel of output device
-static int DisplayBPP;
+int DisplayBPP;
 // Number of bits-per-pixel desired (might not match DisplayBPP)
 static int WantedBPP;
 // Display size
-static int DisplayWidth, DisplayHeight;
+int DisplayWidth, DisplayHeight;
+
+}
 
 static int nummodes = 0;
 
@@ -157,7 +170,7 @@ static void MakeModesList (void)
 			// Filter out modes taller than 1024 pixels since the
 			// assembly routines will choke on them. (Besides, they
 			// are really slow so why use them?)
-			if (ptcmode->y <= 1024) {
+			if (ptcmode->y <= 1024 && ptcmode->format.id == INDEX8) {
 				nummodes++;
 
 				addmode (ptcmode->x, ptcmode->y, ptcmode->format.bits, ptcmode->format.id, &lastmode);
@@ -186,35 +199,7 @@ static void MakeModesList (void)
 
 static char *GetFormatName (const int id)
 {
-	switch (id)
-	{
-		case ARGB8888:		return "ARGB8888";
-		case ABGR8888:		return "ABGR8888";
-		case BGRA8888:		return "BGRA8888";
-		case RGBA8888:		return "RGBA8888";
-		case RGB888:		return "RGB888";
-		case BGR888:		return "BGR888";
-		case RGB565:		return "RGB565";
-		case BGR565:		return "BGR565";
-		case ARGB1555:		return "ARGB1555";
-		case ABGR1555:		return "ABGR1555";
-		case INDEX8:		return "INDEX8";
-		
-		// Will the Win32 version of PTC support fakemodes?
-		// It doesn't on my machine.
-		case FAKEMODE1A:	return "FAKEMODE1A";
-		case FAKEMODE1B:	return "FAKEMODE1B";
-		case FAKEMODE1C:	return "FAKEMODE1C";
-		case FAKEMODE2A:	return "FAKEMODE2A";
-		case FAKEMODE2B:	return "FAKEMODE2B";
-		case FAKEMODE2C:	return "FAKEMODE2C";
-		case FAKEMODE3A:	return "FAKEMODE3A";
-		case FAKEMODE3B:	return "FAKEMODE3B";
-		case FAKEMODE3C:	return "FAKEMODE3C";
-		case GREY8:			return "GREY8";
-		case RGB332:		return "RGB332";
-		default:			return "(custom)";
-	}
+	return IdStrings[id-1000];
 }
 
 
@@ -222,8 +207,6 @@ extern "C" {
 
 void I_ShutdownGraphics (void)
 {
-	I_ShutdownInput ();
-
 	{
 		modelist_t *mode = Modes, *tempmode;
 
@@ -273,6 +256,14 @@ void I_UpdateNoBlit (void)
 	// what is this?
 }
 
+//
+// I_FinishUpdateNoBlit
+//
+void I_FinishUpdateNoBlit (void)
+{
+	V_UnlockScreen (&screens[0]);
+}
+
 //
 // I_FinishUpdate
 //
@@ -292,12 +283,12 @@ void I_FinishUpdate (void)
 				 1000 / (ms - lastms));
 		chars = strlen (fpsbuff);
 		V_Clear (0, screens[0].height - 8, chars * 8, screens[0].height, &screens[0], 0);
-		V_PrintStr (0, screens[0].height - 8, (byte *)&fpsbuff[0], chars, 0);
+		V_PrintStr (0, screens[0].height - 8, (byte *)&fpsbuff[0], chars);
 	}
 	lastms = ms;
 
 	// draws little dots on the bottom of the screen
-	if (devparm) {
+	if (ticker->value) {
 		i = I_GetTime();
 		tics = i - lasttic;
 		lasttic = i;
@@ -352,7 +343,7 @@ void I_SetPalette (unsigned int *pal)
 		return;
 	}
 
-	memcpy (palentries, pal, 256*(sizeof uint));
+	memcpy (palentries, pal, 256*sizeof(uint));
 
 	DisPal->Unlock ();
 
@@ -370,79 +361,78 @@ void I_SetPalette (unsigned int *pal)
 
 static void ReinitPTC (char *iface)
 {
-	if (!ptc.Init (iface, Window))
+	if (!ptc.Init (iface, (WINDOW)Window))
 		I_FatalError ("Could not reinitialize PTC");
+#ifdef _DEBUG
 	// We don't want our priority class bumped up!
 	SetPriorityClass (GetCurrentProcess(), NORMAL_PRIORITY_CLASS);
-	DPrintf ("PTC reinitialized to use %s\n\n", iface);
+#endif
+	if (developer->value && vidactive)
+		Printf ("PTC reinitialized to use %s\n\n", iface);
 }
 
-void I_SetMode (int width, int height, int Bpp)
+void I_SetMode (int width, int height, int id)
 {
-	static BOOL firsttime = true;
-
 	DisplayWidth = width;
 	DisplayHeight = height;
-	WantedBPP = Bpp;
+	DisplayID = id;
 
-	if (firsttime) {
-		firsttime = false;
+	ShowWindow (Window, SW_SHOW);
+
+	if (Fullscreen) {
+		if (!fullscreen->value) {
+			Fullscreen = FALSE;
+			// Get out of fullscreen mode
+			ptc.Close ();
+			//ReinitPTC (WindowedIFace);
+		}
 	} else {
-		if (Fullscreen) {
-			if (!fullscreen->value) {
-				Fullscreen = FALSE;
-				// Get out of fullscreen mode
-				ptc.Close ();
-				//ReinitPTC (WindowedIFace);
-			}
-		} else {
-			if (fullscreen->value) {
-				Fullscreen = TRUE;
-				ReinitPTC (FullscreenIFace);
-			}
+		if (fullscreen->value) {
+			Fullscreen = TRUE;
+			ReinitPTC (FullscreenIFace);
+			I_ResumeMouse ();	// Make sure mouse pointer is grabbed.
 		}
+	}
 
-		if (Fullscreen) {
-			ptc.SetMode (width, height, ModeFromBPP (Bpp));
-		} else {
-			width *= win_stretchx->value;
-			height *= win_stretchy->value;
+	if (Fullscreen) {
+		ptc.SetMode (width, height, id);
+	} else {
+		width *= win_stretchx->value;
+		height *= win_stretchy->value;
 
-			height += GetSystemMetrics (SM_CYFIXEDFRAME) * 2 +
-					  GetSystemMetrics (SM_CYCAPTION);
-			width  += GetSystemMetrics (SM_CXFIXEDFRAME) * 2;
+		height += GetSystemMetrics (SM_CYFIXEDFRAME) * 2 +
+				  GetSystemMetrics (SM_CYCAPTION);
+		width  += GetSystemMetrics (SM_CXFIXEDFRAME) * 2;
 
-			SetWindowPos (Window, NULL, 0, 0, width, height, SWP_DRAWFRAME|
-															 SWP_NOACTIVATE|
-															 SWP_NOCOPYBITS|
-															 SWP_NOMOVE|
-															 SWP_NOZORDER);
+		SetWindowPos (Window, NULL, 0, 0, width, height, SWP_DRAWFRAME|
+														 SWP_NOACTIVATE|
+														 SWP_NOCOPYBITS|
+														 SWP_NOMOVE|
+														 SWP_NOZORDER);
 
-			// Let PTC know about the new window size
-			ReinitPTC (WindowedIFace);
+		// Let PTC know about the new window size
+		ReinitPTC (WindowedIFace);
 
-			// If the menu is active, make sure the mouse is released.
-			if (menuactive)
-				I_PauseMouse ();
-		}
+		// If the menu is active, make sure the mouse is released.
+		if (menuactive || gamestate == GS_FULLCONSOLE)
+			I_PauseMouse ();
 	}
 	{
 		MODE mode = ptc.GetMode();
 
 		DisplayBPP = mode.format.bits;
-		if (developer->value) {
-			Printf ("Mode set: %dx%dx%d\n", mode.x, mode.y, DisplayBPP);
-		}
+		if (developer->value && vidactive)
+			Printf ("Mode set: %dx%d (%s)\n", mode.x, mode.y, IdStrings[DisplayID-1000]);
 	}
 
 	// cheapo hack to make sure current display BPP is stored in screens[0]
-	screens[0].Bpp = WantedBPP >> 3;
+	screens[0].Bpp = IdTobpp[DisplayID-1000] >> 3;
 }
 
 static void refreshDisplay (void) {
 	NewWidth = DisplayWidth;
 	NewHeight = DisplayHeight;
-	NewBpp = WantedBPP;
+	NewID = DisplayID;
 	setmodeneeded = true;
 }
 
@@ -458,20 +448,7 @@ static void fullChanged (cvar_t *var)
 		refreshDisplay ();
 }
 
-void I_InitGraphics(void)
-{
-
-	DisPal = new Palette;
-	if (!DisPal)
-		I_FatalError ("Could not create palette");
-
-	NewWidth = DisplayWidth;
-	NewHeight = DisplayHeight;
-	NewBpp = WantedBPP;
-	setmodeneeded = true;
-}
-
-void I_StartGraphics (void)
+void I_InitGraphics (void)
 {
 	char num[8], *iface;
 	modelist_t *mode = (modelist_t *)&Modes;
@@ -479,6 +456,9 @@ void I_StartGraphics (void)
 	I_DetectOS ();
 
 	I_ShowFPS = cvar ("vid_fps", "0", 0);
+	num[0] = '0' + !!M_CheckParm ("-devparm");
+	num[1] = 0;
+	ticker = cvar ("ticker", num, 0);
 	win_stretchx = cvar ("win_stretchx", "1.0", CVAR_ARCHIVE|CVAR_CALLBACK);
 	win_stretchy = cvar ("win_stretchy", "1.0", CVAR_ARCHIVE|CVAR_CALLBACK);
 	fullscreen = cvar ("fullscreen", "1", CVAR_ARCHIVE|CVAR_CALLBACK);
@@ -503,16 +483,23 @@ void I_StartGraphics (void)
 	if (!ptc.Init (iface, Window))
 		I_FatalError ("Could not initialize PTC");
 
+#ifdef _DEBUG
 	// We don't want our priority class bumped up!
 	SetPriorityClass (GetCurrentProcess(), NORMAL_PRIORITY_CLASS);
+#endif
+
+	if (!(DisPal = new Palette))
+		I_FatalError ("Could not create palette");
+
+	atexit (I_ShutdownGraphics);
 }
 
-BOOL I_CheckResolution (int width, int height, int bpp)
+BOOL I_CheckResolution (int width, int height, int id)
 {
 	modelist_t *mode = Modes;
 
 	while (mode) {
-		if (mode->width == width && mode->height == height && mode->bpp == bpp)
+		if (mode->width == width && mode->height == height && mode->id == id)
 			return true;
 
 		mode = mode->next;
@@ -521,18 +508,18 @@ BOOL I_CheckResolution (int width, int height, int bpp)
 }
 
 static modelist_t *IteratorMode;
-static int IteratorBPP;
+static int IteratorID;
 
-void I_StartModeIterator (int bpp)
+void I_StartModeIterator (int id)
 {
 	IteratorMode = Modes;
-	IteratorBPP = bpp;
+	IteratorID = id;
 }
 
 BOOL I_NextMode (int *width, int *height)
 {
 	if (IteratorMode) {
-		while (IteratorMode && IteratorMode->bpp != IteratorBPP)
+		while (IteratorMode && IteratorMode->id != IteratorID)
 			IteratorMode = IteratorMode->next;
 
 		if (IteratorMode) {
@@ -556,7 +543,7 @@ void Cmd_Vid_DescribeModes ()
 				mode->width,
 				mode->height,
 				mode->bpp,
-				GetFormatName (mode->id));
+				IdStrings[mode->id-1000]);
 
 		// go to next mode
 		mode = mode->next;
@@ -565,7 +552,7 @@ void Cmd_Vid_DescribeModes ()
 
 void Cmd_Vid_DescribeCurrentMode ()
 {
-	Printf ("%dx%dx%d\n", screens[0].width, screens[0].height, screens[0].Bpp << 3);
+	Printf ("%dx%d (%s)\n", screens[0].width, screens[0].height, IdStrings[DisplayID-1000]);
 }
 
 
@@ -584,7 +571,7 @@ BOOL I_AllocateScreen (screen_t *scrn, int width, int height, int Bpp)
 	scrn->height = height;
 	scrn->is8bit = (Bpp == 8) ? true : false;
 	scrn->lockcount = 0;
-	scrn->Bpp = WantedBPP >> 3;
+	scrn->Bpp = IdTobpp[DisplayID-1000] >> 3;
 	scrn->palette = NULL;
 
 	if (scrn == &screens[0])
@@ -600,7 +587,7 @@ BOOL I_AllocateScreen (screen_t *scrn, int width, int height, int Bpp)
 		tracer->next = chain;
 		chain = tracer;
 
-		if (developer->value) {
+		if (developer->value && vidactive) {
 			Printf_Bold ("Allocated new surface. (%dx%dx%d)\n",
 					surface->GetWidth (),
 					surface->GetHeight (),
@@ -677,70 +664,94 @@ void I_UnlockScreen (screen_t *scrn)
 void I_Blit (screen_t *src, int srcx, int srcy, int srcwidth, int srcheight,
 			 screen_t *dest, int destx, int desty, int destwidth, int destheight)
 {
-	if (src->impdata && dest->impdata) {
+	if (!src->impdata || !dest->impdata)
+		return;
 /*
 	Funny problem with calling BitBlt() here. The more I do, the slower it gets.
 	It also doesn't give me quite the right dimensions. (?) For now, I just do
 	the conversion and copying myself.
-
-			RECTANGLE srcrect (srcx, srcy, srcx + srcwidth, srcy + srcheight);
-			RECTANGLE destrect (destx, desty, destx + destwidth, desty + destheight);
-
-			((Surface *)(src->impdata))->BitBlt (*(Surface *)(dest->impdata),
-												 srcrect, destrect);
-
 */
-			fixed_t fracxstep, fracystep;
-			fixed_t fracx, fracy;
-			int x, y;
-			byte *destline, *srcline;
+#if 0
+	RECTANGLE srcrect (srcx, srcy, srcx + srcwidth, srcy + srcheight);
+	RECTANGLE destrect (destx, desty, destx + destwidth, desty + destheight);
 
-			if (!src->lockcount)
-				I_LockScreen (src);
-			if (!dest->lockcount)
-				I_LockScreen (dest);
+	((Surface *)(src->impdata))->BitBlt (*(Surface *)(dest->impdata),
+										 srcrect, destrect);
+#else
+	fixed_t fracxstep, fracystep;
+	fixed_t fracx, fracy;
+	int x, y;
 
-			fracy = srcy << FRACBITS;
-			fracystep = (srcheight << FRACBITS) / destheight;
-			fracxstep = (srcwidth << FRACBITS) / destwidth;
+	if (!src->lockcount)
+		I_LockScreen (src);
+	if (!dest->lockcount)
+		I_LockScreen (dest);
 
-//			if (src->is8bit == dest->is8bit) {
-				if (!dest->is8bit) {
-					destwidth <<= 2;
-					srcwidth <<= 2;
-					srcx <<= 2;
-					destx <<= 2;
-				}
+	fracy = srcy << FRACBITS;
+	fracystep = (srcheight << FRACBITS) / destheight;
+	fracxstep = (srcwidth << FRACBITS) / destwidth;
 
-				if (fracxstep == FRACUNIT) {
-					for (y = desty; y < desty + destheight; y++, fracy += fracystep) {
-						memcpy (dest->buffer + y * dest->pitch + destx,
-								src->buffer + (fracy >> FRACBITS) * src->pitch + srcx,
-								destwidth);
-					}
-				} else {
-					for (y = desty; y < desty + destheight; y++, fracy += fracystep) {
-						srcline = src->buffer + (fracy >> FRACBITS) * src->pitch + srcx;
-						destline = dest->buffer + y * dest->pitch + destx;
-						for (x = fracx = 0; x < destwidth; x++, fracx += fracxstep) {
-							destline[x] = srcline[fracx >> FRACBITS];
-						}
-					}
-				}
-/*			} else if (!src->is8bit && dest->is8bit) {
-				I_FatalError ("Can't I_Blit() an ARGB8888 source to\nan INDEX8 destination");
-			} else {
-				RASTER raster;
-				uint templine[4096];		// Support lines as long as 4096 pixels
+	if (src->is8bit == dest->is8bit) {
+		// INDEX8 -> INDEX8 or ARGB8888 -> ARGB8888
 
-				if (src->is8bit && dest->is8bit)
+		byte *destline, *srcline;
 
-
-			if (!src->lockcount)
-				I_UnlockScreen (src);
-			if (!dest->lockcount)
-				I_UnlockScreen (dest);
+		if (!dest->is8bit) {
+			destwidth <<= 2;
+			srcwidth <<= 2;
+			srcx <<= 2;
+			destx <<= 2;
 		}
-*/	}
-}
+
+		if (fracxstep == FRACUNIT) {
+			for (y = desty; y < desty + destheight; y++, fracy += fracystep) {
+				memcpy (dest->buffer + y * dest->pitch + destx,
+						src->buffer + (fracy >> FRACBITS) * src->pitch + srcx,
+						destwidth);
+			}
+		} else {
+			for (y = desty; y < desty + destheight; y++, fracy += fracystep) {
+				srcline = src->buffer + (fracy >> FRACBITS) * src->pitch + srcx;
+				destline = dest->buffer + y * dest->pitch + destx;
+				for (x = fracx = 0; x < destwidth; x++, fracx += fracxstep) {
+					destline[x] = srcline[fracx >> FRACBITS];
+				}
+			}
+		}
+	} else if (!src->is8bit && dest->is8bit) {
+		// ARGB8888 -> INDEX8
+		I_FatalError ("Can't I_Blit() an ARGB8888 source to\nan INDEX8 destination");
+	} else {
+		// INDEX8 -> ARGB8888 (Palette set in V_Palette)
+		uint *destline;
+		byte *srcline;
+
+		if (fracxstep == FRACUNIT) {
+			// No X-scaling
+			for (y = desty; y < desty + destheight; y++, fracy += fracystep) {
+				srcline = src->buffer + (fracy >> FRACBITS) * src->pitch + srcx;
+				destline = (uint *)(dest->buffer + y * dest->pitch) + destx;
+				for (x = 0; x < destwidth; x++) {
+					destline[x] = V_Palette[srcline[x]];
+				}
+			}
+		} else {
+			// With X-scaling
+			for (y = desty; y < desty + destheight; y++, fracy += fracystep) {
+				srcline = src->buffer + (fracy >> FRACBITS) * src->pitch + srcx;
+				destline = (uint *)(dest->buffer + y * dest->pitch) + destx;
+				for (x = fracx = 0; x < destwidth; x++, fracx += fracxstep) {
+					destline[x] = V_Palette[srcline[fracx >> FRACBITS]];
+				}
+			}
+		}
+	}
+
+	if (!src->lockcount)
+		I_UnlockScreen (src);
+	if (!dest->lockcount)
+		I_UnlockScreen (dest);
+#endif
 }
+
+}	// extern "C"
\ No newline at end of file
diff --git a/code/I_video.h b/code/win32/I_video.h
similarity index 95%
rename from code/I_video.h
rename to code/win32/I_video.h
index 603e48c173..4fc4018319 100644
--- a/code/I_video.h
+++ b/code/win32/I_video.h
@@ -33,9 +33,6 @@ extern BOOL Fullscreen;
 
 
 // Called by D_DoomMain,
-// determines the hardware configuration
-// and available modes
-void I_StartGraphics (void);
 // Sets up the video mode
 void I_InitGraphics (void);
 
@@ -50,6 +47,7 @@ void I_SetPalette (unsigned int *palette);
 void I_BeginUpdate (void);		// [RH] Locks screen[0]
 void I_UpdateNoBlit (void);
 void I_FinishUpdate (void);
+void I_FinishUpdateNoBlit (void);
 
 // Wait for vertical retrace or pause a bit.
 void I_WaitVBL(int count);
diff --git a/code/dxcrap.c b/code/win32/dxcrap.c
similarity index 100%
rename from code/dxcrap.c
rename to code/win32/dxcrap.c
diff --git a/code/i_net.h b/code/win32/i_net.h
similarity index 72%
rename from code/i_net.h
rename to code/win32/i_net.h
index a6cde95955..5b8496cb05 100644
--- a/code/i_net.h
+++ b/code/win32/i_net.h
@@ -20,25 +20,11 @@
 //-----------------------------------------------------------------------------
 
 
-#ifndef __I_NET__
-#define __I_NET__
-
-
-
+#ifndef __I_NET_H__
+#define __I_NET_H__
 
 // Called by D_DoomMain.
-
-
 void I_InitNetwork (void);
 void I_NetCmd (void);
 
-
 #endif
-//-----------------------------------------------------------------------------
-//
-// $Log: i_net.h,v $
-// Revision 1.1.1.1  1997/12/28 12:59:02  pekangas
-// Initial DOOM source release from id Software
-//
-//
-//-----------------------------------------------------------------------------
diff --git a/code/icon1.ico b/code/win32/icon1.ico
similarity index 100%
rename from code/icon1.ico
rename to code/win32/icon1.ico
diff --git a/code/win32/mid2strm.c b/code/win32/mid2strm.c
new file mode 100644
index 0000000000..1044ddaf1c
--- /dev/null
+++ b/code/win32/mid2strm.c
@@ -0,0 +1,793 @@
+/*==========================================================================
+ *
+ *  Copyright (C) 1995-1996 Microsoft Corporation. All Rights Reserved.
+ *
+ *  File:	mid2strm.c
+ *  Content:	Converts a MIDI file into a MDS (MidiStream) File.
+ *
+ * [RH] Adapted this code from the DirectX 5 SDK for use with ZDoom
+ *
+ ***************************************************************************/
+#include <windows.h>
+#include <windowsx.h>
+#include <mmsystem.h>
+#include <assert.h>
+
+#include "doomtype.h"
+#include "mid2strm.h"
+#include "m_alloc.h"
+
+// Macros for swapping hi/lo-endian data
+//
+#define WORDSWAP(w)		(((w) >> 8) | \
+						(((w) << 8) & 0xFF00))
+
+#define DWORDSWAP(dw) 	(((dw) >> 24) |					\
+						(((dw) >> 8) & 0x0000FF00) |	\
+						(((dw) << 8) & 0x00FF0000) |	\
+						(((dw) << 24) & 0xFF000000))
+
+// In debug builds, TRACKERR will show us where the parser died
+//
+#ifdef _DEBUG
+#define TRACKERR(p,sz) ShowTrackError(p,sz);
+#else
+#define TRACKERR(p,sz)
+#endif
+
+
+// These structures are stored in MIDI files; they need to be byte
+// aligned.
+//
+#pragma pack(1)
+
+// Chunk header. dwTag is either MTrk or MThd.
+//
+typedef struct
+{
+	DWORD			dwTag;					// Type
+	DWORD			cbChunk;				// Length (hi-lo)
+} MIDICHUNK;
+
+// Contents of MThd chunk.
+typedef struct
+{
+	WORD			wFormat;				// Format (hi-lo)
+	WORD			cTrack;					// # tracks (hi-lo)
+	WORD			wTimeDivision;			// Time division (hi-lo)
+} MIDIFILEHDR;
+
+#pragma pack()
+
+// Description of a track open for read
+//
+#define ITS_F_ENDOFTRK	0x00000001
+
+typedef struct
+{
+	DWORD			fdwTrack;			// Track status
+	DWORD			cbTrack;			// Total bytes in track
+	DWORD			cbLeft;				// Bytes left unread in track
+	LPBYTE			pTrack;				// -> start of track data
+	LPBYTE			pTrackPointer;		// -> next byte to read
+	DWORD			tkNextEventDue;		// Absolute time of next event in track
+	BYTE			bRunningStatus;		// Running status from last channel msg
+#ifdef _DEBUG
+	DWORD			nTrack;				// # of this track for debugging
+#endif
+} INTRACKSTATE;
+
+// Description of the input MIDI file
+//
+typedef struct
+{
+	DWORD			cbFile;				// Total bytes in file
+	LPBYTE			pFile;				// -> entire file in memory
+	DWORD			cbLeft;				// Bytes left unread
+	LPBYTE			pFilePointer;		// -> next byte to read
+
+	DWORD			dwTimeDivision;		// Original time division
+	DWORD			dwFormat;			// Original format
+	DWORD			cTrack;				// Track count (specifies apIts size)
+	INTRACKSTATE*	apIts;				// -> array of tracks in this file
+} INFILESTATE;
+
+// A few globals
+//
+DWORD midTimeDiv;
+byte UsedPatches[256];
+
+static INFILESTATE  ifs;
+OUTSTREAMSTATE ots;
+
+// Messages
+//
+static char szInitErrMem[]			= "Out of memory.\n";
+static char szInitErrInFile[]		= "Read error on input file or file is corrupt.\n";
+
+#ifdef _DEBUG
+static char gteBadRunStat[] = 		"Reference to missing running status.";
+static char gteRunStatMsgTrunc[] = 	"Running status message truncated";
+static char gteChanMsgTrunc[] = 	"Channel message truncated";
+static char gteSysExLenTrunc[] = 	"SysEx event truncated (length)";
+static char gteSysExTrunc[] = 		"SysEx event truncated";
+static char gteMetaNoClass[] =		"Meta event truncated (no class byte)";
+static char gteMetaLenTrunc[] = 	"Meta event truncated (length)";
+static char gteMetaTrunc[] = 		"Meta event truncated";
+#endif
+
+// Prototypes
+//
+static BOOL			Init (LPBYTE in, DWORD insize);
+static PSTREAMBUF	BuildNewTracks(void);
+static LPBYTE		GetInFileData(DWORD cbToGet);
+static BOOL			GetTrackVDWord(INTRACKSTATE* pTs, LPDWORD lpdw);
+static BOOL			GetTrackEvent(INTRACKSTATE* pTs, MEVENT *pMe);
+#ifdef _DEBUG
+static void 		ShowTrackError(INTRACKSTATE* pTs, char* szErr);
+#endif
+
+// Init
+// 
+// Validate the input file structure
+// Allocate the input track structures and initialize them
+// Initialize the output track structures
+//
+// Return TRUE on success
+// Prints its own error message if something goes wrong
+//
+static BOOL Init (LPBYTE in, DWORD insize)
+{
+	BOOL			fRet = FALSE;
+	LPDWORD			lpdwTag;
+	LPDWORD			lpcbHeader;
+	DWORD			cbHeader;
+	MIDIFILEHDR*	pHeader;
+	INTRACKSTATE*	pTs;
+	UINT			idx;
+	
+	memset (UsedPatches, 0, sizeof(UsedPatches));
+
+	// Initialize things we'll try to free later if we fail
+	//
+	ifs.cbFile = insize;
+	ifs.pFile = in;
+	ifs.apIts = NULL;
+
+	// Set up to read from the memory buffer. Read and validate
+	// - MThd header
+	// - size of file header chunk
+	// - file header itself
+	//	
+	ifs.cbLeft = ifs.cbFile;
+	ifs.pFilePointer = ifs.pFile;
+
+	if (NULL == (lpdwTag = (LPDWORD)GetInFileData(sizeof(*lpdwTag))) ||
+		*lpdwTag != MThd ||
+		NULL == (lpcbHeader = (LPDWORD)GetInFileData(sizeof(*lpcbHeader))) ||
+		(cbHeader = DWORDSWAP(*lpcbHeader)) < sizeof(MIDIFILEHDR) ||
+		NULL == (pHeader = (MIDIFILEHDR*)GetInFileData(cbHeader)))
+	{
+		Printf (szInitErrInFile);
+		goto Init_Cleanup;
+	}
+
+	// File header is stored in hi-lo order. Swap this into Intel order and save
+	// parameters in our native int size (32 bits)
+	//
+	ifs.dwFormat = (DWORD)WORDSWAP(pHeader->wFormat);
+	ifs.cTrack = (DWORD)WORDSWAP(pHeader->cTrack);
+	ifs.dwTimeDivision = (DWORD)WORDSWAP(pHeader->wTimeDivision);
+
+	// We know how many tracks there are; allocate the structures for them and parse
+	// them. The parse merely looks at the MTrk signature and track chunk length
+	// in order to skip to the next track header.
+	//
+	ifs.apIts = (INTRACKSTATE*)malloc(ifs.cTrack*sizeof(INTRACKSTATE));
+	if (NULL == ifs.apIts)
+	{
+		Printf (szInitErrMem);
+		goto Init_Cleanup;
+	}
+
+	for (idx = 0, pTs = ifs.apIts; idx < ifs.cTrack; ++idx, ++pTs)
+	{
+		if (NULL == (lpdwTag = (LPDWORD)GetInFileData(sizeof(*lpdwTag))) ||
+			*lpdwTag != MTrk ||
+			NULL == (lpcbHeader = (LPDWORD)GetInFileData(sizeof(*lpcbHeader))))
+		{
+			Printf (szInitErrInFile);
+			goto Init_Cleanup;
+		}
+
+		cbHeader = DWORDSWAP(*lpcbHeader);
+		pTs->cbTrack = cbHeader;
+		pTs->cbLeft = cbHeader;
+		pTs->pTrack = GetInFileData(cbHeader);
+		if (NULL == pTs->pTrack)
+		{
+			Printf (szInitErrInFile);
+			goto Init_Cleanup;
+		}
+
+#ifdef _DEBUG
+		pTs->nTrack = idx;
+#endif
+		pTs->pTrackPointer = pTs->pTrack;
+		pTs->cbLeft = pTs->cbTrack;
+		pTs->fdwTrack = 0;
+		pTs->bRunningStatus = 0;
+
+		// Handle bozo MIDI files which contain empty track chunks
+		//
+		if (!pTs->cbLeft)
+		{
+			pTs->fdwTrack |= ITS_F_ENDOFTRK;
+			continue;
+		}
+
+		// We always preread the time from each track so the mixer code can
+		// determine which track has the next event with a minimum of work
+		//
+		if (!GetTrackVDWord(pTs, &pTs->tkNextEventDue))
+		{
+			Printf (szInitErrInFile);
+			goto Init_Cleanup;
+		}
+	}
+
+	ots.tkTrack = 0;
+	ots.pFirst = NULL;
+	ots.pLast = NULL;
+
+	fRet = TRUE;
+		
+Init_Cleanup:
+	if (!fRet)
+		mid2strmCleanup();
+
+	return fRet;
+}
+
+//
+// GetInFileData
+//
+// Gets the requested number of bytes of data from the input file and returns
+// a pointer to them.
+// 
+// Returns a pointer to the data or NULL if we'd read more than is
+// there.
+//
+static LPBYTE		GetInFileData(DWORD cbToGet)
+{
+	LPBYTE				pRet;
+
+	if (ifs.cbLeft < cbToGet)
+		return NULL;
+
+	pRet = ifs.pFilePointer;
+
+	ifs.cbLeft -= cbToGet;
+	ifs.pFilePointer += cbToGet;
+
+	return pRet;
+}
+
+//
+// Cleanup
+//
+// Free anything we ever allocated
+//
+void 		mid2strmCleanup(void)
+{
+	PSTREAMBUF			pCurr;
+	PSTREAMBUF			pNext;
+
+	if (ifs.apIts)	free(ifs.apIts);
+
+	pCurr = ots.pFirst;
+	while (pCurr)
+	{
+		pNext = pCurr->pNext;
+		free(pCurr);
+		pCurr = pNext;
+	}
+}
+
+//
+// BuildNewTracks
+//
+// This is where the actual work gets done.
+//
+// Until all tracks are done,
+//  Scan the tracks to find the next due event
+//  Figure out where the event belongs in the new mapping
+//  Put it there
+// Add end of track metas to all new tracks that now have any data
+//
+// Return TRUE on success
+// Prints its own error message if something goes wrong
+//
+static PSTREAMBUF BuildNewTracks(void)
+{
+	INTRACKSTATE*	pTs;
+	INTRACKSTATE*	pTsFound;
+	UINT			idx;
+	DWORD			tkNext;
+	MEVENT			me;
+	
+	for(;;)
+	{
+		// Find nearest event due
+		//
+		pTsFound = NULL;
+		tkNext = 0xFFFFFFFFL;
+
+		for (idx = 0, pTs = ifs.apIts; idx < ifs.cTrack; ++idx, ++pTs)
+			if ((!(pTs->fdwTrack & ITS_F_ENDOFTRK)) && (pTs->tkNextEventDue < tkNext))
+			{
+				tkNext = pTs->tkNextEventDue;
+				pTsFound = pTs;
+			}
+
+		// None found? We must be done
+		//
+		if (!pTsFound)
+			break;
+
+		// Ok, get the event header from that track
+		//
+
+		if (!GetTrackEvent(pTsFound, &me))
+		{
+			Printf ("MIDI file is corrupt!\n");
+			return FALSE;
+		}
+
+		// Don't add end of track event 'til we're done
+		//
+		if (me.abEvent[0] == MIDI_META && me.abEvent[1] == MIDI_META_EOT)
+			continue;
+		
+		if (!AddEventToStream(&me))
+		{
+			Printf ("Out of memory building tracks.\n");
+			return NULL;
+		}
+	}	
+
+	midTimeDiv = ifs.dwTimeDivision;
+	return ots.pFirst;
+}
+
+//
+// GetTrackVDWord
+//
+// Attempts to parse a variable length DWORD from the given track. A VDWord
+// in a MIDI file
+//  (a) is in lo-hi format 
+//  (b) has the high bit set on every byte except the last
+//
+// Returns the DWORD in *lpdw and TRUE on success; else
+// FALSE if we hit end of track first. Sets ITS_F_ENDOFTRK
+// if we hit end of track.
+//
+static BOOL			GetTrackVDWord(INTRACKSTATE* pTs, LPDWORD lpdw)
+{
+	BYTE				b;
+	DWORD				dw = 0;
+
+	if (pTs->fdwTrack & ITS_F_ENDOFTRK)
+		return FALSE;
+
+	do
+	{
+		if (!pTs->cbLeft)
+		{
+			pTs->fdwTrack |= ITS_F_ENDOFTRK;
+			return FALSE;
+		}
+
+		b = *pTs->pTrackPointer++;
+		--pTs->cbLeft;
+
+	 	dw = (dw << 7) | (b & 0x7F);
+	} while (b & 0x80);
+
+	*lpdw = dw;
+
+	return TRUE;
+}
+
+//
+// GetTrackEvent
+//
+// Fills in the event struct with the next event from the track
+//
+// pMe->tkEvent will contain the absolute tick time of the event
+// pMe->abEvent[0] will contain
+//  MIDI_META if the event is a meta event;
+//   in this case pMe->abEvent[1] will contain the meta class
+//  MIDI_SYSEX or MIDI_SYSEXEND if the event is a SysEx event
+//  Otherwise, the event is a channel message and pMe->abEvent[1]
+//   and pMe->abEvent[2] will contain the rest of the event.
+//
+// pMe->cbEvent will contain
+//  The total length of the channel message in pMe->abEvent if
+//   the event is a channel message
+//  The total length of the paramter data pointed to by
+//   pMe->pEvent otherwise
+//
+// pMe->pEvent will point at any additional paramters if the 
+//  event is a SysEx or meta event with non-zero length; else
+//  it will contain NULL
+//
+// Returns TRUE on success or FALSE on any kind of parse error
+// Prints its own error message ONLY in the debug version
+//
+// Maintains the state of the input track (i.e. pTs->cbLeft,
+// pTs->pTrackPointers, and pTs->bRunningStatus).
+//
+static BOOL			GetTrackEvent(INTRACKSTATE* pTs, MEVENT *pMe)
+{
+	BYTE				b;
+	UINT				cbEvent;
+
+	pMe->pEvent = NULL;
+
+	// Already at end of track? There's nothing to read.
+	//
+	if ((pTs->fdwTrack & ITS_F_ENDOFTRK) || !pTs->cbLeft)
+		return FALSE;
+
+	// Get the first byte, which determines the type of event.
+	//
+	b = *pTs->pTrackPointer++;
+	--pTs->cbLeft;
+
+	// If the high bit is not set, then this is a channel message
+	// which uses the status byte from the last channel message
+	// we saw. NOTE: We do not clear running status across SysEx or
+	// meta events even though the spec says to because there are
+	// actually files out there which contain that sequence of data.
+	//
+	if (!(b & 0x80))
+	{
+		// No previous status byte? We're hosed.
+		//
+		if (!pTs->bRunningStatus)
+		{
+			TRACKERR(pTs, gteBadRunStat);
+			return FALSE;
+		}
+
+		pMe->abEvent[0] = pTs->bRunningStatus;
+		pMe->abEvent[1] = b;
+
+		b = pMe->abEvent[0] & 0xF0;
+		pMe->cbEvent = 2;
+
+		// Only program change and channel pressure events are 2 bytes long;
+		// the rest are 3 and need another byte
+		//
+		if (b != MIDI_PRGMCHANGE && b != MIDI_CHANPRESS)
+		{
+			if (!pTs->cbLeft)
+			{
+				TRACKERR(pTs, gteRunStatMsgTrunc);
+				pTs->fdwTrack |= ITS_F_ENDOFTRK;
+				return FALSE;
+			}
+
+			pMe->abEvent[2] = *pTs->pTrackPointer++;
+			--pTs->cbLeft;
+			++pMe->cbEvent;
+		}
+	}
+	else if ((b & 0xF0) != MIDI_SYSEX)
+	{
+		// Not running status, not in SysEx range - must be
+		// normal channel message (0x80-0xEF)
+		//
+		pMe->abEvent[0] = b;
+		pTs->bRunningStatus = b;
+		
+		// Strip off channel and just keep message type
+		//
+		b &= 0xF0;
+
+		cbEvent = (b == MIDI_PRGMCHANGE || b == MIDI_CHANPRESS) ? 1 : 2;
+		pMe->cbEvent = cbEvent + 1;
+
+		if (pTs->cbLeft < cbEvent)
+		{
+			TRACKERR(pTs, gteChanMsgTrunc);
+			pTs->fdwTrack |= ITS_F_ENDOFTRK;
+			return FALSE;
+		}
+
+		pMe->abEvent[1] = *pTs->pTrackPointer++;
+		if (cbEvent == 2)
+			pMe->abEvent[2] = *pTs->pTrackPointer++;
+
+		pTs->cbLeft -= cbEvent;
+	} 
+	else if (b == MIDI_SYSEX || b == MIDI_SYSEXEND)
+	{
+		// One of the SysEx types. (They are the same as far as we're concerned;
+		// there is only a semantic difference in how the data would actually
+		// get sent when the file is played. We must take care to put the correct
+		// event type back on the output track, however.)
+		//
+		// Parse the general format of:
+		//  BYTE 	bEvent (MIDI_SYSEX or MIDI_SYSEXEND)
+		//  VDWORD 	cbParms
+		//  BYTE   	abParms[cbParms]
+		//
+		pMe->abEvent[0] = b;
+		if (!GetTrackVDWord(pTs, &pMe->cbEvent))
+		{
+			TRACKERR(pTs, gteSysExLenTrunc);
+			return FALSE;
+		}
+		
+		if (pTs->cbLeft < pMe->cbEvent)
+		{
+			TRACKERR(pTs, gteSysExTrunc);
+			pTs->fdwTrack |= ITS_F_ENDOFTRK;
+			return FALSE;
+		}
+
+		pMe->pEvent = pTs->pTrackPointer;
+		pTs->pTrackPointer += pMe->cbEvent;
+		pTs->cbLeft -= pMe->cbEvent;
+	} 
+	else if (b == MIDI_META)
+	{
+		// It's a meta event. Parse the general form:
+		//  BYTE	bEvent	(MIDI_META)
+		//	BYTE	bClass
+		//  VDWORD	cbParms
+		//	BYTE	abParms[cbParms]
+		//
+		pMe->abEvent[0] = b;
+
+		if (!pTs->cbLeft)
+		{
+			TRACKERR(pTs, gteMetaNoClass);
+			pTs->fdwTrack |= ITS_F_ENDOFTRK;
+			return FALSE;
+		}
+
+		pMe->abEvent[1] = *pTs->pTrackPointer++;
+		--pTs->cbLeft;
+
+		if (!GetTrackVDWord(pTs, &pMe->cbEvent))
+		{	
+			TRACKERR(pTs, gteMetaLenTrunc);
+			return FALSE;
+		}
+
+		// NOTE: Perfectly valid to have a meta with no data
+		// In this case, cbEvent == 0 and pEvent == NULL
+		//
+		if (pMe->cbEvent)
+		{		
+			if (pTs->cbLeft < pMe->cbEvent)
+			{
+				TRACKERR(pTs, gteMetaTrunc);
+				pTs->fdwTrack |= ITS_F_ENDOFTRK;
+				return FALSE;
+			}
+
+			pMe->pEvent = pTs->pTrackPointer;
+			pTs->pTrackPointer += pMe->cbEvent;
+			pTs->cbLeft -= pMe->cbEvent;
+		}
+
+		if (pMe->abEvent[1] == MIDI_META_EOT)
+			pTs->fdwTrack |= ITS_F_ENDOFTRK;
+	}
+	else
+	{
+		// Messages in this range are system messages and aren't supposed to
+		// be in a normal MIDI file. If they are, we've misparsed or the
+		// authoring software is stupid.
+		//
+		return FALSE;
+	}
+
+	// Event time was already stored as the current track time
+	//
+	pMe->tkEvent = pTs->tkNextEventDue;
+
+	// Now update to the next event time. The code above MUST properly
+	// maintain the end of track flag in case the end of track meta is
+	// missing. 
+	//
+	if (!(pTs->fdwTrack & ITS_F_ENDOFTRK))
+	{
+		DWORD				tkDelta;
+
+		if (!GetTrackVDWord(pTs, &tkDelta))
+			return FALSE;
+
+		pTs->tkNextEventDue += tkDelta;
+	}
+
+	return TRUE;
+}
+
+//
+// AddEventToStream
+//
+// Put the given event onto the given output track.
+// pMe must point to an event filled out in accordance with the
+// description given in GetTrackEvent
+//
+// Returns TRUE on sucess or FALSE if we're out of memory
+//
+BOOL			AddEventToStream(MEVENT *pMe)
+{
+	PDWORD					pdw;		
+	DWORD					tkNow;
+	DWORD					tkDelta;	
+	UINT					cdw;
+
+	tkNow = ots.tkTrack;
+
+	// Delta time is absolute event time minus absolute time
+	// already gone by on this track
+	//
+	tkDelta = pMe->tkEvent - ots.tkTrack;
+
+	// Event time is now current time on this track
+	//
+	ots.tkTrack = pMe->tkEvent;
+
+	if (pMe->abEvent[0] < MIDI_SYSEX)
+	{
+		// Channel message. We know how long it is, just copy it. Need 3 DWORD's: delta-t, 
+		// stream-ID, event
+		// 
+		// TODO: Compress with running status
+		//
+
+		if (NULL == (pdw = (PDWORD)GetOutStreamBytes(tkNow, 3 * sizeof(DWORD))))
+			return FALSE;
+
+		*pdw++ = tkDelta;
+		*pdw++ = 0;
+		*pdw =	(pMe->abEvent[0]) |
+				(((DWORD)pMe->abEvent[1]) << 8) |
+				(((DWORD)pMe->abEvent[2]) << 16) |
+				MIDS_SHORTMSG;
+
+		if ((pMe->abEvent[0] & 0xf0) == MIDI_PRGMCHANGE)
+			UsedPatches[pMe->abEvent[1] & 127] = 1;
+		else if (pMe->abEvent[0] == (MIDI_NOTEON | 10))
+			UsedPatches[128+(pMe->abEvent[1] & 127)] = 1;
+	}
+	else if (pMe->abEvent[0] == MIDI_SYSEX || pMe->abEvent[0] == MIDI_SYSEXEND)
+	{
+		Printf ("NOTE: Ignoring SysEx for now.\n");
+	}
+	else
+	{
+		// Better be a meta event.
+		//  BYTE		bEvent
+		//  BYTE 		bClass
+		//	VDWORD		cbParms
+		//	BYTE		abParms[cbParms]
+		//
+		assert(pMe->abEvent[0] == MIDI_META);
+
+		// The only meta-event we care about is change tempo
+		//
+		if (pMe->abEvent[1] != MIDI_META_TEMPO)
+			return TRUE;
+
+		assert(pMe->cbEvent == 3);
+
+		cdw = 3;
+		pdw = (PDWORD)GetOutStreamBytes(tkNow, 3 * sizeof(DWORD));
+		if (NULL == pdw)
+			return FALSE;
+
+		*pdw++ = tkDelta;
+		*pdw++ = (DWORD)-1;
+		*pdw =	(pMe->pEvent[2]) |
+				(((DWORD)pMe->pEvent[1]) << 8) |
+				(((DWORD)pMe->pEvent[0]) << 16) |
+				MIDS_TEMPO;
+	}
+
+	return TRUE;	
+}
+
+//
+// GetOutStreamBytes
+//
+// This function performs the memory management and pseudo-file I/O for output
+// tracks.
+// 
+// We build a linked list of stream buffers as they would exist if they were
+// about to be played. Each buffer is CB_STREAMBUF bytes long maximum. They are
+// filled as full as possible; events are not allowed to cross buffers.
+//
+// Returns a pointer to the number of requested bytes or NULL if we're out of memory
+//
+static LPBYTE		GetOutStreamBytes(DWORD tkNow, DWORD cbNeeded)
+{
+	LPBYTE					pb;
+
+	// Round request up to the next DWORD boundry. This aligns the final output buffer correctly
+	// and allows the above routines to deal with byte-aligned data
+	//
+	cbNeeded = (cbNeeded + 3) & ~3;
+
+	if (NULL == ots.pLast || cbNeeded > ots.pLast->cbLeft)
+	{
+		PSTREAMBUF 			pNew;
+
+		pNew = malloc(sizeof(*pNew) + CB_STREAMBUF);
+		if (NULL == pNew)
+			return NULL;
+			
+		pNew->pBuffer 		= (LPBYTE)(pNew + 1);
+		pNew->tkStart		= tkNow;
+		pNew->pbNextEvent 	= pNew->pBuffer;
+		pNew->cbLeft 		= CB_STREAMBUF;
+		pNew->pNext 		= NULL;
+		pNew->prepared		= false;
+
+		if (!ots.pLast)
+		{
+			ots.pFirst = pNew;
+			ots.pLast  = pNew;
+		}
+		else
+		{
+			ots.pLast->pNext 	= pNew;
+			ots.pLast			= pNew;
+		}
+	}
+
+	// If there's STILL not enough room for the requested block, then an event is bigger than 
+	// the buffer size -- this is unacceptable. 
+	//
+	if (cbNeeded > ots.pLast->cbLeft)
+	{
+		Printf ("NOTE: An event requested %lu bytes of memory; the\n", cbNeeded);
+		Printf ("      maximum configured buffer size is %lu.\n", (DWORD)CB_STREAMBUF);
+
+		return NULL;
+	}
+
+	pb = ots.pLast->pbNextEvent;
+
+	ots.pLast->pbNextEvent += cbNeeded;
+	ots.pLast->cbLeft -= cbNeeded;
+
+	return pb;
+}
+
+PSTREAMBUF mid2strmConvert (BYTE *inFile, DWORD inSize)
+{
+	if (Init (inFile, inSize)) {
+		PSTREAMBUF buf = BuildNewTracks ();
+		if (!buf)
+			mid2strmCleanup ();
+		return buf;
+	}
+	return NULL;
+}
+
+#ifdef _DEBUG
+static void 			ShowTrackError(INTRACKSTATE* pTs, char* szErr)
+{
+	Printf ("Track %u: %s\n", pTs->nTrack, szErr);		
+	Printf ("Track offset %lu\n", (DWORD)(pTs->pTrackPointer - pTs->pTrack));
+	Printf ("Track total %lu  Track left %lu\n", pTs->cbTrack, pTs->cbLeft);
+}
+#endif
diff --git a/code/win32/mid2strm.h b/code/win32/mid2strm.h
new file mode 100644
index 0000000000..e6dac83215
--- /dev/null
+++ b/code/win32/mid2strm.h
@@ -0,0 +1,70 @@
+#ifndef __MID2STRM_H__
+#define __MID2STRM_H__
+
+#define CB_STREAMBUF	(32768)					// Size of each stream buffer
+
+// MIDI file constants
+//
+#define MThd			0x6468544D				// Start of file
+#define MTrk			0x6B72544D				// Start of track
+
+#define MIDI_SYSEX		((BYTE)0xF0)			// SysEx begin
+#define MIDI_SYSEXEND	((BYTE)0xF7)			// SysEx end
+#define MIDI_META		((BYTE)0xFF)			// Meta event begin
+#define MIDI_META_TEMPO	((BYTE)0x51)
+#define MIDI_META_EOT	((BYTE)0x2F)			// End-of-track
+
+#define MIDI_NOTEOFF	((BYTE)0x80)			// + note + velocity
+#define MIDI_NOTEON		((BYTE)0x90)			// + note + velocity
+#define MIDI_POLYPRESS  ((BYTE)0xA0)			// + pressure (2 bytes)
+#define MIDI_CTRLCHANGE ((BYTE)0xB0)			// + ctrlr + value
+#define MIDI_PRGMCHANGE	((BYTE)0xC0)			// + new patch
+#define MIDI_CHANPRESS	((BYTE)0xD0)			// + pressure (1 byte)
+#define MIDI_PITCHBEND	((BYTE)0xE0)			// + pitch bend (2 bytes)
+
+#define MIDS_SHORTMSG	(0x00000000)
+#define MIDS_TEMPO		(0x01000000)
+
+// Description of a stream buffer on the output side
+//
+typedef struct STREAMBUF *PSTREAMBUF;
+typedef struct STREAMBUF
+{
+	LPBYTE			pBuffer;			// -> Start of actual buffer
+	DWORD			tkStart;			// Tick time just before first event
+	LPBYTE			pbNextEvent;		// Where to write next event
+	DWORD			cbLeft; 			// bytes left in buffer
+	PSTREAMBUF		pNext;				// Next buffer
+	MIDIHDR			midiHeader;
+	BOOL			prepared;
+} STREAMBUF;
+
+// Description of output stream open for write
+//
+typedef struct
+{
+	DWORD			tkTrack;			// Current tick position in track	
+	PSTREAMBUF		pFirst;				// First stream buffer
+	PSTREAMBUF		pLast;				// Last (current) stream buffer
+} OUTSTREAMSTATE;
+
+// One event we're reading or writing to a track
+//
+typedef struct
+{
+	DWORD			tkEvent;			// Absolute time of event
+	BYTE			abEvent[4];			// Event type and parameters if channel msg
+	DWORD			cbEvent;			// Of data which follows if meta or sysex
+	LPBYTE			pEvent;				// -> Event data if applicable
+} MEVENT;	
+
+
+extern DWORD midTimeDiv;
+extern byte UsedPatches[256];
+
+PSTREAMBUF	mid2strmConvert (BYTE *inFile, DWORD inSize);
+void		mid2strmCleanup (void);
+LPBYTE		GetOutStreamBytes (DWORD tkNow, DWORD cbNeeded);
+BOOL		AddEventToStream (MEVENT *pMe);
+
+#endif //__MID2STRM_H__
\ No newline at end of file
diff --git a/code/win32/mus2strm.c b/code/win32/mus2strm.c
new file mode 100644
index 0000000000..7481ce8f3b
--- /dev/null
+++ b/code/win32/mus2strm.c
@@ -0,0 +1,316 @@
+/* mus2strm.c: This is based on the Quick MUS to MIDI converter by
+** Sebasten Bacquet (bacquet@iie.cnam.fr) and also on the mid2strm.c
+** file from the DirectX 5 SDK. It converts MUS files into MIDI
+** streams suitable for passing to the MCI midiStreamOut() function.
+** This is a much cleaner solution than the one I was using previously,
+** which was to use the qmus2mid code to convert the MUS lump into a
+** temporary MIDI file on disk and then use MCI calls to play that file.
+** (The switch even shrank the executable by 3K. Woo!)
+*/
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <windows.h>
+#include <windowsx.h>
+#include <mmsystem.h>
+#include <assert.h>
+
+#include "doomtype.h"
+#include "mus2strm.h"
+#include "m_alloc.h"
+#include "m_swap.h"
+
+#define last(e)         ((unsigned char)(e & 0x80))
+#define event_type(e)   ((unsigned char)((e & 0x7F) >> 4))
+#define channel(e)      ((unsigned char)(e & 0x0F))
+
+
+#define NOTMUSFILE		1		/* Not a MUS file */
+#define MUSFILECOR		2		/* MUS file corrupted */
+#define TOOMCHAN		3		/* Too many channels */
+#define MEMALLOC		4		/* Memory allocation error */
+
+
+// Description of the input MUS file
+//
+typedef struct
+{
+	DWORD			cbFile;				// Total bytes in file
+	LPBYTE			pFile;				// -> entire file in memory
+	DWORD			cbLeft;				// Bytes left unread
+	LPBYTE			pFilePointer;		// -> next byte to read
+
+	DWORD			tkNextEventDue;
+	BOOL			endEncountered;
+} INFILESTATE;
+
+
+static INFILESTATE ifs;
+static byte MUS2MIDcontrol[15] = {
+	0,			/* Program change - not a MIDI control change */
+	0x00,		/* Bank select */
+	0x01,		/* Modulation pot */
+	0x07,		/* Volume */
+	0x0A,		/* Pan pot */
+	0x0B,		/* Expression pot */
+	0x5B,		/* Reverb depth */
+	0x5D,		/* Chorus depth */
+	0x40,		/* Sustain pedal */
+	0x43,		/* Soft pedal */
+	0x78,		/* All sounds off */
+	0x7B,		/* All notes off */
+	0x7E,		/* Mono */
+	0x7F,		/* Poly */
+	0x79		/* Reset all controllers */
+};
+static signed char MUS2MIDchannel[16];
+static char MUSvelocity[16];
+
+static DWORD		ReadTime (void);
+static char			FirstChannelAvailable (signed char MUS2MIDchannel[]);
+static BOOL			ReadMUSheader (MUSheader *MUSh);
+static BOOL			GetTrackEvent (MUSheader *MUSh, MEVENT *me);
+static int			DoConversion (byte *in, DWORD insize, int division);
+
+
+static BOOL ReadMUSheader (MUSheader *mush)
+{
+	if (ifs.cbLeft < sizeof(*mush))
+		return FALSE;
+
+	memcpy (mush, ifs.pFilePointer, sizeof(*mush));
+
+	if (strncmp (mush->ID, MUSMAGIC, 4))
+		return FALSE;
+
+	mush->ScoreLength = SHORT(mush->ScoreLength);
+	mush->ScoreStart = SHORT(mush->ScoreStart);
+	mush->channels = SHORT(mush->channels);
+	mush->SecChannels = SHORT(mush->SecChannels);
+	mush->InstrCnt = SHORT(mush->InstrCnt);
+
+	if (ifs.cbLeft < mush->ScoreStart)
+		return FALSE;
+
+	ifs.cbLeft -= mush->ScoreStart;
+	ifs.pFilePointer += mush->ScoreStart;
+
+	return TRUE;
+}
+
+static DWORD ReadTime (void)
+{
+	DWORD time = 0;
+	byte byt = 0;
+
+	do {
+		if (ifs.cbLeft > 0) {
+			byt = *(ifs.pFilePointer++);
+			ifs.cbLeft--;
+			time = (time << 7) + (byt & 0x7F);
+		}
+	} while ((ifs.cbLeft > 0) && (byt & 0x80));
+
+	return time;
+}
+
+static char FirstChannelAvailable (signed char MUS2MIDchannel[])
+{
+	int i;
+	signed char max = -1;
+
+	for (i = 0; i < 15; i++)
+		if (MUS2MIDchannel[i] > max)
+			max = MUS2MIDchannel[i];
+
+	return max == 8 ? 10 : max+1;
+}
+
+static BOOL GetTrackEvent (MUSheader *MUSh, MEVENT *me)
+{
+	byte event, data;
+	int MUSchannel, MIDIchannel;
+
+	me->pEvent = NULL;
+	
+	if (!ifs.cbLeft)
+		return FALSE;
+	event = *(ifs.pFilePointer++);
+	ifs.cbLeft--;
+
+	MUSchannel = channel(event);
+	if (MUS2MIDchannel[MUSchannel] == -1)
+		MIDIchannel = MUS2MIDchannel[MUSchannel] =
+			(MUSchannel == 15 ? 9 : FirstChannelAvailable (MUS2MIDchannel));
+	else
+		MIDIchannel = MUS2MIDchannel[MUSchannel];
+
+	if (event_type(event) <= MUS_CTRLCHANGE) {
+		if (ifs.cbLeft < 1)
+			return FALSE;
+		data = *(ifs.pFilePointer++);
+		ifs.cbLeft--;
+	}
+
+	switch (event_type(event))
+	{
+		case MUS_RELEASE:
+			me->cbEvent = 3;
+			me->abEvent[0] = MIDI_NOTEOFF | MIDIchannel;
+			me->abEvent[1] = data;
+			me->abEvent[2] = 64;
+			break;
+
+		case MUS_PLAY:
+			me->cbEvent = 3;
+			me->abEvent[0] = MIDI_NOTEON | MIDIchannel;
+			me->abEvent[1] = data & 0x7f;
+			if (data & 0x80) {
+				if (ifs.cbLeft < 1)
+					return FALSE;
+				else {
+					MUSvelocity[MUSchannel] = *(ifs.pFilePointer++);
+					ifs.cbLeft--;
+				}
+			}
+			me->abEvent[2] = MUSvelocity[MUSchannel];
+			break;
+
+		case MUS_PITCHBEND:
+			me->cbEvent = 3;
+			me->abEvent[0] = MIDI_PITCHBEND | MIDIchannel;
+			me->abEvent[1] = (data & 1) << 6;
+			me->abEvent[2] = data >> 1;
+			break ;
+
+		case MUS_SYSEVENT:
+			me->cbEvent = 3;
+			me->abEvent[0] = MIDI_CTRLCHANGE | MIDIchannel;
+			me->abEvent[1] = MUS2MIDcontrol[data];
+			me->abEvent[2] = data == 12 ? MUSh->channels+1 : 0;
+			break;
+
+		case MUS_CTRLCHANGE:
+			if (ifs.cbLeft < 1)
+				return FALSE;
+			ifs.cbLeft--;
+			if (data) {
+				me->cbEvent = 3;
+				me->abEvent[0] = MIDI_CTRLCHANGE | MIDIchannel;
+				me->abEvent[1] = MUS2MIDcontrol[data];
+				me->abEvent[2] = *(ifs.pFilePointer++);
+			} else {
+				me->cbEvent = 2;
+				me->abEvent[0] = MIDI_PRGMCHANGE | MIDIchannel;
+				me->abEvent[1] = *(ifs.pFilePointer++);
+			}
+			break ;
+
+		case MUS_UNKNOWN1:
+		case MUS_UNKNOWN2:
+			return FALSE;
+
+		case MUS_END:
+			ifs.endEncountered = TRUE;
+			break;
+	}
+
+	me->tkEvent = ifs.tkNextEventDue;
+	if (last(event))
+		ifs.tkNextEventDue += ReadTime ();
+
+	return TRUE;
+}
+
+static int DoConversion (byte *in, DWORD insize, int division)
+{	
+	// The start of the first stream buffer contains an event to set
+	// the tempo to 500,000 microseconds per quarter note.
+	static BYTE tempoSet[3] = { 0x07, 0xa1, 0x20 };
+	static MEVENT tempoEvent = {
+		0,
+		MIDI_META, MIDI_META_TEMPO, 0, 0,
+		3,
+		tempoSet
+	};
+
+	MUSheader MUSh;
+	int i;
+
+	memset (UsedPatches, 0, sizeof(UsedPatches));
+
+	ifs.cbFile = insize;
+	ifs.pFile = in;
+
+	ifs.cbLeft = ifs.cbFile;
+	ifs.pFilePointer = ifs.pFile;
+
+	if (!ReadMUSheader (&MUSh))
+		return NOTMUSFILE;
+
+	if (MUSh.channels > 15)			/* <=> MUSchannels+drums > 16 */
+		return TOOMCHAN;
+
+	for (i = 0; i < 16; i++) {
+		MUS2MIDchannel[i] = -1;
+		MUSvelocity[i] = 64;
+	}
+	ifs.tkNextEventDue = 0;
+	ifs.endEncountered = FALSE;
+	ots.tkTrack = 0;
+	ots.pFirst = NULL;
+	ots.pLast = NULL;
+
+	if (!AddEventToStream (&tempoEvent))
+		return MEMALLOC;
+
+	while (!ifs.endEncountered) {
+		MEVENT me;
+
+		if (!GetTrackEvent (&MUSh, &me))
+			return MUSFILECOR;
+
+		if (!ifs.endEncountered && !AddEventToStream (&me))
+			return MEMALLOC;
+	}
+
+	midTimeDiv = division ? division : 70;
+
+	return 0;
+}
+
+void mus2strmCleanup (void)
+{
+	PSTREAMBUF pCurr = ots.pFirst;
+	while (pCurr) {
+		PSTREAMBUF pNext = pCurr->pNext;
+		free (pCurr);
+		pCurr = pNext;
+	}
+}
+
+PSTREAMBUF mus2strmConvert (BYTE *inFile, DWORD inSize)
+{
+	int error = DoConversion (inFile, inSize, 0);
+
+	if (error) {
+		Printf ("MUS error: ");
+		switch (error) {
+			case NOTMUSFILE:
+				Printf ("Not a MUS file.\n"); break;
+			case MUSFILECOR:
+				Printf ("MUS file is corrupt.\n"); break;
+			case TOOMCHAN:
+				Printf ("MUS file has more than 16 channels.\n"); break;
+			case MEMALLOC:
+				Printf ("Not enough memory.\n"); break;
+		}
+		mus2strmCleanup ();
+		return NULL;
+	}
+
+	return ots.pFirst;
+}
\ No newline at end of file
diff --git a/code/win32/mus2strm.h b/code/win32/mus2strm.h
new file mode 100644
index 0000000000..36cb37fe28
--- /dev/null
+++ b/code/win32/mus2strm.h
@@ -0,0 +1,45 @@
+#ifndef __MUS2STRM_H__
+#define __MUS2STRM_H__
+
+#include "mid2strm.h"
+
+#define MUS_RELEASE		0
+#define MUS_PLAY		1
+#define MUS_PITCHBEND	2
+#define MUS_SYSEVENT	3
+#define MUS_CTRLCHANGE	4
+#define MUS_UNKNOWN1	5
+#define MUS_END			6
+#define MUS_UNKNOWN2	7	
+
+#define MUSMAGIC		"MUS\032"
+
+typedef unsigned short int2;
+
+typedef struct
+{
+	char		ID[4];			/* identifier "MUS" 0x1A */
+	int2		ScoreLength;
+	int2		ScoreStart;
+	int2		channels; 		/* count of primary channels */
+	int2		SecChannels;	/* count of secondary channels (?) */
+	int2		InstrCnt;
+} MUSheader;
+
+struct Track
+{
+	unsigned long	 current;
+	char			 vel;
+	long			 DeltaTime;
+	unsigned char	 LastEvent;
+	char			*data;		/* Primary data */
+};
+
+extern OUTSTREAMSTATE ots;
+
+
+PSTREAMBUF	mus2strmConvert (BYTE *inFile, DWORD inSize);
+void		mus2strmCleanup (void);
+
+
+#endif //__MUS2STRM_H__
\ No newline at end of file
diff --git a/code/resource.h b/code/win32/resource.h
similarity index 96%
rename from code/resource.h
rename to code/win32/resource.h
index 1fa8f66b02..199d867da2 100644
--- a/code/resource.h
+++ b/code/win32/resource.h
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}
 // Microsoft Developer Studio generated include file.
-// Used by doom.rc
+// Used by zdoom.rc
 //
 #define IDI_ICON1                       101
 #define IDD_MIDASINITERROR              108
diff --git a/code/win32/zdoom.aps b/code/win32/zdoom.aps
new file mode 100644
index 0000000000..87e89cbe7b
Binary files /dev/null and b/code/win32/zdoom.aps differ
diff --git a/code/doom.rc b/code/win32/zdoom.rc
similarity index 67%
rename from code/doom.rc
rename to code/win32/zdoom.rc
index 0dd6445354..3afed4b4f2 100644
--- a/code/doom.rc
+++ b/code/win32/zdoom.rc
@@ -92,6 +92,50 @@ BEGIN
 END
 #endif    // APSTUDIO_INVOKED
 
+
+#ifndef _MAC
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,15,0,0
+ PRODUCTVERSION 1,15,0,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "Comments", "Thanks to id Software for creating DOOM and then releasing the source code. Thanks also to TeamTNT for creating BOOM, which ZDoom is partially based on.\0"
+            VALUE "CompanyName", " \0"
+            VALUE "FileDescription", "ZDoom\0"
+            VALUE "FileVersion", "1.15\0"
+            VALUE "InternalName", "ZDoom\0"
+            VALUE "LegalCopyright", "Copyright © 1998, id Software & Randy Heit\0"
+            VALUE "LegalTrademarks", "Doom® is a Registered Trademark of id Software, Inc.\0"
+            VALUE "OriginalFilename", "zdoom.exe\0"
+            VALUE "ProductName", "ZDoom\0"
+            VALUE "ProductVersion", "1.15\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif    // !_MAC
+
 #endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/code/z_zone.c b/code/z_zone.c
index 6a3750d904..fc856d55a8 100644
--- a/code/z_zone.c
+++ b/code/z_zone.c
@@ -58,8 +58,8 @@ typedef struct
 
 
 
-memzone_t*		mainzone;
-
+static memzone_t *mainzone;
+static size_t zonesize;
 
 
 //
@@ -67,7 +67,7 @@ memzone_t*		mainzone;
 //
 void Z_ClearZone (memzone_t* zone)
 {
-	memblock_t* 		block;
+	memblock_t *block;
 		
 	// set the entire zone to one free block
 	zone->blocklist.next =
@@ -87,6 +87,11 @@ void Z_ClearZone (memzone_t* zone)
 }
 
 
+static void Z_Close (void)
+{
+	free (mainzone);
+	mainzone = NULL;
+}
 
 //
 // Z_Init
@@ -94,10 +99,9 @@ void Z_ClearZone (memzone_t* zone)
 void Z_Init (void)
 {
 	memblock_t* block;
-	int 		size;
 
-	mainzone = (memzone_t *)I_ZoneBase (&size);
-	mainzone->size = size;
+	mainzone = (memzone_t *)I_ZoneBase (&zonesize);
+	mainzone->size = zonesize;
 
 	// set the entire zone to one free block
 	mainzone->blocklist.next =
@@ -114,6 +118,8 @@ void Z_Init (void)
 	block->user = NULL;
 	
 	block->size = mainzone->size - sizeof(memzone_t);
+
+	atexit (Z_Close);
 }
 
 
@@ -122,8 +128,7 @@ void Z_Init (void)
 //
 void Z_Free2 (void* ptr, char *f, int l)
 {
-	memblock_t* 		block;
-	memblock_t* 		other;
+	memblock_t *block, *other;
 		
 //#ifdef _DEBUG
 //	Z_CheckHeap ();
@@ -132,12 +137,12 @@ void Z_Free2 (void* ptr, char *f, int l)
 	block = (memblock_t *) ( (byte *)ptr - sizeof(memblock_t));
 
 	if (block->id != ZONEID)
-		I_Error ("Z_Free: freed a pointer without ZONEID\n%s, line %i", f, l);
+		I_FatalError ("Z_Free: freed a pointer without ZONEID\n%s, line %i", f, l);
 				
 	if (block->user > (void **)0x100)
 	{
 		// smaller values are not pointers
-		// Note: OS-dependend?
+		// Note: OS-dependent?
 		
 		// clear the user's mark
 		*block->user = 0;
@@ -185,11 +190,7 @@ void Z_Free2 (void* ptr, char *f, int l)
 #define MINFRAGMENT 			64
 
 
-void*
-Z_Malloc
-( int			size,
-  int			tag,
-  void* 		user )
+void *Z_Malloc (size_t size, int tag, void *user)
 {
 	int 		extra;
 	memblock_t* start;
@@ -226,7 +227,7 @@ Z_Malloc
 		if (rover == start)
 		{
 			// scanned all the way around the list
-			I_Error ("Z_Malloc: failed on allocation of %i bytes", size);
+			I_FatalError ("Z_Malloc: failed on allocation of %i bytes", size);
 		}
 		
 		if (rover->user)
@@ -282,7 +283,7 @@ Z_Malloc
 	else
 	{
 		if (tag >= PU_PURGELEVEL)
-			I_Error ("Z_Malloc: an owner is required for purgable blocks");
+			I_FatalError ("Z_Malloc: an owner is required for purgable blocks");
 
 		// mark as in use, but unowned	
 		base->user = (void *)2; 		
@@ -306,10 +307,7 @@ Z_Malloc
 //
 // Z_FreeTags
 //
-void
-Z_FreeTags
-( int			lowtag,
-  int			hightag )
+void Z_FreeTags (int lowtag, int hightag)
 {
 	memblock_t* block;
 	memblock_t* next;
@@ -330,7 +328,7 @@ Z_FreeTags
 			continue;
 		
 		if (block->tag >= lowtag && block->tag <= hightag)
-			Z_Free ( (byte *)block+sizeof(memblock_t));
+			Z_Free ((byte *)block+sizeof(memblock_t));
 	}
 }
 
@@ -340,18 +338,12 @@ Z_FreeTags
 // Z_DumpHeap
 // Note: TFileDumpHeap( stdout ) ?
 //
-void
-Z_DumpHeap
-( int			lowtag,
-  int			hightag )
+void Z_DumpHeap (int lowtag, int hightag)
 {
-	memblock_t* block;
+	memblock_t *block;
 		
-	Printf ("zone size: %i  location: %p\n",
-			mainzone->size,mainzone);
-	
-	Printf ("tag range: %i to %i\n",
-			lowtag, hightag);
+	Printf ("zone size: %i  location: %p\n", mainzone->size,mainzone);
+	Printf ("tag range: %i to %i\n", lowtag, hightag);
 		
 	for (block = mainzone->blocklist.next ; ; block = block->next)
 	{
@@ -380,7 +372,7 @@ Z_DumpHeap
 //
 // Z_FileDumpHeap
 //
-void Z_FileDumpHeap (FILE* f)
+void Z_FileDumpHeap (FILE *f)
 {
 	memblock_t* block;
 		
@@ -426,14 +418,14 @@ void Z_CheckHeap (void)
 		}
 		
 		if ( (byte *)block + block->size != (byte *)block->next)
-			I_Error ("Z_CheckHeap: block size does not touch the next block\n");
+			I_FatalError ("Z_CheckHeap: block size does not touch the next block\n");
 
 		if ( block->next->prev != block)
-			I_Error ("Z_CheckHeap: next block doesn't have proper back link\n"
-					 "(Next is %08x, Back is %08x, This is %08x", block->next, block->next->prev, block);
+			I_FatalError ("Z_CheckHeap: next block doesn't have proper back link\n"
+						  "(Next is %p, Back is %p, This is %p", block->next, block->next->prev, block);
 
 		if (!block->user && !block->next->user)
-			I_Error ("Z_CheckHeap: two consecutive free blocks\n");
+			I_FatalError ("Z_CheckHeap: two consecutive free blocks\n");
 	}
 }
 
@@ -443,20 +435,17 @@ void Z_CheckHeap (void)
 //
 // Z_ChangeTag
 //
-void
-Z_ChangeTag2
-( void* 		ptr,
-  int			tag )
+void Z_ChangeTag2 (void *ptr, int tag)
 {
-	memblock_t* block;
+	memblock_t *block;
 		
 	block = (memblock_t *) ( (byte *)ptr - sizeof(memblock_t));
 
 	if (block->id != ZONEID)
-		I_Error ("Z_ChangeTag: freed a pointer without ZONEID");
+		I_FatalError ("Z_ChangeTag: freed a pointer without ZONEID");
 
 	if (tag >= PU_PURGELEVEL && (unsigned)block->user < 0x100)
-		I_Error ("Z_ChangeTag: an owner is required for purgable blocks");
+		I_FatalError ("Z_ChangeTag: an owner is required for purgable blocks");
 
 	block->tag = tag;
 }
@@ -466,12 +455,20 @@ Z_ChangeTag2
 //
 // Z_FreeMemory
 //
-int Z_FreeMemory (void)
+static size_t numblocks;
+static size_t largestpfree, pfree, usedpblocks;	// Purgable blocks
+static size_t largestefree, efree, usedeblocks; // Empty (Unused) blocks
+static size_t largestlsize, lsize, usedlblocks;	// Locked blocks
+
+size_t Z_FreeMemory (void)
 {
-	memblock_t* 		block;
-	int 				free;
+	memblock_t *block;
+	BOOL lastpurgable = false;
 		
-	free = 0;
+	numblocks =
+		largestpfree = pfree = usedpblocks =
+		largestefree = efree = usedeblocks =
+		largestlsize = lsize = usedlblocks = 0;
 	
 //#ifdef _DEBUG
 //	Z_CheckHeap ();
@@ -481,9 +478,51 @@ int Z_FreeMemory (void)
 		 block != &mainzone->blocklist;
 		 block = block->next)
 	{
-		if (!block->user || block->tag >= PU_PURGELEVEL)
-			free += block->size;
+		numblocks++;
+
+		if (block->tag >= PU_PURGELEVEL) {
+			usedpblocks++;
+			pfree += block->size;
+			if (lastpurgable) {
+				largestpfree += block->size;
+			} else if (block->size > largestpfree) {
+				largestpfree = block->size;
+				lastpurgable = true;
+			}
+		} else if (!block->user) {
+			usedeblocks++;
+			efree += block->size;
+			if (block->size > largestefree)
+				largestefree = block->size;
+			lastpurgable = false;
+		} else {
+			usedlblocks++;
+			lsize += block->size;
+			if (block->size > largestlsize)
+				largestlsize = block->size;
+			lastpurgable = false;
+		}
 	}
-	return free;
+	return pfree + efree;
 }
 
+void Cmd_Mem (void *plyr, int argc, char **argv)
+{
+	Z_FreeMemory ();
+
+	Printf ("%u blocks:\n"
+			"% 5u used      (%u, %u)\n"
+			" % 5u purgable (%u, %u)\n"
+			" % 5u locked   (%u, %u)\n"
+			"% 5u unused    (%u, %u)\n"
+			"% 5u p-free    (%u, %u)\n",
+			numblocks,
+			usedpblocks+usedlblocks, pfree+lsize,
+			largestpfree > largestlsize ? largestpfree : largestlsize,
+			usedpblocks, pfree, largestpfree,
+			usedlblocks, lsize, largestlsize,
+			usedeblocks, efree, largestefree,
+			usedpblocks + usedeblocks, pfree + efree,
+			largestpfree > largestefree ? largestpfree : largestefree
+			);
+}
\ No newline at end of file
diff --git a/code/z_zone.h b/code/z_zone.h
index d5be4e26a8..e3d2d0f59a 100644
--- a/code/z_zone.h
+++ b/code/z_zone.h
@@ -39,13 +39,14 @@
 #define PU_DAVE 				4		// anything else Dave wants static
 #define PU_LEVEL				50		// static until level exited
 #define PU_LEVSPEC				51		// a special thinker in a level
+#define PU_LEVACS				52		// [RH] An ACS script in a level
 // Tags >= 100 are purgable whenever needed.
 #define PU_PURGELEVEL			100
 #define PU_CACHE				101
 
 
 void	Z_Init (void);
-void*	Z_Malloc (int size, int tag, void *ptr);
+void*	Z_Malloc (size_t size, int tag, void *ptr);
 void	Z_Free2 (void *ptr, char *f, int l);
 #define Z_Free(p) Z_Free2 ((p), __FILE__, __LINE__)
 void	Z_FreeTags (int lowtag, int hightag);
@@ -53,12 +54,12 @@ void	Z_DumpHeap (int lowtag, int hightag);
 void	Z_FileDumpHeap (FILE *f);
 void	Z_CheckHeap (void);
 void	Z_ChangeTag2 (void *ptr, int tag);
-int 	Z_FreeMemory (void);
+size_t 	Z_FreeMemory (void);
 
 
 typedef struct memblock_s
 {
-	int 				size;	// including the header and possibly tiny fragments
+	size_t 				size;	// including the header and possibly tiny fragments
 	void**				user;	// NULL if a free block
 	int 				tag;	// purgelevel
 	int 				id; 	// should be ZONEID
@@ -73,7 +74,7 @@ typedef struct memblock_s
 #define Z_ChangeTag(p,t) \
 { \
 	if (( (memblock_t *)( (byte *)(p) - sizeof(memblock_t)))->id!=0x1d4a11) \
-		I_Error("Z_CT at "__FILE__":%i",__LINE__); \
+		I_FatalError("Z_CT at "__FILE__":%i",__LINE__); \
 	Z_ChangeTag2(p,t); \
 };
 
diff --git a/code/zdoom.dsp b/code/zdoom.dsp
new file mode 100644
index 0000000000..87040806a5
--- /dev/null
+++ b/code/zdoom.dsp
@@ -0,0 +1,1824 @@
+# Microsoft Developer Studio Project File - Name="zdoom" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 5.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=zdoom - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "zdoom.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "zdoom.mak" CFG="zdoom - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "zdoom - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "zdoom - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE "zdoom - Win32 Profiling" (based on "Win32 (x86) Application")
+!MESSAGE 
+
+# Begin Project
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /G5 /MT /W3 /GX /O2 /I "../ptc/source" /I "win32" /I "." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "USEASM" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\midas\lib\win32\vcretail\midas.lib wsock32.lib d:\games\doom\ptc\library\win32\vc5.x\release.lib winmm.lib /nologo /subsystem:windows /pdb:none /map /machine:I386 /nodefaultlib:"libc" /out:"../zdoom.exe"
+# SUBTRACT LINK32 /verbose /profile /debug
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /I "../ptc/source" /I "win32" /I "." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "USEASM" /FAs /YX /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ddraw.lib winmm.lib ..\midas\lib\win32\vcretail\midas.lib wsock32.lib ..\ptc\library\win32\vc5.x\release.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcmt" /out:"../doomdbg.exe"
+# SUBTRACT LINK32 /profile
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "zdoom___"
+# PROP BASE Intermediate_Dir "zdoom___"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Profiling"
+# PROP Intermediate_Dir "Profiling"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /G5 /MT /W3 /GX /O2 /I "../ptc/source" /I "win32" /I "." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "USEASM" /YX /FD /c
+# ADD CPP /nologo /G5 /MT /W3 /GX /O2 /I "../ptc/source" /I "win32" /I "." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "USEASM" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\midas\lib\win32\vcretail\midas.lib wsock32.lib d:\games\doom\ptc\library\win32\vc5.x\release.lib winmm.lib /nologo /subsystem:windows /pdb:none /map /machine:I386 /nodefaultlib:"libc" /out:"../zdoom.exe"
+# SUBTRACT BASE LINK32 /verbose /profile /debug
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\midas\lib\win32\vcretail\midas.lib wsock32.lib d:\games\doom\ptc\library\win32\vc5.x\release.lib winmm.lib /nologo /subsystem:windows /profile /debug /machine:I386 /nodefaultlib:"libc" /out:"../zdoomprof.exe"
+# SUBTRACT LINK32 /verbose /map
+
+!ENDIF 
+
+# Begin Target
+
+# Name "zdoom - Win32 Release"
+# Name "zdoom - Win32 Debug"
+# Name "zdoom - Win32 Profiling"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "*.c; *.cpp"
+# Begin Source File
+
+SOURCE=.\am_map.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\c_bind.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\c_cmds.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\c_consol.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\c_cvars.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\c_dispch.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\c_varini.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\cmdlib.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\d_dehack.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\d_items.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\d_main.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\d_net.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\d_netinf.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\d_proto.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\doomdef.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\doomstat.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\dstrings.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\f_finale.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\f_wipe.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\g_game.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\g_level.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\hu_lib.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\hu_stuff.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\info.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_alloc.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_argv.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_bbox.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_cheat.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_fixed.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_menu.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_misc.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_option.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_random.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_swap.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\minilzo.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\p_acs.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\p_ceilng.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\p_doors.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\p_enemy.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\p_floor.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\p_inter.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\p_lights.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\p_lnspec.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\p_map.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\p_maputl.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\p_mobj.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\p_pillar.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\p_plats.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\p_pspr.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\p_quake.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\p_saveg.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\p_setup.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\p_sight.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\p_spec.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\p_switch.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\p_telept.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\p_things.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\p_tick.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\p_user.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\p_xlat.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\r_bsp.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\r_data.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\r_draw.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\r_main.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\r_plane.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\r_segs.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\r_sky.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\r_things.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_sndseq.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_sound.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\st_lib.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\st_new.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\st_stuff.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\tables.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\v_draw.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\v_palett.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\v_text.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\v_video.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\vectors.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\w_wad.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\wi_stuff.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\z_zone.c
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# ADD CPP /FAs
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# ADD BASE CPP /FAs
+# ADD CPP /FAs
+
+!ENDIF 
+
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "*.H"
+# Begin Source File
+
+SOURCE=.\am_map.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\c_bind.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\c_cmds.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\c_consol.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\c_cvars.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\c_dispch.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\cmdlib.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\d_dehack.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\d_englsh.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\d_event.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\d_french.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\d_items.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\d_main.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\d_net.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\d_netinf.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\d_player.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\d_proto.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\d_textur.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\d_think.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\d_ticcmd.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\doomdata.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\doomdef.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\doomstat.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\doomtype.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\dstrings.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\f_finale.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\f_wipe.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\g_game.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\g_level.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\hu_lib.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\hu_stuff.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Info.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\lzoconf.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_alloc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_argv.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_bbox.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_cheat.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_fixed.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_menu.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_misc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_random.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\m_swap.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\minilzo.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\p_acs.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\p_inter.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\p_lnspec.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\p_local.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\p_mobj.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\p_pspr.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\p_saveg.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\p_setup.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\p_spec.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\p_tick.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\r_bsp.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\r_data.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\r_defs.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\r_draw.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\r_local.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\r_main.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\r_plane.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\r_segs.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\r_sky.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\r_state.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\r_things.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\s_sound.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\st_lib.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\st_stuff.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Tables.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\v_palett.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\v_text.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\v_video.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\vectors.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\version.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\w_wad.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\wi_stuff.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\z_zone.h
+# End Source File
+# End Group
+# Begin Group "Assembly Files"
+
+# PROP Default_Filter "*.nas; *.asm"
+# Begin Source File
+
+SOURCE=.\misc.nas
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# Begin Custom Build - Executing NASM...
+IntDir=.\Release
+InputPath=.\misc.nas
+InputName=misc
+
+"$(IntDir)/$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	d:\nasm\nasm -o $(IntDir)\$(InputName).obj -f win32 $(InputPath)
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+# Begin Custom Build - Executing NASM...
+IntDir=.\Debug
+InputPath=.\misc.nas
+InputName=misc
+
+"$(IntDir)/$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	d:\nasm\nasm -o $(IntDir)\$(InputName).obj -f win32 $(InputPath)
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# Begin Custom Build - Executing NASM...
+IntDir=.\Profiling
+InputPath=.\misc.nas
+InputName=misc
+
+"$(IntDir)/$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	d:\nasm\nasmw -o $(IntDir)\$(InputName).obj -f win32 $(InputPath)
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\tmap.nas
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+# Begin Custom Build - Executing NASM...
+IntDir=.\Release
+InputPath=.\tmap.nas
+InputName=tmap
+
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	d:\nasm\nasm -o $(IntDir)\$(InputName).obj -f win32 $(InputPath)
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+# Begin Custom Build - Executing NASM...
+IntDir=.\Debug
+InputPath=.\tmap.nas
+InputName=tmap
+
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	d:\nasm\nasm -o $(IntDir)\$(InputName).obj -f win32 $(InputPath)
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+# Begin Custom Build - Executing NASM...
+IntDir=.\Profiling
+InputPath=.\tmap.nas
+InputName=tmap
+
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	d:\nasm\nasmw -o $(IntDir)\$(InputName).obj -f win32 $(InputPath)
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# End Group
+# Begin Group "Text Files"
+
+# PROP Default_Filter "*.txt"
+# Begin Source File
+
+SOURCE=..\commands.txt
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tempzd\listacs.txt
+# End Source File
+# Begin Source File
+
+SOURCE=".\docs\Rh-log.txt"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\tempzd\zwadconv.txt
+# End Source File
+# End Group
+# Begin Group "Win32 Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\win32\dxcrap.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\win32\I_input.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\win32\I_input.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\win32\I_main.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\win32\I_music.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\win32\I_music.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\win32\I_net.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\win32\i_net.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\win32\I_sound.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\win32\I_sound.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\win32\I_system.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\win32\I_system.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\win32\I_video.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\win32\I_video.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\win32\icon1.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\win32\mid2strm.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\win32\mid2strm.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\win32\mus2strm.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\win32\mus2strm.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\win32\resource.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\win32\zdoom.rc
+
+!IF  "$(CFG)" == "zdoom - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "zdoom - Win32 Profiling"
+
+!ENDIF 
+
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/ptc.diff b/ptc.diff
index 1fce8c4951..b7de38d860 100644
--- a/ptc.diff
+++ b/ptc.diff
@@ -1,6 +1,6 @@
-diff -c -d ptc-073b/globals.h ptc/source/GLOBALS.H
-*** ptc-073b/globals.h	Thu May 28 20:03:10 1998
---- ptc/source/GLOBALS.H	Tue May 05 23:29:34 1998
+diff -c -r -d ptcnew/source/GLOBALS.H ptc/source/GLOBALS.H
+*** ptcnew/source/GLOBALS.H	Thu May 28 20:03:10 1998
+--- ptc/source/GLOBALS.H	Wed Dec 16 17:52:16 1998
 ***************
 *** 37,42 ****
 --- 37,43 ----
@@ -25,9 +25,9 @@ diff -c -d ptc-073b/globals.h ptc/source/GLOBALS.H
   
   
   
-diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
-*** ptc-073b/idirectx.cpp	Mon Jun 08 13:21:36 1998
---- ptc/source/Idirectx.cpp	Wed Jul 08 20:49:18 1998
+diff -c -r -d ptcnew/source/IDIRECTX.CPP ptc/source/IDIRECTX.CPP
+*** ptcnew/source/IDIRECTX.CPP	Mon Jun 08 13:21:36 1998
+--- ptc/source/IDIRECTX.CPP	Wed Dec 16 17:52:12 1998
 ***************
 *** 23,30 ****
   IDirectX::IDirectX(WINDOW window)
@@ -1081,12 +1081,16 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
   
 ***************
 *** 870,875 ****
---- 994,1001 ----
+--- 994,1005 ----
   
           // clear buffer
           Buffer=NULL;
 + 
-+ 		if (lpFDDS) lpFDDS->Flip (NULL, DDFLIP_WAIT);
++ 		if (lpFDDS) {
++ 			HRESULT dderr = lpFDDS->Flip (NULL, DDFLIP_WAIT);
++ 			if (dderr == DDERR_SURFACELOST)
++ 				Restore();
++ 		}
       }
   
       // decrement lock count
@@ -1119,7 +1123,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
   
       // success
       return 1;
---- 1019,1029 ----
+--- 1023,1033 ----
   
   int IDirectX::SURFACE::Restore()
   {
@@ -1167,7 +1171,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
           CloseDisplay();
           return 0;
       }
---- 1118,1163 ----
+--- 1122,1167 ----
   
   int IDirectX::InitDisplay(int x,int y,int id,int output,int frequency,int layout)
   {
@@ -1279,7 +1283,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
           return 1;
       }
       
---- 1166,1244 ----
+--- 1170,1248 ----
       if (!EnterDisplayMode(x,y,id,frequency)) 
       {
           // failure
@@ -1368,7 +1372,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
           CloseDisplay();
           return 0;
       }
---- 1246,1254 ----
+--- 1250,1258 ----
       if (!InitDisplayStart(x,y,output,frequency,layout))
       {
           // failure
@@ -1387,7 +1391,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
           CloseDisplay();
           return 0;
       }
---- 1257,1265 ----
+--- 1261,1269 ----
       if (!EnterDisplayMode(x,y,format,frequency)) 
       {
           // failure
@@ -1419,7 +1423,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
   
       // leave display mode
       LeaveDisplayMode();
---- 1268,1293 ----
+--- 1272,1297 ----
       if (!InitDisplayFinish(x,y,format,output,frequency,layout)) 
       {
           // failure
@@ -1455,7 +1459,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
   }
   
   
---- 1298,1306 ----
+--- 1302,1310 ----
       // close display Window
       CloseDisplayWindow();
   
@@ -1480,7 +1484,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
           return 0;
       }
   
---- 1310,1326 ----
+--- 1314,1330 ----
   
   
   int IDirectX::EnterDisplayMode(int x,int y,int id,int frequency)
@@ -1517,7 +1521,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
   
       // check format
       if (!format.ok()) return 0;
---- 1349,1369 ----
+--- 1353,1373 ----
       }
   
       // set by bits per pixel
@@ -1573,7 +1577,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
       }
       else return 0;
       
---- 1371,1439 ----
+--- 1375,1443 ----
       // enter exclusive mode
       if (!EnterExclusiveMode())
       {
@@ -1674,7 +1678,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
   
       // success
       return 1;
---- 1444,1490 ----
+--- 1448,1494 ----
   
   int IDirectX::SetDisplayMode(int x,int y,FORMAT const &format,int frequency)
   {
@@ -1767,7 +1771,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
           if (result==DDERR_HWNDALREADYSET)
           {
               // close old
---- 1634,1682 ----
+--- 1638,1686 ----
   
   int IDirectX::EnterExclusiveMode()
   {   
@@ -1860,7 +1864,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
       return 1;
   }
   
---- 1685,1731 ----
+--- 1689,1735 ----
               // reinitialize directdraw
               if (!InitDirectDraw()) 
               {
@@ -1923,7 +1927,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
   }
   
   
---- 1733,1749 ----
+--- 1737,1753 ----
   void IDirectX::LeaveExclusiveMode()
   {
       // debug
@@ -1950,7 +1954,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
   
       // close old
       CloseDirectDraw();
---- 1754,1762 ----
+--- 1758,1766 ----
   
   int IDirectX::InitDirectDraw()
   {
@@ -1969,7 +1973,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
           return 0;
       }
   
---- 1765,1773 ----
+--- 1769,1777 ----
       DirectDrawInstance=(HMODULE)LoadLibrary("ddraw.dll");
       if (!DirectDrawInstance)
       {
@@ -1996,7 +2000,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
           if (lpDD) lpDD->Release();
           lpDD=NULL;
           return 0;
---- 1775,1793 ----
+--- 1779,1797 ----
       DIRECTDRAWCREATE_FUNCTION DirectDrawCreateFunction = (DIRECTDRAWCREATE_FUNCTION) GetProcAddress(DirectDrawInstance,"DirectDrawCreate");    
       if (!DirectDrawCreateFunction)
       {
@@ -2030,7 +2034,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
       return 1;
   }
   
---- 1812,1829 ----
+--- 1816,1833 ----
       if (result!=DD_OK) 
       {
           // failure
@@ -2058,7 +2062,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
   }
   
   
---- 1845,1854 ----
+--- 1849,1858 ----
       lpDD2=NULL;    
   
       // release ddraw.dll
@@ -2078,7 +2082,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
       {
           // todo: fix mode changes fullscreen->fullscreen
       }
---- 1868,1874 ----
+--- 1872,1878 ----
           // resize existing window
           if (ResizeDisplayWindow(width,height,output)) return 1;
       }
@@ -2096,7 +2100,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
   
       // specific initialization
       if (output==WINDOWED)
---- 1879,1886 ----
+--- 1883,1890 ----
       // adjust window size
       AdjustWindowSize(width,height,output);
   
@@ -2117,7 +2121,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
       }
       else return 0;
   
---- 1888,1897 ----
+--- 1892,1901 ----
           // create windowed output window
           if (!CreateManagedWindow("PTC_DIRECTX_WINDOWED",WS_OVERLAPPEDWINDOW,SW_NORMAL,CW_USEDEFAULT,CW_USEDEFAULT,width,height)) return 0;
       }
@@ -2139,7 +2143,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
   
       // enter critical section
       EnterWindowCriticalSection();
---- 1936,1946 ----
+--- 1940,1950 ----
   
   
   
@@ -2160,7 +2164,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
   
       // initialize new video memory surface (primary)
       Primary=new Surface(this,XResolution,YResolution,Format,VIDEO);
---- 1952,1958 ----
+--- 1956,1962 ----
       int result=1;
   
       // set primary flag
@@ -2180,7 +2184,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
   
       // finished
       return result;
---- 1969,1978 ----
+--- 1973,1982 ----
       // leave critical section
       LeaveWindowCriticalSection();
       
@@ -2201,7 +2205,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
       return 0;
   }
   
---- 2006,2013 ----
+--- 2010,2017 ----
       // enumerate directx modes
       if (lpDD2) if (lpDD2->EnumDisplayModes(0,NULL,(LPVOID)this,(LPDDENUMMODESCALLBACK)EnumDisplayModesCallback)==DD_OK) return 1;
       else if (lpDD) if (lpDD->EnumDisplayModes(0,NULL,(LPVOID)this,(LPDDENUMMODESCALLBACK)EnumDisplayModesCallback)==DD_OK) return 1;
@@ -2219,7 +2223,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
   }
   
   
---- 2074,2080 ----
+--- 2078,2084 ----
           // indexed 8bit color
           return format.init(INDEX8);
       }
@@ -2236,7 +2240,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
       return 0;
   }
   
---- 2116,2124 ----
+--- 2120,2128 ----
       }
   
       // failure
@@ -2279,7 +2283,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
   
       // default frequency is UNKNOWN (?)
       if (frequency==DEFAULT) frequency=UNKNOWN;
---- 2131,2171 ----
+--- 2135,2175 ----
   int IDirectX::InitDisplayStart(int &x,int &y,int &output,int &frequency,int &layout)
   {
       // debug
@@ -2401,7 +2405,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
   
       // clear primary palette
       uint *data=(uint*)PrimaryPalette.Lock();
---- 2173,2267 ----
+--- 2177,2271 ----
       // check layout
       if (layout!=DEFAULT && layout!=LINEAR) 
       {
@@ -2583,7 +2587,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
       return format;
   }
   
---- 2275,2347 ----
+--- 2279,2351 ----
       }
   
       // success
@@ -2666,7 +2670,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
       // leave critical section
       LeaveStaticCriticalSection();
       return result;
---- 2390,2396 ----
+--- 2394,2400 ----
           // next
           current=iterator.next();
       }
@@ -2684,7 +2688,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
   
               // hide cursor
               SetCursor(NULL);
---- 2565,2574 ----
+--- 2569,2578 ----
       switch (message) 
       { 
           case WM_CREATE:
@@ -2704,7 +2708,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
   
               /*
               // check primary surface
---- 2576,2584 ----
+--- 2580,2588 ----
   
           case WM_PAINT:
   
@@ -2736,7 +2740,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
   
                   // hide cursor
                   SetCursor(NULL);
---- 2627,2652 ----
+--- 2631,2656 ----
   
           case WM_SETCURSOR: 
               
@@ -2778,7 +2782,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
                       // disable window deactivation
                       SetActiveWindow(hWnd);
                       SetForegroundWindow(hWnd);
---- 2656,2670 ----
+--- 2660,2674 ----
               }
               else
               {
@@ -2804,7 +2808,7 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
                       // check
                       if (i)
                       {
---- 2672,2680 ----
+--- 2676,2684 ----
                   else
                   {
                       // allow window deactivation
@@ -2823,17 +2827,17 @@ diff -c -d ptc-073b/idirectx.cpp ptc/source/Idirectx.cpp
   
           default:
   
---- 2716,2721 ----
-diff -c -d ptc-073b/idirectx.h ptc/source/idirectx.h
-*** ptc-073b/idirectx.h	Sun Jun 07 16:26:52 1998
---- ptc/source/idirectx.h	Tue Jun 09 16:26:02 1998
+--- 2720,2725 ----
+diff -c -r -d ptcnew/source/IDIRECTX.H ptc/source/Idirectx.h
+*** ptcnew/source/IDIRECTX.H	Sun Jun 07 16:26:52 1998
+--- ptc/source/Idirectx.h	Wed Dec 16 18:07:06 1998
 ***************
 *** 121,126 ****
 --- 121,127 ----
                   void *Buffer;                   // surface buffer
                   LPDIRECTDRAWSURFACE lpDDS;      // directdraw surface
                   LPDIRECTDRAWSURFACE2 lpDDS2;    // directdraw surface 2
-+ 				LPDIRECTDRAWSURFACE lpFDDS;		// [RH] front directdraw surface (when double buffering)
++                 LPDIRECTDRAWSURFACE lpFDDS;     // [RH] front directdraw surface (when double buffering)
                   int Count;                      // surface lock count
                   int Primary;                    // primary surface flag
                   IDirectX *LocalInterface;       // local interface
@@ -2854,9 +2858,58 @@ diff -c -d ptc-073b/idirectx.h ptc/source/idirectx.h
           void ClosePrimary();
   
           // modelist routines
-diff -c -d ptc-073b/iwin32.cpp ptc/source/Iwin32.cpp
-*** ptc-073b/iwin32.cpp	Mon Jun 08 13:09:24 1998
---- ptc/source/Iwin32.cpp	Tue Jun 09 16:39:50 1998
+diff -c -r -d ptcnew/source/IWIN32.CPP ptc/source/Iwin32.cpp
+*** ptcnew/source/IWIN32.CPP	Mon Jun 08 13:09:24 1998
+--- ptc/source/Iwin32.cpp	Wed Dec 16 18:09:46 1998
+***************
+*** 293,300 ****
+  
+  int IWin32::CreateManagedWindow(char wndclass[],uint style,int show,int x,int y,int width,int height)
+  {
+!     //printf("IWin32::CreateManagedWindow\n");
+! 
+      // fail if not managed
+      if (!Managed) return 0;
+  
+--- 293,299 ----
+  
+  int IWin32::CreateManagedWindow(char wndclass[],uint style,int show,int x,int y,int width,int height)
+  {
+! 	//printf("IWin32::CreateManagedWindow\n");
+      // fail if not managed
+      if (!Managed) return 0;
+  
+***************
+*** 360,373 ****
+      
+      // close window thread info event
+      if (info.event) CloseHandle(info.event);
+! 
+!     // just to be safe ...
+!     //printf("before sleep\n");
+!     Sleep(200);
+!     //printf("after sleep\n");
+  
+      // success
+!     //printf("IWin32::CreateManagedWindow ok\n");
+      return 1;
+  }
+  
+--- 359,372 ----
+      
+      // close window thread info event
+      if (info.event) CloseHandle(info.event);
+!     
+! 	// just to be safe...
+! 	//printf("before sleep\n");
+! 	Sleep(200);
+! 	//printf("after sleep\n");
+  
+      // success
+! 	//printf("IWin32::CreateManagedWindow ok\n");
+      return 1;
+  }
+  
 ***************
 *** 417,429 ****
   
@@ -2889,6 +2942,134 @@ diff -c -d ptc-073b/iwin32.cpp ptc/source/Iwin32.cpp
           // cleanup
           delete WindowThread;
 ***************
+*** 619,629 ****
+          SetFocus(window);
+  
+          // force window to foreground
+!         //printf("SetForegroundWindow\n");
+          SetForegroundWindow(window);
+  
+          // todo: set event to indicate message loop is ready
+!         //printf("starting message loop\n");
+  
+          // signal window event
+          SetEvent(info->event);
+--- 620,630 ----
+          SetFocus(window);
+  
+          // force window to foreground
+! 		//printf("SetForegroundWindow\n");
+          SetForegroundWindow(window);
+  
+          // todo: set event to indicate message loop is ready
+! 		//printf("starting message loop\n");
+  
+          // signal window event
+          SetEvent(info->event);
+***************
+*** 631,638 ****
+          // message loop
+          MSG msg;
+          while (GetMessage(&msg,NULL,0,0)==TRUE)
+!         {       
+!             //printf("translating message\n");
+              TranslateMessage(&msg);
+              DispatchMessage(&msg);
+          }
+--- 632,639 ----
+          // message loop
+          MSG msg;
+          while (GetMessage(&msg,NULL,0,0)==TRUE)
+!         {
+! 			//printf("translating message\n");
+              TranslateMessage(&msg);
+              DispatchMessage(&msg);
+          }
+***************
+*** 640,648 ****
+      else
+      {
+          // failure
+!         //printf("bad window create\n");
+          SetEvent(info->event);
+!         //printf("SetEvent(info->event)\n");
+      }
+  }
+  
+--- 641,649 ----
+      else
+      {
+          // failure
+! 		//printf("bad window create\n");
+          SetEvent(info->event);
+! 		//printf("SetEvent(info->event)\n");
+      }
+  }
+  
+***************
+*** 659,667 ****
+      if (i)
+      {
+          switch (message) 
+!         {
+              case WM_KEYDOWN: 
+!             { 
+                  //printf("IWin32::WndProc - WM_KEYDOWN (i)\n");
+  
+                  // enter critical section
+--- 660,668 ----
+      if (i)
+      {
+          switch (message) 
+!         { 
+              case WM_KEYDOWN: 
+!             {   
+                  //printf("IWin32::WndProc - WM_KEYDOWN (i)\n");
+  
+                  // enter critical section
+***************
+*** 705,713 ****
+                      // fill window with black
+                      RECT rect;
+                      GetClientRect(hWnd,&rect);
+!                     HBRUSH black=GetStockObject(BLACK_BRUSH);
+                      HDC dc=GetDC(hWnd);
+!                     HBRUSH old=SelectObject(dc,black);
+                      Rectangle(dc,rect.left,rect.top,rect.right,rect.bottom);
+                      SelectObject(dc,old);
+                      ReleaseDC(hWnd,dc);
+--- 706,714 ----
+                      // fill window with black
+                      RECT rect;
+                      GetClientRect(hWnd,&rect);
+!                     HBRUSH black=(HBRUSH)GetStockObject(BLACK_BRUSH);
+                      HDC dc=GetDC(hWnd);
+!                     HBRUSH old=(HBRUSH)SelectObject(dc,black);
+                      Rectangle(dc,rect.left,rect.top,rect.right,rect.bottom);
+                      SelectObject(dc,old);
+                      ReleaseDC(hWnd,dc);
+***************
+*** 757,765 ****
+                  // fill window with black
+                  RECT rect;
+                  GetClientRect(hWnd,&rect);
+!                 HBRUSH black=GetStockObject(BLACK_BRUSH);
+                  HDC dc=GetDC(hWnd);
+!                 HBRUSH old=SelectObject(dc,black);
+                  Rectangle(dc,rect.left,rect.top,rect.right,rect.bottom);
+                  SelectObject(dc,old);
+                  ReleaseDC(hWnd,dc);
+--- 758,766 ----
+                  // fill window with black
+                  RECT rect;
+                  GetClientRect(hWnd,&rect);
+!                 HBRUSH black=(HBRUSH)GetStockObject(BLACK_BRUSH);
+                  HDC dc=GetDC(hWnd);
+!                 HBRUSH old=(HBRUSH)SelectObject(dc,black);
+                  Rectangle(dc,rect.left,rect.top,rect.right,rect.bottom);
+                  SelectObject(dc,old);
+                  ReleaseDC(hWnd,dc);
+***************
 *** 864,866 ****
 --- 865,883 ----
   
@@ -2896,7 +3077,7 @@ diff -c -d ptc-073b/iwin32.cpp ptc/source/Iwin32.cpp
   #endif
 + 
 + 
-+ // [RH] Debugginf printf for Win32 debuggers
++ // [RH] Debugging printf for Win32 debuggers
 + #ifdef HAVEDPRINTF
 + void Dprintf (char *fmt, ...)
 + {
@@ -2911,3 +3092,231 @@ diff -c -d ptc-073b/iwin32.cpp ptc/source/Iwin32.cpp
 + }
 + #endif
 \ No newline at end of file
+diff -c -r -d ptcnew/source/source.dsp ptc/source/source.dsp
+*** ptcnew/source/source.dsp	Thu May 28 20:03:12 1998
+--- ptc/source/source.dsp	Thu Nov 26 18:24:14 1998
+***************
+*** 61,74 ****
+  # PROP Intermediate_Dir "..\library\win32\vc5.x\debug"
+  # PROP Target_Dir ""
+  # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+! # ADD CPP /nologo /G5 /MTd /W3 /GX /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
+  # SUBTRACT CPP /YX
+  BSC32=bscmake.exe
+  # ADD BASE BSC32 /nologo
+  # ADD BSC32 /nologo
+  LIB32=link.exe -lib
+  # ADD BASE LIB32 /nologo
+! # ADD LIB32 /nologo /out:"..\library\win32\vc5.x\debug.lib"
+  
+  !ENDIF 
+  
+--- 61,75 ----
+  # PROP Intermediate_Dir "..\library\win32\vc5.x\debug"
+  # PROP Target_Dir ""
+  # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+! # ADD CPP /nologo /G5 /MTd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
+  # SUBTRACT CPP /YX
+  BSC32=bscmake.exe
+  # ADD BASE BSC32 /nologo
+  # ADD BSC32 /nologo
+  LIB32=link.exe -lib
+  # ADD BASE LIB32 /nologo
+! # ADD LIB32 /out:"..\library\win32\vc5.x\debug.lib"
+! # SUBTRACT LIB32 /nologo
+  
+  !ENDIF 
+  
+***************
+*** 480,486 ****
+  InputName=mmx_16
+  
+  "$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+! 	nasm $(InputPath) -f coff -o $(OutDir)\$(InputName).obj
+  
+  # End Custom Build
+  
+--- 481,487 ----
+  InputName=mmx_16
+  
+  "$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+! 	d:\nasm\nasmw $(InputPath) -f coff -o $(OutDir)\$(InputName).obj
+  
+  # End Custom Build
+  
+***************
+*** 511,517 ****
+  InputName=mmx_32
+  
+  "$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+! 	nasm $(InputPath) -f coff -o $(OutDir)\$(InputName).obj
+  
+  # End Custom Build
+  
+--- 512,518 ----
+  InputName=mmx_32
+  
+  "$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+! 	d:\nasm\nasmw $(InputPath) -f coff -o $(OutDir)\$(InputName).obj
+  
+  # End Custom Build
+  
+***************
+*** 542,548 ****
+  InputName=mmx_8
+  
+  "$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+! 	nasm $(InputPath) -f coff -o $(OutDir)\$(InputName).obj
+  
+  # End Custom Build
+  
+--- 543,549 ----
+  InputName=mmx_8
+  
+  "$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+! 	d:\nasm\nasmw $(InputPath) -f coff -o $(OutDir)\$(InputName).obj
+  
+  # End Custom Build
+  
+***************
+*** 573,579 ****
+  InputName=mmx_copy
+  
+  "$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+! 	nasm $(InputPath) -f coff -o $(OutDir)\$(InputName).obj
+  
+  # End Custom Build
+  
+--- 574,580 ----
+  InputName=mmx_copy
+  
+  "$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+! 	d:\nasm\nasmw $(InputPath) -f coff -o $(OutDir)\$(InputName).obj
+  
+  # End Custom Build
+  
+***************
+*** 604,610 ****
+  InputName=mmx_fake
+  
+  "$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+! 	nasm $(InputPath) -f coff -o $(OutDir)\$(InputName).obj
+  
+  # End Custom Build
+  
+--- 605,611 ----
+  InputName=mmx_fake
+  
+  "$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+! 	d:\nasm\nasmw $(InputPath) -f coff -o $(OutDir)\$(InputName).obj
+  
+  # End Custom Build
+  
+***************
+*** 635,641 ****
+  InputName=tables
+  
+  "$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+! 	nasm $(InputPath) -f coff -o $(OutDir)\$(InputName).obj
+  
+  # End Custom Build
+  
+--- 636,642 ----
+  InputName=tables
+  
+  "$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+! 	d:\nasm\nasmw $(InputPath) -f coff -o $(OutDir)\$(InputName).obj
+  
+  # End Custom Build
+  
+***************
+*** 666,672 ****
+  InputName=x86_16
+  
+  "$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+! 	nasm $(InputPath) -f coff -o $(OutDir)\$(InputName).obj
+  
+  # End Custom Build
+  
+--- 667,673 ----
+  InputName=x86_16
+  
+  "$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+! 	d:\nasm\nasmw $(InputPath) -f coff -o $(OutDir)\$(InputName).obj
+  
+  # End Custom Build
+  
+***************
+*** 697,703 ****
+  InputName=x86_32
+  
+  "$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+! 	nasm $(InputPath) -f coff -o $(OutDir)\$(InputName).obj
+  
+  # End Custom Build
+  
+--- 698,704 ----
+  InputName=x86_32
+  
+  "$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+! 	d:\nasm\nasmw $(InputPath) -f coff -o $(OutDir)\$(InputName).obj
+  
+  # End Custom Build
+  
+***************
+*** 728,734 ****
+  InputName=x86_8
+  
+  "$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+! 	nasm $(InputPath) -f coff -o $(OutDir)\$(InputName).obj
+  
+  # End Custom Build
+  
+--- 729,735 ----
+  InputName=x86_8
+  
+  "$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+! 	d:\nasm\nasmw $(InputPath) -f coff -o $(OutDir)\$(InputName).obj
+  
+  # End Custom Build
+  
+***************
+*** 759,765 ****
+  InputName=x86_copy
+  
+  "$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+! 	nasm $(InputPath) -f coff -o $(OutDir)\$(InputName).obj
+  
+  # End Custom Build
+  
+--- 760,766 ----
+  InputName=x86_copy
+  
+  "$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+! 	d:\nasm\nasmw $(InputPath) -f coff -o $(OutDir)\$(InputName).obj
+  
+  # End Custom Build
+  
+***************
+*** 790,796 ****
+  InputName=x86_fake
+  
+  "$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+! 	nasm $(InputPath) -f coff -o $(OutDir)\$(InputName).obj
+  
+  # End Custom Build
+  
+--- 791,797 ----
+  InputName=x86_fake
+  
+  "$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+! 	d:\nasm\nasmw $(InputPath) -f coff -o $(OutDir)\$(InputName).obj
+  
+  # End Custom Build
+  
+Only in ptc/source: SOURCE.DSW
+Only in ptc/source: SOURCE.ncb
+Only in ptc/source: SOURCE.OPT
+Only in ptc/source: SOURCE.PLG
+Only in ptc/source: vc5x.ncb
+Only in ptc/source: vc5x.opt
diff --git a/readme.14a.txt b/readme.14a.txt
deleted file mode 100644
index ec918ec02a..0000000000
--- a/readme.14a.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-This archive contains a unified diff that will patch the source code for
-ZDoom version 1.14 to 1.14a. To use it, you need to have already downloaded
-the archive zdoom114-src.zip and extracted its contains. Then extract
-patch.diff from this archive into your source code directory and apply it
-with the command:
-
-    patch -F 3 -i patch.diff
-
-(You need to have kept the patch.exe included with zdoom114-src.zip.)
-
-Note that there was another version of this archive from July. The only
-difference between that one and this one is that this one fixes the
-savegame loading bug. If you already installed that patch, you can do the
-fix yourself by changing one string in G_DoLoadGame() in g_game.c. The
-string "version %i" should be changed to "version %ia".
-
-Randy Heit
-rheit@usa.net
\ No newline at end of file
diff --git a/readme.txt b/readme.txt
index 34f79e25e0..fc058fcd9f 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,4 +1,4 @@
-This is the source code for ZDoom 1.14 released on 14 July 1998.
+This is the source code for ZDoom 1.16 released on 22 December 1998.
 
 It is based on the Linux DOOM sources that were prepared by B. Krenheimer
 and generously released by John Carmack shortly before Christmas, 1997. If
@@ -40,17 +40,16 @@ packages if you don't already have them. These are:
     will not work unmodified with ZDoom. A context diff has been provided
     along with a copy of GNU patch to generate a version of PTC that works
     with ZDoom. To use it, you need to download the source code for PTC
-    0.73b (available by following the Developers link from the above page).
-    Extract it to some directory (in my case e:/ptc/source), then using a
-    DOS window, CD to that directory and apply the ptc.diff file using the
-    command line:
+    0.72 and the DirectX fix. Extract it to some directory (in my case
+    f:/games/doom/ptc/source), then using a DOS window, CD to that
+    directory and apply the ptc.diff file using the command line:
 
         patch < ptc.diff
 
     Then you'll need to build at least the release build of PTC. The
     batch files provided with PTC to do this will generate the library
     somewhere in ../library. In my case, this ends up being
-    e:/ptc/library/win32/vc5.x.
+    d:/games/doom/ptc/library/win32/vc5.x.
 
   NASM (for the assembly files)
     http://www.cryogen.com/Nasm
@@ -63,21 +62,17 @@ assumptions about the development environment:
 
     MIDAS is installed at the same location in the directory hierarchy as
     the ZDoom source code. In my case, I have the source in
-    f:/games/doom/code, so MIDAS is in f:/games/doom/midas. I_music.c and
+    d:/games/doom/code, so MIDAS is in d:/games/doom/midas. I_music.c and
     I_sound.c also look for MIDAS include files in the "../midas"
     directory.
 
     NASM is installed in d:/nasm.
 
-    PTC is installed in e:/ptc.
+    PTC is installed in d:/games/doom/ptc.
 
 If you want to put things in different places, you'll need to adjust the
 project file accordingly.
 
-The file doom.mak is what VC++ generated when I told it to "Export
-Makefile...." I have no idea if it's of any use to anyone, but if you don't
-have VC++ 5.x, it may be worthwhile to try adapting it to your compiler.
-
 This code should also compile with Watcom C 10.6 (and presumably newer
 versions as well). If you use Watcom, please tell me if the following NASM
 line generates object files far tmap.nas and misc.nas that are usable with