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

- fixed some merging issues.

Browse source
This commit is contained in:
Christoph Oelckers 2019-01-23 21:37:51 +01:00
parent 7966282c1c
commit 8872125f96
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/g_shared/a_decals.cpp
View file

@ -548,17 +548,14 @@ CUSTOM_CVAR (Int, cl_maxdecals, 1024, CVAR_ARCHIVE)
} }
else else
{ {
ForAllLevels([&](FLevelLocals *Level) while (level.ImpactDecalCount > self)
{ {
while (Level->ImpactDecalCount > self) DThinker *thinker = DThinker::FirstThinker(STAT_AUTODECAL);
if (thinker != NULL)
{ {
DThinker *thinker = DThinker::FirstThinker(STAT_AUTODECAL); thinker->Destroy();
if (thinker != NULL)
{
thinker->Destroy();
}
} }
}); }
} }
} }

1
src/wi_stuff.cpp
View file

@ -615,6 +615,7 @@ void DInterBackground::drawBackground(int state, bool drawsplat, bool snl_pointe
for (i = 0; i<anims.Size(); i++) for (i = 0; i<anims.Size(); i++)
{ {
in_anim_t * a = &anims[i]; in_anim_t * a = &anims[i];
level_info_t *li;
switch (a->type & ANIM_CONDITION) switch (a->type & ANIM_CONDITION)
{ {