2004-08-23 00:15:46 +00:00
|
|
|
/*
|
|
|
|
Copyright (C) 1996-1997 Id Software, Inc.
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or
|
|
|
|
modify it under the terms of the GNU General Public License
|
|
|
|
as published by the Free Software Foundation; either version 2
|
|
|
|
of the License, or (at your option) any later version.
|
|
|
|
|
|
|
|
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.
|
|
|
|
|
|
|
|
See the GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the Free Software
|
|
|
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
|
|
|
|
|
*/
|
|
|
|
// wad.c
|
|
|
|
|
|
|
|
#include "quakedef.h"
|
|
|
|
|
|
|
|
int wad_numlumps;
|
|
|
|
lumpinfo_t *wad_lumps;
|
|
|
|
qbyte *wad_base;
|
|
|
|
|
|
|
|
void SwapPic (qpic_t *pic);
|
|
|
|
|
|
|
|
/*
|
|
|
|
==================
|
|
|
|
W_CleanupName
|
|
|
|
|
|
|
|
Lowercases name and pads with spaces and a terminating 0 to the length of
|
|
|
|
lumpinfo_t->name.
|
|
|
|
Used so lumpname lookups can proceed rapidly by comparing 4 chars at a time
|
|
|
|
Space padding is so names can be printed nicely in tables.
|
|
|
|
Can safely be performed in place.
|
|
|
|
==================
|
|
|
|
*/
|
2009-11-04 21:16:50 +00:00
|
|
|
void W_CleanupName (const char *in, char *out)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-07-05 19:42:36 +00:00
|
|
|
void W_Shutdown (void)
|
|
|
|
{
|
|
|
|
if (wad_base)
|
|
|
|
Z_Free(wad_base);
|
|
|
|
wad_base = NULL;
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
====================
|
|
|
|
W_LoadWadFile
|
|
|
|
====================
|
|
|
|
*/
|
|
|
|
void W_LoadWadFile (char *filename)
|
|
|
|
{
|
|
|
|
lumpinfo_t *lump_p;
|
|
|
|
wadinfo_t *header;
|
|
|
|
unsigned i;
|
|
|
|
int infotableofs;
|
|
|
|
|
|
|
|
if (wad_base)
|
|
|
|
Z_Free(wad_base);
|
|
|
|
|
|
|
|
wad_base = COM_LoadFile (filename, 0);
|
|
|
|
if (!wad_base)
|
|
|
|
{
|
|
|
|
wad_numlumps = 0;
|
2011-07-30 14:14:56 +00:00
|
|
|
Con_DPrintf ("W_LoadWadFile: couldn't load %s\n", filename);
|
2004-08-23 00:15:46 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
header = (wadinfo_t *)wad_base;
|
|
|
|
|
|
|
|
if (header->identification[0] != 'W'
|
|
|
|
|| header->identification[1] != 'A'
|
|
|
|
|| header->identification[2] != 'D'
|
|
|
|
|| header->identification[3] != '2')
|
2005-12-29 00:18:23 +00:00
|
|
|
{
|
|
|
|
Con_Printf ("W_LoadWadFile: Wad file %s doesn't have WAD2 id\n",filename);
|
|
|
|
wad_numlumps = 0;
|
|
|
|
Z_Free(wad_base);
|
|
|
|
wad_base = NULL;
|
|
|
|
return;
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
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);
|
|
|
|
lump_p->size = LittleLong(lump_p->size);
|
|
|
|
W_CleanupName (lump_p->name, lump_p->name);
|
|
|
|
if (lump_p->type == TYP_QPIC)
|
|
|
|
SwapPic ( (qpic_t *)(wad_base + lump_p->filepos));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
=============
|
|
|
|
W_GetLumpinfo
|
|
|
|
=============
|
|
|
|
*/
|
|
|
|
lumpinfo_t *W_GetLumpinfo (char *name)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
lumpinfo_t *lump_p;
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
void *W_SafeGetLumpName (const char *name)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
lumpinfo_t *lump_p;
|
|
|
|
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 (void *)(wad_base+lump_p->filepos);
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
void *W_GetLumpName (char *name)
|
|
|
|
{
|
|
|
|
lumpinfo_t *lump;
|
|
|
|
|
|
|
|
lump = W_GetLumpinfo (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);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
=============================================================================
|
|
|
|
|
|
|
|
automatic qbyte swapping
|
|
|
|
|
|
|
|
=============================================================================
|
|
|
|
*/
|
|
|
|
|
|
|
|
void SwapPic (qpic_t *pic)
|
|
|
|
{
|
|
|
|
pic->width = LittleLong(pic->width);
|
|
|
|
pic->height = LittleLong(pic->height);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2005-07-28 15:52:31 +00:00
|
|
|
// based on original code by LordHavoc
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
//FIXME: convert to linked list. is hunk possible?
|
|
|
|
//hash tables?
|
|
|
|
#define TEXWAD_MAXIMAGES 16384
|
|
|
|
typedef struct
|
|
|
|
{
|
|
|
|
char name[16];
|
2005-12-21 03:07:33 +00:00
|
|
|
vfsfile_t *file;
|
2004-08-23 00:15:46 +00:00
|
|
|
int position;
|
|
|
|
int size;
|
|
|
|
} texwadlump_t;
|
|
|
|
int numwadtextures;
|
|
|
|
static texwadlump_t texwadlump[TEXWAD_MAXIMAGES];
|
|
|
|
|
|
|
|
typedef struct wadfile_s {
|
|
|
|
char name[64];
|
|
|
|
FILE *file;
|
|
|
|
struct wadfile_s *next;
|
|
|
|
} wadfile_t;
|
|
|
|
|
|
|
|
wadfile_t *openwadfiles;
|
|
|
|
|
|
|
|
void Wads_Flush (void)
|
|
|
|
{
|
|
|
|
wadfile_t *wf;
|
|
|
|
while(openwadfiles)
|
|
|
|
{
|
|
|
|
fclose(openwadfiles->file);
|
|
|
|
|
|
|
|
wf = openwadfiles->next;
|
|
|
|
Z_Free(openwadfiles);
|
|
|
|
openwadfiles = wf;
|
|
|
|
}
|
|
|
|
|
|
|
|
numwadtextures=0;
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
====================
|
|
|
|
W_LoadTextureWadFile
|
|
|
|
====================
|
|
|
|
*/
|
|
|
|
void W_LoadTextureWadFile (char *filename, int complain)
|
|
|
|
{
|
|
|
|
lumpinfo_t *lumps, *lump_p;
|
|
|
|
wadinfo_t header;
|
|
|
|
int i, j;
|
|
|
|
int infotableofs;
|
2005-12-21 03:07:33 +00:00
|
|
|
vfsfile_t *file;
|
2004-08-23 00:15:46 +00:00
|
|
|
int numlumps;
|
|
|
|
|
|
|
|
wadfile_t *wf = openwadfiles;
|
|
|
|
while(wf)
|
|
|
|
{
|
|
|
|
if (!strcmp(wf->name, filename)) //already loaded
|
|
|
|
return;
|
|
|
|
|
|
|
|
wf = wf->next;
|
|
|
|
}
|
|
|
|
|
2005-12-21 03:07:33 +00:00
|
|
|
file = FS_OpenVFS(filename, "rb", FS_GAME);
|
2004-08-23 00:15:46 +00:00
|
|
|
if (!file)
|
2005-12-21 03:07:33 +00:00
|
|
|
file = FS_OpenVFS(va("textures/halflife/%s", filename), "rb", FS_GAME);
|
2004-08-23 00:15:46 +00:00
|
|
|
if (!file)
|
|
|
|
{
|
|
|
|
if (complain)
|
|
|
|
Con_Printf ("W_LoadTextureWadFile: couldn't find %s", filename);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2005-12-21 03:07:33 +00:00
|
|
|
if (VFS_READ(file, &header, sizeof(wadinfo_t)) != sizeof(wadinfo_t))
|
2004-08-23 00:15:46 +00:00
|
|
|
{Con_Printf ("W_LoadTextureWadFile: unable to read wad header");return;}
|
|
|
|
|
|
|
|
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);
|
2005-12-21 06:50:57 +00:00
|
|
|
if (!VFS_SEEK(file, infotableofs))
|
2004-08-23 00:15:46 +00:00
|
|
|
{Con_Printf ("W_LoadTextureWadFile: unable to seek to lump table");return;}
|
|
|
|
if (!((lumps = Hunk_TempAlloc(sizeof(lumpinfo_t)*numlumps))))
|
|
|
|
{Con_Printf ("W_LoadTextureWadFile: unable to allocate temporary memory for lump table");return;}
|
|
|
|
|
2005-12-21 03:07:33 +00:00
|
|
|
if (VFS_READ(file, lumps, sizeof(lumpinfo_t)*numlumps) != (int)sizeof(lumpinfo_t) * numlumps)
|
2004-08-23 00:15:46 +00:00
|
|
|
{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);
|
|
|
|
for (j = 0;j < numwadtextures;j++)
|
|
|
|
{
|
|
|
|
if (!strcmp(lump_p->name, texwadlump[j].name)) // name match, replace old one
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (j >= TEXWAD_MAXIMAGES)
|
|
|
|
break; // abort loading
|
|
|
|
if (j == numwadtextures)
|
|
|
|
{
|
|
|
|
W_CleanupName (lump_p->name, texwadlump[j].name);
|
|
|
|
texwadlump[j].file = file;
|
|
|
|
texwadlump[j].position = LittleLong(lump_p->filepos);
|
|
|
|
texwadlump[j].size = LittleLong(lump_p->disksize);
|
|
|
|
numwadtextures++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// leaves the file open
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
void W_ApplyGamma (qbyte *data, int len, int skipalpha)
|
|
|
|
{
|
|
|
|
int i, inf;
|
|
|
|
qbyte gammatable[256];
|
|
|
|
|
|
|
|
if (v_gamma.value == 1.0)
|
|
|
|
{
|
|
|
|
for (i=0 ; i<256 ; i++)
|
|
|
|
gammatable[i] = i;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
for (i=0 ; i<256 ; i++)
|
|
|
|
{
|
|
|
|
inf = 255 * pow ( (i+0.5)/255.5 , v_gamma.value ) + 0.5;
|
|
|
|
if (inf < 0)
|
|
|
|
inf = 0;
|
|
|
|
if (inf > 255)
|
|
|
|
inf = 255;
|
|
|
|
gammatable[i] = inf;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
*/
|
|
|
|
qbyte *W_ConvertWAD3Texture(miptex_t *tex, int *width, int *height, qboolean *usesalpha) //returns rgba
|
|
|
|
{
|
|
|
|
qbyte *in, *data, *out, *pal;
|
|
|
|
int d, p;
|
|
|
|
|
|
|
|
int alpha = 0;
|
|
|
|
|
|
|
|
if (tex->name[0] == '{')
|
|
|
|
alpha = 1;
|
|
|
|
else if (!strncmp(tex->name, "window", 6) || !strncmp(tex->name, "glass", 5))
|
|
|
|
alpha = 2;
|
|
|
|
|
|
|
|
//use malloc here if you want, but you'll have to free it again... NUR!
|
2012-07-05 19:42:36 +00:00
|
|
|
data = out = BZ_Malloc(tex->width * tex->height * 4);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
if (!data)
|
|
|
|
return NULL;
|
|
|
|
|
2005-02-17 03:32:18 +00:00
|
|
|
in = (qbyte *)tex + tex->offsets[0];
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
*width = tex->width;
|
|
|
|
*height = tex->height;
|
|
|
|
pal = in + (((tex->width * tex->height) * 85) >> 6);
|
|
|
|
pal += 2;
|
|
|
|
for (d = 0;d < tex->width * tex->height;d++)
|
|
|
|
{
|
|
|
|
p = *in++;
|
|
|
|
if (alpha==1 && p == 255) //only allow alpha on '{' textures
|
|
|
|
out[0] = out[1] = out[2] = out[3] = 0;
|
|
|
|
else if (alpha == 2)
|
|
|
|
{
|
|
|
|
p *= 3;
|
|
|
|
out[0] = pal[p];
|
|
|
|
out[1] = pal[p+1];
|
|
|
|
out[2] = pal[p+2];
|
|
|
|
out[3] = (out[0]+out[1]+out[2])/3;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
p *= 3;
|
|
|
|
out[0] = pal[p];
|
|
|
|
out[1] = pal[p+1];
|
|
|
|
out[2] = pal[p+2];
|
|
|
|
out[3] = 255;
|
|
|
|
}
|
|
|
|
out += 4;
|
|
|
|
}
|
|
|
|
BoostGamma(data, tex->width, tex->height);
|
|
|
|
*usesalpha = !!alpha;
|
|
|
|
return data;
|
|
|
|
}
|
|
|
|
|
|
|
|
qbyte *W_GetTexture(char *name, int *width, int *height, qboolean *usesalpha)//returns rgba
|
|
|
|
{
|
|
|
|
char texname[17];
|
|
|
|
int i, j;
|
2005-12-21 03:07:33 +00:00
|
|
|
vfsfile_t *file;
|
2004-08-23 00:15:46 +00:00
|
|
|
miptex_t *tex;
|
|
|
|
qbyte *data;
|
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
if (!strncmp(name, "gfx/", 4))
|
|
|
|
{
|
|
|
|
qpic_t *p;
|
|
|
|
p = W_SafeGetLumpName(name+4);
|
|
|
|
if (p)
|
|
|
|
{
|
|
|
|
*width = p->width;
|
|
|
|
*height = p->height;
|
|
|
|
*usesalpha = false;
|
|
|
|
|
|
|
|
data = BZ_Malloc(p->width * p->height * 4);
|
|
|
|
for (i = 0; i < p->width * p->height; i++)
|
|
|
|
{
|
|
|
|
((unsigned int*)data)[i] = d_8to24rgbtable[p->data[i]];
|
|
|
|
}
|
|
|
|
return data;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
texname[16] = 0;
|
|
|
|
W_CleanupName (name, texname);
|
|
|
|
for (i = 0;i < numwadtextures;i++)
|
|
|
|
{
|
|
|
|
if (!strcmp(texname, texwadlump[i].name)) // found it
|
|
|
|
{
|
|
|
|
file = texwadlump[i].file;
|
2005-12-21 06:50:57 +00:00
|
|
|
if (!VFS_SEEK(file, texwadlump[i].position))
|
2004-08-23 00:15:46 +00:00
|
|
|
{Con_Printf("W_GetTexture: corrupt WAD3 file");return NULL;}
|
|
|
|
|
|
|
|
tex = BZ_Malloc(texwadlump[i].size); //temp buffer for disk info (was hunk_tempalloc, but that wiped loading maps and the like
|
|
|
|
if (!tex)
|
|
|
|
return NULL;
|
2005-12-21 03:07:33 +00:00
|
|
|
if (VFS_READ(file, tex, texwadlump[i].size) < texwadlump[i].size)
|
2004-08-23 00:15:46 +00:00
|
|
|
{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]);
|
2005-12-02 02:38:10 +00:00
|
|
|
|
2012-07-05 19:42:36 +00:00
|
|
|
data = W_ConvertWAD3Texture(tex, width, height, usesalpha);
|
2004-08-23 00:15:46 +00:00
|
|
|
BZ_Free(tex);
|
|
|
|
return data;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2009-07-19 20:43:07 +00:00
|
|
|
typedef struct mapgroup_s {
|
|
|
|
char *mapname;
|
|
|
|
char *skyname;
|
|
|
|
struct mapgroup_s *next;
|
|
|
|
} mapskys_t;
|
|
|
|
static mapskys_t *mapskies;
|
|
|
|
void CL_Skygroup_f(void)
|
|
|
|
{
|
|
|
|
mapskys_t **link;
|
|
|
|
mapskys_t *ms;
|
|
|
|
char *skyname;
|
|
|
|
char *mapname;
|
|
|
|
int i;
|
|
|
|
int remove;
|
|
|
|
|
|
|
|
skyname = Cmd_Argv(1);
|
|
|
|
|
|
|
|
if (!*skyname)
|
|
|
|
{
|
|
|
|
skyname = NULL;
|
|
|
|
for (ms = mapskies; ms; ms = ms->next)
|
|
|
|
{
|
|
|
|
if (!skyname || strcmp(skyname, ms->skyname))
|
|
|
|
{
|
|
|
|
Con_Printf("%s%s:", skyname?"\n":"", ms->skyname);
|
|
|
|
skyname=ms->skyname;
|
|
|
|
}
|
|
|
|
Con_Printf(" %s", ms->mapname);
|
|
|
|
}
|
|
|
|
if (skyname)
|
|
|
|
Con_Printf("\n");
|
|
|
|
else
|
|
|
|
Con_Printf("No skygroups defined\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!strcmp(skyname, "clear") && Cmd_Argc() == 2)
|
|
|
|
{
|
|
|
|
while (mapskies)
|
|
|
|
{
|
|
|
|
ms = mapskies->next;
|
|
|
|
Z_Free(mapskies);
|
|
|
|
mapskies = ms;
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (*skyname == '-')
|
|
|
|
{
|
|
|
|
skyname++;
|
|
|
|
for (link = &mapskies; *link; )
|
|
|
|
{
|
|
|
|
if (!strcmp((*link)->mapname, skyname) || !strcmp((*link)->skyname, skyname))
|
|
|
|
{
|
|
|
|
ms = *link;
|
|
|
|
*link = ms->next;
|
|
|
|
Z_Free(ms);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
link = &(*link)->next;
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 2; i < Cmd_Argc(); i++)
|
|
|
|
{
|
|
|
|
mapname = Cmd_Argv(i);
|
|
|
|
|
|
|
|
remove = *mapname == '-';
|
|
|
|
mapname += remove;
|
|
|
|
|
|
|
|
for (link = &mapskies; *link; link = &(*link)->next)
|
|
|
|
{
|
|
|
|
if (!strcmp((*link)->mapname, mapname))
|
|
|
|
{
|
|
|
|
ms = *link;
|
|
|
|
*link = ms->next;
|
|
|
|
Z_Free(ms);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (remove)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
ms = Z_Malloc(sizeof(*ms) + strlen(mapname) + strlen(skyname) + 2);
|
|
|
|
|
|
|
|
ms->mapname = (char*)(ms+1);
|
|
|
|
ms->skyname = ms->mapname + strlen(mapname)+1;
|
|
|
|
ms->next = mapskies;
|
|
|
|
|
|
|
|
strcpy(ms->mapname, mapname);
|
|
|
|
strcpy(ms->skyname, skyname);
|
|
|
|
|
|
|
|
mapskies = ms;
|
|
|
|
}
|
|
|
|
}
|
2005-03-28 00:11:59 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
char wads[4096];
|
Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
|
|
|
void Mod_ParseInfoFromEntityLump(model_t *wmodel, char *data, char *mapname) //actually, this should be in the model code.
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
char key[128];
|
2009-07-19 20:43:07 +00:00
|
|
|
mapskys_t *msky;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
cl.skyrotate = 0;
|
|
|
|
VectorClear(cl.skyaxis);
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
wads[0] = '\0';
|
|
|
|
|
2004-11-29 01:21:00 +00:00
|
|
|
#ifndef CLIENTONLY
|
2004-08-23 00:15:46 +00:00
|
|
|
if (isDedicated) //don't bother
|
|
|
|
return;
|
2004-11-29 01:21:00 +00:00
|
|
|
#endif
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2006-04-08 07:32:24 +00:00
|
|
|
// this hack is necessary to ensure Quake 2 maps get their
|
|
|
|
// default skybox
|
Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
|
|
|
if (wmodel->fromgame == fg_quake2)
|
|
|
|
strcpy(cl.skyname, "unit1_");
|
2006-04-08 07:32:24 +00:00
|
|
|
else
|
Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
|
|
|
cl.skyname[0] = '\0';
|
2005-10-22 17:50:28 +00:00
|
|
|
|
2009-07-19 20:43:07 +00:00
|
|
|
for (msky = mapskies; msky; msky = msky->next)
|
|
|
|
{
|
|
|
|
if (!strcmp(msky->mapname, mapname))
|
|
|
|
{
|
Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
|
|
|
Q_strncpyz(cl.skyname, msky->skyname, sizeof(cl.skyname));
|
2009-07-19 20:43:07 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-10-15 20:10:16 +00:00
|
|
|
if (data)
|
|
|
|
if ((data=COM_Parse(data))) //read the map info.
|
|
|
|
if (com_token[0] == '{')
|
2004-08-23 00:15:46 +00:00
|
|
|
while (1)
|
|
|
|
{
|
2005-08-26 22:56:51 +00:00
|
|
|
if (!(data=COM_Parse(data)))
|
2005-10-15 20:10:16 +00:00
|
|
|
break; // error
|
2004-08-23 00:15:46 +00:00
|
|
|
if (com_token[0] == '}')
|
|
|
|
break; // end of worldspawn
|
|
|
|
if (com_token[0] == '_')
|
|
|
|
strcpy(key, com_token + 1); //_ vars are for comments/utility stuff that arn't visible to progs. Ignore them.
|
|
|
|
else
|
|
|
|
strcpy(key, com_token);
|
2005-08-26 22:56:51 +00:00
|
|
|
if (!((data=COM_Parse(data))))
|
2005-10-15 20:10:16 +00:00
|
|
|
break; // error
|
2004-08-23 00:15:46 +00:00
|
|
|
if (!strcmp("wad", key)) // for HalfLife maps
|
|
|
|
{
|
Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
|
|
|
if (wmodel->fromgame == fg_halflife)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
strncat(wads, ";", 4095); //cache it for later (so that we don't play with any temp memory yet)
|
|
|
|
strncat(wads, com_token, 4095); //cache it for later (so that we don't play with any temp memory yet)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (!strcmp("skyname", key)) // for HalfLife maps
|
|
|
|
{
|
Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
|
|
|
Q_strncpyz(cl.skyname, com_token, sizeof(cl.skyname));
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
2011-03-31 02:32:32 +00:00
|
|
|
else if (!strcmp("fog", key))
|
|
|
|
{
|
2012-12-04 19:37:57 +00:00
|
|
|
int oel = Cmd_ExecLevel;
|
Android: fat presses, vibrator, onscreen keyboard, keep-screen-on, console scaling, touch-based console scrolling, additional bindables.
Some memory leaks fixed.
latency with the nq protocol over loopback is much reduced.
Terrain: now mostly a property of a (q1 for now) bsp map, file format changed, glsl now built in, terrain editor builtin improved/changed, holes supported.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4067 fc73d0e0-1445-4013-8a0c-d673dee63da5
2012-07-14 16:25:18 +00:00
|
|
|
void CL_Fog_f(void);
|
|
|
|
key[0] = 'f';
|
|
|
|
key[1] = ' ';
|
|
|
|
Q_strncpyz(key+2, com_token, sizeof(key)-2);
|
|
|
|
Cmd_TokenizeString(key, false, false);
|
2012-12-04 19:37:57 +00:00
|
|
|
Cmd_ExecLevel=RESTRICT_LOCAL;
|
Android: fat presses, vibrator, onscreen keyboard, keep-screen-on, console scaling, touch-based console scrolling, additional bindables.
Some memory leaks fixed.
latency with the nq protocol over loopback is much reduced.
Terrain: now mostly a property of a (q1 for now) bsp map, file format changed, glsl now built in, terrain editor builtin improved/changed, holes supported.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4067 fc73d0e0-1445-4013-8a0c-d673dee63da5
2012-07-14 16:25:18 +00:00
|
|
|
CL_Fog_f();
|
2012-12-04 19:37:57 +00:00
|
|
|
Cmd_ExecLevel=oel;
|
2011-03-31 02:32:32 +00:00
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
else if (!strcmp("sky", key)) // for Quake2 maps
|
|
|
|
{
|
Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
|
|
|
Q_strncpyz(cl.skyname, com_token, sizeof(cl.skyname));
|
2005-10-15 20:10:16 +00:00
|
|
|
}
|
2006-01-09 01:49:06 +00:00
|
|
|
else if (!strcmp("skyrotate", key))
|
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
cl.skyrotate = atof(com_token);
|
2006-01-09 01:49:06 +00:00
|
|
|
}
|
|
|
|
else if (!strcmp("skyaxis", key))
|
2005-10-15 20:10:16 +00:00
|
|
|
{
|
|
|
|
char *s;
|
|
|
|
Q_strncpyz(key, com_token, sizeof(key));
|
|
|
|
s = COM_Parse(key);
|
2006-01-09 01:49:06 +00:00
|
|
|
if (s)
|
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
cl.skyaxis[0] = atof(s);
|
2006-01-09 01:49:06 +00:00
|
|
|
s = COM_Parse(s);
|
|
|
|
if (s)
|
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
cl.skyaxis[1] = atof(s);
|
2006-01-09 01:49:06 +00:00
|
|
|
COM_Parse(s);
|
|
|
|
if (s)
|
2009-11-04 21:16:50 +00:00
|
|
|
cl.skyaxis[2] = atof(s);
|
2006-01-09 01:49:06 +00:00
|
|
|
}
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-09-20 23:25:38 +00:00
|
|
|
//textures/fred.wad is the DP standard - I wanna go for that one.
|
|
|
|
//textures/halfline/fred.wad is what fuhquake can use (yuck).
|
|
|
|
//fred.wad is what half-life supports.
|
|
|
|
|
|
|
|
//we only try one download, for textures/fred.wad
|
|
|
|
//but we will load wads from the other two paths if we have them locally.
|
2004-08-23 00:15:46 +00:00
|
|
|
qboolean Wad_NextDownload (void)
|
|
|
|
{
|
2004-09-20 23:25:38 +00:00
|
|
|
char wadname[4096+9]="textures/";
|
2004-08-23 00:15:46 +00:00
|
|
|
int i, j, k;
|
2004-09-20 23:25:38 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
if (*wads) //now go about checking the wads
|
|
|
|
{
|
|
|
|
j = 0;
|
|
|
|
wads[4095] = '\0';
|
|
|
|
for (i = 0;i < 4095;i++)
|
|
|
|
if (wads[i] != ';' && wads[i] != '\\' && wads[i] != '/' && wads[i] != ':')
|
|
|
|
break;
|
|
|
|
if (wads[i])
|
|
|
|
{
|
|
|
|
j=i;
|
|
|
|
for (;i < 4095;i++)
|
|
|
|
{
|
|
|
|
// ignore path...
|
|
|
|
if (wads[i] == '\\' || wads[i] == '/' || wads[i] == ':')
|
|
|
|
j = i+1;
|
|
|
|
else if (wads[i] == ';' || wads[i] == 0)
|
|
|
|
{
|
|
|
|
k = wads[i];
|
|
|
|
wads[i] = 0;
|
|
|
|
strcpy(wadname, &wads[j]);
|
2004-09-20 23:25:38 +00:00
|
|
|
if (wadname[9])
|
|
|
|
{
|
|
|
|
if (COM_FCheckExists(wadname+9)) //wad is in root dir, so we don't need to try textures.
|
2008-11-09 22:29:28 +00:00
|
|
|
CL_CheckOrEnqueDownloadFile(wadname, wadname, DLLF_REQUIRED); //don't skip this one, or the world is white.
|
2004-09-20 23:25:38 +00:00
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
wads[i] = k;
|
|
|
|
|
|
|
|
j = i+1;
|
|
|
|
if (!k)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Wads_Flush();
|
|
|
|
if (*wads) //now go about loading the wads, we are now safe from tempallocs
|
|
|
|
{
|
|
|
|
j = 0;
|
|
|
|
wads[4095] = '\0';
|
|
|
|
for (i = 0;i < 4095;i++)
|
|
|
|
if (wads[i] != ';' && wads[i] != '\\' && wads[i] != '/' && wads[i] != ':')
|
|
|
|
break;
|
|
|
|
if (wads[i])
|
|
|
|
{
|
|
|
|
j=i;
|
|
|
|
for (;i < 4095;i++)
|
|
|
|
{
|
|
|
|
// ignore path...
|
|
|
|
if (wads[i] == '\\' || wads[i] == '/' || wads[i] == ':')
|
|
|
|
j = i+1;
|
|
|
|
else if (wads[i] == ';' || wads[i] == 0)
|
|
|
|
{
|
|
|
|
k = wads[i];
|
|
|
|
wads[i] = 0;
|
2004-09-20 23:25:38 +00:00
|
|
|
strcpy(wadname+9, &wads[j]);
|
|
|
|
if (wadname[9])
|
|
|
|
{
|
|
|
|
if (COM_FCheckExists(wadname+9))
|
|
|
|
W_LoadTextureWadFile (wadname+9, false);
|
|
|
|
else
|
|
|
|
W_LoadTextureWadFile (wadname, false);
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
j = i+1;
|
|
|
|
if (!k)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|