mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-11-21 20:11:12 +00:00
Adapt set translucency linedef to UDMF
This commit is contained in:
parent
d2ad12c034
commit
6d007f388a
5 changed files with 9191 additions and 14 deletions
|
@ -2991,6 +2991,27 @@ udmf
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
491
|
||||
{
|
||||
title = "Set Translucency";
|
||||
prefix = "(491)";
|
||||
arg0
|
||||
{
|
||||
title = "PolyObject ID";
|
||||
type = 14;
|
||||
}
|
||||
arg1
|
||||
{
|
||||
title = "Translucency level";
|
||||
}
|
||||
arg2
|
||||
{
|
||||
title = "Set/Add?";
|
||||
type = 11;
|
||||
enum = "setadd";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
scrollpush
|
||||
|
|
|
@ -406,6 +406,12 @@ enums
|
|||
1 = "Yes";
|
||||
}
|
||||
|
||||
setadd
|
||||
{
|
||||
0 = "Set";
|
||||
1 = "Add";
|
||||
}
|
||||
|
||||
onoff
|
||||
{
|
||||
0 = "On";
|
||||
|
|
|
@ -3741,6 +3741,15 @@ static void P_ConvertBinaryMap(void)
|
|||
lines[i].args[2] = lines[i].args[1];
|
||||
lines[i].special = 489;
|
||||
break;
|
||||
case 491: //Polyobject - set translucency
|
||||
lines[i].args[0] = tag;
|
||||
// If Front X Offset is specified, use that. Else, use floorheight.
|
||||
lines[i].args[1] = (sides[lines[i].sidenum[0]].textureoffset ? sides[lines[i].sidenum[0]].textureoffset : lines[i].frontsector->floorheight) >> FRACBITS;
|
||||
// If DONTPEGBOTTOM, specify raw translucency value. Else, take it out of 1000.
|
||||
if (!(lines[i].flags & ML_DONTPEGBOTTOM))
|
||||
lines[i].args[1] /= 100;
|
||||
lines[i].args[2] = !!(lines[i].flags & ML_EFFECT3);
|
||||
break;
|
||||
case 500: //Scroll front wall left
|
||||
case 501: //Scroll front wall right
|
||||
lines[i].args[0] = 0;
|
||||
|
|
19
src/p_spec.c
19
src/p_spec.c
|
@ -1064,16 +1064,14 @@ static void PolySetVisibilityTangibility(line_t *line)
|
|||
}
|
||||
|
||||
// Sets the translucency of a polyobject
|
||||
// Frontsector floor / 100 = translevel
|
||||
static void PolyTranslucency(line_t *line)
|
||||
{
|
||||
INT32 polyObjNum = Tag_FGet(&line->tags);
|
||||
INT32 polyObjNum = line->args[0];
|
||||
polyobj_t *po;
|
||||
INT32 value;
|
||||
|
||||
if (!(po = Polyobj_GetForNum(polyObjNum)))
|
||||
{
|
||||
CONS_Debug(DBG_POLYOBJ, "EV_DoPolyObjWaypoint: bad polyobj %d\n", polyObjNum);
|
||||
CONS_Debug(DBG_POLYOBJ, "PolyTranslucency: bad polyobj %d\n", polyObjNum);
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -1081,17 +1079,10 @@ static void PolyTranslucency(line_t *line)
|
|||
if (po->isBad)
|
||||
return;
|
||||
|
||||
// If Front X Offset is specified, use that. Else, use floorheight.
|
||||
value = (sides[line->sidenum[0]].textureoffset ? sides[line->sidenum[0]].textureoffset : line->frontsector->floorheight) >> FRACBITS;
|
||||
|
||||
// If DONTPEGBOTTOM, specify raw translucency value. Else, take it out of 1000.
|
||||
if (!(line->flags & ML_DONTPEGBOTTOM))
|
||||
value /= 100;
|
||||
|
||||
if (line->flags & ML_EFFECT3) // relative calc
|
||||
po->translucency += value;
|
||||
if (lines->args[2]) // relative calc
|
||||
po->translucency += line->args[1];
|
||||
else
|
||||
po->translucency = value;
|
||||
po->translucency = line->args[1];
|
||||
|
||||
po->translucency = max(min(po->translucency, NUMTRANSMAPS), 0);
|
||||
}
|
||||
|
|
9150
src/p_spec.c.orig
Normal file
9150
src/p_spec.c.orig
Normal file
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue