- Fixed: In P_LineOpening_3dMidtex(), set the floorpic or ceilingpic to the 3D midtex if it

alters the opening. This fixes things such as removing a projectile when it hits a 3D midtex
  instead of exploding it because the real floor or ceiling is sky.

SVN r3490 (trunk)

src/p_3dmidtex.cpp

@@ -256,23 +256,28 @@ bool P_GetMidTexturePosition(const line_t *line, int sideno, fixed_t *ptextop, f
 //
 //============================================================================
 
-bool P_LineOpening_3dMidtex(AActor *thing, const line_t *linedef, fixed_t &opentop, fixed_t &openbottom, bool *above)
+bool P_LineOpening_3dMidtex(AActor *thing, const line_t *linedef, FLineOpening &open)
 {
 	fixed_t tt, tb;
 
-	*above = false;
+	open.abovemidtex = false;
 	if (P_GetMidTexturePosition(linedef, 0, &tt, &tb))
 	{
 		if (thing->z + (thing->height/2) < (tt + tb)/2)
 		{
-			if(tb < opentop) opentop = tb;
+			if (tb < open.top)
+			{
+				open.top = tb;
+				open.ceilingpic = linedef->sidedef[0]->GetTexture(side_t::mid);
+			}
 		}
 		else
 		{
-			if(tt > openbottom) 
+			if (tt > open.bottom) 
 			{
-				openbottom = tt;
+				open.bottom = tt;
-				*above = true;
+				open.abovemidtex = true;
+				open.floorpic = linedef->sidedef[0]->GetTexture(side_t::mid);
 			}
 			// returns true if it touches the midtexture
 			return (abs(thing->z - tt) <= thing->MaxStepHeight);

src/p_3dmidtex.h

@@ -14,7 +14,7 @@ void P_Start3dMidtexInterpolations(TArray<DInterpolation *> &list, sector_t *sec
 void P_Attach3dMidtexLinesToSector(sector_t *dest, int lineid, int tag, bool ceiling);
 bool P_GetMidTexturePosition(const line_t *line, int sideno, fixed_t *ptextop, fixed_t *ptexbot);
 bool P_Check3dMidSwitch(AActor *actor, line_t *line, int side);
-bool P_LineOpening_3dMidtex(AActor *thing, const line_t *linedef, fixed_t &opentop, fixed_t &openbottom, bool *above);
+bool P_LineOpening_3dMidtex(AActor *thing, const line_t *linedef, struct FLineOpening &open);
 
 bool P_MoveLinkedSectors(sector_t *sector, int crush, fixed_t move, bool ceiling);
 void P_StartLinkedSectorInterpolations(TArray<DInterpolation *> &list, sector_t *sector, bool ceiling);

src/p_maputl.cpp

@@ -212,9 +212,12 @@ void P_LineOpening (FLineOpening &open, AActor *actor, const line_t *linedef,
 	if (actor != NULL && linedef->frontsector != NULL && linedef->backsector != NULL && 
 		linedef->flags & ML_3DMIDTEX)
 	{
-		open.touchmidtex = P_LineOpening_3dMidtex(actor, linedef, open.top, open.bottom, &open.abovemidtex);
+		open.touchmidtex = P_LineOpening_3dMidtex(actor, linedef, open);
+	}
+	else
+	{
+		open.abovemidtex = open.touchmidtex = false;
 	}
-	else open.abovemidtex = open.touchmidtex = false;
 
 	open.range = open.top - open.bottom;
 }

src/po_man.cpp

@@ -1195,8 +1195,9 @@ bool FPolyObj::CheckMobjBlocking (side_t *sd)
 					checker.Push (mobj);
 					if ((mobj->flags&MF_SOLID) && !(mobj->flags&MF_NOCLIP))
 					{
-						fixed_t top = -INT_MAX, bottom = INT_MAX;
+						FLineOpening open;
-						bool above;
+						open.top = -INT_MAX;
+						open.bottom = INT_MAX;
 						// [TN] Check wether this actor gets blocked by the line.
 						if (ld->backsector != NULL &&
 							!(ld->flags & (ML_BLOCKING|ML_BLOCKEVERYTHING))
@@ -1204,9 +1205,9 @@ bool FPolyObj::CheckMobjBlocking (side_t *sd)
 							&& !(ld->flags & ML_BLOCKMONSTERS && mobj->flags3 & MF3_ISMONSTER)
 							&& !((mobj->flags & MF_FLOAT) && (ld->flags & ML_BLOCK_FLOATERS))
 							&& (!(ld->flags & ML_3DMIDTEX) ||
-								(!P_LineOpening_3dMidtex(mobj, ld, bottom, top, &above) &&
+								(!P_LineOpening_3dMidtex(mobj, ld, open) &&
-									(mobj->z + mobj->height < bottom)
+									(mobj->z + mobj->height < open.bottom)
-								) || (above && mobj->z > mobj->floorz))
+								) || (open.abovemidtex && mobj->z > mobj->floorz))
 							)
 						{
 							continue;