X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=image.c;h=a072df248dd460dd7195013a8061a791331c77ae;hb=a51a70c2254b27a68e5fe74cc5985b02dc36e1e9;hp=93d7d89b463815cca1be8966a6c6f170da827c1a;hpb=cc0e49ff09037fcfb8ae11f5eff119f84d413ab6;p=xonotic%2Fdarkplaces.git

diff --git a/image.c b/image.c
index 93d7d89b..a072df24 100644
--- a/image.c
+++ b/image.c
@@ -878,7 +878,7 @@ static unsigned char* LoadLMP_BGRA(const unsigned char *f, int filesize, int *mi
 }
 
 // gfx/conchars is a raw 128x128 image with 0 as transparent color rather than 255
-unsigned char *LoadConChars_BGRA(const unsigned char *f, int filesize, int *miplevel)
+static unsigned char *LoadConChars_BGRA(const unsigned char *f, int filesize, int *miplevel)
 {
 	unsigned char *image_buffer;
 	int i;
@@ -970,28 +970,46 @@ imageformat_t;
 imageformat_t imageformats_tenebrae[] =
 {
 	{"override/%s.tga", LoadTGA_BGRA},
+	{"override/%s.TGA", LoadTGA_BGRA},
 	{"override/%s.png", PNG_LoadImage_BGRA},
+	{"override/%s.PNG", PNG_LoadImage_BGRA},
 	{"override/%s.jpg", JPEG_LoadImage_BGRA},
+	{"override/%s.JPG", JPEG_LoadImage_BGRA},
 	{"override/%s.pcx", LoadPCX_BGRA},
+	{"override/%s.PCX", LoadPCX_BGRA},	
 	{"%s.tga", LoadTGA_BGRA},
+	{"%s.TGA", LoadTGA_BGRA},
 	{"%s.png", PNG_LoadImage_BGRA},
+	{"%s.PNG", PNG_LoadImage_BGRA},
 	{"%s.jpg", JPEG_LoadImage_BGRA},
+	{"%s.JPG", JPEG_LoadImage_BGRA},
 	{"%s.pcx", LoadPCX_BGRA},
+	{"%s.PCX", LoadPCX_BGRA},
 	{NULL, NULL}
 };
 
 imageformat_t imageformats_nopath[] =
 {
 	{"override/%s.tga", LoadTGA_BGRA},
+	{"override/%s.TGA", LoadTGA_BGRA},
 	{"override/%s.png", PNG_LoadImage_BGRA},
+	{"override/%s.PNG", PNG_LoadImage_BGRA},
 	{"override/%s.jpg", JPEG_LoadImage_BGRA},
+	{"override/%s.JPG", JPEG_LoadImage_BGRA},
 	{"textures/%s.tga", LoadTGA_BGRA},
+	{"textures/%s.TGA", LoadTGA_BGRA},
 	{"textures/%s.png", PNG_LoadImage_BGRA},
+	{"textures/%s.PNG", PNG_LoadImage_BGRA},
 	{"textures/%s.jpg", JPEG_LoadImage_BGRA},
+	{"textures/%s.JPG", JPEG_LoadImage_BGRA},
 	{"%s.tga", LoadTGA_BGRA},
+	{"%s.TGA", LoadTGA_BGRA},
 	{"%s.png", PNG_LoadImage_BGRA},
+	{"%s.PNG", PNG_LoadImage_BGRA},
 	{"%s.jpg", JPEG_LoadImage_BGRA},
+	{"%s.JPG", JPEG_LoadImage_BGRA},
 	{"%s.pcx", LoadPCX_BGRA},
+	{"%s.PCX", LoadPCX_BGRA},
 	{NULL, NULL}
 };
 
@@ -1003,39 +1021,58 @@ imageformat_t imageformats_nopath[] =
 imageformat_t imageformats_dq[] =
 {
 	{"%s.tga", LoadTGA_BGRA},
+	{"%s.TGA", LoadTGA_BGRA},
 	{"%s.jpg", JPEG_LoadImage_BGRA},
+	{"%s.JPG", JPEG_LoadImage_BGRA},	
 	{"texturemaps/%s.tga", LoadTGA_BGRA},
+	{"texturemaps/%s.TGA", LoadTGA_BGRA},	
 	{"texturemaps/%s.jpg", JPEG_LoadImage_BGRA},
+	{"texturemaps/%s.JPG", JPEG_LoadImage_BGRA},	
 	{NULL, NULL}
 };
 
 imageformat_t imageformats_textures[] =
 {
 	{"%s.tga", LoadTGA_BGRA},
+	{"%s.TGA", LoadTGA_BGRA},
 	{"%s.png", PNG_LoadImage_BGRA},
+	{"%s.PNG", PNG_LoadImage_BGRA},
 	{"%s.jpg", JPEG_LoadImage_BGRA},
+	{"%s.JPG", JPEG_LoadImage_BGRA},
 	{"%s.pcx", LoadPCX_BGRA},
+	{"%s.PCX", LoadPCX_BGRA},
 	{"%s.wal", LoadWAL_BGRA},
+	{"%s.WAL", LoadWAL_BGRA},	
 	{NULL, NULL}
 };
 
 imageformat_t imageformats_gfx[] =
 {
 	{"%s.tga", LoadTGA_BGRA},
+	{"%s.TGA", LoadTGA_BGRA},
 	{"%s.png", PNG_LoadImage_BGRA},
+	{"%s.PNG", PNG_LoadImage_BGRA},
 	{"%s.jpg", JPEG_LoadImage_BGRA},
+	{"%s.JPG", JPEG_LoadImage_BGRA},
 	{"%s.pcx", LoadPCX_BGRA},
+	{"%s.PCX", LoadPCX_BGRA},
 	{"%s.lmp", LoadLMP_BGRA},
+	{"%s.LMP", LoadLMP_BGRA},
 	{NULL, NULL}
 };
 
 imageformat_t imageformats_other[] =
 {
 	{"%s.tga", LoadTGA_BGRA},
+	{"%s.TGA", LoadTGA_BGRA},
 	{"%s.png", PNG_LoadImage_BGRA},
+	{"%s.PNG", PNG_LoadImage_BGRA},
 	{"%s.jpg", JPEG_LoadImage_BGRA},
+	{"%s.JPG", JPEG_LoadImage_BGRA},
 	{"%s.pcx", LoadPCX_BGRA},
+	{"%s.PCX", LoadPCX_BGRA},
 	{"%s.lmp", LoadLMP_BGRA},
+	{"%s.LMP", LoadLMP_BGRA},	
 	{NULL, NULL}
 };
 
@@ -1044,6 +1081,7 @@ unsigned char *loadimagepixelsbgra (const char *filename, qboolean complain, qbo
 {
 	fs_offset_t filesize;
 	imageformat_t *firstformat, *format;
+	int mymiplevel;
 	unsigned char *f, *data = NULL, *data2 = NULL;
 	char basename[MAX_QPATH], name[MAX_QPATH], name2[MAX_QPATH], path[MAX_QPATH], afterpath[MAX_QPATH], *c;
 	char vabuf[1024];
@@ -1086,7 +1124,7 @@ unsigned char *loadimagepixelsbgra (const char *filename, qboolean complain, qbo
 		f = FS_LoadFile(name, tempmempool, true, &filesize);
 		if (f)
 		{
-			int mymiplevel = miplevel ? *miplevel : 0;
+			mymiplevel = miplevel ? *miplevel : 0;
 			image_width = 0;
 			image_height = 0;
 			data = format->loadfunc(f, (int)filesize, &mymiplevel);
@@ -1152,7 +1190,7 @@ unsigned char *loadimagepixelsbgra (const char *filename, qboolean complain, qbo
 			if (developer_loading.integer)
 				Con_Printf("loading gfx.wad lump \"%s\"\n", afterpath);
 
-			int mymiplevel = miplevel ? *miplevel : 0;
+			mymiplevel = miplevel ? *miplevel : 0;
 			if (!strcmp(afterpath, "conchars"))
 			{
 				// conchars is a raw image and with color 0 as transparent instead of 255