Merge branch 'map-palette-titlefix' into 'next'

Fix per-map palette not being reset properly when it should.

See merge request KartKrew/Kart-Public!9
This commit is contained in:
Sal 2019-01-03 01:08:42 -05:00
commit 0b0cbcabb7

View file

@ -321,7 +321,7 @@ static void D_Display(void)
F_RunWipe(wipedefs[wipedefindex], gamestate != GS_TIMEATTACK); F_RunWipe(wipedefs[wipedefindex], gamestate != GS_TIMEATTACK);
} }
if (wipegamestate == GS_LEVEL && rendermode != render_none) if (gamestate != GS_LEVEL && rendermode != render_none)
{ {
V_SetPaletteLump("PLAYPAL"); // Reset the palette V_SetPaletteLump("PLAYPAL"); // Reset the palette
R_ReInitColormaps(0, LUMPERROR); R_ReInitColormaps(0, LUMPERROR);