From d166211ce073cbbcfc96de87edfdc7d24daccefc Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <c.oelckers@zdoom.fake>
Date: Thu, 16 Apr 2015 19:55:46 +0200
Subject: [PATCH] - reverted changes from copying over p_3dfloors.cpp with
 GZDoom's version.

---
 src/p_3dfloors.cpp | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/p_3dfloors.cpp b/src/p_3dfloors.cpp
index ae1c31a86..42d79dcc0 100644
--- a/src/p_3dfloors.cpp
+++ b/src/p_3dfloors.cpp
@@ -44,7 +44,6 @@
 #include "r_data/colormaps.h"
 
 #ifdef _3DFLOORS
-EXTERN_CVAR(Int, vid_renderer)
 
 //==========================================================================
 //
@@ -202,7 +201,7 @@ static void P_Add3DFloor(sector_t* sec, sector_t* sec2, line_t* master, int flag
 
 	// kg3D - software renderer only hack
 	// this is really required because of ceilingclip and floorclip
-	if((vid_renderer == 0) && (flags & FF_BOTHPLANES))
+	if(flags & FF_BOTHPLANES)
 	{
 		P_Add3DFloor(sec, sec2, master, FF_EXISTS | FF_THISINSIDE | FF_RENDERPLANES | FF_NOSHADE | FF_SEETHROUGH | FF_SHOOTTHROUGH |
 			(flags & (FF_INVERTSECTOR | FF_TRANSLUCENT | FF_ADDITIVETRANS)), alpha);
@@ -221,7 +220,8 @@ static int P_Set3DFloor(line_t * line, int param, int param2, int alpha)
 	int tag=line->args[0];
     sector_t * sec = line->frontsector, * ss;
 
-    for (s=-1; (s = P_FindSectorFromTag(tag,s)) >= 0;)
+	FSectorTagIterator it(tag);
+	while ((s = it.Next()) >= 0)
 	{
 		ss=&sectors[s];
 
@@ -265,7 +265,6 @@ static int P_Set3DFloor(line_t * line, int param, int param2, int alpha)
 		else if (param==4)
 		{
 			flags=FF_EXISTS|FF_RENDERPLANES|FF_INVERTPLANES|FF_NOSHADE|FF_FIX;
-			if (param2 & 1) flags |= FF_SEETHROUGH;	// marker for allowing missing texture checks
 			alpha=255;
 		}
 		else 
@@ -584,7 +583,6 @@ void P_Recalculate3DFloors(sector_t * sector)
 		lightlist[0].extra_colormap = sector->ColorMap;
 		lightlist[0].blend = 0;
 		lightlist[0].flags = 0;
-		lightlist[0].fromsector = true;
 		
 		maxheight = sector->CenterCeiling();
 		minheight = sector->CenterFloor();
@@ -606,7 +604,6 @@ void P_Recalculate3DFloors(sector_t * sector)
 				newlight.extra_colormap = rover->GetColormap();
 				newlight.blend = rover->GetBlend();
 				newlight.flags = rover->flags;
-				newlight.fromsector = false;
 				lightlist.Push(newlight);
 			}
 			else if (i==0)
@@ -621,7 +618,6 @@ void P_Recalculate3DFloors(sector_t * sector)
 					lightlist[0].extra_colormap = rover->GetColormap();
 					lightlist[0].blend = rover->GetBlend();
 					lightlist[0].flags = rover->flags;
-					lightlist[0].fromsector = false;
 				}
 			}
 			if (rover->flags&FF_DOUBLESHADOW)
@@ -646,7 +642,6 @@ void P_Recalculate3DFloors(sector_t * sector)
 						newlight.blend = 0;
 					}
 					newlight.flags = rover->flags;
-					newlight.fromsector = false;
 					lightlist.Push(newlight);
 				}
 			}
@@ -849,7 +844,7 @@ void P_Spawn3DFloors (void)
 			{
 				if (line->args[1]&8)
 				{
-					line->id = line->args[4];
+					line->SetMainId(line->args[4]);
 				}
 				else
 				{