X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=image.h;h=17b6149fdd6b0bccd73a4132186017b5b72a59d2;hp=a25f2201193578df8475f1ed8ad10f2c11f0dc11;hb=397530aecdd5492236e3dc5620ee7126078c07f3;hpb=ea3f4513f96a21ae1bcbaae4a4997968ace1ab95

diff --git a/image.h b/image.h
index a25f2201..17b6149f 100644
--- a/image.h
+++ b/image.h
@@ -18,8 +18,7 @@ void Image_GammaRemapRGB(const unsigned char *in, unsigned char *out, int pixels
 // converts 8bit image data to RGBA, in can not be the same as out
 void Image_Copy8bitRGBA(const unsigned char *in, unsigned char *out, int pixels, const unsigned int *pal);
 
-// makes a RGBA mask from RGBA input, in can be the same as out
-int image_makemask (const unsigned char *in, unsigned char *out, int size);
+void Image_StripImageExtension (const char *in, char *out, size_t size_out);
 
 unsigned char *LoadTGA (const unsigned char *f, int filesize, int matchwidth, int matchheight);
 
@@ -29,31 +28,12 @@ unsigned char *loadimagepixels (const char *filename, qboolean complain, int mat
 // loads a texture, as a texture
 rtexture_t *loadtextureimage (rtexturepool_t *pool, const char *filename, int matchwidth, int matchheight, qboolean complain, int flags);
 
-// loads a texture's alpha mask, as pixel data
-unsigned char *loadimagepixelsmask (const char *filename, qboolean complain, int matchwidth, int matchheight);
-
-// loads a texture's alpha mask, as a texture
-rtexture_t *loadtextureimagemask (rtexturepool_t *pool, const char *filename, int matchwidth, int matchheight, qboolean complain, int flags);
-
-// loads a texture and it's alpha mask at once (NULL if it has no translucent pixels)
-extern rtexture_t *image_masktex;
-extern rtexture_t *image_nmaptex;
-rtexture_t *loadtextureimagewithmask (rtexturepool_t *pool, const char *filename, int matchwidth, int matchheight, qboolean complain, int flags);
-rtexture_t *loadtextureimagewithmaskandnmap (rtexturepool_t *pool, const char *filename, int matchwidth, int matchheight, qboolean complain, int flags, float bumpscale);
-rtexture_t *loadtextureimagebumpasnmap (rtexturepool_t *pool, const char *filename, int matchwidth, int matchheight, qboolean complain, int flags, float bumpscale);
-
 // writes a RGB TGA that is already upside down (which TGA wants)
 qboolean Image_WriteTGARGB_preflipped (const char *filename, int width, int height, const unsigned char *data, unsigned char *buffer);
 
-// writes a RGB TGA
-void Image_WriteTGARGB (const char *filename, int width, int height, const unsigned char *data);
-
 // writes a RGBA TGA
 void Image_WriteTGARGBA (const char *filename, int width, int height, const unsigned char *data);
 
-// returns true if the image has some translucent pixels
-qboolean Image_CheckAlpha(const unsigned char *data, int size, qboolean rgba);
-
 // resizes the image (in can not be the same as out)
 void Image_Resample (const void *indata, int inwidth, int inheight, int indepth, void *outdata, int outwidth, int outheight, int outdepth, int bytesperpixel, int quality);
 
@@ -65,20 +45,5 @@ unsigned char *LoadLMP (const unsigned char *f, int filesize, int matchwidth, in
 
 void Image_HeightmapToNormalmap(const unsigned char *inpixels, unsigned char *outpixels, int width, int height, int clamp, float bumpscale);
 
-typedef struct imageskin_s
-{
-	unsigned char *basepixels;int basepixels_width;int basepixels_height;
-	unsigned char *nmappixels;int nmappixels_width;int nmappixels_height;
-	unsigned char *glowpixels;int glowpixels_width;int glowpixels_height;
-	unsigned char *glosspixels;int glosspixels_width;int glosspixels_height;
-	unsigned char *pantspixels;int pantspixels_width;int pantspixels_height;
-	unsigned char *shirtpixels;int shirtpixels_width;int shirtpixels_height;
-	unsigned char *maskpixels;int maskpixels_width;int maskpixels_height;
-}
-imageskin_t;
-
-int image_loadskin(imageskin_t *s, char *name);
-void image_freeskin(imageskin_t *s);
-
 #endif