stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-17 23:21:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Adapt POF_SPLAT to UDMF setup

Browse source
This commit is contained in:
MascaraSnake 2020-06-09 09:44:49 +02:00
parent 4a0206b38d
commit d07c376f6d
4 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
extras/conf/udb/Includes/SRB222_linedefs.cfg
View file

@ -1550,6 +1550,7 @@ udmf
8 = "Don't render planes"; 8 = "Don't render planes";
16 = "Trigger linedef executor on touch"; 16 = "Trigger linedef executor on touch";
32 = "Crush player"; 32 = "Crush player";
64 = "Cut cyan flat pixels";
} }
} }
arg4 arg4

2
src/p_polyobj.c
View file

@ -231,7 +231,7 @@ static void Polyobj_GetInfo(polyobj_t *po, line_t *line)
/*if (line->args[3] & TMPF_DONTCLIPPLANES) /*if (line->args[3] & TMPF_DONTCLIPPLANES)
po->flags &= ~POF_CLIPPLANES;*/ po->flags &= ~POF_CLIPPLANES;*/
if (lines[i].flags & ML_EFFECT6) if (lines[i].flags & TMPF_SPLAT)
po->flags |= POF_SPLAT; po->flags |= POF_SPLAT;
if (line->args[3] & TMPF_EXECUTOR) // Has a linedef executor if (line->args[3] & TMPF_EXECUTOR) // Has a linedef executor

3
src/p_polyobj.h
View file

@ -58,7 +58,8 @@ typedef enum
TMPF_INVISIBLEPLANES = 1<<3, TMPF_INVISIBLEPLANES = 1<<3,
TMPF_EXECUTOR = 1<<4, TMPF_EXECUTOR = 1<<4,
TMPF_CRUSH = 1<<5, TMPF_CRUSH = 1<<5,
//TMPF_DONTCLIPPLANES = 1<<6, TMPF_SPLAT = 1<<6,
//TMPF_DONTCLIPPLANES = 1<<7,
} textmappolyobjectflags_t; } textmappolyobjectflags_t;
// //

2
src/p_setup.c
View file

@ -2995,6 +2995,8 @@ static void P_ConvertBinaryMap(void)
lines[i].args[3] &= ~TMPF_INVISIBLEPLANES; lines[i].args[3] &= ~TMPF_INVISIBLEPLANES;
/*if (lines[paramline].flags & ML_EFFECT5) /*if (lines[paramline].flags & ML_EFFECT5)
lines[i].args[3] |= TMPF_DONTCLIPPLANES;*/ lines[i].args[3] |= TMPF_DONTCLIPPLANES;*/
if (lines[paramline].flags & ML_EFFECT6)
lines[i].args[3] |= TMPF_SPLAT;
if (lines[paramline].flags & ML_NOCLIMB) if (lines[paramline].flags & ML_NOCLIMB)
lines[i].args[3] |= TMPF_EXECUTOR; lines[i].args[3] |= TMPF_EXECUTOR;