From 1b86a84270af216ef766b8fd0f8d6a19dbf62bda Mon Sep 17 00:00:00 2001 From: Denis Pauk Date: Sun, 11 Aug 2024 23:39:52 +0300 Subject: [PATCH] sync SCR_LoadImageWithPalette usage --- src/client/cl_cin.c | 2 +- src/client/cl_image.c | 2 +- src/client/header/client.h | 2 -- src/client/header/screen.h | 2 ++ src/client/vid/vid.c | 2 +- value | 0 6 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 value diff --git a/src/client/cl_cin.c b/src/client/cl_cin.c index 777a3b90..529e87d4 100644 --- a/src/client/cl_cin.c +++ b/src/client/cl_cin.c @@ -758,7 +758,7 @@ SCR_LoadHiColor(const char* namewe, const char *ext, int *width, int *height, Q_strlcat(filename, ".", sizeof(filename)); Q_strlcat(filename, ext, sizeof(filename)); - VID_ImageDecode(filename, &data, &palette_in, + SCR_LoadImageWithPalette(filename, &data, &palette_in, width, height, bitsPerPixel); if (data == NULL) { diff --git a/src/client/cl_image.c b/src/client/cl_image.c index addc69f2..3899be19 100644 --- a/src/client/cl_image.c +++ b/src/client/cl_image.c @@ -907,7 +907,7 @@ LoadImageWithPalette(const char *filename, byte **pic, byte **palette, } 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) { LoadImageWithPalette(filename, pic, palette, width, height, bitsPerPixel); diff --git a/src/client/header/client.h b/src/client/header/client.h index e3e720a0..8468c29d 100644 --- a/src/client/header/client.h +++ b/src/client/header/client.h @@ -507,8 +507,6 @@ void V_AddEntity (entity_t *ent); 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_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_GetPalette24to8(const byte *d_8to24table, byte** d_16to8table); unsigned VID_PaletteColor(byte color); diff --git a/src/client/header/screen.h b/src/client/header/screen.h index 71f0216a..431d8013 100644 --- a/src/client/header/screen.h +++ b/src/client/header/screen.h @@ -59,6 +59,8 @@ extern int crosshair_width, crosshair_height; void SCR_AddDirtyPoint(int x, int y); 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); qboolean SCR_DrawCinematic(void); void SCR_RunCinematic(void); diff --git a/src/client/vid/vid.c b/src/client/vid/vid.c index 78deece6..c6a71901 100644 --- a/src/client/vid/vid.c +++ b/src/client/vid/vid.c @@ -447,7 +447,7 @@ VID_LoadRenderer(void) ri.Vid_GetModeInfo = VID_GetModeInfo; ri.Vid_MenuInit = VID_MenuInit; ri.Vid_WriteScreenshot = VID_WriteScreenshot; - ri.VID_ImageDecode = VID_ImageDecode; + ri.VID_ImageDecode = SCR_LoadImageWithPalette; ri.VID_GetPalette = VID_GetPalette; ri.VID_GetPalette24to8 = VID_GetPalette24to8; ri.Vid_RequestRestart = VID_RequestRestart; diff --git a/value b/value deleted file mode 100644 index e69de29b..00000000