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"
|
2019-07-19 02:13:19 +00:00
|
|
|
#include "shader.h"
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2017-02-19 00:15:42 +00:00
|
|
|
void *wadmutex;
|
|
|
|
|
2017-02-21 21:18:48 +00:00
|
|
|
#ifndef PACKAGE_TEXWAD
|
2017-02-19 00:15:42 +00:00
|
|
|
void Wads_Flush (void){}
|
|
|
|
qboolean Wad_NextDownload (void){return true;}
|
2017-12-09 22:10:51 +00:00
|
|
|
void *W_GetLumpName (const char *name, size_t *size, qbyte *type) {return NULL;}
|
2018-10-23 07:09:06 +00:00
|
|
|
qbyte *W_GetTexture(const char *name, int *width, int *height, uploadfmt_t *format){return NULL;}
|
2017-02-19 00:15:42 +00:00
|
|
|
void W_LoadWadFile (char *filename){}
|
|
|
|
void W_Shutdown (void){}
|
|
|
|
void CL_Skygroup_f(void){}
|
|
|
|
#else
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
int wad_numlumps;
|
|
|
|
lumpinfo_t *wad_lumps;
|
|
|
|
qbyte *wad_base;
|
|
|
|
|
2017-02-19 00:15:42 +00:00
|
|
|
static char wads[4096];
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
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;
|
2016-11-25 08:14:54 +00:00
|
|
|
|
|
|
|
if (!strncmp(in, "textures/", 9))
|
|
|
|
in += 9;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
for (i=0 ; i<16 ; i++ )
|
|
|
|
{
|
|
|
|
c = in[i];
|
|
|
|
if (!c)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (c >= 'A' && c <= 'Z')
|
|
|
|
c += ('a' - 'A');
|
2015-04-14 23:12:17 +00:00
|
|
|
if (c == '*') //not a valid filesystem char
|
|
|
|
c = '#';
|
2004-08-23 00:15:46 +00:00
|
|
|
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);
|
|
|
|
|
2018-07-05 16:21:44 +00:00
|
|
|
wad_base = COM_LoadFile (filename, 0, 0, NULL);
|
2004-08-23 00:15:46 +00:00
|
|
|
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'
|
2017-12-09 21:22:46 +00:00
|
|
|
|| (header->identification[3] != '2' && header->identification[3] != '3'))
|
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));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
=============
|
2017-12-09 21:22:46 +00:00
|
|
|
W_GetLumpName
|
2004-08-23 00:15:46 +00:00
|
|
|
=============
|
|
|
|
*/
|
2017-12-09 21:22:46 +00:00
|
|
|
void *W_GetLumpName (const char *name, size_t *size, qbyte *type)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
lumpinfo_t *lump_p;
|
|
|
|
char clean[16];
|
|
|
|
|
2017-12-09 21:22:46 +00:00
|
|
|
*type = 0;
|
|
|
|
*size = 0;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
W_CleanupName (name, clean);
|
|
|
|
|
|
|
|
for (lump_p=wad_lumps, i=0 ; i<wad_numlumps ; i++,lump_p++)
|
|
|
|
{
|
|
|
|
if (!strcmp(clean, lump_p->name))
|
2016-08-25 00:12:14 +00:00
|
|
|
{
|
2017-12-09 21:22:46 +00:00
|
|
|
*type = lump_p->type;
|
2016-08-25 00:12:14 +00:00
|
|
|
*size = lump_p->disksize;
|
2004-08-23 00:15:46 +00:00
|
|
|
return (void *)(wad_base+lump_p->filepos);
|
2016-08-25 00:12:14 +00:00
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
=============================================================================
|
|
|
|
|
|
|
|
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
|
2015-10-11 11:34:58 +00:00
|
|
|
|
|
|
|
typedef struct wadfile_s
|
|
|
|
{
|
|
|
|
vfsfile_t *file;
|
|
|
|
struct wadfile_s *next;
|
|
|
|
char name[1];
|
|
|
|
} wadfile_t;
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
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;
|
2021-05-09 13:02:49 +00:00
|
|
|
static int numwadtextures;
|
2004-08-23 00:15:46 +00:00
|
|
|
static texwadlump_t texwadlump[TEXWAD_MAXIMAGES];
|
|
|
|
|
2021-05-09 13:02:49 +00:00
|
|
|
static wadfile_t *openwadfiles;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
void Wads_Flush (void)
|
|
|
|
{
|
|
|
|
wadfile_t *wf;
|
2015-10-11 11:34:58 +00:00
|
|
|
if (wadmutex)
|
|
|
|
Sys_LockMutex(wadmutex);
|
2004-08-23 00:15:46 +00:00
|
|
|
while(openwadfiles)
|
|
|
|
{
|
2013-08-07 14:20:24 +00:00
|
|
|
VFS_CLOSE(openwadfiles->file);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
wf = openwadfiles->next;
|
|
|
|
Z_Free(openwadfiles);
|
|
|
|
openwadfiles = wf;
|
|
|
|
}
|
|
|
|
|
|
|
|
numwadtextures=0;
|
2015-10-11 11:34:58 +00:00
|
|
|
if (wadmutex)
|
|
|
|
Sys_UnlockMutex(wadmutex);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
/*
|
|
|
|
====================
|
|
|
|
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;}
|
|
|
|
|
2015-01-07 13:34:05 +00:00
|
|
|
if (memcmp(header.identification, "WAD3", 4) && memcmp(header.identification, "WAD2", 4))
|
2004-08-23 00:15:46 +00:00
|
|
|
{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
|
2015-04-14 23:12:17 +00:00
|
|
|
|
|
|
|
wf = BZ_Malloc(sizeof(*wf) + strlen(filename));
|
|
|
|
strcpy(wf->name, filename);
|
|
|
|
wf->file = file;
|
|
|
|
wf->next = openwadfiles;
|
|
|
|
openwadfiles = wf;
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
*/
|
2018-09-29 17:31:58 +00:00
|
|
|
qbyte *W_ConvertWAD3Texture(miptex_t *tex, size_t lumpsize, int *width, int *height, uploadfmt_t *format) //returns rgba
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
qbyte *in, *data, *out, *pal;
|
|
|
|
int d, p;
|
|
|
|
|
|
|
|
int alpha = 0;
|
|
|
|
|
|
|
|
if (tex->name[0] == '{')
|
|
|
|
alpha = 1;
|
|
|
|
|
2015-04-14 23:12:17 +00:00
|
|
|
if (tex->width > 0x10000 || tex->height > 0x10000)
|
|
|
|
return NULL;
|
|
|
|
|
2020-03-29 19:42:40 +00:00
|
|
|
//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;
|
2015-04-14 23:12:17 +00:00
|
|
|
|
|
|
|
//halflife wads have palettes embedded in them. but make sure everything else is packed because some quake wads are weird.
|
|
|
|
if (tex->offsets[0] == sizeof(*tex) &&
|
|
|
|
tex->offsets[1] == tex->offsets[0] + (tex->width)*(tex->height) &&
|
|
|
|
tex->offsets[2] == tex->offsets[1] + (tex->width>>1)*(tex->height>>1) &&
|
|
|
|
tex->offsets[3] == tex->offsets[2] + (tex->width>>2)*(tex->height>>2) &&
|
2015-10-11 11:34:58 +00:00
|
|
|
((lumpsize+3)&~3) >= ((tex->offsets[3] + (tex->width>>3)*(tex->height>>3) + 2 + 768+3)&~3))
|
2016-12-09 09:09:12 +00:00
|
|
|
{
|
|
|
|
short fl = *(short*)((qbyte *)tex + tex->offsets[3] + (tex->width>>3)*(tex->height>>3));
|
|
|
|
if (fl == 256)
|
|
|
|
pal = (qbyte *)tex + tex->offsets[3] + (tex->width>>3)*(tex->height>>3) + 2;
|
|
|
|
else
|
|
|
|
pal = host_basepal;
|
|
|
|
}
|
2015-04-14 23:12:17 +00:00
|
|
|
else
|
2015-01-07 13:34:05 +00:00
|
|
|
pal = host_basepal;
|
2015-04-14 23:12:17 +00:00
|
|
|
|
2020-03-29 19:42:40 +00:00
|
|
|
/* handle decals type textures -eukara */
|
|
|
|
if (alpha == 1 && (pal[765] == 255 && pal[766] == 255 && pal[767] == 255))
|
|
|
|
alpha = 3;
|
|
|
|
if (alpha == 1 && !(pal[765] == 0 && pal[766] == 0 && pal[767] == 255))
|
|
|
|
alpha = 2;
|
|
|
|
|
2015-10-11 11:34:58 +00:00
|
|
|
if (tex->offsets[0] + tex->width * tex->height > lumpsize)
|
|
|
|
{ //fucked texture.
|
|
|
|
for (d = 0;d < tex->width * tex->height;d++)
|
|
|
|
{
|
|
|
|
out[0] = 0;
|
|
|
|
out[1] = 255;
|
|
|
|
out[2] = 0;
|
|
|
|
out[3] = 255;
|
|
|
|
out += 4;
|
|
|
|
}
|
|
|
|
}
|
2020-03-29 19:42:40 +00:00
|
|
|
else for (d = 0;d < tex->width * tex->height;d++)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
p = *in++;
|
2020-03-29 19:42:40 +00:00
|
|
|
if (alpha == 1 && p == 255) {
|
2004-08-23 00:15:46 +00:00
|
|
|
out[0] = out[1] = out[2] = out[3] = 0;
|
2020-03-29 19:42:40 +00:00
|
|
|
} else if (alpha == 2) {
|
|
|
|
p *= 3;
|
|
|
|
/* this will be a blended decal -eukara */
|
|
|
|
out[0] = pal[765];
|
|
|
|
out[1] = pal[766];
|
|
|
|
out[2] = pal[767];
|
|
|
|
out[3] = 255 - pal[p];
|
|
|
|
} else if (alpha == 3) {
|
2004-08-23 00:15:46 +00:00
|
|
|
p *= 3;
|
2020-03-29 19:42:40 +00:00
|
|
|
/* this is used for glass and so on -eukara */
|
2020-04-02 20:28:11 +00:00
|
|
|
out[0] = 255;
|
|
|
|
out[1] = 255;
|
|
|
|
out[2] = 255;
|
2020-03-29 19:42:40 +00:00
|
|
|
out[3] = pal[p];
|
|
|
|
} else {
|
2004-08-23 00:15:46 +00:00
|
|
|
p *= 3;
|
2020-03-29 19:42:40 +00:00
|
|
|
/* non transparent -eukara */
|
2004-08-23 00:15:46 +00:00
|
|
|
out[0] = pal[p];
|
|
|
|
out[1] = pal[p+1];
|
|
|
|
out[2] = pal[p+2];
|
|
|
|
out[3] = 255;
|
|
|
|
}
|
|
|
|
out += 4;
|
|
|
|
}
|
2018-09-29 17:31:58 +00:00
|
|
|
*format = alpha?PTI_RGBA8:PTI_RGBX8;
|
2018-02-04 13:16:25 +00:00
|
|
|
if (!vid_hardwaregamma.value)
|
2018-09-29 17:31:58 +00:00
|
|
|
BoostGamma(data, tex->width, tex->height, *format);
|
2004-08-23 00:15:46 +00:00
|
|
|
return data;
|
|
|
|
}
|
|
|
|
|
2018-09-29 17:31:58 +00:00
|
|
|
qbyte *W_GetTexture(const char *name, int *width, int *height, uploadfmt_t *format)//returns rgba
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
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;
|
|
|
|
|
2016-08-25 00:12:14 +00:00
|
|
|
if (!strncmp(name, "gfx/", 4) || !strncmp(name, "wad/", 4))
|
2009-11-04 21:16:50 +00:00
|
|
|
{
|
|
|
|
qpic_t *p;
|
2016-08-25 00:12:14 +00:00
|
|
|
size_t lumpsize;
|
2017-12-09 21:22:46 +00:00
|
|
|
qbyte lumptype;
|
|
|
|
p = W_GetLumpName(name+4, &lumpsize, &lumptype);
|
2009-11-04 21:16:50 +00:00
|
|
|
if (p)
|
|
|
|
{
|
2020-02-11 18:06:10 +00:00
|
|
|
if (/*lumptype == TYP_MIPTEX && */!strcmp(name+4, "conchars") && (lumpsize==128*128
|
|
|
|
#ifdef HAVE_LEGACY
|
|
|
|
|| (lumptype == TYP_QPIC&&lumpsize==8+128*128)
|
|
|
|
#endif
|
|
|
|
))
|
2016-08-25 00:12:14 +00:00
|
|
|
{ //conchars has no header.
|
|
|
|
qbyte *lump = (qbyte*)p;
|
|
|
|
extern cvar_t con_ocranaleds;
|
|
|
|
|
2020-02-11 18:06:10 +00:00
|
|
|
if (lumpsize==8+128*128)
|
|
|
|
Con_Printf(CON_WARNING"WARNING: gfx.wad conchars lump has incorrect lump size.\n");
|
|
|
|
|
2016-08-25 00:12:14 +00:00
|
|
|
if (con_ocranaleds.ival)
|
|
|
|
{
|
2021-04-14 05:21:04 +00:00
|
|
|
if (con_ocranaleds.ival != 2 || CalcHashInt(&hash_crc16, lump, 128*128) == 798)
|
2016-08-25 00:12:14 +00:00
|
|
|
AddOcranaLEDsIndexed (lump, 128, 128);
|
|
|
|
}
|
|
|
|
|
|
|
|
*width = 128;
|
|
|
|
*height = 128;
|
2018-09-30 01:42:00 +00:00
|
|
|
*format = PTI_RGBA8;
|
2016-08-25 00:12:14 +00:00
|
|
|
|
|
|
|
data = BZ_Malloc(128 * 128 * 4);
|
|
|
|
for (i = 0; i < 128 * 128; i++)
|
|
|
|
{
|
|
|
|
qbyte b = lump[i];
|
|
|
|
if (b == 0)
|
|
|
|
((unsigned int*)data)[i] = 0;
|
|
|
|
else
|
|
|
|
((unsigned int*)data)[i] = d_8to24rgbtable[lump[i]] | 0xff000000;
|
|
|
|
}
|
|
|
|
|
|
|
|
return data;
|
|
|
|
}
|
2017-12-09 21:22:46 +00:00
|
|
|
else if (lumptype == TYP_QPIC && lumpsize == 8+p->width*p->height)
|
2009-11-04 21:16:50 +00:00
|
|
|
{
|
2018-09-30 01:42:00 +00:00
|
|
|
qboolean alpha = false;
|
|
|
|
qbyte pal;
|
2016-08-25 00:12:14 +00:00
|
|
|
*width = p->width;
|
|
|
|
*height = p->height;
|
|
|
|
|
|
|
|
data = BZ_Malloc(p->width * p->height * 4);
|
|
|
|
for (i = 0; i < p->width * p->height; i++)
|
|
|
|
{
|
2018-09-30 01:42:00 +00:00
|
|
|
pal = p->data[i];
|
|
|
|
((unsigned int*)data)[i] = d_8to24rgbtable[pal];
|
|
|
|
if (pal == 0xff)
|
|
|
|
alpha = true;
|
2016-08-25 00:12:14 +00:00
|
|
|
}
|
2018-09-30 01:42:00 +00:00
|
|
|
*format = alpha?PTI_RGBA8:PTI_RGBX8;
|
2016-08-25 00:12:14 +00:00
|
|
|
return data;
|
2009-11-04 21:16:50 +00:00
|
|
|
}
|
2017-12-09 21:22:46 +00:00
|
|
|
else if (lumptype == TYP_QPIC && lumpsize == 8+p->width*p->height+4+768)
|
|
|
|
{ //halflife, 24bit palette at end
|
|
|
|
qbyte *pal = p->data+p->width*p->height+4;
|
|
|
|
*width = p->width;
|
|
|
|
*height = p->height;
|
2018-09-29 17:31:58 +00:00
|
|
|
*format = PTI_RGBA8;
|
2017-12-09 21:22:46 +00:00
|
|
|
|
|
|
|
data = BZ_Malloc(p->width * p->height * 4);
|
|
|
|
for (i = 0; i < p->width * p->height; i++)
|
|
|
|
{
|
|
|
|
qbyte *rgb = pal + p->data[i]*3;
|
|
|
|
data[i*4+0] = rgb[0];
|
|
|
|
data[i*4+1] = rgb[1];
|
|
|
|
data[i*4+2] = rgb[2];
|
|
|
|
data[i*4+3] = ((p->data[i]==255)?0:255);
|
|
|
|
}
|
|
|
|
return data;
|
|
|
|
}
|
2019-03-23 07:06:37 +00:00
|
|
|
else if (lumptype == TYP_HLFONT)
|
|
|
|
; //FIXME... gah
|
2017-12-09 21:22:46 +00:00
|
|
|
else
|
|
|
|
Con_Printf("W_GetTexture: unknown lump type\n");
|
2009-11-04 21:16:50 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
texname[16] = 0;
|
|
|
|
W_CleanupName (name, texname);
|
2015-10-11 11:34:58 +00:00
|
|
|
Sys_LockMutex(wadmutex);
|
2004-08-23 00:15:46 +00:00
|
|
|
for (i = 0;i < numwadtextures;i++)
|
|
|
|
{
|
|
|
|
if (!strcmp(texname, texwadlump[i].name)) // found it
|
|
|
|
{
|
|
|
|
file = texwadlump[i].file;
|
2015-10-11 11:34:58 +00:00
|
|
|
|
|
|
|
if (VFS_SEEK(file, texwadlump[i].position))
|
|
|
|
{
|
|
|
|
tex = BZ_Malloc(texwadlump[i].size); //temp buffer for disk info (was hunk_tempalloc, but that wiped loading maps and the like
|
|
|
|
if (tex && VFS_READ(file, tex, texwadlump[i].size) == texwadlump[i].size)
|
|
|
|
{
|
|
|
|
Sys_UnlockMutex(wadmutex);
|
|
|
|
tex->width = LittleLong(tex->width);
|
|
|
|
tex->height = LittleLong(tex->height);
|
|
|
|
for (j = 0;j < MIPLEVELS;j++)
|
|
|
|
tex->offsets[j] = LittleLong(tex->offsets[j]);
|
|
|
|
|
2018-09-29 17:31:58 +00:00
|
|
|
data = W_ConvertWAD3Texture(tex, texwadlump[i].size, width, height, format);
|
2015-10-11 11:34:58 +00:00
|
|
|
BZ_Free(tex);
|
|
|
|
return data;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Con_Printf("W_GetTexture: corrupt WAD3 file\n");
|
|
|
|
break;
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
}
|
2015-10-11 11:34:58 +00:00
|
|
|
Sys_UnlockMutex(wadmutex);
|
2004-08-23 00:15:46 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2015-04-14 23:12:17 +00:00
|
|
|
miptex_t *W_GetMipTex(const char *name)
|
|
|
|
{
|
|
|
|
char texname[17];
|
|
|
|
int i, j;
|
|
|
|
vfsfile_t *file;
|
|
|
|
miptex_t *tex;
|
|
|
|
|
|
|
|
texname[16] = 0;
|
|
|
|
W_CleanupName (name, texname);
|
2015-10-11 11:34:58 +00:00
|
|
|
Sys_LockMutex(wadmutex);
|
2015-04-14 23:12:17 +00:00
|
|
|
for (i = 0;i < numwadtextures;i++)
|
|
|
|
{
|
|
|
|
if (!strcmp(texname, texwadlump[i].name)) // found it
|
|
|
|
{
|
|
|
|
file = texwadlump[i].file;
|
2015-10-11 11:34:58 +00:00
|
|
|
if (VFS_SEEK(file, texwadlump[i].position))
|
|
|
|
{
|
|
|
|
tex = BZ_Malloc(texwadlump[i].size); //temp buffer for disk info (was hunk_tempalloc, but that wiped loading maps and the like
|
|
|
|
if (tex && VFS_READ(file, tex, texwadlump[i].size) == texwadlump[i].size)
|
|
|
|
{
|
|
|
|
Sys_UnlockMutex(wadmutex);
|
|
|
|
tex->width = LittleLong(tex->width);
|
|
|
|
tex->height = LittleLong(tex->height);
|
|
|
|
for (j = 0;j < MIPLEVELS;j++)
|
|
|
|
tex->offsets[j] = LittleLong(tex->offsets[j]);
|
|
|
|
return tex;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Con_Printf("W_GetTexture: corrupt WAD3 file\n");
|
|
|
|
break;
|
2015-04-14 23:12:17 +00:00
|
|
|
}
|
|
|
|
}
|
2015-10-11 11:34:58 +00:00
|
|
|
Sys_UnlockMutex(wadmutex);
|
2015-04-14 23:12:17 +00:00
|
|
|
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
|
|
|
|
2017-02-19 00:15:42 +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.
|
|
|
|
qboolean Wad_NextDownload (void)
|
|
|
|
{
|
|
|
|
char wadname[4096+9]="textures/";
|
|
|
|
int i, j, k;
|
|
|
|
model_t *wmodel = cl.worldmodel;
|
|
|
|
if (wmodel && (wmodel->fromgame == fg_halflife || wmodel->type == mod_heightmap) && *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+9, &wads[j]);
|
|
|
|
if (wadname[9])
|
|
|
|
{
|
|
|
|
if (!COM_FCheckExists(wadname+9)) //wad is in root dir, so we don't need to try textures.
|
|
|
|
CL_CheckOrEnqueDownloadFile(wadname, wadname, DLLF_REQUIRED); //don't skip this one, or the world is white.
|
|
|
|
}
|
|
|
|
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;
|
2017-11-14 14:37:04 +00:00
|
|
|
Q_strncpyz(wadname+9, &wads[j], sizeof(wadname)-9);
|
2017-02-19 00:15:42 +00:00
|
|
|
if (wadname[9])
|
|
|
|
{
|
|
|
|
if (COM_FCheckExists(wadname+9))
|
|
|
|
W_LoadTextureWadFile (wadname+9, false);
|
|
|
|
else
|
|
|
|
W_LoadTextureWadFile (wadname, false);
|
|
|
|
}
|
|
|
|
j = i+1;
|
|
|
|
if (!k)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2015-01-07 13:34:05 +00:00
|
|
|
void Mod_ParseInfoFromEntityLump(model_t *wmodel) //actually, this should be in the model code.
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2014-10-05 20:04:11 +00:00
|
|
|
char token[4096];
|
2004-08-23 00:15:46 +00:00
|
|
|
char key[128];
|
2017-08-29 02:29:06 +00:00
|
|
|
char skyname[128];
|
2016-11-25 08:14:54 +00:00
|
|
|
const char *data = Mod_GetEntitiesString(wmodel);
|
2017-02-21 21:18:48 +00:00
|
|
|
#ifdef PACKAGE_TEXWAD
|
2009-07-19 20:43:07 +00:00
|
|
|
mapskys_t *msky;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2019-01-22 13:57:57 +00:00
|
|
|
if (wmodel && wmodel->fromgame == fg_halflife)
|
|
|
|
strcpy(wads, "decals.wad");
|
|
|
|
else
|
|
|
|
wads[0] = '\0';
|
2017-02-19 00:15:42 +00:00
|
|
|
#endif
|
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
cl.skyrotate = 0;
|
|
|
|
VectorClear(cl.skyaxis);
|
|
|
|
|
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
|
|
|
|
2014-08-15 02:20:41 +00:00
|
|
|
// this hack is necessary to ensure Quake 2 maps get their default skybox, without breaking q1 etc
|
2017-08-29 02:29:06 +00:00
|
|
|
if (wmodel && wmodel->fromgame == fg_quake2)
|
|
|
|
strcpy(skyname, "unit1_");
|
2006-04-08 07:32:24 +00:00
|
|
|
else
|
2017-08-29 02:29:06 +00:00
|
|
|
skyname[0] = '\0';
|
2005-10-22 17:50:28 +00:00
|
|
|
|
2005-10-15 20:10:16 +00:00
|
|
|
if (data)
|
2014-10-05 20:04:11 +00:00
|
|
|
if ((data=COM_ParseOut(data, token, sizeof(token)))) //read the map info.
|
|
|
|
if (token[0] == '{')
|
2004-08-23 00:15:46 +00:00
|
|
|
while (1)
|
|
|
|
{
|
2014-10-05 20:04:11 +00:00
|
|
|
if (!(data=COM_ParseOut(data, token, sizeof(token))))
|
2005-10-15 20:10:16 +00:00
|
|
|
break; // error
|
2014-10-05 20:04:11 +00:00
|
|
|
if (token[0] == '}')
|
2004-08-23 00:15:46 +00:00
|
|
|
break; // end of worldspawn
|
2014-10-05 20:04:11 +00:00
|
|
|
if (token[0] == '_')
|
|
|
|
Q_strncpyz(key, token + 1, sizeof(key)); //_ vars are for comments/utility stuff that arn't visible to progs. Ignore them.
|
2004-08-23 00:15:46 +00:00
|
|
|
else
|
2014-10-05 20:04:11 +00:00
|
|
|
Q_strncpyz(key, token, sizeof(key));
|
|
|
|
if (!((data=COM_ParseOut(data, token, sizeof(token)))))
|
2017-02-19 00:15:42 +00:00
|
|
|
break; // error
|
2004-08-23 00:15:46 +00:00
|
|
|
if (!strcmp("wad", key)) // for HalfLife maps
|
|
|
|
{
|
2017-02-21 21:18:48 +00:00
|
|
|
#ifdef PACKAGE_TEXWAD
|
2017-02-19 00:15:42 +00:00
|
|
|
Q_strncatz(wads, ";", sizeof(wads)); //cache it for later (so that we don't play with any temp memory yet)
|
|
|
|
Q_strncatz(wads, token, sizeof(wads)); //cache it for later (so that we don't play with any temp memory yet)
|
|
|
|
#endif
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
2019-02-23 14:36:17 +00:00
|
|
|
else if (!strcmp("skyfog", key)) //override cvars so mappers don't end up hacking cvars and fucking over configs (at least in other engines).
|
|
|
|
Cvar_LockFromServer(&r_skyfog, token);
|
2018-11-19 06:37:25 +00:00
|
|
|
else if (!strcmp("fog", key) || !strcmp("airfog", key)) //q1 extension. FIXME: should be made temporary.
|
2011-03-31 02:32:32 +00:00
|
|
|
{
|
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
|
|
|
key[0] = 'f';
|
2014-10-11 19:39:45 +00:00
|
|
|
key[1] = 'o';
|
|
|
|
key[2] = 'g';
|
|
|
|
key[3] = ' ';
|
|
|
|
Q_strncpyz(key+4, token, sizeof(key)-4);
|
|
|
|
Cbuf_AddText(key, RESTRICT_INSECURE);
|
2015-10-11 11:34:58 +00:00
|
|
|
Cbuf_AddText("\n", RESTRICT_INSECURE);
|
2011-03-31 02:32:32 +00:00
|
|
|
}
|
Reworked client support for DPP5+. less code now, its much more graceful.
added waterfog command. waterfog overrides regular fog only when the view is in water.
fixed 64bit printf format specifiers. should work better on winxp64.
fixed some spec angle weirdness.
fixed viewsize 99.99 weirdness with ezhud.
fixed extra offset on the console (exhibited in 64bit builds, but not limited to).
fixed .avi playback, can now actually display frames again.
reimplemented line sparks.
fixed r_editlights_save flipping the light's pitch.
fixed issue with oggs failing to load.
fixed condump to cope with unicode properly.
made sv_bigcoords default except in quake. hexen2 kinda needs it for bsp angle precision.
fixed nq server to not stall weirdly on map changes.
fixed qwprogs svc_cdtrack not bugging out with nq clients on the server.
fixed restart command to load the last map run by the server, instead of start.bsp (when idle)
optimised d3d9 renderer a little. now uses less draw calls, especially with complex scenes. seems to get higher framerates than opengl now.
fixed d3d9 renderer to not bug out quite so much when run fullscreen (shader subsystem is now correctly initialised).
fixed a couple of bugs from font change. also now supports utf-8 in a few more places.
r_editlights_reload no longer generates rtlights inside the void. this resolves a few glitches (but should also help framerates a little).
fixed so corona-only lights won't generate shadowmaps and waste lots of time.
removed lots of #defines from qclib. I should never have made them in the first place, but I was lazy. obviously there's more left that I cba to remove yet.
fixed nested calls with variant-vectors. this fixes csaddon's light editor.
fixed qcc hc calling conventions using redundant stores.
disabled keywords can still be used by using __keyword instead.
fixed ftegccgui grep feature.
fixed motionless-dog qcc bug.
tweaked qcc warnings a little. -Wall is now a viable setting. you should be able to fix all those warnings.
fixed qw svc_intermission + dpp5+ clients bug.
fixed annoying spam about disconnecting in hexen2.
rewrote status command a little to cope with ipv6 addresses more gracefully
fixed significant stall when hibernating/debugging a server with a player sitting on it.
fixed truelightning.
fixed rocketlight overriding pflags.
fixed torches vanishing on vid_restart.
fixed issue with decal scaling.
fixed findentityfield builtin.
fixed fteqcc issue with ptr+1
fixed use of arrays inside class functions.
fixed/implemented fteqcc emulation of pointer opcodes.
added __inout keyword to fteqcc, so that it doesn't feel so horrendous.
fixed sizeof(*foo)
fixed *struct = struct;
fixed recursive structs.
fixed fteqcc warning report.
fixed sdl2 controller support, hopefully.
attempted to implement xinput, including per-player audio playback.
slightly fixed relaxed attitude to mouse focus when running fullscreen.
fixed weird warnings/errors with 'ent.arrayhead' terms. now generates sane errors.
implemented bindmaps (for csqc).
fixed crashing bug with eprint builtin.
implemented subset of music_playlist_* functionality. significant changes to music playback.
fixed some more dpcsqc compat.
fixed binds menu. now displays and accepts modifiers.
fixed issues with huge lightmaps.
fixed protocol determinism with dp clients connecting to fte servers. the initial getchallenge request now inhibits vanilla nq connection requests.
implemented support for 'dupe' userinfo key, allowing clients to request client->server packet duplication. should probably queue them tbh.
implemented sv_saveentfile command.
fixed resume after breaking inside a stepped-over function.
fixed erroneous footer after debugging.
(I wonder just how many things I broke with these fixes)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4946 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-07-26 10:56:18 +00:00
|
|
|
else if (!strcmp("waterfog", key)) //q1 extension. FIXME: should be made temporary.
|
|
|
|
{
|
|
|
|
memcpy(key, "waterfog ", 9);
|
|
|
|
Q_strncpyz(key+9, token, sizeof(key)-9);
|
|
|
|
Cbuf_AddText(key, RESTRICT_INSECURE);
|
2015-10-11 11:34:58 +00:00
|
|
|
Cbuf_AddText("\n", RESTRICT_INSECURE);
|
Reworked client support for DPP5+. less code now, its much more graceful.
added waterfog command. waterfog overrides regular fog only when the view is in water.
fixed 64bit printf format specifiers. should work better on winxp64.
fixed some spec angle weirdness.
fixed viewsize 99.99 weirdness with ezhud.
fixed extra offset on the console (exhibited in 64bit builds, but not limited to).
fixed .avi playback, can now actually display frames again.
reimplemented line sparks.
fixed r_editlights_save flipping the light's pitch.
fixed issue with oggs failing to load.
fixed condump to cope with unicode properly.
made sv_bigcoords default except in quake. hexen2 kinda needs it for bsp angle precision.
fixed nq server to not stall weirdly on map changes.
fixed qwprogs svc_cdtrack not bugging out with nq clients on the server.
fixed restart command to load the last map run by the server, instead of start.bsp (when idle)
optimised d3d9 renderer a little. now uses less draw calls, especially with complex scenes. seems to get higher framerates than opengl now.
fixed d3d9 renderer to not bug out quite so much when run fullscreen (shader subsystem is now correctly initialised).
fixed a couple of bugs from font change. also now supports utf-8 in a few more places.
r_editlights_reload no longer generates rtlights inside the void. this resolves a few glitches (but should also help framerates a little).
fixed so corona-only lights won't generate shadowmaps and waste lots of time.
removed lots of #defines from qclib. I should never have made them in the first place, but I was lazy. obviously there's more left that I cba to remove yet.
fixed nested calls with variant-vectors. this fixes csaddon's light editor.
fixed qcc hc calling conventions using redundant stores.
disabled keywords can still be used by using __keyword instead.
fixed ftegccgui grep feature.
fixed motionless-dog qcc bug.
tweaked qcc warnings a little. -Wall is now a viable setting. you should be able to fix all those warnings.
fixed qw svc_intermission + dpp5+ clients bug.
fixed annoying spam about disconnecting in hexen2.
rewrote status command a little to cope with ipv6 addresses more gracefully
fixed significant stall when hibernating/debugging a server with a player sitting on it.
fixed truelightning.
fixed rocketlight overriding pflags.
fixed torches vanishing on vid_restart.
fixed issue with decal scaling.
fixed findentityfield builtin.
fixed fteqcc issue with ptr+1
fixed use of arrays inside class functions.
fixed/implemented fteqcc emulation of pointer opcodes.
added __inout keyword to fteqcc, so that it doesn't feel so horrendous.
fixed sizeof(*foo)
fixed *struct = struct;
fixed recursive structs.
fixed fteqcc warning report.
fixed sdl2 controller support, hopefully.
attempted to implement xinput, including per-player audio playback.
slightly fixed relaxed attitude to mouse focus when running fullscreen.
fixed weird warnings/errors with 'ent.arrayhead' terms. now generates sane errors.
implemented bindmaps (for csqc).
fixed crashing bug with eprint builtin.
implemented subset of music_playlist_* functionality. significant changes to music playback.
fixed some more dpcsqc compat.
fixed binds menu. now displays and accepts modifiers.
fixed issues with huge lightmaps.
fixed protocol determinism with dp clients connecting to fte servers. the initial getchallenge request now inhibits vanilla nq connection requests.
implemented support for 'dupe' userinfo key, allowing clients to request client->server packet duplication. should probably queue them tbh.
implemented sv_saveentfile command.
fixed resume after breaking inside a stepped-over function.
fixed erroneous footer after debugging.
(I wonder just how many things I broke with these fixes)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4946 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-07-26 10:56:18 +00:00
|
|
|
}
|
2019-10-18 08:37:38 +00:00
|
|
|
else if (!strcmp("skyroomfog", key)) //q1 extension. FIXME: should be made temporary.
|
|
|
|
{
|
|
|
|
memcpy(key, "skyroomfog ", 11);
|
|
|
|
Q_strncpyz(key+11, token, sizeof(key)-11);
|
|
|
|
Cbuf_AddText(key, RESTRICT_INSECURE);
|
|
|
|
Cbuf_AddText("\n", RESTRICT_INSECURE);
|
|
|
|
}
|
2014-08-25 07:35:41 +00:00
|
|
|
else if (!strncmp("cvar_", key, 5)) //override cvars so mappers don't end up hacking cvars and fucking over configs (at least in other engines).
|
|
|
|
{
|
|
|
|
cvar_t *var = Cvar_FindVar(key+5);
|
|
|
|
if (var && !(var->flags & CVAR_NOTFROMSERVER))
|
2018-04-15 02:48:23 +00:00
|
|
|
Cvar_LockFromServer(var, token);
|
2014-08-25 07:35:41 +00:00
|
|
|
}
|
2014-08-15 02:20:41 +00:00
|
|
|
else if (!strcmp("wateralpha", key)) //override cvars so mappers don't end up hacking cvars and fucking over configs (at least in other engines).
|
|
|
|
{
|
2018-04-15 02:48:23 +00:00
|
|
|
Cvar_LockFromServer(&r_wateralpha, token);
|
2014-08-15 02:20:41 +00:00
|
|
|
Cvar_LockFromServer(&r_waterstyle, "1"); //force vanilla-style water too.
|
|
|
|
}
|
2014-08-25 07:35:41 +00:00
|
|
|
else if (!strcmp("slimealpha", key))
|
|
|
|
{
|
2018-04-15 02:48:23 +00:00
|
|
|
Cvar_LockFromServer(&r_slimealpha, token);
|
2014-08-25 07:35:41 +00:00
|
|
|
Cvar_LockFromServer(&r_slimestyle, "1");
|
|
|
|
}
|
|
|
|
else if (!strcmp("lavaalpha", key))
|
|
|
|
{
|
2018-04-15 02:48:23 +00:00
|
|
|
Cvar_LockFromServer(&r_lavaalpha, token);
|
2014-08-25 07:35:41 +00:00
|
|
|
Cvar_LockFromServer(&r_lavastyle, "1");
|
|
|
|
}
|
|
|
|
else if (!strcmp("telealpha", key))
|
|
|
|
{
|
2018-04-15 02:48:23 +00:00
|
|
|
Cvar_LockFromServer(&r_telealpha, token);
|
2014-08-25 07:35:41 +00:00
|
|
|
Cvar_LockFromServer(&r_telestyle, "1");
|
|
|
|
}
|
2019-07-02 04:12:20 +00:00
|
|
|
else if (!strcmp("skyroom", key)) // for Quake mappers that lack the proper tools
|
|
|
|
{
|
Too many changes, sorry.
Change revision displays, use the SVN commit date instead of using __DATE__ (when there's no local changes). This should allow reproducible builds.
Added s_al_disable cvar, to block openal and all the various problems people have had with it, without having to name an explicit fallback (which would vary by system).
Add mastervolume cvar (for ss).
Add r_shadows 2 (aka fake shadows - for ss).
Add scr_loadingscreen_aspect -1 setting, to disable levelshots entirely, also disables the progress bar (for ss).
Better support for some effectinfo hacks (for ss).
Added dpcompat_nocsqcwarnings (because of lazy+buggy mods like ss).
Rework the dpcsqc versions of project+unproject builtins for better compat (for ss).
Added dpcompat_csqcinputeventtypes to block unexpected csqc input events (for ss).
Better compat with DP's loadfont console command (for ss).
Added dpcompat_smallerfonts cvar to replicate a DP bug (for ss).
Detect dp's m_draw extension, to work around it (for ss).
Cvar dpcompat_ignoremodificationtimes added. A value of 0 favour the most recently modified file, 1 will use DP-like alphabetically sorted preferences (for ss).
loadfont builtin can now accept outline=1 in the sizes arg for slightly more readable fonts.
Fix bbox calcs for rotated entities, fix needed for r_ignorenetpvs 0.
Hackily parse emoji.json to provide :poop: etc suggestions.
Skip prediction entirely when there's no local entity info. This fixes stair-smoothing in xonotic.
screenshot_cubemap will now capture half-float images when saving to ktx or dds files.
Fix support for xcf files larger than 4gb, mostly to avoid compiler warnings.
Fixed size of gfx/loading.lmp when replacement textures are used.
Added mipmap support for rg8 and l8a8 textures.
r_hdr_framebuffer cvar updated to support format names instead of random negative numbers. Description updated to name some interesting ones.
Perform autoupdate _checks_ ONLY with explicit user confirmation (actual updating already needed user confirmation, but this extra step should reduce the chances of us getting wrongly accused of exfiltrating user data if we're run in a sandbox - we ONLY ever included the updating engine's version in the checks, though there's nothing we can do to avoid sending the user's router's IP).
Removed the 'summon satan all over your harddrive' quit message, in case paranoid security researchers are idiots and don't bother doing actual research.
Removed the triptohell.info and fte.triptohell.info certificates, they really need to stop being self-signed. The updates domain is still self-signed for autoupdates.
Video drivers are now able to report supported video resolutions, visible to menuqc. Currently only works with SDL2 builds.
Added setmousepos builtin. Should work with glx+win32 build.
VF_SKYROOM_CAMERA can now accept an extra two args, setviewprop(VF_SKYROOM_CAMERA, org, axis, degrees).
Removed v_skyroom_origin+v_skyroom_orientation cvars in favour just v_skyroom, which should make it behave more like the 'fog' command (used when csqc isn't overriding).
Added R_EndPolygonRibbon builtin to make it faster+easier to generate textured ribbon/cable/etc wide lines (for TW).
sdl: Fix up sys_sdl.c's file enumeration to support wildcards in directories.
edit command now displays end1.bin/end2.bin correctly, because we can.
Finally add support for f_modified - though ruleset_allow_larger_models and ruleset_allow_overlong_sounds generally make it redundant.
Fix threading race condition in sha1 lookups.
Updated f_ruleset to include the same extra flags reported by ezquake.
A mod's default.fmf file can now contain an eg 'mainconfig config.cfg' line (to explicitly set the main config saved with cfg_save_auto 1 etc).
fmf: basegame steam:GameName/GameDir can be used to try to load a mod directory from an installed steam game. The resulting gamedir will be read-only.
HOMEDIR CHANGE: use homedirs only if the basedir cannot be written or a homedir already exists, which should further reduce the probability of microsoft randomly uploading our data to their cloud (but mostly because its annoying to never know where your data is written).
Fixed buf_cvarlist, should work in xonotic now, and without segfaults.
Added an extra arg to URI_Get_Callback calls - the response size, also changed the tempstring to contain all bytes of the response, you need to be careful about nulls though.
Try to work around nvidia's forced-panning bug on x11 when changing video modes. This might screw with other programs.
sdl: support custom icons.
sdl: support choosing a specific display.
Added some documentation to menuqc builtins.
menusys: use outlines for slightly more readable fonts.
menusys: switch vid_width and vid_height combos into a single video mode combo to set both according to reported video modes.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5581 fc73d0e0-1445-4013-8a0c-d673dee63da5
2019-11-20 03:09:50 +00:00
|
|
|
extern cvar_t v_skyroom;
|
|
|
|
Cvar_LockFromServer(&v_skyroom, token);
|
2019-07-02 04:12:20 +00:00
|
|
|
}
|
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
|
|
|
else if (!strcmp("skyname", key)) // for HalfLife maps
|
|
|
|
{
|
2017-08-29 02:29:06 +00:00
|
|
|
Q_strncpyz(skyname, token, sizeof(skyname));
|
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
else if (!strcmp("sky", key)) // for Quake2 maps
|
|
|
|
{
|
2017-08-29 02:29:06 +00:00
|
|
|
Q_strncpyz(skyname, token, sizeof(skyname));
|
2005-10-15 20:10:16 +00:00
|
|
|
}
|
2014-08-15 02:20:41 +00:00
|
|
|
else if (!strcmp("skyrotate", key)) //q2 feature
|
2006-01-09 01:49:06 +00:00
|
|
|
{
|
2014-10-05 20:04:11 +00:00
|
|
|
cl.skyrotate = atof(token);
|
2006-01-09 01:49:06 +00:00
|
|
|
}
|
2014-08-15 02:20:41 +00:00
|
|
|
else if (!strcmp("skyaxis", key)) //q2 feature
|
2005-10-15 20:10:16 +00:00
|
|
|
{
|
|
|
|
char *s;
|
2023-08-11 04:00:01 +00:00
|
|
|
s = COM_ParseOut(token, key, sizeof(key));
|
2006-01-09 01:49:06 +00:00
|
|
|
if (s)
|
|
|
|
{
|
2023-08-11 04:00:01 +00:00
|
|
|
cl.skyaxis[0] = atof(key);
|
|
|
|
s = COM_ParseOut(s, key, sizeof(key));
|
2006-01-09 01:49:06 +00:00
|
|
|
if (s)
|
|
|
|
{
|
2023-08-11 04:00:01 +00:00
|
|
|
cl.skyaxis[1] = atof(key);
|
|
|
|
COM_ParseOut(s, key, sizeof(key));
|
2006-01-09 01:49:06 +00:00
|
|
|
if (s)
|
2023-08-11 04:00:01 +00:00
|
|
|
cl.skyaxis[2] = atof(key);
|
2006-01-09 01:49:06 +00:00
|
|
|
}
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
}
|
2014-08-15 02:20:41 +00:00
|
|
|
|
2019-07-19 02:13:19 +00:00
|
|
|
if (cl.skyrotate)
|
|
|
|
{
|
|
|
|
if (cl.skyaxis[0]||cl.skyaxis[1]||cl.skyaxis[2])
|
|
|
|
Cvar_Set(&r_skybox_orientation, va("%g %g %g %g", cl.skyaxis[0], cl.skyaxis[1], cl.skyaxis[2], cl.skyrotate));
|
|
|
|
else
|
|
|
|
Cvar_Set(&r_skybox_orientation, va("0 0 1 %g", cl.skyrotate));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
Cvar_Set(&r_skybox_orientation, "");
|
|
|
|
|
2017-08-29 02:29:06 +00:00
|
|
|
if (wmodel)
|
|
|
|
{
|
|
|
|
COM_FileBase (wmodel->name, token, sizeof(token));
|
2014-08-15 02:20:41 +00:00
|
|
|
|
2017-02-21 21:18:48 +00:00
|
|
|
#ifdef PACKAGE_TEXWAD
|
2017-08-29 02:29:06 +00:00
|
|
|
//map-specific sky override feature
|
|
|
|
for (msky = mapskies; msky; msky = msky->next)
|
2014-08-15 02:20:41 +00:00
|
|
|
{
|
2017-08-29 02:29:06 +00:00
|
|
|
if (!strcmp(msky->mapname, token))
|
|
|
|
{
|
|
|
|
Q_strncpyz(skyname, msky->skyname, sizeof(skyname));
|
|
|
|
break;
|
|
|
|
}
|
2014-08-15 02:20:41 +00:00
|
|
|
}
|
2017-02-19 00:15:42 +00:00
|
|
|
#endif
|
2017-08-29 02:29:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
R_SetSky(skyname);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|