This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
#include "quakedef.h"
-int wad_numlumps;
-lumpinfo_t *wad_lumps;
-byte *wad_base;
+static int wad_numlumps;
+static lumpinfo_t *wad_lumps;
+static byte *wad_base = NULL;
+static mempool_t *wad_mempool = NULL;
void SwapPic (qpic_t *pic);
Can safely be performed in place.
==================
*/
-void W_CleanupName (char *in, char *out)
+static void W_CleanupName (char *in, char *out)
{
int i;
int c;
-
+
for (i=0 ; i<16 ; i++ )
{
c = in[i];
if (!c)
break;
-
+
if (c >= 'A' && c <= 'Z')
c += ('a' - 'A');
out[i] = c;
}
-
+
for ( ; i< 16 ; i++ )
out[i] = 0;
}
wadinfo_t *header;
unsigned i;
int infotableofs;
-
- wad_base = COM_LoadHunkFile (filename, false);
- if (!wad_base)
+ void *temp;
+
+ temp = COM_LoadFile (filename, false);
+ if (!temp)
Sys_Error ("W_LoadWadFile: couldn't load %s", filename);
+ if (wad_mempool)
+ Mem_FreePool(&wad_mempool);
+ wad_mempool = Mem_AllocPool(filename);
+ wad_base = Mem_Alloc(wad_mempool, loadsize);
+
+ memcpy(wad_base, temp, loadsize);
+ Mem_Free(temp);
+
header = (wadinfo_t *)wad_base;
-
- if (header->identification[0] != 'W'
- || header->identification[1] != 'A'
- || header->identification[2] != 'D'
- || header->identification[3] != '2')
+
+ if (memcmp(header->identification, "WAD2", 4))
Sys_Error ("Wad file %s doesn't have WAD2 id\n",filename);
-
+
wad_numlumps = LittleLong(header->numlumps);
infotableofs = LittleLong(header->infotableofs);
wad_lumps = (lumpinfo_t *)(wad_base + infotableofs);
-
+
for (i=0, lump_p = wad_lumps ; i<wad_numlumps ; i++,lump_p++)
{
lump_p->filepos = LittleLong(lump_p->filepos);
}
}
-
-/*
-=============
-W_GetLumpinfo
-=============
-*/
-lumpinfo_t *W_GetLumpinfo (char *name)
+void *W_GetLumpName (char *name)
{
int i;
- lumpinfo_t *lump_p;
+ lumpinfo_t *lump;
char clean[16];
-
+
W_CleanupName (name, clean);
-
- for (lump_p=wad_lumps, i=0 ; i<wad_numlumps ; i++,lump_p++)
- {
- if (!strcmp(clean, lump_p->name))
- return lump_p;
- }
-
- Sys_Error ("W_GetLumpinfo: %s not found", name);
- return NULL;
-}
-void *W_GetLumpName (char *name)
-{
- lumpinfo_t *lump;
-
- lump = W_GetLumpinfo (name);
-
- return (void *)(wad_base + lump->filepos);
-}
+ for (lump = wad_lumps, i = 0;i < wad_numlumps;i++, lump++)
+ if (!strcmp(clean, lump->name))
+ return (void *)(wad_base + lump->filepos);
-void *W_GetLumpNum (int num)
-{
- lumpinfo_t *lump;
-
- if (num < 0 || num > wad_numlumps)
- Sys_Error ("W_GetLumpNum: bad number: %i", num);
-
- lump = wad_lumps + num;
-
- return (void *)(wad_base + lump->filepos);
+ Sys_Error ("W_GetLumpinfo: %s not found", name);
+ return NULL;
}
/*
void SwapPic (qpic_t *pic)
{
pic->width = LittleLong(pic->width);
- pic->height = LittleLong(pic->height);
+ pic->height = LittleLong(pic->height);
}
// LordHavoc: added alternate WAD2/WAD3 system for HalfLife texture wads
-#define TEXWAD_MAXIMAGES 8192
+#define TEXWAD_MAXIMAGES 16384
typedef struct
{
char name[16];
- FILE *file;
+ QFile *file;
int position;
int size;
} texwadlump_t;
-texwadlump_t texwadlump[TEXWAD_MAXIMAGES];
+static texwadlump_t texwadlump[TEXWAD_MAXIMAGES];
/*
====================
wadinfo_t header;
unsigned i, j;
int infotableofs;
- FILE *file;
+ QFile *file;
int numlumps;
-
- COM_FOpenFile (filename, &file, false);
+
+ COM_FOpenFile (filename, &file, false, false);
if (!file)
{
if (complain)
return;
}
- if (fread(&header, sizeof(wadinfo_t), 1, file) != 1)
+ if (Qread(file, &header, sizeof(wadinfo_t)) != sizeof(wadinfo_t))
{Con_Printf ("W_LoadTextureWadFile: unable to read wad header");return;}
-
- if(header.identification[0] != 'W'
- || header.identification[1] != 'A'
- || header.identification[2] != 'D'
- || header.identification[3] != '3')
+
+ if(memcmp(header.identification, "WAD3", 4))
{Con_Printf ("W_LoadTextureWadFile: Wad file %s doesn't have WAD3 id\n",filename);return;}
numlumps = LittleLong(header.numlumps);
if (numlumps < 1 || numlumps > TEXWAD_MAXIMAGES)
{Con_Printf ("W_LoadTextureWadFile: invalid number of lumps (%i)\n", numlumps);return;}
infotableofs = LittleLong(header.infotableofs);
- if (fseek(file, infotableofs, SEEK_SET))
+ if (Qseek(file, infotableofs, SEEK_SET))
{Con_Printf ("W_LoadTextureWadFile: unable to seek to lump table");return;}
- if (!(lumps = malloc(sizeof(lumpinfo_t)*numlumps)))
+ if (!(lumps = Mem_Alloc(tempmempool, sizeof(lumpinfo_t)*numlumps)))
{Con_Printf ("W_LoadTextureWadFile: unable to allocate temporary memory for lump table");return;}
- if (fread(lumps, sizeof(lumpinfo_t), numlumps, file) != numlumps)
+ if (Qread(file, lumps, sizeof(lumpinfo_t) * numlumps) != sizeof(lumpinfo_t) * numlumps)
{Con_Printf ("W_LoadTextureWadFile: unable to read lump table");return;}
-
+
for (i=0, lump_p = lumps ; i<numlumps ; i++,lump_p++)
{
W_CleanupName (lump_p->name, lump_p->name);
texwadlump[j].position = LittleLong(lump_p->filepos);
texwadlump[j].size = LittleLong(lump_p->disksize);
}
- free(lumps);
+ Mem_Free(lumps);
// leaves the file open
}
-
+/*
byte hlpalette[768] =
{
0x00,0x00,0x00,0x0F,0x0F,0x0F,0x1F,0x1F,0x1F,0x2F,0x2F,0x2F,0x3F,0x3F,0x3F,0x4B,
0xE7,0xFF,0xD7,0xFF,0xFF,0x67,0x00,0x00,0x8B,0x00,0x00,0xB3,0x00,0x00,0xD7,0x00,
0x00,0xFF,0x00,0x00,0xFF,0xF3,0x93,0xFF,0xF7,0xC7,0xFF,0xFF,0xFF,0x9F,0x5B,0x53,
};
+*/
-byte *W_GetTexture(char *name, int matchwidth, int matchheight)
+byte *W_ConvertWAD3Texture(miptex_t *tex)
{
- int i, c, datasize;
- short colorcount;
- FILE *file;
- struct
+ byte *in, *data, *out, *pal;
+// int palsize;
+ int d, p;
+ in = (byte *)((int) tex + tex->offsets[0]);
+ data = out = Mem_Alloc(tempmempool, tex->width * tex->height * 4);
+ if (!data)
+ return NULL;
+ image_width = tex->width;
+ image_height = tex->height;
+ pal = in + (((image_width * image_height) * 85) >> 6);
+// palsize = pal[1] * 0x100 + pal[0];
+// if (palsize >= 256)
+// palsize = 256;
+ pal += 2;
+ for (d = 0;d < image_width * image_height;d++)
{
- char name[16];
- int width;
- int height;
- int ofs[4];
- } t;
- byte pal[256][3], *indata, *outdata, *data;
+ p = *in++;
+ if (tex->name[0] == '{' && p == 255)
+ out[0] = out[1] = out[2] = out[3] = 0;
+ else
+ {
+ p *= 3;
+ out[0] = pal[p];
+ out[1] = pal[p+1];
+ out[2] = pal[p+2];
+ out[3] = 255;
+ }
+ out += 4;
+ }
+ return data;
+}
+
+byte *W_GetTexture(char *name)
+{
+// int i, c, datasize;
+// short colorcount;
+// byte pal[256][3], *indata, *outdata, *data;
+ char texname[17];
+ int i, j;
+ QFile *file;
+ miptex_t *tex;
+ byte *data;
+ texname[16] = 0;
+ W_CleanupName (name, texname);
for (i = 0;i < TEXWAD_MAXIMAGES;i++)
{
if (texwadlump[i].name[0])
{
- if (!strcmp(name, texwadlump[i].name)) // found it
+ if (!strcmp(texname, texwadlump[i].name)) // found it
{
file = texwadlump[i].file;
- if (fseek(file, texwadlump[i].position, SEEK_SET))
- {Con_Printf("W_GetTexture: corrupt WAD3 file");return FALSE;}
- if (fread(&t, sizeof(t), 1, file) != 1)
- {Con_Printf("W_GetTexture: corrupt WAD3 file");return FALSE;}
+ if (Qseek(file, texwadlump[i].position, SEEK_SET))
+ {Con_Printf("W_GetTexture: corrupt WAD3 file");return NULL;}
+
+ tex = Mem_Alloc(tempmempool, texwadlump[i].size);
+ if (!tex)
+ return NULL;
+ if (Qread(file, tex, texwadlump[i].size) < texwadlump[i].size)
+ {Con_Printf("W_GetTexture: corrupt WAD3 file");return NULL;}
+
+ tex->width = LittleLong(tex->width);
+ tex->height = LittleLong(tex->height);
+ for (j = 0;j < MIPLEVELS;j++)
+ tex->offsets[j] = LittleLong(tex->offsets[j]);
+ data = W_ConvertWAD3Texture(tex);
+ Mem_Free(tex);
+ return data;
+ /*
image_width = LittleLong(t.width);
image_height = LittleLong(t.height);
if (matchwidth && image_width != matchwidth)
if (matchheight && image_height != matchheight)
continue;
if (image_width & 15 || image_height & 15)
- {Con_Printf("W_GetTexture: corrupt WAD3 file");return FALSE;}
+ {Con_Printf("W_GetTexture: corrupt WAD3 file");return NULL;}
// allocate space for expanded image,
// and load incoming image into upper area (overwritten as it expands)
- if (!(data = outdata = malloc(image_width*image_height*4)))
- {Con_Printf("W_GetTexture: out of memory");return FALSE;}
+ if (!(data = outdata = Mem_Alloc(tempmempool, image_width*image_height*4)))
+ {Con_Printf("W_GetTexture: out of memory");return NULL;}
indata = outdata + image_width*image_height*3;
datasize = image_width*image_height*85/64;
// read the image data
- if (fseek(file, texwadlump[i].position + sizeof(t), SEEK_SET))
- {Con_Printf("W_GetTexture: corrupt WAD3 file");return FALSE;}
- if (fread(indata, 1, image_width*image_height, file) != image_width*image_height)
- {Con_Printf("W_GetTexture: corrupt WAD3 file");return FALSE;}
+ if (Qseek(file, texwadlump[i].position + sizeof(t), SEEK_SET))
+ {Con_Printf("W_GetTexture: corrupt WAD3 file");return NULL;}
+ if (Qread(file, indata, image_width*image_height) != image_width*image_height)
+ {Con_Printf("W_GetTexture: corrupt WAD3 file");return NULL;}
// read the number of colors used (always 256)
- if (fseek(file, texwadlump[i].position + sizeof(t) + datasize, SEEK_SET))
- {Con_Printf("W_GetTexture: corrupt WAD3 file");return FALSE;}
- if (fread(&colorcount, 2, 1, file) != 1)
- {Con_Printf("W_GetTexture: corrupt WAD3 file");return FALSE;}
+ if (Qseek(file, texwadlump[i].position + sizeof(t) + datasize, SEEK_SET))
+ {Con_Printf("W_GetTexture: corrupt WAD3 file");return NULL;}
+ if (Qread(file, &colorcount, 2) != 2)
+ {Con_Printf("W_GetTexture: corrupt WAD3 file");return NULL;}
if (texwadlump[i].size > (datasize + sizeof(t)))
{
colorcount = LittleShort(colorcount);
if (colorcount < 0) colorcount = 0;
if (colorcount > 256) colorcount = 256;
// read the palette
- // fseek(file, texwadlump[i].position + sizeof(t) + datasize + 2, SEEK_SET);
- if (fread(&pal, 3, colorcount, file) != colorcount)
- {Con_Printf("W_GetTexture: corrupt WAD3 file");return FALSE;}
+ // Qseek(file, texwadlump[i].position + sizeof(t) + datasize + 2, SEEK_SET);
+ if (Qread(file, &pal, 3 * colorcount) != 3 * colorcount)
+ {Con_Printf("W_GetTexture: corrupt WAD3 file");return NULL;}
}
else
memcpy(&pal, hlpalette, 768);
for (i = 0;i < image_width*image_height;i++)
{
c = *indata++;
- if (c == 255) // transparent color
- {
- *outdata++ = 0;
- *outdata++ = 0;
- *outdata++ = 0;
- *outdata++ = 0;
- }
+ if (name[0] == '{' && c == 255)
+ outdata[0] = outdata[1] = outdata[2] = outdata[3] = 0;
else
{
- *outdata++ = pal[c][0];
- *outdata++ = pal[c][1];
- *outdata++ = pal[c][2];
- *outdata++ = 255;
+ outdata[0] = pal[c][0];
+ outdata[1] = pal[c][1];
+ outdata[2] = pal[c][2];
+ outdata[3] = 255;
}
+ outdata += 4;
}
return data;
+ */
}
}
else
projects / xonotic / darkplaces.git / blobdiff