From 2e9dc59ca75d38ddd74cd3fb31a7bf7ac4c67ec9 Mon Sep 17 00:00:00 2001 From: MascaraSnake Date: Wed, 15 Apr 2020 09:49:00 +0200 Subject: [PATCH] Forgot some stuff regarding FOF type 170 --- extras/conf/udb/Includes/SRB222_linedefs.cfg | 30 ++++++++++++++++++++ src/p_setup.c | 6 ++++ 2 files changed, 36 insertions(+) diff --git a/extras/conf/udb/Includes/SRB222_linedefs.cfg b/extras/conf/udb/Includes/SRB222_linedefs.cfg index dcff6927b..32584505d 100644 --- a/extras/conf/udb/Includes/SRB222_linedefs.cfg +++ b/extras/conf/udb/Includes/SRB222_linedefs.cfg @@ -1583,6 +1583,36 @@ udmf } } + 170 + { + title = "Crumbling"; + prefix = "(170)"; + arg0 + { + title = "Target sector tag"; + type = 13; + } + arg1 + { + title = "Tangibility"; + type = 12; + enum = "tangibility"; + } + arg2 + { + title = "Flags"; + type = 12; + enum + { + 1 = "Translucent"; + 2 = "No shadow"; + 4 = "No respawn"; + 8 = "Air bobbing"; + 16 = "Float on water"; + } + } + } + 200 { title = "Light Block"; diff --git a/src/p_setup.c b/src/p_setup.c index 6b7f59327..8eb2a750c 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -2939,7 +2939,13 @@ static void P_ConvertBinaryMap(void) lines[i].args[2] |= 2; //Don't cast shadow } if (lines[i].special >= 174 && lines[i].special <= 175) + { lines[i].args[2] |= 1; //Translucent + 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; + } if (lines[i].special % 2 == 1) lines[i].args[2] |= 4; //Don't respawn if (lines[i].special == 176 || lines[i].special == 177 || lines[i].special == 180)