OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- moved the impact decal counter into FLevelLocals and do the counting in a less problematic fashion.

Browse source 
This was yet another piece of code that lived or died with the assumption that there can only be one level, stored in global variables.

# Conflicts:
#	src/p_saveg.cpp
This commit is contained in:
Christoph Oelckers 2019-01-09 00:04:28 +01:00
commit e90ef4e886
4 changed files with 15 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/g_shared/a_decals.cpp
View file

@ -548,37 +548,39 @@ CUSTOM_CVAR (Int, cl_maxdecals, 1024, CVAR_ARCHIVE)
}
else
{
while (ImpactCount > self)
ForAllLevels([&](FLevelLocals *Level)
{
DThinker *thinker = DThinker::FirstThinker (STAT_AUTODECAL);
if (thinker != NULL)
while (Level->ImpactDecalCount > self)
{
thinker->Destroy();
DThinker *thinker = DThinker::FirstThinker(STAT_AUTODECAL);
if (thinker != NULL)
{
thinker->Destroy();
}
}
}
});
}
}
DImpactDecal::DImpactDecal ()
: DBaseDecal (STAT_AUTODECAL, 0.)
{
ImpactCount++;
}
DImpactDecal::DImpactDecal (double z)
: DBaseDecal (STAT_AUTODECAL, z)
{
ImpactCount++;
}
void DImpactDecal::CheckMax ()
{
if (ImpactCount >= cl_maxdecals)
if (++level.ImpactDecalCount >= cl_maxdecals)
{
DThinker *thinker = DThinker::FirstThinker (STAT_AUTODECAL);
if (thinker != NULL)
{
thinker->Destroy();
level.ImpactDecalCount--;
}
}
}
@ -613,7 +615,6 @@ DImpactDecal *DImpactDecal::StaticCreate (const FDecalTemplate *tpl, const DVect
else lowercolor = color;
StaticCreate (tpl_low, pos, wall, ffloor, lowercolor);
}
DImpactDecal::CheckMax();
decal = Create<DImpactDecal>(pos.Z);
if (decal == NULL)
{
@ -624,6 +625,7 @@ DImpactDecal *DImpactDecal::StaticCreate (const FDecalTemplate *tpl, const DVect
{
return NULL;
}
decal->CheckMax();
tpl->ApplyToDecal (decal, wall);
if (color != 0)
@ -649,12 +651,12 @@ DBaseDecal *DImpactDecal::CloneSelf (const FDecalTemplate *tpl, double ix, doubl
return NULL;
}
DImpactDecal::CheckMax();
DImpactDecal *decal = Create<DImpactDecal>(iz);
if (decal != NULL)
{
if (decal->StickToWall (wall, ix, iy, ffloor).isValid())
{
decal->CheckMax();
tpl->ApplyToDecal (decal, wall);
decal->AlphaColor = AlphaColor;
decal->RenderFlags = (decal->RenderFlags & RF_DECALMASK) |
@ -669,12 +671,6 @@ DBaseDecal *DImpactDecal::CloneSelf (const FDecalTemplate *tpl, double ix, doubl
return decal;
}
void DImpactDecal::OnDestroy ()
{
ImpactCount--;
Super::OnDestroy();
}
CCMD (countdecals)
{
Printf ("%d impact decals\n", ImpactCount);