thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 04:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'load-palette-before-map-data' into 'big-large-map-markers'

Browse source 
Load palette before map data

See merge request KartKrew/Kart!705
This commit is contained in:
toaster 2022-09-25 09:37:39 +00:00
commit b36195bfe8
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/d_main.c
View file

@ -1438,6 +1438,10 @@ void D_SRB2Main(void)
#endif //ifndef DEVELOP #endif //ifndef DEVELOP
// Do it before P_InitMapData because PNG patch
// conversion sometimes needs the palette
V_ReloadPalette();
// //
// search for mainwad maps // search for mainwad maps
// //

8
src/v_video.c
View file

@ -404,7 +404,7 @@ const char *GetPalette(void)
return "PLAYPAL"; return "PLAYPAL";
} }
static void LoadMapPalette(void) void V_ReloadPalette(void)
{ {
LoadPalette(GetPalette()); LoadPalette(GetPalette());
} }
@ -416,7 +416,7 @@ static void LoadMapPalette(void)
void V_SetPalette(INT32 palettenum) void V_SetPalette(INT32 palettenum)
{ {
if (!pLocalPalette) if (!pLocalPalette)
LoadMapPalette(); V_ReloadPalette();
#ifdef HWRENDER #ifdef HWRENDER
if (rendermode == render_opengl) if (rendermode == render_opengl)
@ -449,7 +449,7 @@ void V_SetPaletteLump(const char *pal)
static void CV_palette_OnChange(void) static void CV_palette_OnChange(void)
{ {
// reload palette // reload palette
LoadMapPalette(); V_ReloadPalette();
V_SetPalette(0); V_SetPalette(0);
} }
@ -2980,8 +2980,6 @@ void V_Init(void)
UINT8 *base = vid.buffer; UINT8 *base = vid.buffer;
const INT32 screensize = vid.rowbytes * vid.height; const INT32 screensize = vid.rowbytes * vid.height;
LoadMapPalette();
for (i = 0; i < NUMSCREENS; i++) for (i = 0; i < NUMSCREENS; i++)
screens[i] = NULL; screens[i] = NULL;

3
src/v_video.h
View file

@ -56,6 +56,9 @@ void InitColorLUT(colorlookup_t *lut, RGBA_t *palette, boolean makecolors);
UINT8 GetColorLUT(colorlookup_t *lut, UINT8 r, UINT8 g, UINT8 b); UINT8 GetColorLUT(colorlookup_t *lut, UINT8 r, UINT8 g, UINT8 b);
UINT8 GetColorLUTDirect(colorlookup_t *lut, UINT8 r, UINT8 g, UINT8 b); UINT8 GetColorLUTDirect(colorlookup_t *lut, UINT8 r, UINT8 g, UINT8 b);
// Loads the correct palette into memory
void V_ReloadPalette(void);
// Set the current RGB palette lookup to use for palettized graphics // Set the current RGB palette lookup to use for palettized graphics
void V_SetPalette(INT32 palettenum); void V_SetPalette(INT32 palettenum);