stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-14 17:01:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'udmf-lighting' into udmf-linedef-executors

Browse source
This commit is contained in:
MascaraSnake 2021-09-23 11:31:01 +02:00
commit 25bc48b8dd
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
extras/conf/SRB2-22.cfg
View file

@ -2000,11 +2000,12 @@ linedeftypes
title = "Set Tagged Sector's Ceiling Height/Texture";
prefix = "(401)";
flags8text = "[3] Set delay by backside sector";
flags64text = "[6] Keep floor flat";
}
402
{
title = "Set Tagged Sector's Light Level";
title = "Copy Light Level to Tagged Sectors";
prefix = "(402)";
flags8text = "[3] Set delay by backside sector";
}
@ -2090,6 +2091,14 @@ linedeftypes
prefix = "(435)";
flags8text = "[3] Set delay by backside sector";
}
467
{
title = "Set Tagged Sector's Light Level";
prefix = "(467)";
flags8text = "[3] Set delay by backside sector";
flags256text = "[8] Set relative to current";
}
}
linedefexecplane

1
src/p_floor.c
View file

@ -231,6 +231,7 @@ void T_MoveFloor(floormove_t *movefloor)
remove = true;
break;
default:
remove = true;
break;
}
}

2
src/p_setup.c
View file

@ -3686,7 +3686,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 402: //Copy light level