From 2e120953ec2b06ffa376e009336228f1b106dd84 Mon Sep 17 00:00:00 2001 From: MascaraSnake Date: Tue, 21 Sep 2021 11:35:04 +0200 Subject: [PATCH 1/2] Fix typo in linedef type 400 conversion --- extras/conf/SRB2-22.cfg | 1 + src/p_setup.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/extras/conf/SRB2-22.cfg b/extras/conf/SRB2-22.cfg index 608fe508f..bcb823aa3 100644 --- a/extras/conf/SRB2-22.cfg +++ b/extras/conf/SRB2-22.cfg @@ -2000,6 +2000,7 @@ linedeftypes title = "Set Tagged Sector's Ceiling Height/Texture"; prefix = "(401)"; flags8text = "[3] Set delay by backside sector"; + flags64text = "[6] Keep floor flat"; } 402 diff --git a/src/p_setup.c b/src/p_setup.c index 27bfdc4c9..1e65a2dfd 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -3622,7 +3622,7 @@ static void P_ConvertBinaryMap(void) case 401: //Set tagged sector's ceiling height/texture lines[i].args[0] = tag; lines[i].args[1] = lines[i].special - 400; - lines[i].args[2] = !!(lines[i].flags & ML_NOCLIMB); + lines[i].args[2] = !(lines[i].flags & ML_NOCLIMB); lines[i].special = 400; break; case 403: //Move tagged sector's floor From 5df1dd324d34156dbdf9f2d05933e51030ee46ab Mon Sep 17 00:00:00 2001 From: MascaraSnake Date: Thu, 23 Sep 2021 10:24:02 +0200 Subject: [PATCH 2/2] Fix oversight in T_MoveFloor --- src/p_floor.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/p_floor.c b/src/p_floor.c index eebb9366e..2da410de5 100644 --- a/src/p_floor.c +++ b/src/p_floor.c @@ -231,6 +231,7 @@ void T_MoveFloor(floormove_t *movefloor) remove = true; break; default: + remove = true; break; } }