diff --git a/src/d_main.c b/src/d_main.c index 38791a469..df75ceb7f 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1682,6 +1682,10 @@ void D_SRB2Main(void) #undef PUSHSPEEDO memcpy(speedo_cons_t, speedo_cons_temp, sizeof(speedo_cons_t)); + // Do it before P_InitMapData because PNG patch + // conversion sometimes needs the palette + V_ReloadPalette(); + // // search for maps // diff --git a/src/v_video.c b/src/v_video.c index 65441d2e5..f41934752 100644 --- a/src/v_video.c +++ b/src/v_video.c @@ -528,7 +528,7 @@ const char *GetPalette(void) return "PLAYPAL"; } -static void LoadMapPalette(void) +void V_ReloadPalette(void) { LoadPalette(GetPalette()); } @@ -540,7 +540,7 @@ static void LoadMapPalette(void) void V_SetPalette(INT32 palettenum) { if (!pLocalPalette) - LoadMapPalette(); + V_ReloadPalette(); #ifdef HWRENDER if (rendermode == render_opengl) @@ -575,7 +575,7 @@ static void CV_palette_OnChange(void) if (loaded_config == false) return; // reload palette - LoadMapPalette(); + V_ReloadPalette(); V_SetPalette(0); } @@ -3377,8 +3377,6 @@ void V_Init(void) UINT8 *base = vid.buffer; const INT32 screensize = vid.rowbytes * vid.height; - LoadMapPalette(); - for (i = 0; i < NUMSCREENS; i++) screens[i] = NULL; diff --git a/src/v_video.h b/src/v_video.h index 77f628efb..b1d10af6a 100644 --- a/src/v_video.h +++ b/src/v_video.h @@ -49,6 +49,9 @@ extern UINT8 colorlookup[CLUTSIZE][CLUTSIZE][CLUTSIZE]; void InitColorLUT(void); +// Loads the correct palette into memory +void V_ReloadPalette(void); + // Set the current RGB palette lookup to use for palettized graphics void V_SetPalette(INT32 palettenum);