ubergames/ioef
0
0
Fork 0
mirror of https://github.com/UberGames/ioef.git synced 2024-11-28 06:52:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix prohibits illegal downloading of id PK3 files from servers. That bug is hit by *every* official server release from ID.

Browse source
This commit is contained in:
Thilo Schulz 2006-04-22 18:24:50 +00:00
parent ef51968654
commit 40d5eee8ef
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
code/qcommon/files.c
View file

@ -2556,6 +2556,13 @@ FS_idPak
*/ */
qboolean FS_idPak( char *pak, char *base ) { qboolean FS_idPak( char *pak, char *base ) {
int i; int i;
char pakbuf[MAX_QPATH], *pakptr;
// Chop off filename extension if necessary.
Com_sprintf(pakbuf, sizeof(pakbuf), "%s", pak);
pakptr = Q_strrchr(pakbuf, '.');
if(pakptr)
*pakptr = '\0';
for (i = 0; i < NUM_ID_PAKS; i++) { for (i = 0; i < NUM_ID_PAKS; i++) {
if ( !FS_FilenameCompare(pak, va("%s/pak%d", base, i)) ) { if ( !FS_FilenameCompare(pak, va("%s/pak%d", base, i)) ) {

4
code/renderer/tr_flares.c
View file

@ -354,7 +354,7 @@ void RB_RenderFlare( flare_t *f ) {
VectorScale(f->color, f->drawIntensity * tr.identityLight * intensity, color); VectorScale(f->color, f->drawIntensity * tr.identityLight * intensity, color);
// Calculations for fogging // Calculations for fogging
if(f->fogNum < tr.world->numfogs) if(tr.world && f->fogNum < tr.world->numfogs)
{ {
tess.numVertexes = 1; tess.numVertexes = 1;
VectorCopy(f->origin, tess.xyz[0]); VectorCopy(f->origin, tess.xyz[0]);
@ -363,7 +363,7 @@ void RB_RenderFlare( flare_t *f ) {
RB_CalcModulateColorsByFog(fogFactors); RB_CalcModulateColorsByFog(fogFactors);
// We don't need to render the flare if colors are 0 anyways. // We don't need to render the flare if colors are 0 anyways.
if(!fogFactors[0] && !fogFactors[1] && !fogFactors[2]) if(!(fogFactors[0] || fogFactors[1] || fogFactors[2]))
return; return;
} }