stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-07 08:52:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'udmf-thing-types' into udmf-more-linedef-types

Browse source
This commit is contained in:
MascaraSnake 2021-12-29 15:53:46 +01:00
commit 29ee8484eb
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
extras/conf/udb/Includes/SRB222_things.cfg
View file

@ -5465,6 +5465,11 @@ udmf
{ {
title = "Rising distance"; title = "Rising distance";
} }
arg6
{
title = "Heights control linedef";
type = 15;
}
} }
758 758
{ {

4
src/p_mobj.c
View file

@ -12430,8 +12430,8 @@ static boolean P_SetupParticleGen(mapthing_t *mthing, mobj_t *mobj)
INT32 line; INT32 line;
const size_t mthingi = (size_t)(mthing - mapthings); const size_t mthingi = (size_t)(mthing - mapthings);
// Find the corresponding linedef special, using angle as tag // Find the corresponding linedef special, using args[6] as tag
line = Tag_FindLineSpecial(15, mthing->angle); line = mthing->args[6] ? Tag_FindLineSpecial(15, mthing->args[6]) : -1;
type = mthing->stringargs[0] ? get_number(mthing->stringargs[0]) : MT_PARTICLE; type = mthing->stringargs[0] ? get_number(mthing->stringargs[0]) : MT_PARTICLE;

1
src/p_setup.c
View file

@ -5248,6 +5248,7 @@ static void P_ConvertBinaryMap(void)
mapthings[i].args[2] = sides[lines[j].sidenum[0]].textureoffset >> FRACBITS; mapthings[i].args[2] = sides[lines[j].sidenum[0]].textureoffset >> FRACBITS;
mapthings[i].args[3] = sides[lines[j].sidenum[0]].rowoffset >> FRACBITS; mapthings[i].args[3] = sides[lines[j].sidenum[0]].rowoffset >> FRACBITS;
mapthings[i].args[4] = lines[j].backsector ? sides[lines[j].sidenum[1]].textureoffset >> FRACBITS : 0; mapthings[i].args[4] = lines[j].backsector ? sides[lines[j].sidenum[1]].textureoffset >> FRACBITS : 0;
mapthings[i].args[6] = mapthings[i].angle;
if (sides[lines[j].sidenum[0]].toptexture) if (sides[lines[j].sidenum[0]].toptexture)
P_WriteConstant(sides[lines[j].sidenum[0]].toptexture, &mapthings[i].stringargs[0]); P_WriteConstant(sides[lines[j].sidenum[0]].toptexture, &mapthings[i].stringargs[0]);
break; break;