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

- properly un-count faded out decals without involving the Destroy method.

Browse source
This commit is contained in:
Christoph Oelckers 2019-02-07 09:36:39 +01:00
parent 97e3e858a1
commit 9dec214c15
3 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/g_shared/a_decalfx.cpp
View file

@ -76,6 +76,7 @@ void DDecalFader::Tick ()
}
else if (Level->maptime >= TimeToEndDecay)
{
TheDecal->Expired(); // for impact decal bookkeeping.
TheDecal->Destroy (); // remove the decal
Destroy (); // remove myself
return;

13
src/g_shared/a_decals.cpp
View file

@ -666,6 +666,8 @@ DBaseDecal *DBaseDecal::CloneSelf (const FDecalTemplate *tpl, double ix, double
void DImpactDecal::CheckMax ()
{
static int SpawnCounter;
if (++Level->ImpactDecalCount >= cl_maxdecals)
{
DThinker *thinker = Level->FirstThinker (STAT_AUTODECAL);
@ -683,6 +685,17 @@ void DImpactDecal::CheckMax ()
//
//----------------------------------------------------------------------------
void DImpactDecal::Expired()
{
Level->ImpactDecalCount--;
}
//----------------------------------------------------------------------------
//
//
//
//----------------------------------------------------------------------------
DImpactDecal *DImpactDecal::StaticCreate (FLevelLocals *Level, const char *name, const DVector3 &pos, side_t *wall, F3DFloor * ffloor, PalEntry color)
{
if (cl_maxdecals > 0)

2
src/g_shared/a_sharedglobal.h
View file

@ -26,6 +26,7 @@ public:
void Serialize(FSerializer &arc);
void OnDestroy() override;
virtual void Expired() {} // For thinkers that can remove their decal. For impact decal bookkeeping.
FTextureID StickToWall(side_t *wall, double x, double y, F3DFloor * ffloor);
double GetRealZ (const side_t *wall) const;
void SetShade (uint32_t rgb);
@ -71,6 +72,7 @@ public:
static DImpactDecal *StaticCreate(FLevelLocals *Level, const FDecalTemplate *tpl, const DVector3 &pos, side_t *wall, F3DFloor * ffloor, PalEntry color = 0);
void BeginPlay ();
void Expired() override;
protected:
DBaseDecal *CloneSelf(const FDecalTemplate *tpl, double x, double y, double z, side_t *wall, F3DFloor * ffloor) const;