zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 11:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't wait for pain tinting to subside when changing a base palette.

Browse source 
This means that when e.g. emerging from water hurt will change the
palette instantly, but because bit 16 is added to the P_SetGamePalette
call, the tinting is retained.

git-svn-id: https://svn.eduke32.com/eduke32@2303 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-01-30 21:18:59 +00:00
parent 021126045f
commit 04e19dd942
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
polymer/eduke32/source/game.c
View file

@ -2650,14 +2650,15 @@ void G_DisplayRest(int32_t smoothratio)
g_restorePalette = 1; // JBF 20040101 g_restorePalette = 1; // JBF 20040101
applyTint = 1; applyTint = 1;
} }
// reset a normal palette // reset a normal palette
else if (g_restorePalette) if (g_restorePalette)
{ {
static uint32_t omovethingscnt; static uint32_t omovethingscnt;
if (g_restorePalette < 2 || omovethingscnt+1 == g_moveThingsCount) if (g_restorePalette < 2 || omovethingscnt+1 == g_moveThingsCount)
{ {
P_SetGamePalette(pp,pp->palette,2); P_SetGamePalette(pp,pp->palette,2+16);
g_restorePalette = 0; g_restorePalette = 0;
} }
else else
@ -2667,12 +2668,13 @@ void G_DisplayRest(int32_t smoothratio)
} }
} }
// loogies courtesy of being snotted on // loogies courtesy of being snotted on
else if (pp->loogcnt > 0) else if (pp->pals.f==0 && pp->loogcnt > 0)
{ {
palette_t lp = { 0, 64, 0, pp->loogcnt>>1 }; palette_t lp = { 0, 64, 0, pp->loogcnt>>1 };
Bmemcpy(&tempFade, &lp, sizeof(palette_t)); Bmemcpy(&tempFade, &lp, sizeof(palette_t));
applyTint = 1; applyTint = 1;
} }
if (tempFade.f > tempTint.f) if (tempFade.f > tempTint.f)
Bmemcpy(&tempTint, &tempFade, sizeof(palette_t)); Bmemcpy(&tempTint, &tempFade, sizeof(palette_t));