From 360ef8cf3b4295642fe379197cb24a66d7b2fed6 Mon Sep 17 00:00:00 2001 From: molivier Date: Mon, 4 Apr 2005 08:26:46 +0000 Subject: [PATCH] Removed LoadLMPAs8Bit; the menu now uses LoadLMP directly git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5149 d7cf8633-e32d-0410-b094-e92efae38249 --- image.c | 5 ----- image.h | 2 +- menu.c | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/image.c b/image.c index 86c3d9ee..38497c79 100644 --- a/image.c +++ b/image.c @@ -571,11 +571,6 @@ static qbyte *LoadLMPRGBA (const qbyte *f, int matchwidth, int matchheight) return LoadLMP(f, matchwidth, matchheight, false); } -qbyte *LoadLMPAs8Bit (const qbyte *f, int matchwidth, int matchheight) -{ - return LoadLMP(f, matchwidth, matchheight, true); -} - typedef struct { diff --git a/image.h b/image.h index 023a489c..71168916 100644 --- a/image.h +++ b/image.h @@ -59,7 +59,7 @@ void Image_Resample (const void *indata, int inwidth, int inheight, int indepth, void Image_MipReduce(const qbyte *in, qbyte *out, int *width, int *height, int *depth, int destwidth, int destheight, int destdepth, int bytesperpixel); // only used by menuplyr coloring -qbyte *LoadLMPAs8Bit (const qbyte *f, int matchwidth, int matchheight); +qbyte *LoadLMP (const qbyte *f, int matchwidth, int matchheight, qboolean loadAs8Bit); void Image_HeightmapToNormalmap(const unsigned char *inpixels, unsigned char *outpixels, int width, int height, int clamp, float bumpscale); diff --git a/menu.c b/menu.c index 184df15f..100e4f2e 100644 --- a/menu.c +++ b/menu.c @@ -1328,7 +1328,7 @@ void M_Setup_Draw (void) menuplyr_bottom = -1; if ((f = FS_LoadFile("gfx/menuplyr.lmp", tempmempool, true))) { - data = LoadLMPAs8Bit (f, 0, 0); + data = LoadLMP (f, 0, 0, true); menuplyr_width = image_width; menuplyr_height = image_height; Mem_Free(f); -- 2.39.2