X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=image.c;h=1f15a2fce253d4d330d7edb1e05d5935d800222d;hp=21e809ed8360ddd11a0c24f05261e578ef09c106;hb=eb155f171d675b2c36f09f0bdf348776d2ec2fab;hpb=d7dc58ac2811c032a59852625bc2ca5edc245919

diff --git a/image.c b/image.c
index 21e809ed..1f15a2fc 100644
--- a/image.c
+++ b/image.c
@@ -8,6 +8,14 @@
 int		image_width;
 int		image_height;
 
+static void Image_CopyAlphaFromBlueBGRA(unsigned char *outpixels, const unsigned char *inpixels, int w, int h)
+{
+	int i, n;
+	n = w * h;
+	for(i = 0; i < n; ++i)
+		outpixels[4*i+3] = inpixels[4*i]; // blue channel
+}
+
 #if 1
 // written by LordHavoc in a readable way, optimized by Vic, further optimized by LordHavoc (the non-special index case), readable version preserved below this
 void Image_CopyMux(unsigned char *outpixels, const unsigned char *inpixels, int inputwidth, int inputheight, qboolean inputflipx, qboolean inputflipy, qboolean inputflipdiagonal, int numoutputcomponents, int numinputcomponents, int *outputinputcomponentindices)
@@ -26,14 +34,14 @@ void Image_CopyMux(unsigned char *outpixels, const unsigned char *inpixels, int
 		if (inputflipdiagonal)
 		{
 			for (x = 0, line = inpixels + col_ofs; x < inputwidth; x++, line += col_inc)
-				for (y = 0, in = line + row_ofs; y < inputheight; y++, in += row_inc, outpixels += numinputcomponents)
+				for (y = 0, in = line + row_ofs; y < inputheight; y++, in += row_inc, outpixels += numoutputcomponents)
 					for (c = 0; c < numoutputcomponents; c++)
 						outpixels[c] = ((index = outputinputcomponentindices[c]) & 0x80000000) ? index : in[index];
 		}
 		else
 		{
 			for (y = 0, line = inpixels + row_ofs; y < inputheight; y++, line += row_inc)
-				for (x = 0, in = line + col_ofs; x < inputwidth; x++, in += col_inc, outpixels += numinputcomponents)
+				for (x = 0, in = line + col_ofs; x < inputwidth; x++, in += col_inc, outpixels += numoutputcomponents)
 					for (c = 0; c < numoutputcomponents; c++)
 						outpixels[c] = ((index = outputinputcomponentindices[c]) & 0x80000000) ? index : in[index];
 		}
@@ -44,14 +52,14 @@ void Image_CopyMux(unsigned char *outpixels, const unsigned char *inpixels, int
 		if (inputflipdiagonal)
 		{
 			for (x = 0, line = inpixels + col_ofs; x < inputwidth; x++, line += col_inc)
-				for (y = 0, in = line + row_ofs; y < inputheight; y++, in += row_inc, outpixels += numinputcomponents)
+				for (y = 0, in = line + row_ofs; y < inputheight; y++, in += row_inc, outpixels += numoutputcomponents)
 					for (c = 0; c < numoutputcomponents; c++)
 						outpixels[c] = in[outputinputcomponentindices[c]];
 		}
 		else
 		{
 			for (y = 0, line = inpixels + row_ofs; y < inputheight; y++, line += row_inc)
-				for (x = 0, in = line + col_ofs; x < inputwidth; x++, in += col_inc, outpixels += numinputcomponents)
+				for (x = 0, in = line + col_ofs; x < inputwidth; x++, in += col_inc, outpixels += numoutputcomponents)
 					for (c = 0; c < numoutputcomponents; c++)
 						outpixels[c] = in[outputinputcomponentindices[c]];
 		}
@@ -115,7 +123,7 @@ void Image_GammaRemapRGB(const unsigned char *in, unsigned char *out, int pixels
 }
 
 // note: pal must be 32bit color
-void Image_Copy8bitRGBA(const unsigned char *in, unsigned char *out, int pixels, const unsigned int *pal)
+void Image_Copy8bitBGRA(const unsigned char *in, unsigned char *out, int pixels, const unsigned int *pal)
 {
 	int *iout = (int *)out;
 	while (pixels >= 8)
@@ -181,10 +189,10 @@ typedef struct pcx_s
 LoadPCX
 ============
 */
-unsigned char* LoadPCX (const unsigned char *f, int filesize, int matchwidth, int matchheight)
+static unsigned char* LoadPCX_BGRA (const unsigned char *f, int filesize, int *miplevel)
 {
 	pcx_t pcx;
-	unsigned char *a, *b, *image_rgba, *pbuf;
+	unsigned char *a, *b, *image_buffer, *pbuf;
 	const unsigned char *palette, *fin, *enddata;
 	int x, y, x2, dataByte;
 
@@ -211,23 +219,21 @@ unsigned char* LoadPCX (const unsigned char *f, int filesize, int matchwidth, in
 
 	image_width = pcx.xmax + 1 - pcx.xmin;
 	image_height = pcx.ymax + 1 - pcx.ymin;
-	if (pcx.manufacturer != 0x0a || pcx.version != 5 || pcx.encoding != 1 || pcx.bits_per_pixel != 8 || image_width > 4096 || image_height > 4096 || image_width <= 0 || image_height <= 0)
+	if (pcx.manufacturer != 0x0a || pcx.version != 5 || pcx.encoding != 1 || pcx.bits_per_pixel != 8 || image_width > 32768 || image_height > 32768 || image_width <= 0 || image_height <= 0)
 	{
 		Con_Print("Bad pcx file\n");
 		return NULL;
 	}
-	if ((matchwidth && image_width != matchwidth) || (matchheight && image_height != matchheight))
-		return NULL;
 
 	palette = f + filesize - 768;
 
-	image_rgba = (unsigned char *)Mem_Alloc(tempmempool, image_width*image_height*4);
-	if (!image_rgba)
+	image_buffer = (unsigned char *)Mem_Alloc(tempmempool, image_width*image_height*4);
+	if (!image_buffer)
 	{
 		Con_Printf("LoadPCX: not enough memory for %i by %i image\n", image_width, image_height);
 		return NULL;
 	}
-	pbuf = image_rgba + image_width*image_height*3;
+	pbuf = image_buffer + image_width*image_height*3;
 	enddata = palette;
 
 	for (y = 0;y < image_height && fin < enddata;y++)
@@ -250,24 +256,115 @@ unsigned char* LoadPCX (const unsigned char *f, int filesize, int matchwidth, in
 			else
 				a[x++] = dataByte;
 		}
-		fin += pcx.bytes_per_line - image_width; // the number of bytes per line is always forced to an even number
 		while(x < image_width)
 			a[x++] = 0;
 	}
 
-	a = image_rgba;
+	a = image_buffer;
 	b = pbuf;
 
 	for(x = 0;x < image_width*image_height;x++)
 	{
 		y = *b++ * 3;
-		*a++ = palette[y];
-		*a++ = palette[y+1];
 		*a++ = palette[y+2];
+		*a++ = palette[y+1];
+		*a++ = palette[y];
 		*a++ = 255;
 	}
 
-	return image_rgba;
+	return image_buffer;
+}
+
+/*
+============
+LoadPCX
+============
+*/
+qboolean LoadPCX_QWSkin(const unsigned char *f, int filesize, unsigned char *pixels, int outwidth, int outheight)
+{
+	pcx_t pcx;
+	unsigned char *a;
+	const unsigned char *fin, *enddata;
+	int x, y, x2, dataByte, pcxwidth, pcxheight;
+
+	if (filesize < (int)sizeof(pcx) + 768)
+		return false;
+
+	image_width = outwidth;
+	image_height = outheight;
+	fin = f;
+
+	memcpy(&pcx, fin, sizeof(pcx));
+	fin += sizeof(pcx);
+
+	// LordHavoc: big-endian support ported from QF newtree
+	pcx.xmax = LittleShort (pcx.xmax);
+	pcx.xmin = LittleShort (pcx.xmin);
+	pcx.ymax = LittleShort (pcx.ymax);
+	pcx.ymin = LittleShort (pcx.ymin);
+	pcx.hres = LittleShort (pcx.hres);
+	pcx.vres = LittleShort (pcx.vres);
+	pcx.bytes_per_line = LittleShort (pcx.bytes_per_line);
+	pcx.palette_type = LittleShort (pcx.palette_type);
+
+	pcxwidth = pcx.xmax + 1 - pcx.xmin;
+	pcxheight = pcx.ymax + 1 - pcx.ymin;
+	if (pcx.manufacturer != 0x0a || pcx.version != 5 || pcx.encoding != 1 || pcx.bits_per_pixel != 8 || pcxwidth > 4096 || pcxheight > 4096 || pcxwidth <= 0 || pcxheight <= 0)
+		return false;
+
+	enddata = f + filesize - 768;
+
+	for (y = 0;y < outheight && fin < enddata;y++)
+	{
+		a = pixels + y * outwidth;
+		// pad the output with blank lines if needed
+		if (y >= pcxheight)
+		{
+			memset(a, 0, outwidth);
+			continue;
+		}
+		for (x = 0;x < pcxwidth;)
+		{
+			if (fin >= enddata)
+				return false;
+			dataByte = *fin++;
+			if(dataByte >= 0xC0)
+			{
+				x2 = x + (dataByte & 0x3F);
+				if (fin >= enddata)
+					return false;
+				if (x2 > pcxwidth)
+					return false;
+				dataByte = *fin++;
+				for (;x < x2;x++)
+					if (x < outwidth)
+						a[x] = dataByte;
+			}
+			else
+			{
+				if (x < outwidth) // truncate to destination width
+					a[x] = dataByte;
+				x++;
+			}
+		}
+		while(x < outwidth)
+			a[x++] = 0;
+	}
+
+	return true;
+}
+
+/*
+============
+LoadPCX
+============
+*/
+qboolean LoadPCX_PaletteOnly(const unsigned char *f, int filesize, unsigned char *palette768b)
+{
+	if (filesize < 768)
+		return false;
+	memcpy(palette768b, f + filesize - 768, 768);
+	return true;
 }
 
 /*
@@ -288,7 +385,7 @@ typedef struct _TargaHeader
 }
 TargaHeader;
 
-void PrintTargaHeader(TargaHeader *t)
+static void PrintTargaHeader(TargaHeader *t)
 {
 	Con_Printf("TargaHeader:\nuint8 id_length = %i;\nuint8 colormap_type = %i;\nuint8 image_type = %i;\nuint16 colormap_index = %i;\nuint16 colormap_length = %i;\nuint8 colormap_size = %i;\nuint16 x_origin = %i;\nuint16 y_origin = %i;\nuint16 width = %i;\nuint16 height = %i;\nuint8 pixel_size = %i;\nuint8 attributes = %i;\n", t->id_length, t->colormap_type, t->image_type, t->colormap_index, t->colormap_length, t->colormap_size, t->x_origin, t->y_origin, t->width, t->height, t->pixel_size, t->attributes);
 }
@@ -298,14 +395,20 @@ void PrintTargaHeader(TargaHeader *t)
 LoadTGA
 =============
 */
-unsigned char *LoadTGA (const unsigned char *f, int filesize, int matchwidth, int matchheight)
+unsigned char *LoadTGA_BGRA (const unsigned char *f, int filesize, int *miplevel)
 {
-	int x, y, row_inc, compressed, readpixelcount, red, green, blue, alpha, runlen, pindex, alphabits;
-	unsigned char *pixbuf, *image_rgba;
+	int x, y, pix_inc, row_inci, runlen, alphabits;
+	unsigned char *image_buffer;
+	unsigned int *pixbufi;
 	const unsigned char *fin, *enddata;
-	unsigned char *p;
 	TargaHeader targa_header;
-	unsigned char palette[256*4];
+	unsigned int palettei[256];
+	union
+	{
+		unsigned int i;
+		unsigned char b[4];
+	}
+	bgra;
 
 	if (filesize < 19)
 		return NULL;
@@ -323,16 +426,17 @@ unsigned char *LoadTGA (const unsigned char *f, int filesize, int matchwidth, in
 	targa_header.y_origin = f[10] + f[11] * 256;
 	targa_header.width = image_width = f[12] + f[13] * 256;
 	targa_header.height = image_height = f[14] + f[15] * 256;
-	if (image_width > 4096 || image_height > 4096 || image_width <= 0 || image_height <= 0)
+	targa_header.pixel_size = f[16];
+	targa_header.attributes = f[17];
+
+	if (image_width > 32768 || image_height > 32768 || image_width <= 0 || image_height <= 0)
 	{
 		Con_Print("LoadTGA: invalid size\n");
 		PrintTargaHeader(&targa_header);
 		return NULL;
 	}
-	if ((matchwidth && image_width != matchwidth) || (matchheight && image_height != matchheight))
-		return NULL;
-	targa_header.pixel_size = f[16];
-	targa_header.attributes = f[17];
+
+	memset(palettei, 0, sizeof(palettei));
 
 	// advance to end of header
 	fin = f + 18;
@@ -361,21 +465,17 @@ unsigned char *LoadTGA (const unsigned char *f, int filesize, int matchwidth, in
 		{
 			for (x = 0;x < targa_header.colormap_length;x++)
 			{
-				palette[x*4+2] = *fin++;
-				palette[x*4+1] = *fin++;
-				palette[x*4+0] = *fin++;
-				palette[x*4+3] = 255;
+				bgra.b[0] = *fin++;
+				bgra.b[1] = *fin++;
+				bgra.b[2] = *fin++;
+				bgra.b[3] = 255;
+				palettei[x] = bgra.i;
 			}
 		}
 		else if (targa_header.colormap_size == 32)
 		{
-			for (x = 0;x < targa_header.colormap_length;x++)
-			{
-				palette[x*4+2] = *fin++;
-				palette[x*4+1] = *fin++;
-				palette[x*4+0] = *fin++;
-				palette[x*4+3] = *fin++;
-			}
+			memcpy(palettei, fin, targa_header.colormap_length*4);
+			fin += targa_header.colormap_length * 4;
 		}
 		else
 		{
@@ -386,35 +486,34 @@ unsigned char *LoadTGA (const unsigned char *f, int filesize, int matchwidth, in
 	}
 
 	// check our pixel_size restrictions according to image_type
-	if (targa_header.image_type == 2 || targa_header.image_type == 10)
+	switch (targa_header.image_type & ~8)
 	{
+	case 2:
 		if (targa_header.pixel_size != 24 && targa_header.pixel_size != 32)
 		{
 			Con_Print("LoadTGA: only 24bit and 32bit pixel sizes supported for type 2 and type 10 images\n");
 			PrintTargaHeader(&targa_header);
 			return NULL;
 		}
-	}
-	else if (targa_header.image_type == 1 || targa_header.image_type == 9)
-	{
-		if (targa_header.pixel_size != 8)
+		break;
+	case 3:
+		// set up a palette to make the loader easier
+		for (x = 0;x < 256;x++)
 		{
-			Con_Print("LoadTGA: only 8bit pixel size for type 1, 3, 9, and 11 images supported\n");
-			PrintTargaHeader(&targa_header);
-			return NULL;
+			bgra.b[0] = bgra.b[1] = bgra.b[2] = x;
+			bgra.b[3] = 255;
+			palettei[x] = bgra.i;
 		}
-	}
-	else if (targa_header.image_type == 3 || targa_header.image_type == 11)
-	{
+		// fall through to colormap case
+	case 1:
 		if (targa_header.pixel_size != 8)
 		{
 			Con_Print("LoadTGA: only 8bit pixel size for type 1, 3, 9, and 11 images supported\n");
 			PrintTargaHeader(&targa_header);
 			return NULL;
 		}
-	}
-	else
-	{
+		break;
+	default:
 		Con_Printf("LoadTGA: Only type 1, 2, 3, 9, 10, and 11 targa RGB images supported, image_type = %i\n", targa_header.image_type);
 		PrintTargaHeader(&targa_header);
 		return NULL;
@@ -434,8 +533,8 @@ unsigned char *LoadTGA (const unsigned char *f, int filesize, int matchwidth, in
 		return NULL;
 	}
 
-	image_rgba = (unsigned char *)Mem_Alloc(tempmempool, image_width * image_height * 4);
-	if (!image_rgba)
+	image_buffer = (unsigned char *)Mem_Alloc(tempmempool, image_width * image_height * 4);
+	if (!image_buffer)
 	{
 		Con_Printf("LoadTGA: not enough memory for %i by %i image\n", image_width, image_height);
 		return NULL;
@@ -444,145 +543,211 @@ unsigned char *LoadTGA (const unsigned char *f, int filesize, int matchwidth, in
 	// If bit 5 of attributes isn't set, the image has been stored from bottom to top
 	if ((targa_header.attributes & 0x20) == 0)
 	{
-		pixbuf = image_rgba + (image_height - 1)*image_width*4;
-		row_inc = -image_width*4*2;
+		pixbufi = (unsigned int*)image_buffer + (image_height - 1)*image_width;
+		row_inci = -image_width*2;
 	}
 	else
 	{
-		pixbuf = image_rgba;
-		row_inc = 0;
+		pixbufi = (unsigned int*)image_buffer;
+		row_inci = 0;
 	}
 
-	compressed = targa_header.image_type == 9 || targa_header.image_type == 10 || targa_header.image_type == 11;
-	x = 0;
-	y = 0;
-	red = green = blue = alpha = 255;
-	while (y < image_height)
+	pix_inc = 1;
+	if ((targa_header.image_type & ~8) == 2)
+		pix_inc = (targa_header.pixel_size + 7) / 8;
+	switch (targa_header.image_type)
 	{
-		// decoder is mostly the same whether it's compressed or not
-		readpixelcount = 1000000;
-		runlen = 1000000;
-		if (compressed && fin < enddata)
+	case 1: // colormapped, uncompressed
+	case 3: // greyscale, uncompressed
+		if (fin + image_width * image_height * pix_inc > enddata)
+			break;
+		for (y = 0;y < image_height;y++, pixbufi += row_inci)
+			for (x = 0;x < image_width;x++)
+				*pixbufi++ = palettei[*fin++];
+		break;
+	case 2:
+		// BGR or BGRA, uncompressed
+		if (fin + image_width * image_height * pix_inc > enddata)
+			break;
+		if (targa_header.pixel_size == 32 && alphabits)
 		{
-			runlen = *fin++;
-			// high bit indicates this is an RLE compressed run
-			if (runlen & 0x80)
-				readpixelcount = 1;
-			runlen = 1 + (runlen & 0x7f);
+			for (y = 0;y < image_height;y++)
+				memcpy(pixbufi + y * (image_width + row_inci), fin + y * image_width * pix_inc, image_width*4);
 		}
+		else
+		{
+			for (y = 0;y < image_height;y++, pixbufi += row_inci)
+			{
+				for (x = 0;x < image_width;x++, fin += pix_inc)
+				{
+					bgra.b[0] = fin[0];
+					bgra.b[1] = fin[1];
+					bgra.b[2] = fin[2];
+					bgra.b[3] = 255;
+					*pixbufi++ = bgra.i;
+				}
+			}
+		}
+		break;
+	case 9: // colormapped, RLE
+	case 11: // greyscale, RLE
+		for (y = 0;y < image_height;y++, pixbufi += row_inci)
+		{
+			for (x = 0;x < image_width;)
+			{
+				if (fin >= enddata)
+					break; // error - truncated file
+				runlen = *fin++;
+				if (runlen & 0x80)
+				{
+					// RLE - all pixels the same color
+					runlen += 1 - 0x80;
+					if (fin + pix_inc > enddata)
+						break; // error - truncated file
+					if (x + runlen > image_width)
+						break; // error - line exceeds width
+					bgra.i = palettei[*fin++];
+					for (;runlen--;x++)
+						*pixbufi++ = bgra.i;
+				}
+				else
+				{
+					// uncompressed - all pixels different color
+					runlen++;
+					if (fin + pix_inc * runlen > enddata)
+						break; // error - truncated file
+					if (x + runlen > image_width)
+						break; // error - line exceeds width
+					for (;runlen--;x++)
+						*pixbufi++ = palettei[*fin++];
+				}
+			}
 
-		while((runlen--) && y < image_height)
+			if (x != image_width)
+			{
+				// pixbufi is useless now
+				Con_Printf("LoadTGA: corrupt file\n");
+				break;
+			}
+		}
+		break;
+	case 10:
+		// BGR or BGRA, RLE
+		if (targa_header.pixel_size == 32 && alphabits)
 		{
-			if (readpixelcount > 0)
+			for (y = 0;y < image_height;y++, pixbufi += row_inci)
 			{
-				readpixelcount--;
-				red = green = blue = alpha = 255;
-				if (fin < enddata)
+				for (x = 0;x < image_width;)
 				{
-					switch(targa_header.image_type)
+					if (fin >= enddata)
+						break; // error - truncated file
+					runlen = *fin++;
+					if (runlen & 0x80)
 					{
-					case 1:
-					case 9:
-						// colormapped
-						pindex = *fin++;
-						if (pindex >= targa_header.colormap_length)
-							pindex = 0; // error
-						p = palette + pindex * 4;
-						red = p[0];
-						green = p[1];
-						blue = p[2];
-						alpha = p[3];
-						break;
-					case 2:
-					case 10:
-						// BGR or BGRA
-						blue = *fin++;
-						if (fin < enddata)
-							green = *fin++;
-						if (fin < enddata)
-							red = *fin++;
-						if (targa_header.pixel_size == 32 && fin < enddata)
-							alpha = *fin++;
-						break;
-					case 3:
-					case 11:
-						// greyscale
-						red = green = blue = *fin++;
-						break;
+						// RLE - all pixels the same color
+						runlen += 1 - 0x80;
+						if (fin + pix_inc > enddata)
+							break; // error - truncated file
+						if (x + runlen > image_width)
+							break; // error - line exceeds width
+						bgra.b[0] = fin[0];
+						bgra.b[1] = fin[1];
+						bgra.b[2] = fin[2];
+						bgra.b[3] = fin[3];
+						fin += pix_inc;
+						for (;runlen--;x++)
+							*pixbufi++ = bgra.i;
 					}
-					if (!alphabits)
-						alpha = 255;
+					else
+					{
+						// uncompressed - all pixels different color
+						runlen++;
+						if (fin + pix_inc * runlen > enddata)
+							break; // error - truncated file
+						if (x + runlen > image_width)
+							break; // error - line exceeds width
+						for (;runlen--;x++)
+						{
+							bgra.b[0] = fin[0];
+							bgra.b[1] = fin[1];
+							bgra.b[2] = fin[2];
+							bgra.b[3] = fin[3];
+							fin += pix_inc;
+							*pixbufi++ = bgra.i;
+						}
+					}
+				}
+
+				if (x != image_width)
+				{
+					// pixbufi is useless now
+					Con_Printf("LoadTGA: corrupt file\n");
+					break;
 				}
 			}
-			*pixbuf++ = red;
-			*pixbuf++ = green;
-			*pixbuf++ = blue;
-			*pixbuf++ = alpha;
-			x++;
-			if (x == image_width)
+		}
+		else
+		{
+			for (y = 0;y < image_height;y++, pixbufi += row_inci)
 			{
-				// end of line, advance to next
-				x = 0;
-				y++;
-				pixbuf += row_inc;
+				for (x = 0;x < image_width;)
+				{
+					if (fin >= enddata)
+						break; // error - truncated file
+					runlen = *fin++;
+					if (runlen & 0x80)
+					{
+						// RLE - all pixels the same color
+						runlen += 1 - 0x80;
+						if (fin + pix_inc > enddata)
+							break; // error - truncated file
+						if (x + runlen > image_width)
+							break; // error - line exceeds width
+						bgra.b[0] = fin[0];
+						bgra.b[1] = fin[1];
+						bgra.b[2] = fin[2];
+						bgra.b[3] = 255;
+						fin += pix_inc;
+						for (;runlen--;x++)
+							*pixbufi++ = bgra.i;
+					}
+					else
+					{
+						// uncompressed - all pixels different color
+						runlen++;
+						if (fin + pix_inc * runlen > enddata)
+							break; // error - truncated file
+						if (x + runlen > image_width)
+							break; // error - line exceeds width
+						for (;runlen--;x++)
+						{
+							bgra.b[0] = fin[0];
+							bgra.b[1] = fin[1];
+							bgra.b[2] = fin[2];
+							bgra.b[3] = 255;
+							fin += pix_inc;
+							*pixbufi++ = bgra.i;
+						}
+					}
+				}
+
+				if (x != image_width)
+				{
+					// pixbufi is useless now
+					Con_Printf("LoadTGA: corrupt file\n");
+					break;
+				}
 			}
 		}
+		break;
+	default:
+		// unknown image_type
+		break;
 	}
 
-	return image_rgba;
-}
-
-/*
-============
-LoadLMP
-============
-*/
-unsigned char *LoadLMP (const unsigned char *f, int filesize, int matchwidth, int matchheight, qboolean loadAs8Bit)
-{
-	unsigned char *image_buffer;
-
-	if (filesize < 9)
-	{
-		Con_Print("LoadLMP: invalid LMP file\n");
-		return NULL;
-	}
-
-	// parse the very complicated header *chuckle*
-	image_width = BuffLittleLong(f);
-	image_height = BuffLittleLong(f + 4);
-	if (image_width > 4096 || image_height > 4096 || image_width <= 0 || image_height <= 0)
-	{
-		Con_Printf("LoadLMP: invalid size %ix%i\n", image_width, image_height);
-		return NULL;
-	}
-	if ((matchwidth && image_width != matchwidth) || (matchheight && image_height != matchheight))
-		return NULL;
-
-	if (filesize < (8 + image_width * image_height))
-	{
-		Con_Print("LoadLMP: invalid LMP file\n");
-		return NULL;
-	}
-
-	if (loadAs8Bit)
-	{
-		image_buffer = (unsigned char *)Mem_Alloc(tempmempool, image_width * image_height);
-		memcpy(image_buffer, f + 8, image_width * image_height);
-	}
-	else
-	{
-		image_buffer = (unsigned char *)Mem_Alloc(tempmempool, image_width * image_height * 4);
-		Image_Copy8bitRGBA(f + 8, image_buffer, image_width * image_height, palette_transparent);
-	}
 	return image_buffer;
 }
 
-static unsigned char *LoadLMPRGBA (const unsigned char *f, int filesize, int matchwidth, int matchheight)
-{
-	return LoadLMP(f, filesize, matchwidth, matchheight, false);
-}
-
-
 typedef struct q2wal_s
 {
 	char		name[32];
@@ -594,9 +759,9 @@ typedef struct q2wal_s
 	int			value;
 } q2wal_t;
 
-unsigned char *LoadWAL (const unsigned char *f, int filesize, int matchwidth, int matchheight)
+static unsigned char *LoadWAL_BGRA (const unsigned char *f, int filesize, int *miplevel)
 {
-	unsigned char *image_rgba;
+	unsigned char *image_buffer;
 	const q2wal_t *inwal = (const q2wal_t *)f;
 
 	if (filesize < (int) sizeof(q2wal_t))
@@ -607,120 +772,209 @@ unsigned char *LoadWAL (const unsigned char *f, int filesize, int matchwidth, in
 
 	image_width = LittleLong(inwal->width);
 	image_height = LittleLong(inwal->height);
-	if (image_width > 4096 || image_height > 4096 || image_width <= 0 || image_height <= 0)
+	if (image_width > 32768 || image_height > 32768 || image_width <= 0 || image_height <= 0)
 	{
 		Con_Printf("LoadWAL: invalid size %ix%i\n", image_width, image_height);
 		return NULL;
 	}
-	if ((matchwidth && image_width != matchwidth) || (matchheight && image_height != matchheight))
-		return NULL;
 
-	if (filesize < (int) sizeof(q2wal_t) + (int) LittleLong(inwal->offsets[0]) + image_width * image_height)
+	if (filesize < (int) LittleLong(inwal->offsets[0]) + image_width * image_height)
 	{
 		Con_Print("LoadWAL: invalid WAL file\n");
 		return NULL;
 	}
 
-	image_rgba = (unsigned char *)Mem_Alloc(tempmempool, image_width * image_height * 4);
-	if (!image_rgba)
+	image_buffer = (unsigned char *)Mem_Alloc(tempmempool, image_width * image_height * 4);
+	if (!image_buffer)
 	{
-		Con_Printf("LoadLMP: not enough memory for %i by %i image\n", image_width, image_height);
+		Con_Printf("LoadWAL: not enough memory for %i by %i image\n", image_width, image_height);
 		return NULL;
 	}
-	Image_Copy8bitRGBA(f + LittleLong(inwal->offsets[0]), image_rgba, image_width * image_height, palette_complete);
-	return image_rgba;
+	Image_Copy8bitBGRA(f + LittleLong(inwal->offsets[0]), image_buffer, image_width * image_height, q2palette_bgra_complete);
+	return image_buffer;
 }
 
-
-void Image_StripImageExtension (const char *in, char *out)
+qboolean LoadWAL_GetMetadata(const unsigned char *f, int filesize, int *retwidth, int *retheight, int *retflags, int *retvalue, int *retcontents, char *retanimname32c)
 {
-	const char *end, *temp;
-	end = in + strlen(in);
-	if ((end - in) >= 4)
+	const q2wal_t *inwal = (const q2wal_t *)f;
+
+	if (filesize < (int) sizeof(q2wal_t))
 	{
-		temp = end - 4;
-		if (strcmp(temp, ".tga") == 0
-		 || strcmp(temp, ".pcx") == 0
-		 || strcmp(temp, ".lmp") == 0
-		 || strcmp(temp, ".png") == 0
-		 || strcmp(temp, ".jpg") == 0)
-			end = temp;
-		while (in < end)
-			*out++ = *in++;
-		*out++ = 0;
+		Con_Print("LoadWAL: invalid WAL file\n");
+		if (retwidth)
+			*retwidth = 16;
+		if (retheight)
+			*retheight = 16;
+		if (retflags)
+			*retflags = 0;
+		if (retvalue)
+			*retvalue = 0;
+		if (retcontents)
+			*retcontents = 0;
+		if (retanimname32c)
+			memset(retanimname32c, 0, 32);
+		return false;
 	}
+
+	if (retwidth)
+		*retwidth = LittleLong(inwal->width);
+	if (retheight)
+		*retheight = LittleLong(inwal->height);
+	if (retflags)
+		*retflags = LittleLong(inwal->flags);
+	if (retvalue)
+		*retvalue = LittleLong(inwal->value);
+	if (retcontents)
+		*retcontents = LittleLong(inwal->contents);
+	if (retanimname32c)
+	{
+		memcpy(retanimname32c, inwal->animname, 32);
+		retanimname32c[31] = 0;
+	}
+	return true;
+}
+
+
+void Image_StripImageExtension (const char *in, char *out, size_t size_out)
+{
+	const char *ext;
+
+	if (size_out == 0)
+		return;
+
+	ext = FS_FileExtension(in);
+	if (ext && (!strcmp(ext, "tga") || !strcmp(ext, "pcx") || !strcmp(ext, "lmp") || !strcmp(ext, "png") || !strcmp(ext, "jpg") || !strcmp(ext, "wal")))
+		FS_StripExtension(in, out, size_out);
 	else
-		strcpy(out, in);
+		strlcpy(out, in, size_out);
+}
+
+static unsigned char image_linearfromsrgb[256];
+static unsigned char image_srgbfromlinear_lightmap[256];
+
+void Image_MakeLinearColorsFromsRGB(unsigned char *pout, const unsigned char *pin, int numpixels)
+{
+	int i;
+	// this math from http://www.opengl.org/registry/specs/EXT/texture_sRGB.txt
+	if (!image_linearfromsrgb[255])
+		for (i = 0;i < 256;i++)
+			image_linearfromsrgb[i] = (unsigned char)floor(Image_LinearFloatFromsRGB(i) * 255.0f + 0.5f);
+	for (i = 0;i < numpixels;i++)
+	{
+		pout[i*4+0] = image_linearfromsrgb[pin[i*4+0]];
+		pout[i*4+1] = image_linearfromsrgb[pin[i*4+1]];
+		pout[i*4+2] = image_linearfromsrgb[pin[i*4+2]];
+		pout[i*4+3] = pin[i*4+3];
+	}
+}
+
+void Image_MakesRGBColorsFromLinear_Lightmap(unsigned char *pout, const unsigned char *pin, int numpixels)
+{
+	int i;
+	// this math from http://www.opengl.org/registry/specs/EXT/texture_sRGB.txt
+	if (!image_srgbfromlinear_lightmap[255])
+		for (i = 0;i < 256;i++)
+			image_srgbfromlinear_lightmap[i] = (unsigned char)floor(bound(0.0f, Image_sRGBFloatFromLinear_Lightmap(i), 1.0f) * 255.0f + 0.5f);
+	for (i = 0;i < numpixels;i++)
+	{
+		pout[i*4+0] = image_srgbfromlinear_lightmap[pin[i*4+0]];
+		pout[i*4+1] = image_srgbfromlinear_lightmap[pin[i*4+1]];
+		pout[i*4+2] = image_srgbfromlinear_lightmap[pin[i*4+2]];
+		pout[i*4+3] = pin[i*4+3];
+	}
 }
 
 typedef struct imageformat_s
 {
 	const char *formatstring;
-	unsigned char *(*loadfunc)(const unsigned char *f, int filesize, int matchwidth, int matchheight);
+	unsigned char *(*loadfunc)(const unsigned char *f, int filesize, int *miplevel);
 }
 imageformat_t;
 
 // GAME_TENEBRAE only
 imageformat_t imageformats_tenebrae[] =
 {
-	{"override/%s.tga", LoadTGA},
-	{"override/%s.png", PNG_LoadImage},
-	{"override/%s.jpg", JPEG_LoadImage},
+	{"override/%s.tga", LoadTGA_BGRA},
+	{"override/%s.png", PNG_LoadImage_BGRA},
+	{"override/%s.jpg", JPEG_LoadImage_BGRA},
+	{"override/%s.pcx", LoadPCX_BGRA},
+	{"%s.tga", LoadTGA_BGRA},
+	{"%s.png", PNG_LoadImage_BGRA},
+	{"%s.jpg", JPEG_LoadImage_BGRA},
+	{"%s.pcx", LoadPCX_BGRA},
 	{NULL, NULL}
 };
 
 imageformat_t imageformats_nopath[] =
 {
-	{"textures/%s.tga", LoadTGA},
-	{"textures/%s.png", PNG_LoadImage},
-	{"textures/%s.jpg", JPEG_LoadImage},
-	{"%s.tga", LoadTGA},
-	{"%s.png", PNG_LoadImage},
-	{"%s.jpg", JPEG_LoadImage},
+	{"override/%s.tga", LoadTGA_BGRA},
+	{"override/%s.png", PNG_LoadImage_BGRA},
+	{"override/%s.jpg", JPEG_LoadImage_BGRA},
+	{"textures/%s.tga", LoadTGA_BGRA},
+	{"textures/%s.png", PNG_LoadImage_BGRA},
+	{"textures/%s.jpg", JPEG_LoadImage_BGRA},
+	{"%s.tga", LoadTGA_BGRA},
+	{"%s.png", PNG_LoadImage_BGRA},
+	{"%s.jpg", JPEG_LoadImage_BGRA},
+	{"%s.pcx", LoadPCX_BGRA},
+	{NULL, NULL}
+};
+
+// GAME_DELUXEQUAKE only
+// VorteX: the point why i use such messy texture paths is
+// that GtkRadiant can't detect normal/gloss textures
+// and exclude them from texture browser
+// so i just use additional folder to store this textures
+imageformat_t imageformats_dq[] =
+{
+	{"%s.tga", LoadTGA_BGRA},
+	{"%s.jpg", JPEG_LoadImage_BGRA},
+	{"texturemaps/%s.tga", LoadTGA_BGRA},
+	{"texturemaps/%s.jpg", JPEG_LoadImage_BGRA},
 	{NULL, NULL}
 };
 
 imageformat_t imageformats_textures[] =
 {
-	{"%s.tga", LoadTGA},
-	{"%s.png", PNG_LoadImage},
-	{"%s.jpg", JPEG_LoadImage},
-	{"%s.pcx", LoadPCX},
-	{"%s.wal", LoadWAL},
+	{"%s.tga", LoadTGA_BGRA},
+	{"%s.png", PNG_LoadImage_BGRA},
+	{"%s.jpg", JPEG_LoadImage_BGRA},
+	{"%s.pcx", LoadPCX_BGRA},
+	{"%s.wal", LoadWAL_BGRA},
 	{NULL, NULL}
 };
 
 imageformat_t imageformats_gfx[] =
 {
-	{"%s.tga", LoadTGA},
-	{"%s.png", PNG_LoadImage},
-	{"%s.jpg", JPEG_LoadImage},
-	{"%s.pcx", LoadPCX},
-	{"%s.lmp", LoadLMPRGBA},
+	{"%s.tga", LoadTGA_BGRA},
+	{"%s.png", PNG_LoadImage_BGRA},
+	{"%s.jpg", JPEG_LoadImage_BGRA},
+	{"%s.pcx", LoadPCX_BGRA},
 	{NULL, NULL}
 };
 
 imageformat_t imageformats_other[] =
 {
-	{"%s.tga", LoadTGA},
-	{"%s.png", PNG_LoadImage},
-	{"%s.jpg", JPEG_LoadImage},
-	{"%s.pcx", LoadPCX},
+	{"%s.tga", LoadTGA_BGRA},
+	{"%s.png", PNG_LoadImage_BGRA},
+	{"%s.jpg", JPEG_LoadImage_BGRA},
+	{"%s.pcx", LoadPCX_BGRA},
 	{NULL, NULL}
 };
 
-unsigned char *loadimagepixels (const char *filename, qboolean complain, int matchwidth, int matchheight)
+int fixtransparentpixels(unsigned char *data, int w, int h);
+unsigned char *loadimagepixelsbgra (const char *filename, qboolean complain, qboolean allowFixtrans, qboolean convertsRGB, int *miplevel)
 {
 	fs_offset_t filesize;
 	imageformat_t *firstformat, *format;
-	unsigned char *f, *data = NULL;
-	char basename[MAX_QPATH], name[MAX_QPATH], *c;
-	if (developer_memorydebug.integer)
-		Mem_CheckSentinelsGlobal();
+	unsigned char *f, *data = NULL, *data2 = NULL;
+	char basename[MAX_QPATH], name[MAX_QPATH], name2[MAX_QPATH], *c;
+	char vabuf[1024];
+	//if (developer_memorydebug.integer)
+	//	Mem_CheckSentinelsGlobal();
 	if (developer_texturelogging.integer)
 		Log_Printf("textures.log", "%s\n", filename);
-	strlcpy(basename, filename, sizeof(basename));
-	Image_StripImageExtension(basename, basename); // strip filename extensions to allow replacement by other types
+	Image_StripImageExtension(filename, basename, sizeof(basename)); // strip filename extensions to allow replacement by other types
 	// replace *'s with #, so commandline utils don't get confused when dealing with the external files
 	for (c = basename;*c;c++)
 		if (*c == '*')
@@ -735,30 +989,79 @@ unsigned char *loadimagepixels (const char *filename, qboolean complain, int mat
 	}
 	if (gamemode == GAME_TENEBRAE)
 		firstformat = imageformats_tenebrae;
+	else if (gamemode == GAME_DELUXEQUAKE)
+		firstformat = imageformats_dq;
 	else if (!strcasecmp(name, "textures"))
 		firstformat = imageformats_textures;
 	else if (!strcasecmp(name, "gfx"))
 		firstformat = imageformats_gfx;
-	else if (!strchr(name, '/'))
+	else if (!strchr(basename, '/'))
 		firstformat = imageformats_nopath;
 	else
 		firstformat = imageformats_other;
 	// now try all the formats in the selected list
 	for (format = firstformat;format->formatstring;format++)
 	{
-		sprintf (name, format->formatstring, basename);
+		dpsnprintf (name, sizeof(name), format->formatstring, basename);
 		f = FS_LoadFile(name, tempmempool, true, &filesize);
 		if (f)
 		{
-			data = format->loadfunc(f, filesize, matchwidth, matchheight);
+			int mymiplevel = miplevel ? *miplevel : 0;
+			image_width = 0;
+			image_height = 0;
+			data = format->loadfunc(f, (int)filesize, &mymiplevel);
 			Mem_Free(f);
 			if (data)
 			{
-				Con_DPrintf("loaded image %s (%dx%d)\n", name, image_width, image_height);
-				if (developer_memorydebug.integer)
-					Mem_CheckSentinelsGlobal();
+				if(format->loadfunc == JPEG_LoadImage_BGRA) // jpeg can't do alpha, so let's simulate it by loading another jpeg
+				{
+					dpsnprintf (name2, sizeof(name2), format->formatstring, va(vabuf, sizeof(vabuf), "%s_alpha", basename));
+					f = FS_LoadFile(name2, tempmempool, true, &filesize);
+					if(f)
+					{
+						int mymiplevel2 = miplevel ? *miplevel : 0;
+						int image_width_save = image_width;
+						int image_height_save = image_height;
+						data2 = format->loadfunc(f, (int)filesize, &mymiplevel2);
+						if(data2 && mymiplevel == mymiplevel2 && image_width == image_width_save && image_height == image_height_save)
+							Image_CopyAlphaFromBlueBGRA(data, data2, image_width, image_height);
+						else
+							Con_Printf("loadimagepixelsrgba: corrupt or invalid alpha image %s_alpha\n", basename);
+						image_width = image_width_save;
+						image_height = image_height_save;
+						if(data2)
+							Mem_Free(data2);
+						Mem_Free(f);
+					}
+				}
+				if (developer_loading.integer)
+					Con_DPrintf("loaded image %s (%dx%d)\n", name, image_width, image_height);
+				if(miplevel)
+					*miplevel = mymiplevel;
+				//if (developer_memorydebug.integer)
+				//	Mem_CheckSentinelsGlobal();
+				if(allowFixtrans && r_fixtrans_auto.integer)
+				{
+					int n = fixtransparentpixels(data, image_width, image_height);
+					if(n)
+					{
+						Con_Printf("- had to fix %s (%d pixels changed)\n", name, n);
+						if(r_fixtrans_auto.integer >= 2)
+						{
+							char outfilename[MAX_QPATH], buf[MAX_QPATH];
+							Image_StripImageExtension(name, buf, sizeof(buf));
+							dpsnprintf(outfilename, sizeof(outfilename), "fixtrans/%s.tga", buf);
+							Image_WriteTGABGRA(outfilename, image_width, image_height, data);
+							Con_Printf("- %s written.\n", outfilename);
+						}
+					}
+				}
+				if (convertsRGB)
+					Image_MakeLinearColorsFromsRGB(data, data, image_width * image_height);
 				return data;
 			}
+			else
+				Con_DPrintf("Error loading image %s (file loaded but decode failed)\n", name);
 		}
 	}
 	if (complain)
@@ -766,31 +1069,193 @@ unsigned char *loadimagepixels (const char *filename, qboolean complain, int mat
 		Con_Printf("Couldn't load %s using ", filename);
 		for (format = firstformat;format->formatstring;format++)
 		{
-			sprintf (name, format->formatstring, basename);
+			dpsnprintf (name, sizeof(name), format->formatstring, basename);
 			Con_Printf(format == firstformat ? "\"%s\"" : (format[1].formatstring ? ", \"%s\"" : " or \"%s\".\n"), format->formatstring);
 		}
 	}
-	if (developer_memorydebug.integer)
-		Mem_CheckSentinelsGlobal();
+
+	// texture loading can take a while, so make sure we're sending keepalives
+	CL_KeepaliveMessage(false);
+
+	//if (developer_memorydebug.integer)
+	//	Mem_CheckSentinelsGlobal();
 	return NULL;
 }
 
-rtexture_t *loadtextureimage (rtexturepool_t *pool, const char *filename, int matchwidth, int matchheight, qboolean complain, int flags)
+extern cvar_t gl_picmip;
+rtexture_t *loadtextureimage (rtexturepool_t *pool, const char *filename, qboolean complain, int flags, qboolean allowFixtrans, qboolean sRGB)
 {
 	unsigned char *data;
 	rtexture_t *rt;
-	if (!(data = loadimagepixels (filename, complain, matchwidth, matchheight)))
+	int miplevel = R_PicmipForFlags(flags);
+	if (!(data = loadimagepixelsbgra (filename, complain, allowFixtrans, false, &miplevel)))
 		return 0;
-	rt = R_LoadTexture2D(pool, filename, image_width, image_height, data, TEXTYPE_RGBA, flags, NULL);
+	rt = R_LoadTexture2D(pool, filename, image_width, image_height, data, sRGB ? TEXTYPE_SRGB_BGRA : TEXTYPE_BGRA, flags, miplevel, NULL);
 	Mem_Free(data);
 	return rt;
 }
 
-qboolean Image_WriteTGARGB_preflipped (const char *filename, int width, int height, const unsigned char *data, unsigned char *buffer)
+int fixtransparentpixels(unsigned char *data, int w, int h)
+{
+	int const FIXTRANS_NEEDED = 1;
+	int const FIXTRANS_HAS_L = 2;
+	int const FIXTRANS_HAS_R = 4;
+	int const FIXTRANS_HAS_U = 8;
+	int const FIXTRANS_HAS_D = 16;
+	int const FIXTRANS_FIXED = 32;
+	unsigned char *fixMask = (unsigned char *) Mem_Alloc(tempmempool, w * h);
+	int fixPixels = 0;
+	int changedPixels = 0;
+	int x, y;
+
+#define FIXTRANS_PIXEL (y*w+x)
+#define FIXTRANS_PIXEL_U (((y+h-1)%h)*w+x)
+#define FIXTRANS_PIXEL_D (((y+1)%h)*w+x)
+#define FIXTRANS_PIXEL_L (y*w+((x+w-1)%w))
+#define FIXTRANS_PIXEL_R (y*w+((x+1)%w))
+
+	memset(fixMask, 0, w * h);
+	for(y = 0; y < h; ++y)
+		for(x = 0; x < w; ++x)
+		{
+			if(data[FIXTRANS_PIXEL * 4 + 3] == 0)
+			{
+				fixMask[FIXTRANS_PIXEL] |= FIXTRANS_NEEDED;
+				++fixPixels;
+			}
+			else
+			{
+				fixMask[FIXTRANS_PIXEL_D] |= FIXTRANS_HAS_U;
+				fixMask[FIXTRANS_PIXEL_U] |= FIXTRANS_HAS_D;
+				fixMask[FIXTRANS_PIXEL_R] |= FIXTRANS_HAS_L;
+				fixMask[FIXTRANS_PIXEL_L] |= FIXTRANS_HAS_R;
+			}
+		}
+	if(fixPixels == w * h)
+		return 0; // sorry, can't do anything about this
+	while(fixPixels)
+	{
+		for(y = 0; y < h; ++y)
+			for(x = 0; x < w; ++x)
+				if(fixMask[FIXTRANS_PIXEL] & FIXTRANS_NEEDED)
+				{
+					unsigned int sumR = 0, sumG = 0, sumB = 0, sumA = 0, sumRA = 0, sumGA = 0, sumBA = 0, cnt = 0;
+					unsigned char r, g, b, a, r0, g0, b0;
+					if(fixMask[FIXTRANS_PIXEL] & FIXTRANS_HAS_U)
+					{
+						r = data[FIXTRANS_PIXEL_U * 4 + 2];
+						g = data[FIXTRANS_PIXEL_U * 4 + 1];
+						b = data[FIXTRANS_PIXEL_U * 4 + 0];
+						a = data[FIXTRANS_PIXEL_U * 4 + 3];
+						sumR += r; sumG += g; sumB += b; sumA += a; sumRA += r*a; sumGA += g*a; sumBA += b*a; ++cnt;
+					}
+					if(fixMask[FIXTRANS_PIXEL] & FIXTRANS_HAS_D)
+					{
+						r = data[FIXTRANS_PIXEL_D * 4 + 2];
+						g = data[FIXTRANS_PIXEL_D * 4 + 1];
+						b = data[FIXTRANS_PIXEL_D * 4 + 0];
+						a = data[FIXTRANS_PIXEL_D * 4 + 3];
+						sumR += r; sumG += g; sumB += b; sumA += a; sumRA += r*a; sumGA += g*a; sumBA += b*a; ++cnt;
+					}
+					if(fixMask[FIXTRANS_PIXEL] & FIXTRANS_HAS_L)
+					{
+						r = data[FIXTRANS_PIXEL_L * 4 + 2];
+						g = data[FIXTRANS_PIXEL_L * 4 + 1];
+						b = data[FIXTRANS_PIXEL_L * 4 + 0];
+						a = data[FIXTRANS_PIXEL_L * 4 + 3];
+						sumR += r; sumG += g; sumB += b; sumA += a; sumRA += r*a; sumGA += g*a; sumBA += b*a; ++cnt;
+					}
+					if(fixMask[FIXTRANS_PIXEL] & FIXTRANS_HAS_R)
+					{
+						r = data[FIXTRANS_PIXEL_R * 4 + 2];
+						g = data[FIXTRANS_PIXEL_R * 4 + 1];
+						b = data[FIXTRANS_PIXEL_R * 4 + 0];
+						a = data[FIXTRANS_PIXEL_R * 4 + 3];
+						sumR += r; sumG += g; sumB += b; sumA += a; sumRA += r*a; sumGA += g*a; sumBA += b*a; ++cnt;
+					}
+					if(!cnt)
+						continue;
+					r0 = data[FIXTRANS_PIXEL * 4 + 2];
+					g0 = data[FIXTRANS_PIXEL * 4 + 1];
+					b0 = data[FIXTRANS_PIXEL * 4 + 0];
+					if(sumA)
+					{
+						// there is a surrounding non-alpha pixel
+						r = (sumRA + sumA / 2) / sumA;
+						g = (sumGA + sumA / 2) / sumA;
+						b = (sumBA + sumA / 2) / sumA;
+					}
+					else
+					{
+						// need to use a "regular" average
+						r = (sumR + cnt / 2) / cnt;
+						g = (sumG + cnt / 2) / cnt;
+						b = (sumB + cnt / 2) / cnt;
+					}
+					if(r != r0 || g != g0 || b != b0)
+						++changedPixels;
+					data[FIXTRANS_PIXEL * 4 + 2] = r;
+					data[FIXTRANS_PIXEL * 4 + 1] = g;
+					data[FIXTRANS_PIXEL * 4 + 0] = b;
+					fixMask[FIXTRANS_PIXEL] |= FIXTRANS_FIXED;
+				}
+		for(y = 0; y < h; ++y)
+			for(x = 0; x < w; ++x)
+				if(fixMask[FIXTRANS_PIXEL] & FIXTRANS_FIXED)
+				{
+					fixMask[FIXTRANS_PIXEL] &= ~(FIXTRANS_NEEDED | FIXTRANS_FIXED);
+					fixMask[FIXTRANS_PIXEL_D] |= FIXTRANS_HAS_U;
+					fixMask[FIXTRANS_PIXEL_U] |= FIXTRANS_HAS_D;
+					fixMask[FIXTRANS_PIXEL_R] |= FIXTRANS_HAS_L;
+					fixMask[FIXTRANS_PIXEL_L] |= FIXTRANS_HAS_R;
+					--fixPixels;
+				}
+	}
+	return changedPixels;
+}
+
+void Image_FixTransparentPixels_f(void)
+{
+	const char *filename, *filename_pattern;
+	fssearch_t *search;
+	int i, n;
+	char outfilename[MAX_QPATH], buf[MAX_QPATH];
+	unsigned char *data;
+	if(Cmd_Argc() != 2)
+	{
+		Con_Printf("Usage: %s imagefile\n", Cmd_Argv(0));
+		return;
+	}
+	filename_pattern = Cmd_Argv(1);
+	search = FS_Search(filename_pattern, true, true);
+	if(!search)
+		return;
+	for(i = 0; i < search->numfilenames; ++i)
+	{
+		filename = search->filenames[i];
+		Con_Printf("Processing %s... ", filename);
+		Image_StripImageExtension(filename, buf, sizeof(buf));
+		dpsnprintf(outfilename, sizeof(outfilename), "fixtrans/%s.tga", buf);
+		if(!(data = loadimagepixelsbgra(filename, true, false, false, NULL)))
+			return;
+		if((n = fixtransparentpixels(data, image_width, image_height)))
+		{
+			Image_WriteTGABGRA(outfilename, image_width, image_height, data);
+			Con_Printf("%s written (%d pixels changed).\n", outfilename, n);
+		}
+		else
+			Con_Printf("unchanged.\n");
+		Mem_Free(data);
+	}
+	FS_FreeSearch(search);
+}
+
+qboolean Image_WriteTGABGR_preflipped (const char *filename, int width, int height, const unsigned char *data)
 {
 	qboolean ret;
-	unsigned char *out;
-	const unsigned char *in, *end;
+	unsigned char buffer[18];
+	const void *buffers[2];
+	fs_offset_t sizes[2];
 
 	memset (buffer, 0, 18);
 	buffer[2] = 2;		// uncompressed type
@@ -800,26 +1265,21 @@ qboolean Image_WriteTGARGB_preflipped (const char *filename, int width, int heig
 	buffer[15] = (height >> 8) & 0xFF;
 	buffer[16] = 24;	// pixel size
 
-	// swap rgb to bgr
-	in = data;
-	out = buffer + 18;
-	end = in + width*height*3;
-	for (;in < end;in += 3)
-	{
-		*out++ = in[2];
-		*out++ = in[1];
-		*out++ = in[0];
-	}
-	ret = FS_WriteFile (filename, buffer, width*height*3 + 18 );
+	buffers[0] = buffer;
+	sizes[0] = 18;
+	buffers[1] = data;
+	sizes[1] = width*height*3;
+	ret = FS_WriteFileInBlocks(filename, buffers, sizes, 2);
 
 	return ret;
 }
 
-void Image_WriteTGARGBA (const char *filename, int width, int height, const unsigned char *data)
+qboolean Image_WriteTGABGRA (const char *filename, int width, int height, const unsigned char *data)
 {
 	int y;
 	unsigned char *buffer, *out;
 	const unsigned char *in, *end;
+	qboolean ret;
 
 	buffer = (unsigned char *)Mem_Alloc(tempmempool, width*height*4 + 18);
 
@@ -829,26 +1289,50 @@ void Image_WriteTGARGBA (const char *filename, int width, int height, const unsi
 	buffer[13] = (width >> 8) & 0xFF;
 	buffer[14] = (height >> 0) & 0xFF;
 	buffer[15] = (height >> 8) & 0xFF;
-	buffer[16] = 32;	// pixel size
-	buffer[17] = 8; // 8 bits of alpha
 
-	// swap rgba to bgra and flip upside down
-	out = buffer + 18;
-	for (y = height - 1;y >= 0;y--)
+	for (y = 3;y < width*height*4;y += 4)
+		if (data[y] < 255)
+			break;
+
+	if (y < width*height*4)
 	{
-		in = data + y * width * 4;
-		end = in + width * 4;
-		for (;in < end;in += 4)
+		// save the alpha channel
+		buffer[16] = 32;	// pixel size
+		buffer[17] = 8; // 8 bits of alpha
+
+		// flip upside down
+		out = buffer + 18;
+		for (y = height - 1;y >= 0;y--)
 		{
-			*out++ = in[2];
-			*out++ = in[1];
-			*out++ = in[0];
-			*out++ = in[3];
+			memcpy(out, data + y * width * 4, width * 4);
+			out += width*4;
 		}
 	}
-	FS_WriteFile (filename, buffer, width*height*4 + 18 );
+	else
+	{
+		// save only the color channels
+		buffer[16] = 24;	// pixel size
+		buffer[17] = 0; // 8 bits of alpha
+
+		// truncate bgra to bgr and flip upside down
+		out = buffer + 18;
+		for (y = height - 1;y >= 0;y--)
+		{
+			in = data + y * width * 4;
+			end = in + width * 4;
+			for (;in < end;in += 4)
+			{
+				*out++ = in[0];
+				*out++ = in[1];
+				*out++ = in[2];
+			}
+		}
+	}
+	ret = FS_WriteFile (filename, buffer, out - buffer);
 
 	Mem_Free(buffer);
+
+	return ret;
 }
 
 static void Image_Resample32LerpLine (const unsigned char *in, unsigned char *out, int inwidth, int outwidth)
@@ -882,37 +1366,8 @@ static void Image_Resample32LerpLine (const unsigned char *in, unsigned char *ou
 	}
 }
 
-static void Image_Resample24LerpLine (const unsigned char *in, unsigned char *out, int inwidth, int outwidth)
-{
-	int		j, xi, oldx = 0, f, fstep, endx, lerp;
-	fstep = (int) (inwidth*65536.0f/outwidth);
-	endx = (inwidth-1);
-	for (j = 0,f = 0;j < outwidth;j++, f += fstep)
-	{
-		xi = f >> 16;
-		if (xi != oldx)
-		{
-			in += (xi - oldx) * 3;
-			oldx = xi;
-		}
-		if (xi < endx)
-		{
-			lerp = f & 0xFFFF;
-			*out++ = (unsigned char) ((((in[3] - in[0]) * lerp) >> 16) + in[0]);
-			*out++ = (unsigned char) ((((in[4] - in[1]) * lerp) >> 16) + in[1]);
-			*out++ = (unsigned char) ((((in[5] - in[2]) * lerp) >> 16) + in[2]);
-		}
-		else // last pixel of the line has no pixel to lerp to
-		{
-			*out++ = in[0];
-			*out++ = in[1];
-			*out++ = in[2];
-		}
-	}
-}
-
 #define LERPBYTE(i) r = resamplerow1[i];out[i] = (unsigned char) ((((resamplerow2[i] - r) * lerp) >> 16) + r)
-void Image_Resample32Lerp(const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight)
+static void Image_Resample32Lerp(const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight)
 {
 	int i, j, r, yi, oldy, f, fstep, lerp, endy = (inheight-1), inwidth4 = inwidth*4, outwidth4 = outwidth*4;
 	unsigned char *out;
@@ -1016,7 +1471,7 @@ void Image_Resample32Lerp(const void *indata, int inwidth, int inheight, void *o
 	resamplerow2 = NULL;
 }
 
-void Image_Resample32Nolerp(const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight)
+static void Image_Resample32Nolerp(const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight)
 {
 	int i, j;
 	unsigned frac, fracstep;
@@ -1053,177 +1508,44 @@ void Image_Resample32Nolerp(const void *indata, int inwidth, int inheight, void
 	}
 }
 
-void Image_Resample24Lerp(const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight)
-{
-	int i, j, r, yi, oldy, f, fstep, lerp, endy = (inheight-1), inwidth3 = inwidth * 3, outwidth3 = outwidth * 3;
-	unsigned char *out;
-	const unsigned char *inrow;
-	unsigned char *resamplerow1;
-	unsigned char *resamplerow2;
-	out = (unsigned char *)outdata;
-	fstep = (int) (inheight*65536.0f/outheight);
-
-	resamplerow1 = (unsigned char *)Mem_Alloc(tempmempool, outwidth*3*2);
-	resamplerow2 = resamplerow1 + outwidth*3;
-
-	inrow = (const unsigned char *)indata;
-	oldy = 0;
-	Image_Resample24LerpLine (inrow, resamplerow1, inwidth, outwidth);
-	Image_Resample24LerpLine (inrow + inwidth3, resamplerow2, inwidth, outwidth);
-	for (i = 0, f = 0;i < outheight;i++,f += fstep)
-	{
-		yi = f >> 16;
-		if (yi < endy)
-		{
-			lerp = f & 0xFFFF;
-			if (yi != oldy)
-			{
-				inrow = (unsigned char *)indata + inwidth3*yi;
-				if (yi == oldy+1)
-					memcpy(resamplerow1, resamplerow2, outwidth3);
-				else
-					Image_Resample24LerpLine (inrow, resamplerow1, inwidth, outwidth);
-				Image_Resample24LerpLine (inrow + inwidth3, resamplerow2, inwidth, outwidth);
-				oldy = yi;
-			}
-			j = outwidth - 4;
-			while(j >= 0)
-			{
-				LERPBYTE( 0);
-				LERPBYTE( 1);
-				LERPBYTE( 2);
-				LERPBYTE( 3);
-				LERPBYTE( 4);
-				LERPBYTE( 5);
-				LERPBYTE( 6);
-				LERPBYTE( 7);
-				LERPBYTE( 8);
-				LERPBYTE( 9);
-				LERPBYTE(10);
-				LERPBYTE(11);
-				out += 12;
-				resamplerow1 += 12;
-				resamplerow2 += 12;
-				j -= 4;
-			}
-			if (j & 2)
-			{
-				LERPBYTE( 0);
-				LERPBYTE( 1);
-				LERPBYTE( 2);
-				LERPBYTE( 3);
-				LERPBYTE( 4);
-				LERPBYTE( 5);
-				out += 6;
-				resamplerow1 += 6;
-				resamplerow2 += 6;
-			}
-			if (j & 1)
-			{
-				LERPBYTE( 0);
-				LERPBYTE( 1);
-				LERPBYTE( 2);
-				out += 3;
-				resamplerow1 += 3;
-				resamplerow2 += 3;
-			}
-			resamplerow1 -= outwidth3;
-			resamplerow2 -= outwidth3;
-		}
-		else
-		{
-			if (yi != oldy)
-			{
-				inrow = (unsigned char *)indata + inwidth3*yi;
-				if (yi == oldy+1)
-					memcpy(resamplerow1, resamplerow2, outwidth3);
-				else
-					Image_Resample24LerpLine (inrow, resamplerow1, inwidth, outwidth);
-				oldy = yi;
-			}
-			memcpy(out, resamplerow1, outwidth3);
-		}
-	}
-	Mem_Free(resamplerow1);
-	resamplerow1 = NULL;
-	resamplerow2 = NULL;
-}
-
-void Image_Resample24Nolerp(const void *indata, int inwidth, int inheight, void *outdata, int outwidth, int outheight)
-{
-	int i, j, f, inwidth3 = inwidth * 3;
-	unsigned frac, fracstep;
-	unsigned char *inrow, *out;
-	out = (unsigned char *)outdata;
-
-	fracstep = inwidth*0x10000/outwidth;
-	for (i = 0;i < outheight;i++)
-	{
-		inrow = (unsigned char *)indata + inwidth3*(i*inheight/outheight);
-		frac = fracstep >> 1;
-		j = outwidth - 4;
-		while (j >= 0)
-		{
-			f = (frac >> 16)*3;*out++ = inrow[f+0];*out++ = inrow[f+1];*out++ = inrow[f+2];frac += fracstep;
-			f = (frac >> 16)*3;*out++ = inrow[f+0];*out++ = inrow[f+1];*out++ = inrow[f+2];frac += fracstep;
-			f = (frac >> 16)*3;*out++ = inrow[f+0];*out++ = inrow[f+1];*out++ = inrow[f+2];frac += fracstep;
-			f = (frac >> 16)*3;*out++ = inrow[f+0];*out++ = inrow[f+1];*out++ = inrow[f+2];frac += fracstep;
-			j -= 4;
-		}
-		if (j & 2)
-		{
-			f = (frac >> 16)*3;*out++ = inrow[f+0];*out++ = inrow[f+1];*out++ = inrow[f+2];frac += fracstep;
-			f = (frac >> 16)*3;*out++ = inrow[f+0];*out++ = inrow[f+1];*out++ = inrow[f+2];frac += fracstep;
-			out += 2;
-		}
-		if (j & 1)
-		{
-			f = (frac >> 16)*3;*out++ = inrow[f+0];*out++ = inrow[f+1];*out++ = inrow[f+2];frac += fracstep;
-			out += 1;
-		}
-	}
-}
-
 /*
 ================
 Image_Resample
 ================
 */
-void Image_Resample (const void *indata, int inwidth, int inheight, int indepth, void *outdata, int outwidth, int outheight, int outdepth, int bytesperpixel, int quality)
+void Image_Resample32(const void *indata, int inwidth, int inheight, int indepth, void *outdata, int outwidth, int outheight, int outdepth, int quality)
 {
 	if (indepth != 1 || outdepth != 1)
 	{
 		Con_Printf ("Image_Resample: 3D resampling not supported\n");
 		return;
 	}
-	if (bytesperpixel == 4)
-	{
-		if (quality)
-			Image_Resample32Lerp(indata, inwidth, inheight, outdata, outwidth, outheight);
-		else
-			Image_Resample32Nolerp(indata, inwidth, inheight, outdata, outwidth, outheight);
-	}
-	else if (bytesperpixel == 3)
-	{
-		if (quality)
-			Image_Resample24Lerp(indata, inwidth, inheight, outdata, outwidth, outheight);
-		else
-			Image_Resample24Nolerp(indata, inwidth, inheight, outdata, outwidth, outheight);
-	}
+	if (quality)
+		Image_Resample32Lerp(indata, inwidth, inheight, outdata, outwidth, outheight);
 	else
-		Con_Printf ("Image_Resample: unsupported bytesperpixel %i\n", bytesperpixel);
+		Image_Resample32Nolerp(indata, inwidth, inheight, outdata, outwidth, outheight);
 }
 
 // in can be the same as out
-void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, int *height, int *depth, int destwidth, int destheight, int destdepth, int bytesperpixel)
+void Image_MipReduce32(const unsigned char *in, unsigned char *out, int *width, int *height, int *depth, int destwidth, int destheight, int destdepth)
 {
+	const unsigned char *inrow;
 	int x, y, nextrow;
 	if (*depth != 1 || destdepth != 1)
 	{
 		Con_Printf ("Image_Resample: 3D resampling not supported\n");
+		if (*width > destwidth)
+			*width >>= 1;
+		if (*height > destheight)
+			*height >>= 1;
+		if (*depth > destdepth)
+			*depth >>= 1;
 		return;
 	}
-	nextrow = *width * bytesperpixel;
+	// note: if given odd width/height this discards the last row/column of
+	// pixels, rather than doing a proper box-filter scale down
+	inrow = in;
+	nextrow = *width * 4;
 	if (*width > destwidth)
 	{
 		*width >>= 1;
@@ -1231,74 +1553,34 @@ void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, in
 		{
 			// reduce both
 			*height >>= 1;
-			if (bytesperpixel == 4)
-			{
-				for (y = 0;y < *height;y++)
-				{
-					for (x = 0;x < *width;x++)
-					{
-						out[0] = (unsigned char) ((in[0] + in[4] + in[nextrow  ] + in[nextrow+4]) >> 2);
-						out[1] = (unsigned char) ((in[1] + in[5] + in[nextrow+1] + in[nextrow+5]) >> 2);
-						out[2] = (unsigned char) ((in[2] + in[6] + in[nextrow+2] + in[nextrow+6]) >> 2);
-						out[3] = (unsigned char) ((in[3] + in[7] + in[nextrow+3] + in[nextrow+7]) >> 2);
-						out += 4;
-						in += 8;
-					}
-					in += nextrow; // skip a line
-				}
-			}
-			else if (bytesperpixel == 3)
+			for (y = 0;y < *height;y++, inrow += nextrow * 2)
 			{
-				for (y = 0;y < *height;y++)
+				for (in = inrow, x = 0;x < *width;x++)
 				{
-					for (x = 0;x < *width;x++)
-					{
-						out[0] = (unsigned char) ((in[0] + in[3] + in[nextrow  ] + in[nextrow+3]) >> 2);
-						out[1] = (unsigned char) ((in[1] + in[4] + in[nextrow+1] + in[nextrow+4]) >> 2);
-						out[2] = (unsigned char) ((in[2] + in[5] + in[nextrow+2] + in[nextrow+5]) >> 2);
-						out += 3;
-						in += 6;
-					}
-					in += nextrow; // skip a line
+					out[0] = (unsigned char) ((in[0] + in[4] + in[nextrow  ] + in[nextrow+4]) >> 2);
+					out[1] = (unsigned char) ((in[1] + in[5] + in[nextrow+1] + in[nextrow+5]) >> 2);
+					out[2] = (unsigned char) ((in[2] + in[6] + in[nextrow+2] + in[nextrow+6]) >> 2);
+					out[3] = (unsigned char) ((in[3] + in[7] + in[nextrow+3] + in[nextrow+7]) >> 2);
+					out += 4;
+					in += 8;
 				}
 			}
-			else
-				Con_Printf ("Image_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel);
 		}
 		else
 		{
 			// reduce width
-			if (bytesperpixel == 4)
+			for (y = 0;y < *height;y++, inrow += nextrow)
 			{
-				for (y = 0;y < *height;y++)
+				for (in = inrow, x = 0;x < *width;x++)
 				{
-					for (x = 0;x < *width;x++)
-					{
-						out[0] = (unsigned char) ((in[0] + in[4]) >> 1);
-						out[1] = (unsigned char) ((in[1] + in[5]) >> 1);
-						out[2] = (unsigned char) ((in[2] + in[6]) >> 1);
-						out[3] = (unsigned char) ((in[3] + in[7]) >> 1);
-						out += 4;
-						in += 8;
-					}
+					out[0] = (unsigned char) ((in[0] + in[4]) >> 1);
+					out[1] = (unsigned char) ((in[1] + in[5]) >> 1);
+					out[2] = (unsigned char) ((in[2] + in[6]) >> 1);
+					out[3] = (unsigned char) ((in[3] + in[7]) >> 1);
+					out += 4;
+					in += 8;
 				}
 			}
-			else if (bytesperpixel == 3)
-			{
-				for (y = 0;y < *height;y++)
-				{
-					for (x = 0;x < *width;x++)
-					{
-						out[0] = (unsigned char) ((in[0] + in[3]) >> 1);
-						out[1] = (unsigned char) ((in[1] + in[4]) >> 1);
-						out[2] = (unsigned char) ((in[2] + in[5]) >> 1);
-						out += 3;
-						in += 6;
-					}
-				}
-			}
-			else
-				Con_Printf ("Image_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel);
 		}
 	}
 	else
@@ -1307,224 +1589,61 @@ void Image_MipReduce(const unsigned char *in, unsigned char *out, int *width, in
 		{
 			// reduce height
 			*height >>= 1;
-			if (bytesperpixel == 4)
+			for (y = 0;y < *height;y++, inrow += nextrow * 2)
 			{
-				for (y = 0;y < *height;y++)
+				for (in = inrow, x = 0;x < *width;x++)
 				{
-					for (x = 0;x < *width;x++)
-					{
-						out[0] = (unsigned char) ((in[0] + in[nextrow  ]) >> 1);
-						out[1] = (unsigned char) ((in[1] + in[nextrow+1]) >> 1);
-						out[2] = (unsigned char) ((in[2] + in[nextrow+2]) >> 1);
-						out[3] = (unsigned char) ((in[3] + in[nextrow+3]) >> 1);
-						out += 4;
-						in += 4;
-					}
-					in += nextrow; // skip a line
-				}
-			}
-			else if (bytesperpixel == 3)
-			{
-				for (y = 0;y < *height;y++)
-				{
-					for (x = 0;x < *width;x++)
-					{
-						out[0] = (unsigned char) ((in[0] + in[nextrow  ]) >> 1);
-						out[1] = (unsigned char) ((in[1] + in[nextrow+1]) >> 1);
-						out[2] = (unsigned char) ((in[2] + in[nextrow+2]) >> 1);
-						out += 3;
-						in += 3;
-					}
-					in += nextrow; // skip a line
+					out[0] = (unsigned char) ((in[0] + in[nextrow  ]) >> 1);
+					out[1] = (unsigned char) ((in[1] + in[nextrow+1]) >> 1);
+					out[2] = (unsigned char) ((in[2] + in[nextrow+2]) >> 1);
+					out[3] = (unsigned char) ((in[3] + in[nextrow+3]) >> 1);
+					out += 4;
+					in += 4;
 				}
 			}
-			else
-				Con_Printf ("Image_MipReduce: unsupported bytesperpixel %i\n", bytesperpixel);
 		}
 		else
 			Con_Printf ("Image_MipReduce: desired size already achieved\n");
 	}
 }
 
-void Image_HeightmapToNormalmap(const unsigned char *inpixels, unsigned char *outpixels, int width, int height, int clamp, float bumpscale)
+void Image_HeightmapToNormalmap_BGRA(const unsigned char *inpixels, unsigned char *outpixels, int width, int height, int clamp, float bumpscale)
 {
-	int x, y;
-	const unsigned char *p0, *p1, *p2;
+	int x, y, x1, x2, y1, y2;
+	const unsigned char *b, *row[3];
+	int p[5];
 	unsigned char *out;
-	float iwidth, iheight, ibumpscale, n[3];
-	iwidth = 1.0f / width;
-	iheight = 1.0f / height;
-	ibumpscale = (255.0f * 3.0f) / bumpscale;
+	float ibumpscale, n[3];
+	ibumpscale = (255.0f * 6.0f) / bumpscale;
 	out = outpixels;
-	for (y = 0;y < height;y++)
+	for (y = 0, y1 = height-1;y < height;y1 = y, y++)
 	{
-		for (x = 0;x < width;x++)
+		y2 = y + 1;if (y2 >= height) y2 = 0;
+		row[0] = inpixels + (y1 * width) * 4;
+		row[1] = inpixels + (y  * width) * 4;
+		row[2] = inpixels + (y2 * width) * 4;
+		for (x = 0, x1 = width-1;x < width;x1 = x, x++)
 		{
-			p0 = inpixels + (y * width + x) * 4;
-			if (x == width - 1)
-			{
-				if (clamp)
-					p1 = inpixels + (y * width + x) * 4;
-				else
-					p1 = inpixels + (y * width) * 4;
-			}
-			else
-				p1 = inpixels + (y * width + x + 1) * 4;
-			if (y == height - 1)
-			{
-				if (clamp)
-					p2 = inpixels + (y * width + x) * 4;
-				else
-					p2 = inpixels + x * 4;
-			}
-			else
-				p2 = inpixels + ((y + 1) * width + x) * 4;
-			/*
-			dv[0][0] = iwidth;
-			dv[0][1] = 0;
-			dv[0][2] = ((p0[0] + p0[1] + p0[2]) * ibumpscale) - ((p1[0] + p1[1] + p1[2]) * ibumpscale);
-			dv[1][0] = 0;
-			dv[1][1] = iheight;
-			dv[1][2] = ((p2[0] + p2[1] + p2[2]) * ibumpscale) - ((p0[0] + p0[1] + p0[2]) * ibumpscale);
-			n[0] = dv[0][1]*dv[1][2]-dv[0][2]*dv[1][1];
-			n[1] = dv[0][2]*dv[1][0]-dv[0][0]*dv[1][2];
-			n[2] = dv[0][0]*dv[1][1]-dv[0][1]*dv[1][0];
-			*/
-			n[0] = ((p0[0] + p0[1] + p0[2]) - (p1[0] + p1[1] + p1[2]));
-			n[1] = ((p2[0] + p2[1] + p2[2]) - (p0[0] + p0[1] + p0[2]));
-			n[2] = ibumpscale;
-			VectorNormalize(n);
-			/*
-			// this should work for the bottom right triangle if anyone wants
-			// code for that for some reason
-			n[0] = ((p3[0] + p3[1] + p3[2]) - (p1[0] + p1[1] + p1[2]));
-			n[1] = ((p2[0] + p2[1] + p2[2]) - (p3[0] + p3[1] + p3[2]));
+			x2 = x + 1;if (x2 >= width) x2 = 0;
+			// left, right
+			b = row[1] + x1 * 4;p[0] = (b[0] + b[1] + b[2]);
+			b = row[1] + x2 * 4;p[1] = (b[0] + b[1] + b[2]);
+			// above, below
+			b = row[0] + x  * 4;p[2] = (b[0] + b[1] + b[2]);
+			b = row[2] + x  * 4;p[3] = (b[0] + b[1] + b[2]);
+			// center
+			b = row[1] + x  * 4;p[4] = (b[0] + b[1] + b[2]);
+			// calculate a normal from the slopes
+			n[0] = p[0] - p[1];
+			n[1] = p[3] - p[2];
 			n[2] = ibumpscale;
 			VectorNormalize(n);
-			*/
-			out[0] = 128.0f + n[0] * 127.0f;
-			out[1] = 128.0f + n[1] * 127.0f;
-			out[2] = 128.0f + n[2] * 127.0f;
-			out[3] = (p0[0] + p0[1] + p0[2]) / 3;
+			// turn it into a dot3 rgb vector texture
+			out[2] = (int)(128.0f + n[0] * 127.0f);
+			out[1] = (int)(128.0f + n[1] * 127.0f);
+			out[0] = (int)(128.0f + n[2] * 127.0f);
+			out[3] = (p[4]) / 3;
 			out += 4;
 		}
 	}
 }
-
-int image_loadskin(imageskin_t *s, const char *shadername)
-{
-	int j;
-	unsigned char *bumppixels;
-	int bumppixels_width, bumppixels_height;
-	char name[MAX_QPATH];
-	strlcpy(name, shadername, sizeof(name));
-	Image_StripImageExtension(name, name);
-	memset(s, 0, sizeof(*s));
-	s->basepixels = loadimagepixels(name, false, 0, 0);
-	if (s->basepixels == NULL)
-		return false;
-	s->basepixels_width = image_width;
-	s->basepixels_height = image_height;
-
-	bumppixels = NULL;bumppixels_width = 0;bumppixels_height = 0;
-	for (j = 3;j < s->basepixels_width * s->basepixels_height * 4;j += 4)
-		if (s->basepixels[j] < 255)
-			break;
-	if (j < s->basepixels_width * s->basepixels_height * 4)
-	{
-		// has transparent pixels
-		s->maskpixels = (unsigned char *)Mem_Alloc(loadmodel->mempool, s->basepixels_width * s->basepixels_height * 4);
-		s->maskpixels_width = s->basepixels_width;
-		s->maskpixels_height = s->basepixels_height;
-		memcpy(s->maskpixels, s->basepixels, s->maskpixels_width * s->maskpixels_height * 4);
-		for (j = 0;j < s->basepixels_width * s->basepixels_height * 4;j += 4)
-		{
-			s->maskpixels[j+0] = 255;
-			s->maskpixels[j+1] = 255;
-			s->maskpixels[j+2] = 255;
-		}
-	}
-
-	// _luma is supported for tenebrae compatibility
-	// (I think it's a very stupid name, but oh well)
-	if ((s->glowpixels = loadimagepixels(va("%s_glow", name), false, 0, 0)) != NULL
-	 || (s->glowpixels = loadimagepixels(va("%s_luma", name), false, 0, 0)) != NULL)
-	{
-		s->glowpixels_width = image_width;
-		s->glowpixels_height = image_height;
-	}
-	// _norm is the name used by tenebrae
-	// (I don't like the name much)
-	if ((s->nmappixels = loadimagepixels(va("%s_norm", name), false, 0, 0)) != NULL)
-	{
-		s->nmappixels_width = image_width;
-		s->nmappixels_height = image_height;
-	}
-	else if ((bumppixels = loadimagepixels(va("%s_bump", name), false, 0, 0)) != NULL)
-	{
-		bumppixels_width = image_width;
-		bumppixels_height = image_height;
-	}
-	if ((s->glosspixels = loadimagepixels(va("%s_gloss", name), false, 0, 0)) != NULL)
-	{
-		s->glosspixels_width = image_width;
-		s->glosspixels_height = image_height;
-	}
-	if ((s->pantspixels = loadimagepixels(va("%s_pants", name), false, 0, 0)) != NULL)
-	{
-		s->pantspixels_width = image_width;
-		s->pantspixels_height = image_height;
-	}
-	if ((s->shirtpixels = loadimagepixels(va("%s_shirt", name), false, 0, 0)) != NULL)
-	{
-		s->shirtpixels_width = image_width;
-		s->shirtpixels_height = image_height;
-	}
-
-	if (s->nmappixels == NULL)
-	{
-		if (bumppixels != NULL)
-		{
-			if (r_shadow_bumpscale_bumpmap.value > 0)
-			{
-				s->nmappixels = (unsigned char *)Mem_Alloc(loadmodel->mempool, bumppixels_width * bumppixels_height * 4);
-				s->nmappixels_width = bumppixels_width;
-				s->nmappixels_height = bumppixels_height;
-				Image_HeightmapToNormalmap(bumppixels, s->nmappixels, s->nmappixels_width, s->nmappixels_height, false, r_shadow_bumpscale_bumpmap.value);
-			}
-		}
-		else
-		{
-			if (r_shadow_bumpscale_basetexture.value > 0)
-			{
-				s->nmappixels = (unsigned char *)Mem_Alloc(loadmodel->mempool, s->basepixels_width * s->basepixels_height * 4);
-				s->nmappixels_width = s->basepixels_width;
-				s->nmappixels_height = s->basepixels_height;
-				Image_HeightmapToNormalmap(s->basepixels, s->nmappixels, s->nmappixels_width, s->nmappixels_height, false, r_shadow_bumpscale_basetexture.value);
-			}
-		}
-	}
-	if (bumppixels != NULL)
-		Mem_Free(bumppixels);
-	return true;
-}
-
-void image_freeskin(imageskin_t *s)
-{
-	if (s->basepixels)
-		Mem_Free(s->basepixels);
-	if (s->maskpixels)
-		Mem_Free(s->maskpixels);
-	if (s->nmappixels)
-		Mem_Free(s->nmappixels);
-	if (s->glowpixels)
-		Mem_Free(s->glowpixels);
-	if (s->glosspixels)
-		Mem_Free(s->glosspixels);
-	if (s->pantspixels)
-		Mem_Free(s->pantspixels);
-	if (s->shirtpixels)
-		Mem_Free(s->shirtpixels);
-	memset(s, 0, sizeof(*s));
-}
-