qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

seems MIPTEX means mipable textures, not the format

This commit is contained in:
Bill Currie 2007-01-07 01:19:33 +00:00 committed by Jeff Teunissen
parent 99e05d2188
commit 476dbce456
1 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
tools/wad/wad.c
View File

@ -44,6 +44,7 @@ static __attribute__ ((used)) const char rcsid[] =
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <math.h>
#include <QF/bspfile.h> #include <QF/bspfile.h>
#include <QF/cmd.h> #include <QF/cmd.h>
@ -231,10 +232,9 @@ wad_extract (wad_t *wad, lumpinfo_t *pf)
size_t count; size_t count;
int len, i; int len, i;
QFile *file; QFile *file;
byte buffer[16384]; byte *buffer;
pcx_t *pcx; pcx_t *pcx;
qpic_t *qpic; qpic_t *qpic;
miptex_t *mip;
switch (pf->type) { switch (pf->type) {
case TYP_PALETTE: case TYP_PALETTE:
@ -262,8 +262,10 @@ wad_extract (wad_t *wad, lumpinfo_t *pf)
switch (pf->type) { switch (pf->type) {
case TYP_PALETTE: case TYP_PALETTE:
if (options.verbosity > 1)
fprintf (stderr, "PALETTE: %d\n", pf->size);
count = 768; count = 768;
memset (buffer, 0, count); buffer = calloc (count + 256, 1);
if ((int) count > pf->size) if ((int) count > pf->size)
count = pf->size; count = pf->size;
for (i = 0; i < 256; i++) for (i = 0; i < 256; i++)
@ -274,9 +276,12 @@ wad_extract (wad_t *wad, lumpinfo_t *pf)
fprintf (stderr, "Error writing to %s\n", name.str); fprintf (stderr, "Error writing to %s\n", name.str);
return -1; return -1;
} }
free (buffer);
Qclose (file); Qclose (file);
return 0; return 0;
case TYP_QPIC: case TYP_QPIC:
if (options.verbosity > 1)
fprintf (stderr, "QPIC: %d\n", pf->size);
qpic = malloc (pf->size); qpic = malloc (pf->size);
Qread (wad->handle, qpic, pf->size); Qread (wad->handle, qpic, pf->size);
pcx = EncodePCX (qpic->data, qpic->width, qpic->height, pcx = EncodePCX (qpic->data, qpic->width, qpic->height,
@ -289,12 +294,15 @@ wad_extract (wad_t *wad, lumpinfo_t *pf)
Qclose (file); Qclose (file);
return 0; return 0;
case TYP_MIPTEX: case TYP_MIPTEX:
mip = malloc (pf->size); buffer = malloc (pf->size);
Qread (wad->handle, mip, pf->size); Qread (wad->handle, buffer, pf->size);
pcx = EncodePCX ((byte *) mip + mip->offsets[0], i = sqrt (pf->size);
mip->width, mip->height, mip->width, if (options.verbosity > 1)
default_palette, false, &len); fprintf (stderr, "MIPTEX: %d %d %d %02x %02x %02x %02x\n",
free (mip); pf->size, i, i * i,
buffer[0], buffer[1], buffer[2], buffer[3]);
pcx = EncodePCX (buffer, i, i, i, default_palette, false, &len);
free (buffer);
if (Qwrite (file, pcx, len) != len) { if (Qwrite (file, pcx, len) != len) {
fprintf (stderr, "Error writing to %s\n", name.str); fprintf (stderr, "Error writing to %s\n", name.str);
return -1; return -1;
@ -302,20 +310,28 @@ wad_extract (wad_t *wad, lumpinfo_t *pf)
Qclose (file); Qclose (file);
return 0; return 0;
case TYP_SOUND: case TYP_SOUND:
if (options.verbosity > 1)
fprintf (stderr, "SOUND: %d\n", pf->size);
break;
case TYP_QTEX: case TYP_QTEX:
if (options.verbosity > 1)
fprintf (stderr, "QTEX: %d\n", pf->size);
break;
default: default:
break; break;
} }
buffer = malloc (16384);
len = pf->size; len = pf->size;
while (len) { while (len) {
count = len; count = len;
if (count > sizeof (buffer)) if (count > 16384)
count = sizeof (buffer); count = 16384;
count = Qread (wad->handle, buffer, count); count = Qread (wad->handle, buffer, count);
Qwrite (file, buffer, count); Qwrite (file, buffer, count);
len -= count; len -= count;
} }
free (buffer);
Qclose (file); Qclose (file);
return 0; return 0;
} }