mirror of
https://github.com/ZDoom/raze-gles.git
synced 2025-01-12 19:20:38 +00:00
Don't clear loogie tint transiently on changing palette.
git-svn-id: https://svn.eduke32.com/eduke32@2953 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
a53e9b60d8
commit
ef8adcc51f
1 changed files with 13 additions and 13 deletions
|
@ -2619,6 +2619,19 @@ void G_DisplayRest(int32_t smoothratio)
|
||||||
Bmemcpy(&tempFade, &pp2->pals, sizeof(palette_t));
|
Bmemcpy(&tempFade, &pp2->pals, sizeof(palette_t));
|
||||||
applyTint = 1;
|
applyTint = 1;
|
||||||
}
|
}
|
||||||
|
// loogies courtesy of being snotted on
|
||||||
|
else if (pp->pals.f==0 && pp->loogcnt > 0)
|
||||||
|
{
|
||||||
|
palette_t lp = { 0, 64, 0, pp->loogcnt>>1 };
|
||||||
|
Bmemcpy(&tempFade, &lp, sizeof(palette_t));
|
||||||
|
applyTint = 1;
|
||||||
|
}
|
||||||
|
else if (pp2 && pp2->pals.f==0 && pp2->loogcnt > 0)
|
||||||
|
{
|
||||||
|
palette_t lp = { 0, 64, 0, pp2->loogcnt>>1 };
|
||||||
|
Bmemcpy(&tempFade, &lp, sizeof(palette_t));
|
||||||
|
applyTint = 1;
|
||||||
|
}
|
||||||
|
|
||||||
if (g_restorePalette)
|
if (g_restorePalette)
|
||||||
{
|
{
|
||||||
|
@ -2637,19 +2650,6 @@ void G_DisplayRest(int32_t smoothratio)
|
||||||
omovethingscnt = g_moveThingsCount;
|
omovethingscnt = g_moveThingsCount;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// loogies courtesy of being snotted on
|
|
||||||
else if (pp->pals.f==0 && pp->loogcnt > 0)
|
|
||||||
{
|
|
||||||
palette_t lp = { 0, 64, 0, pp->loogcnt>>1 };
|
|
||||||
Bmemcpy(&tempFade, &lp, sizeof(palette_t));
|
|
||||||
applyTint = 1;
|
|
||||||
}
|
|
||||||
else if (pp2 && pp2->pals.f==0 && pp2->loogcnt > 0)
|
|
||||||
{
|
|
||||||
palette_t lp = { 0, 64, 0, pp2->loogcnt>>1 };
|
|
||||||
Bmemcpy(&tempFade, &lp, sizeof(palette_t));
|
|
||||||
applyTint = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (tempFade.f > 0 /*tempTint.f*/)
|
if (tempFade.f > 0 /*tempTint.f*/)
|
||||||
Bmemcpy(&tempTint, &tempFade, sizeof(palette_t));
|
Bmemcpy(&tempTint, &tempFade, sizeof(palette_t));
|
||||||
|
|
Loading…
Reference in a new issue