zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-24 21:11:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- made particles portal-aware.

Browse source
This commit is contained in:
Christoph Oelckers 2016-02-29 16:40:28 +01:00
parent 07771bd56e
commit 0c7aea88db
1 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/p_effect.cpp
View file

@ -205,9 +205,9 @@ void P_FindParticleSubsectors ()
} }
for (WORD i = ActiveParticles; i != NO_PARTICLE; i = Particles[i].tnext) for (WORD i = ActiveParticles; i != NO_PARTICLE; i = Particles[i].tnext)
{ {
subsector_t *ssec = R_PointInSubsector (Particles[i].x, Particles[i].y); // Try to reuse the subsector from the last portal check, if still valid.
int ssnum = int(ssec-subsectors); if (Particles[i].subsector == NULL) Particles[i].subsector = R_PointInSubsector(Particles[i].x, Particles[i].y);
Particles[i].subsector = ssec; int ssnum = int(Particles[i].subsector - subsectors);
Particles[i].snext = ParticlesInSubsec[ssnum]; Particles[i].snext = ParticlesInSubsec[ssnum];
ParticlesInSubsec[ssnum] = i; ParticlesInSubsec[ssnum] = i;
} }
@ -278,12 +278,37 @@ void P_ThinkParticles ()
InactiveParticles = (int)(particle - Particles); InactiveParticles = (int)(particle - Particles);
continue; continue;
} }
particle->x += particle->velx;
particle->y += particle->vely; fixedvec2 newxy = P_GetOffsetPosition(particle->x, particle->y, particle->velx, particle->vely);
particle->x = newxy.x;
particle->y = newxy.y;
//particle->x += particle->velx;
//particle->y += particle->vely;
particle->z += particle->velz; particle->z += particle->velz;
particle->velx += particle->accx; particle->velx += particle->accx;
particle->vely += particle->accy; particle->vely += particle->accy;
particle->velz += particle->accz; particle->velz += particle->accz;
particle->subsector = R_PointInSubsector(particle->x, particle->y);
if (!particle->subsector->sector->PortalBlocksMovement(sector_t::ceiling))
{
AActor *skybox = particle->subsector->sector->SkyBoxes[sector_t::ceiling];
if (particle->z > skybox->threshold)
{
particle->x += skybox->scaleX;
particle->y += skybox->scaleY;
particle->subsector = NULL;
}
}
else if (!particle->subsector->sector->PortalBlocksMovement(sector_t::floor))
{
AActor *skybox = particle->subsector->sector->SkyBoxes[sector_t::floor];
if (particle->z < skybox->threshold)
{
particle->x += skybox->scaleX;
particle->y += skybox->scaleY;
particle->subsector = NULL;
}
}
prev = particle; prev = particle;
} }
} }