Removed LoadLMPAs8Bit; the menu now uses LoadLMP directly

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5149 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/image.c b/image.c
index 86c3d9eeb15c108480be03a124fd130e988bc444..38497c799eb693f7e6fc78164c3d2ee7e303666a 100644 (file)
--- 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 023a489c0c3d469e443b75ceb1eac0737a61f916..71168916416c24f763e3b8238ef1bef289206b26 100644 (file)
--- 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 184df15f104d771ffce97dbbd71fe4461c226450..100e4f2e958971c1c525ddacf9ef68d5efb55e9d 100644 (file)
--- 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);