yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-29 15:51:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

sync SCR_LoadImageWithPalette usage

Browse source
This commit is contained in:
Denis Pauk 2024-08-11 23:39:52 +03:00
parent a38c2b5cee
commit 1b86a84270
6 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/client/cl_cin.c
View file

@ -758,7 +758,7 @@ SCR_LoadHiColor(const char* namewe, const char *ext, int *width, int *height,
Q_strlcat(filename, ".", sizeof(filename)); Q_strlcat(filename, ".", sizeof(filename));
Q_strlcat(filename, ext, sizeof(filename)); Q_strlcat(filename, ext, sizeof(filename));
VID_ImageDecode(filename, &data, &palette_in, SCR_LoadImageWithPalette(filename, &data, &palette_in,
width, height, bitsPerPixel); width, height, bitsPerPixel);
if (data == NULL) if (data == NULL)
{ {

2
src/client/cl_image.c
View file

@ -907,7 +907,7 @@ LoadImageWithPalette(const char *filename, byte **pic, byte **palette,
} }
void void
VID_ImageDecode(const char *filename, byte **pic, byte **palette, SCR_LoadImageWithPalette(const char *filename, byte **pic, byte **palette,
int *width, int *height, int *bitsPerPixel) int *width, int *height, int *bitsPerPixel)
{ {
LoadImageWithPalette(filename, pic, palette, width, height, bitsPerPixel); LoadImageWithPalette(filename, pic, palette, width, height, bitsPerPixel);

2
src/client/header/client.h
View file

@ -507,8 +507,6 @@ void V_AddEntity (entity_t *ent);
void V_AddParticle (vec3_t org, unsigned int color, float alpha); void V_AddParticle (vec3_t org, unsigned int color, float alpha);
void V_AddLight (vec3_t org, float intensity, float r, float g, float b); void V_AddLight (vec3_t org, float intensity, float r, float g, float b);
void V_AddLightStyle (int style, float r, float g, float b); void V_AddLightStyle (int style, float r, float g, float b);
void VID_ImageDecode(const char *filename, byte **pic, byte **palette,
int *width, int *height, int *bitsPerPixel);
void VID_GetPalette(byte **colormap, unsigned *d_8to24table); void VID_GetPalette(byte **colormap, unsigned *d_8to24table);
void VID_GetPalette24to8(const byte *d_8to24table, byte** d_16to8table); void VID_GetPalette24to8(const byte *d_8to24table, byte** d_16to8table);
unsigned VID_PaletteColor(byte color); unsigned VID_PaletteColor(byte color);

2
src/client/header/screen.h
View file

@ -59,6 +59,8 @@ extern int crosshair_width, crosshair_height;
void SCR_AddDirtyPoint(int x, int y); void SCR_AddDirtyPoint(int x, int y);
void SCR_DirtyScreen(void); void SCR_DirtyScreen(void);
void SCR_LoadImageWithPalette(const char *filename, byte **pic, byte **palette,
int *width, int *height, int *bitsPerPixel);
void SCR_PlayCinematic(char *name); void SCR_PlayCinematic(char *name);
qboolean SCR_DrawCinematic(void); qboolean SCR_DrawCinematic(void);
void SCR_RunCinematic(void); void SCR_RunCinematic(void);

2
src/client/vid/vid.c
View file

@ -447,7 +447,7 @@ VID_LoadRenderer(void)
ri.Vid_GetModeInfo = VID_GetModeInfo; ri.Vid_GetModeInfo = VID_GetModeInfo;
ri.Vid_MenuInit = VID_MenuInit; ri.Vid_MenuInit = VID_MenuInit;
ri.Vid_WriteScreenshot = VID_WriteScreenshot; ri.Vid_WriteScreenshot = VID_WriteScreenshot;
ri.VID_ImageDecode = VID_ImageDecode; ri.VID_ImageDecode = SCR_LoadImageWithPalette;
ri.VID_GetPalette = VID_GetPalette; ri.VID_GetPalette = VID_GetPalette;
ri.VID_GetPalette24to8 = VID_GetPalette24to8; ri.VID_GetPalette24to8 = VID_GetPalette24to8;
ri.Vid_RequestRestart = VID_RequestRestart; ri.Vid_RequestRestart = VID_RequestRestart;

0
value
View file