stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-20 01:43:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Adapt fan particle generator to UDMF

Browse source
This commit is contained in:
MascaraSnake 2021-12-18 10:31:42 +01:00
parent ebf692f143
commit 1a1e5faf08
4 changed files with 90 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1591,6 +1591,17 @@ udmf
}
}
parameters
{
title = "Parameters";
15
{
title = "Fan Particle Generator Heights";
prefix = "(15)";
}
}
polyobject
{
title = "PolyObject";

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

@ -4539,6 +4539,31 @@ udmf
sprite = "PRTLA0";
width = 8;
height = 16;
arg0
{
title = "Particles";
}
arg1
{
title = "Radius";
}
arg2
{
title = "Rising speed";
}
arg3
{
title = "Rotation speed";
type = 8;
}
arg4
{
title = "Spawn interval";
}
arg5
{
title = "Rising distance";
}
}
758
{

58
src/p_mobj.c
View file

@ -7295,8 +7295,22 @@ static boolean P_ParticleGenSceneryThink(mobj_t *mobj)
mobj->fuse = (tic_t)mobj->reactiontime;
bottomheight = lines[line].frontsector->floorheight;
topheight = lines[line].frontsector->ceilingheight - mobjinfo[(mobjtype_t)type].height;
if (line != -1)
{
bottomheight = lines[line].frontsector->floorheight;
topheight = lines[line].frontsector->ceilingheight - mobjinfo[(mobjtype_t)type].height;
}
else if (mobj->flags2 & MF2_OBJECTFLIP)
{
bottomheight = mobj->z - mobj->extravalue1;
topheight = mobj->z - mobjinfo[(mobjtype_t)type].height;
}
else
{
bottomheight = mobj->z;
topheight = mobj->z + mobj->extravalue1 - mobjinfo[(mobjtype_t)type].height;
}
if (mobj->waterbottom != bottomheight || mobj->watertop != topheight)
{
@ -7305,7 +7319,8 @@ static boolean P_ParticleGenSceneryThink(mobj_t *mobj)
else
mobj->health = 0;
mobj->z = ((mobj->flags2 & MF2_OBJECTFLIP) ? topheight : bottomheight);
if (line != -1)
mobj->z = ((mobj->flags2 & MF2_OBJECTFLIP) ? topheight : bottomheight);
}
if (!mobj->health)
@ -12420,7 +12435,7 @@ static boolean P_SetupMace(mapthing_t *mthing, mobj_t *mobj, boolean *doangle)
static boolean P_SetupParticleGen(mapthing_t *mthing, mobj_t *mobj)
{
fixed_t radius, speed;
fixed_t radius, speed, zdist;
INT32 type, numdivisions, anglespeed, ticcount;
angle_t angledivision;
INT32 line;
@ -12429,41 +12444,34 @@ static boolean P_SetupParticleGen(mapthing_t *mthing, mobj_t *mobj)
// Find the corresponding linedef special, using angle as tag
line = Tag_FindLineSpecial(15, mthing->angle);
if (line == -1)
{
CONS_Debug(DBG_GAMELOGIC, "Particle generator (mapthing #%s) needs to be tagged to a #15 parameter line (trying to find tag %d).\n", sizeu1(mthingi), mthing->angle);
return false;
}
type = mthing->stringargs[0] ? get_number(mthing->stringargs[0]) : MT_PARTICLE;
if (sides[lines[line].sidenum[0]].toptexture)
type = sides[lines[line].sidenum[0]].toptexture; // Set as object type in p_setup.c...
else
type = (INT32)MT_PARTICLE;
if (!lines[line].backsector
|| (ticcount = (sides[lines[line].sidenum[1]].textureoffset >> FRACBITS)) < 1)
ticcount = mthing->args[4];
if (ticcount < 1)
ticcount = 3;
numdivisions = mthing->z;
numdivisions = mthing->args[0];
if (numdivisions)
{
radius = R_PointToDist2(lines[line].v1->x, lines[line].v1->y, lines[line].v2->x, lines[line].v2->y);
anglespeed = (sides[lines[line].sidenum[0]].rowoffset >> FRACBITS) % 360;
radius = mthing->args[1] << FRACBITS;
anglespeed = (mthing->args[3]) % 360;
angledivision = 360/numdivisions;
}
else
{
numdivisions = 1; // Simple trick to make A_ParticleSpawn simpler.
numdivisions = 1; // Simple trick to make P_ParticleGenSceneryThink simpler.
radius = 0;
anglespeed = 0;
angledivision = 0;
}
speed = abs(sides[lines[line].sidenum[0]].textureoffset);
speed = abs(mthing->args[2]) << FRACBITS;
if (mthing->options & MTF_OBJECTFLIP)
speed *= -1;
zdist = abs(mthing->args[5]) << FRACBITS;
CONS_Debug(DBG_GAMELOGIC, "Particle Generator (mapthing #%s):\n"
"Radius is %d\n"
"Speed is %d\n"
@ -12471,9 +12479,14 @@ static boolean P_SetupParticleGen(mapthing_t *mthing, mobj_t *mobj)
"Numdivisions is %d\n"
"Angledivision is %d\n"
"Type is %d\n"
"Tic seperation is %d\n",
"Tic separation is %d\n",
sizeu1(mthingi), radius, speed, anglespeed, numdivisions, angledivision, type, ticcount);
if (line == -1)
CONS_Debug(DBG_GAMELOGIC, "Spawn Z is %d\nZ dist is %d\n", mobj->z, zdist);
else
CONS_Debug(DBG_GAMELOGIC, "Heights are taken from control sector\n");
mobj->angle = 0;
mobj->movefactor = speed;
mobj->lastlook = numdivisions;
@ -12482,6 +12495,7 @@ static boolean P_SetupParticleGen(mapthing_t *mthing, mobj_t *mobj)
mobj->friction = radius;
mobj->threshold = type;
mobj->reactiontime = ticcount;
mobj->extravalue1 = zdist;
mobj->cvmem = line;
mobj->watertop = mobj->waterbottom = 0;
return true;

18
src/p_setup.c
View file

@ -4908,6 +4908,24 @@ static void P_ConvertBinaryMap(void)
mapthings[i].type = 754;
break;
}
case 757: //Fan particle generator
{
INT32 j = Tag_FindLineSpecial(15, mapthings[i].angle);
if (j == -1)
{
CONS_Debug(DBG_GAMELOGIC, "Particle generator (mapthing #%d) needs to be tagged to a #15 parameter line (trying to find tag %d).\n", i, mapthings[i].angle);
break;
}
mapthings[i].args[0] = mapthings[i].z;
mapthings[i].args[1] = R_PointToDist2(lines[j].v1->x, lines[j].v1->y, lines[j].v2->x, lines[j].v2->y) >> 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[4] = lines[j].backsector ? sides[lines[j].sidenum[1]].textureoffset >> FRACBITS : 0;
if (sides[lines[j].sidenum[0]].toptexture)
P_WriteConstant(sides[lines[j].sidenum[0]].toptexture, &mapthings[i].stringargs[0]);
break;
}
case 762: //PolyObject spawn point (crush)
{
INT32 check = -1;