removed EntityFrame5_ResetDatabase because it was only used in EntityFrame5_AllocDatabase

[xonotic/darkplaces.git] / image.c

diff --git a/image.c b/image.c
index 5a151506f6d0646a92ef38471d89ff3fe712956c..fc73fd1bbbb15b697f61d38bcdf6cc8269cce808 100644 (file)
--- a/image.c
+++ b/image.c
@@ -2,6 +2,7 @@
 #include "quakedef.h"
 #include "image.h"
 #include "jpeg.h"
+#include "image_png.h"
 #include "r_shadow.h"
 
 int            image_width;
@@ -571,7 +572,7 @@ unsigned char *LoadLMP (const unsigned char *f, int filesize, int matchwidth, in
        else
        {
                image_buffer = (unsigned char *)Mem_Alloc(tempmempool, image_width * image_height * 4);
-               Image_Copy8bitRGBA(f + 8, image_buffer, image_width * image_height, palette_complete);
+               Image_Copy8bitRGBA(f + 8, image_buffer, image_width * image_height, palette_transparent);
        }
        return image_buffer;
 }
@@ -660,12 +661,15 @@ struct imageformat_s
 imageformats[] =
 {
        {"override/%s.tga", LoadTGA},
+       {"override/%s.png", PNG_LoadImage},
        {"override/%s.jpg", JPEG_LoadImage},
        {"textures/%s.tga", LoadTGA},
+       {"textures/%s.png", PNG_LoadImage},
        {"textures/%s.jpg", JPEG_LoadImage},
        {"textures/%s.pcx", LoadPCX},
        {"textures/%s.wal", LoadWAL},
        {"%s.tga", LoadTGA},
+       {"%s.png", PNG_LoadImage},
        {"%s.jpg", JPEG_LoadImage},
        {"%s.pcx", LoadPCX},
        {"%s.lmp", LoadLMPRGBA},
@@ -1512,7 +1516,7 @@ void Image_HeightmapToNormalmap(const unsigned char *inpixels, unsigned char *ou
        }
 }
 
-int image_loadskin(imageskin_t *s, char *shadername)
+int image_loadskin(imageskin_t *s, const char *shadername)
 {
        int j;
        unsigned char *bumppixels;