- copied the flickering Coot fix from master.

This commit is contained in:
Christoph Oelckers 2020-07-25 00:04:38 +02:00
parent bcb6c36ef2
commit 52cd2db4e7
2 changed files with 7 additions and 5 deletions

View file

@ -551,7 +551,8 @@ void animatesprites_d(int x,int y,int a,int smoothratio)
t->picnum += k + ScriptCode[t4] + l * t3;
if(l > 0) while(tilesiz[t->picnum].x == 0 && t->picnum > 0 )
if (l > 0)
while (!tileGetTexture(t->picnum)->isValid() && t->picnum > 0)
t->picnum -= l; //Hack, for actors
if( hittype[i].dispicnum >= 0)
@ -561,7 +562,7 @@ void animatesprites_d(int x,int y,int a,int smoothratio)
t->cstat |= 4;
}
if( s->statnum == 13 || badguy(s) || (s->picnum == APLAYER && s->owner >= 0) )
if( s->statnum == STAT_DUMMYPLAYER || badguy(s) || (s->picnum == APLAYER && s->owner >= 0) )
if(t->statnum != 99 && s->picnum != EXPLOSION2 && s->picnum != HANGLIGHT && s->picnum != DOMELITE)
if(s->picnum != HOTMEAT)
{

View file

@ -707,7 +707,8 @@ void animatesprites_r(int x,int y,int a,int smoothratio)
t->picnum += k + ScriptCode[t4] + l * t3;
if(l > 0) while(tilesiz[t->picnum].x == 0 && t->picnum > 0 )
if (l > 0)
while (!tileGetTexture(t->picnum)->isValid() && t->picnum > 0)
t->picnum -= l; //Hack, for actors
if( hittype[i].dispicnum >= 0)