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

Adapt linedef type 439 to UDMF

Browse source
This commit is contained in:
MascaraSnake 2021-09-20 14:42:21 +02:00
parent 877ec96eec
commit 3a73c6167c
3 changed files with 44 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3050,6 +3050,29 @@ udmf
} }
} }
439
{
title = "Change Tagged Linedef's Textures";
prefix = "(439)";
arg0
{
title = "Target linedef tag";
type = 15;
}
arg1
{
title = "Affected sides";
type = 11;
enum = "frontbackboth";
}
arg2
{
title = "Change unset textures?";
type = 11;
enum = "yesno";
}
}
440 440
{ {
title = "Start Metal Sonic Race"; title = "Start Metal Sonic Race";

5
src/p_setup.c
View file

@ -3824,6 +3824,11 @@ static void P_ConvertBinaryMap(void)
lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS;
lines[i].args[1] = !!(lines[i].flags & ML_NOCLIMB); lines[i].args[1] = !!(lines[i].flags & ML_NOCLIMB);
break; break;
case 439: //Change tagged linedef's textures
lines[i].args[0] = tag;
lines[i].args[1] = TMSD_FRONTBACK;
lines[i].args[2] = !!(lines[i].flags & ML_NOCLIMB);
break;
case 441: //Condition set trigger case 441: //Condition set trigger
lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS; lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS;
break; break;

29
src/p_spec.c
View file

@ -2776,30 +2776,33 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
{ {
size_t linenum; size_t linenum;
side_t *set = &sides[line->sidenum[0]], *this; side_t *set = &sides[line->sidenum[0]], *this;
boolean always = !(line->flags & ML_NOCLIMB); // If noclimb: Only change mid texture if mid texture already exists on tagged lines, etc. boolean always = !(line->args[2]); // If args[2] is set: Only change mid texture if mid texture already exists on tagged lines, etc.
for (linenum = 0; linenum < numlines; linenum++) for (linenum = 0; linenum < numlines; linenum++)
{ {
if (lines[linenum].special == 439) if (lines[linenum].special == 439)
continue; // Don't override other set texture lines! continue; // Don't override other set texture lines!
if (!Tag_Find(&lines[linenum].tags, tag)) if (!Tag_Find(&lines[linenum].tags, line->args[0]))
continue; // Find tagged lines continue; // Find tagged lines
// Front side // Front side
this = &sides[lines[linenum].sidenum[0]]; if (line->args[1] != TMSD_BACK)
if (always || this->toptexture) this->toptexture = set->toptexture; {
if (always || this->midtexture) this->midtexture = set->midtexture; this = &sides[lines[linenum].sidenum[0]];
if (always || this->bottomtexture) this->bottomtexture = set->bottomtexture; if (always || this->toptexture) this->toptexture = set->toptexture;
if (always || this->midtexture) this->midtexture = set->midtexture;
if (lines[linenum].sidenum[1] == 0xffff) if (always || this->bottomtexture) this->bottomtexture = set->bottomtexture;
continue; // One-sided stops here. }
// Back side // Back side
this = &sides[lines[linenum].sidenum[1]]; if (line->args[1] != TMSD_FRONT && lines[linenum].sidenum[1] != 0xffff)
if (always || this->toptexture) this->toptexture = set->toptexture; {
if (always || this->midtexture) this->midtexture = set->midtexture; this = &sides[lines[linenum].sidenum[1]];
if (always || this->bottomtexture) this->bottomtexture = set->bottomtexture; if (always || this->toptexture) this->toptexture = set->toptexture;
if (always || this->midtexture) this->midtexture = set->midtexture;
if (always || this->bottomtexture) this->bottomtexture = set->bottomtexture;
}
} }
} }
break; break;