From 88aad41310b59bb605e0a119d76c1192ca62190f Mon Sep 17 00:00:00 2001
From: MascaraSnake <jonassauer27@gmail.com>
Date: Fri, 12 Jun 2020 18:22:16 +0200
Subject: [PATCH] Remove unnecessary options from quicksand FOF again

---
 extras/conf/udb/Includes/SRB222_linedefs.cfg | 17 ++++-------------
 src/p_setup.c                                |  9 +++------
 src/p_spec.c                                 | 10 ++++------
 src/p_spec.h                                 |  6 ------
 4 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/extras/conf/udb/Includes/SRB222_linedefs.cfg b/extras/conf/udb/Includes/SRB222_linedefs.cfg
index b88d97aef6..a899f9488d 100644
--- a/extras/conf/udb/Includes/SRB222_linedefs.cfg
+++ b/extras/conf/udb/Includes/SRB222_linedefs.cfg
@@ -2103,25 +2103,16 @@ udmf
 				type = 13;
 			}
 			arg1
-			{
-				title = "Alpha";
-				default = 255;
-			}
-			arg2
 			{
 				title = "Ripple effect?";
-				type = 12;
-				enum
-				{
-					1 = "No ripple effect";
-					2 = "Cut cyan flat pixels";
-				}
+				type = 11;
+				enum = "yesno";
 			}
-			arg3
+			arg2
 			{
 				title = "Sinking speed";
 			}
-			arg4
+			arg3
 			{
 				title = "Friction";
 			}
diff --git a/src/p_setup.c b/src/p_setup.c
index 5a2b7e580d..49b5ffcb5a 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -3363,13 +3363,10 @@ static void P_ConvertBinaryMap(void)
 			break;
 		case 257: //FOF: Quicksand
 			lines[i].args[0] = lines[i].tag;
-			lines[i].args[1] = 255;
 			if (!(lines[i].flags & ML_EFFECT5))
-				lines[i].args[2] |= TMFQ_NORIPPLE;
-			if (lines[i].flags & ML_EFFECT6)
-				lines[i].args[2] |= TMFQ_SPLAT;
-			lines[i].args[3] = lines[i].dx >> FRACBITS; //Sinking speed
-			lines[i].args[4] = lines[i].dy >> FRACBITS; //Friction
+				lines[i].args[1] = 1; //No ripple effect
+			lines[i].args[2] = lines[i].dx >> FRACBITS; //Sinking speed
+			lines[i].args[3] = lines[i].dy >> FRACBITS; //Friction
 			break;
 		case 258: //FOF: Laser
 			lines[i].args[0] = lines[i].tag;
diff --git a/src/p_spec.c b/src/p_spec.c
index ade4501a65..4bc02ba792 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -6887,16 +6887,14 @@ void P_SpawnSpecials(boolean fromnetsave)
 			}
 			case 257: // Quicksand
 				ffloorflags = FF_EXISTS|FF_QUICKSAND|FF_RENDERALL|FF_ALLSIDES|FF_CUTSPRITES;
-				if (!(lines[i].args[2] & TMFQ_NORIPPLE))
+				if (!(lines[i].args[1]))
 					ffloorflags |= FF_RIPPLE;
-				if (lines[i].args[2] & TMFQ_SPLAT)
-					ffloorflags |= FF_SPLAT;
 
 				for (s = -1; (s = P_FindSectorFromTag(lines[i].args[0], s)) >= 0 ;)
 				{
-					ffloor_t *fflr = P_AddFakeFloor(&sectors[s], lines[i].frontsector, lines + i, lines[i].args[1], ffloorflags, secthinkers);
-					fflr->sinkspeed = abs(lines[i].args[3]) << (FRACBITS - 1);
-					fflr->friction = abs(lines[i].args[4]) << (FRACBITS - 6);
+					ffloor_t *fflr = P_AddFakeFloor(&sectors[s], lines[i].frontsector, lines + i, 0xff, ffloorflags, secthinkers);
+					fflr->sinkspeed = abs(lines[i].args[2]) << (FRACBITS - 1);
+					fflr->friction = abs(lines[i].args[3]) << (FRACBITS - 6);
 				}
 				break;
 
diff --git a/src/p_spec.h b/src/p_spec.h
index 52dcf6786b..94648b8408 100644
--- a/src/p_spec.h
+++ b/src/p_spec.h
@@ -96,12 +96,6 @@ typedef enum
 	TMFB_SPLAT       = 1<<3,
 } textmapfofbustflags_t;
 
-typedef enum
-{
-	TMFQ_NORIPPLE = 1,
-	TMFQ_SPLAT    = 1<<1,
-} textmapfofquicksandflags_t;
-
 typedef enum
 {
 	TMFL_NOBOSSES = 1,
-- 
GitLab