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

Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs

Browse source
This commit is contained in:
MascaraSnake 2022-01-09 13:48:40 +01:00
commit 5e7547b822
2 changed files with 6 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/hardware/hw_main.c
View file

@ -1434,34 +1434,10 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
// set alpha for transparent walls // set alpha for transparent walls
// ooops ! this do not work at all because render order we should render it in backtofront order // ooops ! this do not work at all because render order we should render it in backtofront order
switch (gl_linedef->special)
{
// Translucent
case 102:
case 121:
case 123:
case 124:
case 125:
case 141:
case 142:
case 144:
case 145:
case 174:
case 175:
case 192:
case 195:
case 221:
case 253:
case 256:
blendmode = PF_Translucent;
break;
default:
if (gl_linedef->alpha >= 0 && gl_linedef->alpha < FRACUNIT) if (gl_linedef->alpha >= 0 && gl_linedef->alpha < FRACUNIT)
blendmode = HWR_TranstableToAlpha(R_GetLinedefTransTable(gl_linedef->alpha), &Surf); blendmode = HWR_TranstableToAlpha(R_GetLinedefTransTable(gl_linedef->alpha), &Surf);
else else
blendmode = PF_Masked; blendmode = PF_Masked;
break;
}
if (gl_curline->polyseg && gl_curline->polyseg->translucency > 0) if (gl_curline->polyseg && gl_curline->polyseg->translucency > 0)
{ {

4
src/p_setup.c
View file

@ -3620,10 +3620,10 @@ static void P_ConvertBinaryMap(void)
//Flags //Flags
if (lines[i].flags & ML_EFFECT1) if (lines[i].flags & ML_EFFECT1)
lines[i].args[2] = TMFL_NOBOSSES; lines[i].args[2] |= TMFL_NOBOSSES;
//Replicate old hack: Translucent FOFs set to full opacity cut cyan pixels //Replicate old hack: Translucent FOFs set to full opacity cut cyan pixels
if (lines[i].flags & ML_EFFECT6 || lines[i].args[1] == 256) if (lines[i].flags & ML_EFFECT6 || lines[i].args[1] == 256)
lines[i].args[2] = TMFL_SPLAT; lines[i].args[2] |= TMFL_SPLAT;
break; break;
case 259: //Custom FOF case 259: //Custom FOF