From 6949b70dbf63aec524134d550ca78e7f26c24678 Mon Sep 17 00:00:00 2001
From: MascaraSnake <jonassauer27@gmail.com>
Date: Sat, 2 May 2020 23:33:07 +0200
Subject: [PATCH] Remove temporary FOF setup code

---
 src/p_setup.c | 11 -----------
 src/p_spec.c  |  7 -------
 2 files changed, 18 deletions(-)

diff --git a/src/p_setup.c b/src/p_setup.c
index 2b47464ff..6551f3b4a 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -3309,17 +3309,6 @@ static void P_ConvertBinaryMap(void)
 		case 908: //Translucent wall (90%)
 			lines[i].alpha = ((909 - lines[i].special) << FRACBITS)/10;
 			break;
-		default:
-			// \todo Remove once all FOF types are converted
-			if (lines[i].special >= 100 && lines[i].special < 300)
-			{
-				lines[i].args[0] = lines[i].tag;
-				if (sides[lines[i].sidenum[0]].toptexture > 0)
-					lines[i].alpha = (sides[lines[i].sidenum[0]].toptexture << FRACBITS)/255;
-				else
-					lines[i].alpha = FRACUNIT/2;
-			}
-			break;
 		}
 	}
 
diff --git a/src/p_spec.c b/src/p_spec.c
index 6040ac6eb..ddd09f173 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -5807,13 +5807,6 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, f
 	if (sec2->hasslope)
 		sec->hasslope = true;
 
-	// \todo Remove once all FOFs are adapted
-	if ((flags & FF_SOLID) && (master->flags & ML_EFFECT1)) // Block player only
-		flags &= ~FF_BLOCKOTHERS;
-
-	if ((flags & FF_SOLID) && (master->flags & ML_EFFECT2)) // Block all BUT player
-		flags &= ~FF_BLOCKPLAYER;
-
 	fflr->spawnflags = fflr->flags = flags;
 	fflr->master = master;
 	fflr->norender = INFTICS;