From 19a7cf743ecc48dca462b6182e187854011dde44 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Thu, 27 Apr 2006 15:12:17 +0000
Subject: [PATCH] SVN r68 (trunk)

---
 docs/rh-log.txt           | 3 +++
 src/g_level.cpp           | 2 ++
 src/g_level.h             | 2 ++
 src/p_setup.cpp           | 2 ++
 src/p_xlat.cpp            | 5 +----
 wadsrc/mapinfo/strife.txt | 2 +-
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 0782bbecc..0b9878871 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,4 +1,7 @@
 April 23, 2006 (Changes by Graf Zahl)
+- Added a clipmidtextures level flag which exposes the ML_CLIP_MIDTEX
+  feature globally per level. Also moved the setting of this flag for Strife
+  into MAPINFO.
 - Added MBF's logic to move monsters away from a dropoff but changed it
   so that it doesn't require a general change in the movement code.
 - Added: The Trace function needs a compatibility option to exclude
diff --git a/src/g_level.cpp b/src/g_level.cpp
index cd3639359..acc1f1b56 100644
--- a/src/g_level.cpp
+++ b/src/g_level.cpp
@@ -240,6 +240,7 @@ static const char *MapInfoMapLevel[] =
 	"sndseq",
 	"sndinfo",
 	"soundinfo",
+	"clipmidtextures",
 	NULL
 };
 
@@ -351,6 +352,7 @@ MapHandlers[] =
 	{ MITYPE_LUMPNAME,	lioffset(sndseq), 0 },
 	{ MITYPE_LUMPNAME,	lioffset(soundinfo), 0 },
 	{ MITYPE_LUMPNAME,	lioffset(soundinfo), 0 },
+	{ MITYPE_SETFLAG,	LEVEL_CLIPMIDTEX, 0 },
 };
 
 static const char *MapInfoClusterLevel[] =
diff --git a/src/g_level.h b/src/g_level.h
index d45262e6b..61128e17d 100644
--- a/src/g_level.h
+++ b/src/g_level.h
@@ -100,6 +100,8 @@
 
 #define LEVEL_MUSICDEFINED			UCONST64(0x8000000000)		// a marker to disable the $map command in SNDINFO for this map
 #define LEVEL_MONSTERFALLINGDAMAGE	UCONST64(0x10000000000)
+#define LEVEL_CLIPMIDTEX			UCONST64(0x20000000000)
+
 struct acsdefered_s;
 class FBehavior;
 
diff --git a/src/p_setup.cpp b/src/p_setup.cpp
index 32627fe1c..070614261 100644
--- a/src/p_setup.cpp
+++ b/src/p_setup.cpp
@@ -1477,6 +1477,7 @@ void P_LoadLineDefs (int lump)
 
 		P_AdjustLine (ld);
 		P_SaveLineSpecial (ld);
+		if (level.flags&LEVEL_CLIPMIDTEX) ld.flags|=ML_CLIP_MIDTEX;
 	}
 }
 
@@ -1547,6 +1548,7 @@ void P_LoadLineDefs2 (int lump)
 
 		P_AdjustLine (ld);
 		P_SaveLineSpecial (ld);
+		if (level.flags&LEVEL_CLIPMIDTEX) ld.flags|=ML_CLIP_MIDTEX;
 	}
 }
 
diff --git a/src/p_xlat.cpp b/src/p_xlat.cpp
index 1ede6095a..12e6cbc9e 100644
--- a/src/p_xlat.cpp
+++ b/src/p_xlat.cpp
@@ -71,9 +71,6 @@ void P_TranslateLineDef (line_t *ld, maplinedef_t *mld)
 	BOOL passthrough;
 	int i;
 
-	// In Doom format maps, the tag is always the same as the line's id.
-	ld->id = tag;
-
 	if (flags & ML_TRANSLUCENT_STRIFE)
 	{
 		ld->alpha = 255*3/4;
@@ -91,7 +88,7 @@ void P_TranslateLineDef (line_t *ld, maplinedef_t *mld)
 		{
 			flags |= ML_BLOCK_FLOATERS;
 		}
-		flags |= ML_CLIP_MIDTEX;
+		//flags |= ML_CLIP_MIDTEX; moved to MAPINFO
 		passthrough = 0;
 	}
 	else
diff --git a/wadsrc/mapinfo/strife.txt b/wadsrc/mapinfo/strife.txt
index 41672b49e..9fede0d2e 100644
--- a/wadsrc/mapinfo/strife.txt
+++ b/wadsrc/mapinfo/strife.txt
@@ -4,7 +4,7 @@ defaultmap
 forcenoskystretch
 strifefallingdamage
 nointermission
-
+clipmidtextures
 
 map MAP01 "AREA  1: sanctuary"
 next MAP02