zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-02-21 19:10:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed some merging issues.

Browse source 
# Conflicts:
#	src/g_shared/a_decals.cpp
This commit is contained in:
Christoph Oelckers 2019-01-23 21:37:51 +01:00 committed by drfrag
parent 67c4317d54
commit f90dadba44
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/wi_stuff.cpp
View file

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