From: Thomas Debesse Date: Tue, 23 Jan 2018 23:15:59 +0000 (+0100) Subject: tools: reduce diff noise X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=131c36f6be58bba507a42f767533b061b721dfec;p=xonotic%2Fnetradiant.git tools: reduce diff noise --- diff --git a/libs/picomodel/lwo/lwob.c b/libs/picomodel/lwo/lwob.c index 459c6560..cae5357d 100644 --- a/libs/picomodel/lwo/lwob.c +++ b/libs/picomodel/lwo/lwob.c @@ -72,7 +72,7 @@ static int add_clip( char *s, lwClip **clist, int *nclips ){ clip->saturation.val = 1.0f; clip->gamma.val = 1.0f; - if ( ( p = strstr( s, "(sequence)" ) ) ) { + if ( ( p = strstr( s, "(sequence)" ) ) != NULL ) { p[ -1 ] = 0; clip->type = ID_ISEQ; clip->source.seq.prefix = s; @@ -381,12 +381,15 @@ lwSurface *lwGetSurface5( picoMemStream_t *fp, int cksize, lwObject *obj ){ break; case ID_TFLG: - if ( !tex ) { + if( tex == NULL ) { goto Fail; } + flags = getU2( fp ); i = -1; + + //only one of the three axis bits should be set if ( flags & 1 ) { i = 0; } diff --git a/libs/picomodel/picointernal.c b/libs/picomodel/picointernal.c index 4e45fb6f..018ee3a1 100644 --- a/libs/picomodel/picointernal.c +++ b/libs/picomodel/picointernal.c @@ -757,7 +757,7 @@ picoParser_t *_pico_new_parser( const picoByte_t *buffer, int bufSize ){ } /* setup */ p->buffer = (const char *) buffer; - p->cursor = (const char *) buffer; + p->cursor = p->buffer; p->bufSize = bufSize; p->max = p->buffer + bufSize; p->curLine = 1; /* sea: new */ diff --git a/libs/picomodel/picointernal.h b/libs/picomodel/picointernal.h index f3935236..4bcbd4c2 100644 --- a/libs/picomodel/picointernal.h +++ b/libs/picomodel/picointernal.h @@ -80,22 +80,22 @@ extern "C" /* types */ typedef struct picoParser_s { - const char *buffer; + const char *buffer; int bufSize; - char *token; + char *token; int tokenSize; int tokenMax; - const char *cursor; - const char *max; + const char *cursor; + const char *max; int curLine; } picoParser_t; typedef struct picoMemStream_s { - const picoByte_t *buffer; + const picoByte_t *buffer; int bufSize; - const picoByte_t *curPos; + const picoByte_t *curPos; int flag; } picoMemStream_t; diff --git a/libs/picomodel/pm_3ds.c b/libs/picomodel/pm_3ds.c index 1a8e88f1..e72454a1 100644 --- a/libs/picomodel/pm_3ds.c +++ b/libs/picomodel/pm_3ds.c @@ -119,7 +119,7 @@ debugChunkNames[] = { CHUNK_OBJECT_UV, "CHUNK_OBJECT_UV" }, { 0, NULL } }; -static char *DebugGetChunkName( int id ){ +static char *DebugGetChunkName( int id ) { int i,max; /* imax? ;) */ max = sizeof( debugChunkNames ) / sizeof( debugChunkNames[0] ); @@ -518,7 +518,6 @@ static int DoNextEditorDataChunk( T3dsLoaderPers *pers, long endofs ){ /* read in surface name */ if ( !GetASCIIZ( pers,surfaceName,sizeof( surfaceName ) ) ) { return 0; /* this is bad */ - } //PicoGetSurfaceName /* ignore NULL name surfaces */ diff --git a/libs/picomodel/pm_terrain.c b/libs/picomodel/pm_terrain.c index ef0371e3..a82e4b12 100644 --- a/libs/picomodel/pm_terrain.c +++ b/libs/picomodel/pm_terrain.c @@ -55,7 +55,7 @@ tga_t; fixme: replace/clean this function */ -void _terrain_load_tga_buffer( unsigned char *buffer, unsigned char **pic, int *width, int *height ){ +void _terrain_load_tga_buffer( unsigned char *buffer, unsigned char **pic, int *width, int *height ) { int row, column; int columns, rows, numPixels; unsigned char *pixbuf; @@ -291,7 +291,7 @@ breakOut:; validates a picoterrain file */ -static int _terrain_canload( PM_PARAMS_CANLOAD ){ +static int _terrain_canload( PM_PARAMS_CANLOAD ) { picoParser_t *p; @@ -326,7 +326,7 @@ static int _terrain_canload( PM_PARAMS_CANLOAD ){ loads a picoterrain file */ -static picoModel_t *_terrain_load( PM_PARAMS_LOAD ){ +static picoModel_t *_terrain_load( PM_PARAMS_LOAD ) { int i, j, v, pw[ 5 ], r; picoParser_t *p; diff --git a/tools/quake2/common/bspfile.c b/tools/quake2/common/bspfile.c index 8c663dc7..4caeab57 100644 --- a/tools/quake2/common/bspfile.c +++ b/tools/quake2/common/bspfile.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/common/bspfile.h b/tools/quake2/common/bspfile.h index 7d478801..279e7302 100644 --- a/tools/quake2/common/bspfile.h +++ b/tools/quake2/common/bspfile.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/common/cmdlib.c b/tools/quake2/common/cmdlib.c index a2eaaf15..02e0be87 100644 --- a/tools/quake2/common/cmdlib.c +++ b/tools/quake2/common/cmdlib.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/common/cmdlib.h b/tools/quake2/common/cmdlib.h index 25860c77..f8d8e0d3 100644 --- a/tools/quake2/common/cmdlib.h +++ b/tools/quake2/common/cmdlib.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/common/inout.c b/tools/quake2/common/inout.c index 165390de..f81aff94 100644 --- a/tools/quake2/common/inout.c +++ b/tools/quake2/common/inout.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/common/inout.h b/tools/quake2/common/inout.h index 80bf1527..934189f2 100644 --- a/tools/quake2/common/inout.h +++ b/tools/quake2/common/inout.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/common/l3dslib.c b/tools/quake2/common/l3dslib.c index b3d67b29..d4a096ad 100644 --- a/tools/quake2/common/l3dslib.c +++ b/tools/quake2/common/l3dslib.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/common/l3dslib.h b/tools/quake2/common/l3dslib.h index 0f7ff877..41cb344e 100644 --- a/tools/quake2/common/l3dslib.h +++ b/tools/quake2/common/l3dslib.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/common/lbmlib.c b/tools/quake2/common/lbmlib.c index b40b7cb9..bb5458c0 100644 --- a/tools/quake2/common/lbmlib.c +++ b/tools/quake2/common/lbmlib.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/common/lbmlib.h b/tools/quake2/common/lbmlib.h index ab4141ce..8bc9cafc 100644 --- a/tools/quake2/common/lbmlib.h +++ b/tools/quake2/common/lbmlib.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/common/mathlib.c b/tools/quake2/common/mathlib.c index f218f0c0..25d5f828 100644 --- a/tools/quake2/common/mathlib.c +++ b/tools/quake2/common/mathlib.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/common/mathlib.h b/tools/quake2/common/mathlib.h index 497cf893..1999b71f 100644 --- a/tools/quake2/common/mathlib.h +++ b/tools/quake2/common/mathlib.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/common/path_init.c b/tools/quake2/common/path_init.c index 71687a03..cd413805 100644 --- a/tools/quake2/common/path_init.c +++ b/tools/quake2/common/path_init.c @@ -1,6 +1,6 @@ /* ------------------------------------------------------------------------------- - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/common/polylib.c b/tools/quake2/common/polylib.c index ab83418a..9d450841 100644 --- a/tools/quake2/common/polylib.c +++ b/tools/quake2/common/polylib.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/common/polylib.h b/tools/quake2/common/polylib.h index 5254248a..a0eb3f09 100644 --- a/tools/quake2/common/polylib.h +++ b/tools/quake2/common/polylib.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/common/q2_threads.h b/tools/quake2/common/q2_threads.h index 7f7b3caf..decd226a 100644 --- a/tools/quake2/common/q2_threads.h +++ b/tools/quake2/common/q2_threads.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/common/qfiles.h b/tools/quake2/common/qfiles.h index 39b646af..a677a22a 100644 --- a/tools/quake2/common/qfiles.h +++ b/tools/quake2/common/qfiles.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/common/scriplib.c b/tools/quake2/common/scriplib.c index 9069de71..2f3f3eec 100644 --- a/tools/quake2/common/scriplib.c +++ b/tools/quake2/common/scriplib.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/common/scriplib.h b/tools/quake2/common/scriplib.h index 39c2717b..306533be 100644 --- a/tools/quake2/common/scriplib.h +++ b/tools/quake2/common/scriplib.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/common/threads.c b/tools/quake2/common/threads.c index f45e1855..d648e99e 100644 --- a/tools/quake2/common/threads.c +++ b/tools/quake2/common/threads.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/common/trilib.c b/tools/quake2/common/trilib.c index 7bded9d7..cbe23ccf 100644 --- a/tools/quake2/common/trilib.c +++ b/tools/quake2/common/trilib.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/common/trilib.h b/tools/quake2/common/trilib.h index 5dbe002f..6ff4a853 100644 --- a/tools/quake2/common/trilib.h +++ b/tools/quake2/common/trilib.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/q2map/brushbsp.c b/tools/quake2/q2map/brushbsp.c index 1be89836..3ca734bb 100644 --- a/tools/quake2/q2map/brushbsp.c +++ b/tools/quake2/q2map/brushbsp.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/q2map/csg.c b/tools/quake2/q2map/csg.c index 0b0bda93..bc6f340a 100644 --- a/tools/quake2/q2map/csg.c +++ b/tools/quake2/q2map/csg.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/q2map/faces.c b/tools/quake2/q2map/faces.c index 1675a61b..15bb095f 100644 --- a/tools/quake2/q2map/faces.c +++ b/tools/quake2/q2map/faces.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/q2map/flow.c b/tools/quake2/q2map/flow.c index 587e1902..4a4cac05 100644 --- a/tools/quake2/q2map/flow.c +++ b/tools/quake2/q2map/flow.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/q2map/gldraw.c b/tools/quake2/q2map/gldraw.c index 55c8becf..0f08d1e3 100644 --- a/tools/quake2/q2map/gldraw.c +++ b/tools/quake2/q2map/gldraw.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/q2map/glfile.c b/tools/quake2/q2map/glfile.c index 0cd600db..731ca685 100644 --- a/tools/quake2/q2map/glfile.c +++ b/tools/quake2/q2map/glfile.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/q2map/leakfile.c b/tools/quake2/q2map/leakfile.c index e78b3fbf..d8034a04 100644 --- a/tools/quake2/q2map/leakfile.c +++ b/tools/quake2/q2map/leakfile.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/q2map/lightmap.c b/tools/quake2/q2map/lightmap.c index 0e763603..8d82b6da 100644 --- a/tools/quake2/q2map/lightmap.c +++ b/tools/quake2/q2map/lightmap.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/q2map/main.c b/tools/quake2/q2map/main.c index c335dd34..fb85403b 100644 --- a/tools/quake2/q2map/main.c +++ b/tools/quake2/q2map/main.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/q2map/map.c b/tools/quake2/q2map/map.c index ed68ccae..f812393e 100644 --- a/tools/quake2/q2map/map.c +++ b/tools/quake2/q2map/map.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/q2map/nodraw.c b/tools/quake2/q2map/nodraw.c index bd481763..398a8aab 100644 --- a/tools/quake2/q2map/nodraw.c +++ b/tools/quake2/q2map/nodraw.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/q2map/patches.c b/tools/quake2/q2map/patches.c index 1e8b91c8..4782b80a 100644 --- a/tools/quake2/q2map/patches.c +++ b/tools/quake2/q2map/patches.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/q2map/portals.c b/tools/quake2/q2map/portals.c index b26c75f9..d2d96527 100644 --- a/tools/quake2/q2map/portals.c +++ b/tools/quake2/q2map/portals.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/q2map/prtfile.c b/tools/quake2/q2map/prtfile.c index c15916b7..06a36e8a 100644 --- a/tools/quake2/q2map/prtfile.c +++ b/tools/quake2/q2map/prtfile.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/q2map/q2map.h b/tools/quake2/q2map/q2map.h index 8344f388..644f7b9e 100644 --- a/tools/quake2/q2map/q2map.h +++ b/tools/quake2/q2map/q2map.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/q2map/qbsp.c b/tools/quake2/q2map/qbsp.c index 128fb7ab..0f4591b0 100644 --- a/tools/quake2/q2map/qbsp.c +++ b/tools/quake2/q2map/qbsp.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/q2map/qbsp.h b/tools/quake2/q2map/qbsp.h index d803354c..8f3ef9e0 100644 --- a/tools/quake2/q2map/qbsp.h +++ b/tools/quake2/q2map/qbsp.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/q2map/qrad.c b/tools/quake2/q2map/qrad.c index 0ae19f24..c17b5bb9 100644 --- a/tools/quake2/q2map/qrad.c +++ b/tools/quake2/q2map/qrad.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/q2map/qrad.h b/tools/quake2/q2map/qrad.h index 061a2e3f..7f5df16c 100644 --- a/tools/quake2/q2map/qrad.h +++ b/tools/quake2/q2map/qrad.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/q2map/qvis.c b/tools/quake2/q2map/qvis.c index f942d1c4..ce1dd103 100644 --- a/tools/quake2/q2map/qvis.c +++ b/tools/quake2/q2map/qvis.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/q2map/qvis.h b/tools/quake2/q2map/qvis.h index 7ee1e8c7..07e0d247 100644 --- a/tools/quake2/q2map/qvis.h +++ b/tools/quake2/q2map/qvis.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/q2map/textures.c b/tools/quake2/q2map/textures.c index c7ac4f60..c43fabbb 100644 --- a/tools/quake2/q2map/textures.c +++ b/tools/quake2/q2map/textures.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/q2map/trace.c b/tools/quake2/q2map/trace.c index af1edfa2..8425022f 100644 --- a/tools/quake2/q2map/trace.c +++ b/tools/quake2/q2map/trace.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/q2map/tree.c b/tools/quake2/q2map/tree.c index c73f6229..89658abd 100644 --- a/tools/quake2/q2map/tree.c +++ b/tools/quake2/q2map/tree.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/q2map/writebsp.c b/tools/quake2/q2map/writebsp.c index 0d3c6a48..c116b20f 100644 --- a/tools/quake2/q2map/writebsp.c +++ b/tools/quake2/q2map/writebsp.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata/images.c b/tools/quake2/qdata/images.c index 4c877600..00f30e05 100644 --- a/tools/quake2/qdata/images.c +++ b/tools/quake2/qdata/images.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata/models.c b/tools/quake2/qdata/models.c index 8b9614dd..848e6752 100644 --- a/tools/quake2/qdata/models.c +++ b/tools/quake2/qdata/models.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata/qdata.c b/tools/quake2/qdata/qdata.c index c3923ad3..1d9f6c78 100644 --- a/tools/quake2/qdata/qdata.c +++ b/tools/quake2/qdata/qdata.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata/qdata.h b/tools/quake2/qdata/qdata.h index bcb0e5ce..8d06be4c 100644 --- a/tools/quake2/qdata/qdata.h +++ b/tools/quake2/qdata/qdata.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata/sprites.c b/tools/quake2/qdata/sprites.c index 16eb00c6..38aa1f5f 100644 --- a/tools/quake2/qdata/sprites.c +++ b/tools/quake2/qdata/sprites.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata/tables.c b/tools/quake2/qdata/tables.c index fa9085c1..00e89547 100644 --- a/tools/quake2/qdata/tables.c +++ b/tools/quake2/qdata/tables.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata/video.c b/tools/quake2/qdata/video.c index 0fc06757..b6fe5117 100644 --- a/tools/quake2/qdata/video.c +++ b/tools/quake2/qdata/video.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/adpcm.h b/tools/quake2/qdata_heretic2/adpcm.h index 387ee191..aad74eaa 100644 --- a/tools/quake2/qdata_heretic2/adpcm.h +++ b/tools/quake2/qdata_heretic2/adpcm.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/animcomp.c b/tools/quake2/qdata_heretic2/animcomp.c index fbcd21dd..a7619325 100644 --- a/tools/quake2/qdata_heretic2/animcomp.c +++ b/tools/quake2/qdata_heretic2/animcomp.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/animcomp.h b/tools/quake2/qdata_heretic2/animcomp.h index 9c531b26..36ea3b1f 100644 --- a/tools/quake2/qdata_heretic2/animcomp.h +++ b/tools/quake2/qdata_heretic2/animcomp.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/anorms.h b/tools/quake2/qdata_heretic2/anorms.h index 8aef344c..65e92ef1 100644 --- a/tools/quake2/qdata_heretic2/anorms.h +++ b/tools/quake2/qdata_heretic2/anorms.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/book.c b/tools/quake2/qdata_heretic2/book.c index 066a5223..412aefe8 100644 --- a/tools/quake2/qdata_heretic2/book.c +++ b/tools/quake2/qdata_heretic2/book.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/common/bspfile.c b/tools/quake2/qdata_heretic2/common/bspfile.c index f76ae145..add0ef30 100644 --- a/tools/quake2/qdata_heretic2/common/bspfile.c +++ b/tools/quake2/qdata_heretic2/common/bspfile.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/common/bspfile.h b/tools/quake2/qdata_heretic2/common/bspfile.h index 6585147a..f66659b5 100644 --- a/tools/quake2/qdata_heretic2/common/bspfile.h +++ b/tools/quake2/qdata_heretic2/common/bspfile.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/common/cmdlib.c b/tools/quake2/qdata_heretic2/common/cmdlib.c index e67106eb..7a49c52e 100644 --- a/tools/quake2/qdata_heretic2/common/cmdlib.c +++ b/tools/quake2/qdata_heretic2/common/cmdlib.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/common/cmdlib.h b/tools/quake2/qdata_heretic2/common/cmdlib.h index b66ccb77..b8b1aa3d 100644 --- a/tools/quake2/qdata_heretic2/common/cmdlib.h +++ b/tools/quake2/qdata_heretic2/common/cmdlib.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/common/her2_threads.h b/tools/quake2/qdata_heretic2/common/her2_threads.h index 7e6cc468..6027a695 100644 --- a/tools/quake2/qdata_heretic2/common/her2_threads.h +++ b/tools/quake2/qdata_heretic2/common/her2_threads.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/common/inout.c b/tools/quake2/qdata_heretic2/common/inout.c index 165390de..f81aff94 100644 --- a/tools/quake2/qdata_heretic2/common/inout.c +++ b/tools/quake2/qdata_heretic2/common/inout.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/common/inout.h b/tools/quake2/qdata_heretic2/common/inout.h index 80bf1527..934189f2 100644 --- a/tools/quake2/qdata_heretic2/common/inout.h +++ b/tools/quake2/qdata_heretic2/common/inout.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/common/l3dslib.c b/tools/quake2/qdata_heretic2/common/l3dslib.c index 3c4c5d36..708577a1 100644 --- a/tools/quake2/qdata_heretic2/common/l3dslib.c +++ b/tools/quake2/qdata_heretic2/common/l3dslib.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/common/l3dslib.h b/tools/quake2/qdata_heretic2/common/l3dslib.h index 0c2f634f..0b1b5379 100644 --- a/tools/quake2/qdata_heretic2/common/l3dslib.h +++ b/tools/quake2/qdata_heretic2/common/l3dslib.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/common/lbmlib.c b/tools/quake2/qdata_heretic2/common/lbmlib.c index 8b0abd24..7eabd19c 100644 --- a/tools/quake2/qdata_heretic2/common/lbmlib.c +++ b/tools/quake2/qdata_heretic2/common/lbmlib.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/common/lbmlib.h b/tools/quake2/qdata_heretic2/common/lbmlib.h index 489afc86..5ee2909f 100644 --- a/tools/quake2/qdata_heretic2/common/lbmlib.h +++ b/tools/quake2/qdata_heretic2/common/lbmlib.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/common/mathlib.c b/tools/quake2/qdata_heretic2/common/mathlib.c index ae61e4b3..8243d86d 100644 --- a/tools/quake2/qdata_heretic2/common/mathlib.c +++ b/tools/quake2/qdata_heretic2/common/mathlib.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/common/mathlib.h b/tools/quake2/qdata_heretic2/common/mathlib.h index 7ae3c074..cd989ea3 100644 --- a/tools/quake2/qdata_heretic2/common/mathlib.h +++ b/tools/quake2/qdata_heretic2/common/mathlib.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/common/path_init.c b/tools/quake2/qdata_heretic2/common/path_init.c index ce5ef540..14470377 100644 --- a/tools/quake2/qdata_heretic2/common/path_init.c +++ b/tools/quake2/qdata_heretic2/common/path_init.c @@ -1,6 +1,6 @@ /* ------------------------------------------------------------------------------- - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/common/polylib.c b/tools/quake2/qdata_heretic2/common/polylib.c index fa38efe1..af5df499 100644 --- a/tools/quake2/qdata_heretic2/common/polylib.c +++ b/tools/quake2/qdata_heretic2/common/polylib.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/common/polylib.h b/tools/quake2/qdata_heretic2/common/polylib.h index a6820aad..00b7b394 100644 --- a/tools/quake2/qdata_heretic2/common/polylib.h +++ b/tools/quake2/qdata_heretic2/common/polylib.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/common/qfiles.c b/tools/quake2/qdata_heretic2/common/qfiles.c index 4abe741b..53452f36 100644 --- a/tools/quake2/qdata_heretic2/common/qfiles.c +++ b/tools/quake2/qdata_heretic2/common/qfiles.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/common/qfiles.h b/tools/quake2/qdata_heretic2/common/qfiles.h index fd20cc99..bee4b4fc 100644 --- a/tools/quake2/qdata_heretic2/common/qfiles.h +++ b/tools/quake2/qdata_heretic2/common/qfiles.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/common/scriplib.c b/tools/quake2/qdata_heretic2/common/scriplib.c index 925fcfd1..af5e5716 100644 --- a/tools/quake2/qdata_heretic2/common/scriplib.c +++ b/tools/quake2/qdata_heretic2/common/scriplib.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/common/scriplib.h b/tools/quake2/qdata_heretic2/common/scriplib.h index 737b47f8..8c441c8b 100644 --- a/tools/quake2/qdata_heretic2/common/scriplib.h +++ b/tools/quake2/qdata_heretic2/common/scriplib.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/common/threads.c b/tools/quake2/qdata_heretic2/common/threads.c index 31a6ca9f..0ee1e2d5 100644 --- a/tools/quake2/qdata_heretic2/common/threads.c +++ b/tools/quake2/qdata_heretic2/common/threads.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/common/token.c b/tools/quake2/qdata_heretic2/common/token.c index a14bcd71..632cfe40 100644 --- a/tools/quake2/qdata_heretic2/common/token.c +++ b/tools/quake2/qdata_heretic2/common/token.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/common/token.h b/tools/quake2/qdata_heretic2/common/token.h index 345aca02..6dca1a1a 100644 --- a/tools/quake2/qdata_heretic2/common/token.h +++ b/tools/quake2/qdata_heretic2/common/token.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/common/trilib.c b/tools/quake2/qdata_heretic2/common/trilib.c index 847b8090..29acab6f 100644 --- a/tools/quake2/qdata_heretic2/common/trilib.c +++ b/tools/quake2/qdata_heretic2/common/trilib.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/common/trilib.h b/tools/quake2/qdata_heretic2/common/trilib.h index 1e3e82c1..8dfd6d28 100644 --- a/tools/quake2/qdata_heretic2/common/trilib.h +++ b/tools/quake2/qdata_heretic2/common/trilib.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/fmodels.c b/tools/quake2/qdata_heretic2/fmodels.c index e764a63b..7d8df18a 100644 --- a/tools/quake2/qdata_heretic2/fmodels.c +++ b/tools/quake2/qdata_heretic2/fmodels.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/images.c b/tools/quake2/qdata_heretic2/images.c index 6131c5d0..a7138b11 100644 --- a/tools/quake2/qdata_heretic2/images.c +++ b/tools/quake2/qdata_heretic2/images.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/jointed.c b/tools/quake2/qdata_heretic2/jointed.c index 7879733f..de8b802a 100644 --- a/tools/quake2/qdata_heretic2/jointed.c +++ b/tools/quake2/qdata_heretic2/jointed.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/jointed.h b/tools/quake2/qdata_heretic2/jointed.h index e6e935f3..264d3175 100644 --- a/tools/quake2/qdata_heretic2/jointed.h +++ b/tools/quake2/qdata_heretic2/jointed.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/joints.h b/tools/quake2/qdata_heretic2/joints.h index 960225f6..f8e64bf5 100644 --- a/tools/quake2/qdata_heretic2/joints.h +++ b/tools/quake2/qdata_heretic2/joints.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/models.c b/tools/quake2/qdata_heretic2/models.c index 22336817..244f24ac 100644 --- a/tools/quake2/qdata_heretic2/models.c +++ b/tools/quake2/qdata_heretic2/models.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/pics.c b/tools/quake2/qdata_heretic2/pics.c index ca1f1fb7..e9e91c27 100644 --- a/tools/quake2/qdata_heretic2/pics.c +++ b/tools/quake2/qdata_heretic2/pics.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/qcommon/angles.h b/tools/quake2/qdata_heretic2/qcommon/angles.h index 0d095c44..b0baf314 100644 --- a/tools/quake2/qdata_heretic2/qcommon/angles.h +++ b/tools/quake2/qdata_heretic2/qcommon/angles.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/qcommon/arrayedlist.h b/tools/quake2/qdata_heretic2/qcommon/arrayedlist.h index 9ef9705b..e54ad223 100644 --- a/tools/quake2/qdata_heretic2/qcommon/arrayedlist.h +++ b/tools/quake2/qdata_heretic2/qcommon/arrayedlist.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/qcommon/flex.h b/tools/quake2/qdata_heretic2/qcommon/flex.h index 8acd7c21..98184e87 100644 --- a/tools/quake2/qdata_heretic2/qcommon/flex.h +++ b/tools/quake2/qdata_heretic2/qcommon/flex.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/qcommon/fmodel.h b/tools/quake2/qdata_heretic2/qcommon/fmodel.h index f1352d31..e2ebfa8d 100644 --- a/tools/quake2/qdata_heretic2/qcommon/fmodel.h +++ b/tools/quake2/qdata_heretic2/qcommon/fmodel.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/qcommon/h2common.h b/tools/quake2/qdata_heretic2/qcommon/h2common.h index b326e820..e1f25591 100644 --- a/tools/quake2/qdata_heretic2/qcommon/h2common.h +++ b/tools/quake2/qdata_heretic2/qcommon/h2common.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/qcommon/placement.h b/tools/quake2/qdata_heretic2/qcommon/placement.h index 9f7166e9..9151183f 100644 --- a/tools/quake2/qdata_heretic2/qcommon/placement.h +++ b/tools/quake2/qdata_heretic2/qcommon/placement.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/qcommon/q_typedef.h b/tools/quake2/qdata_heretic2/qcommon/q_typedef.h index c980b544..cbe69dd1 100644 --- a/tools/quake2/qdata_heretic2/qcommon/q_typedef.h +++ b/tools/quake2/qdata_heretic2/qcommon/q_typedef.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/qcommon/qfiles.h b/tools/quake2/qdata_heretic2/qcommon/qfiles.h index f787779c..4d0648c1 100644 --- a/tools/quake2/qdata_heretic2/qcommon/qfiles.h +++ b/tools/quake2/qdata_heretic2/qcommon/qfiles.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/qcommon/reference.c b/tools/quake2/qdata_heretic2/qcommon/reference.c index e426f697..7be9740d 100644 --- a/tools/quake2/qdata_heretic2/qcommon/reference.c +++ b/tools/quake2/qdata_heretic2/qcommon/reference.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/qcommon/reference.h b/tools/quake2/qdata_heretic2/qcommon/reference.h index 3454e355..747c4d43 100644 --- a/tools/quake2/qdata_heretic2/qcommon/reference.h +++ b/tools/quake2/qdata_heretic2/qcommon/reference.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/qcommon/resourcemanager.c b/tools/quake2/qdata_heretic2/qcommon/resourcemanager.c index 2b5a40bb..2eb01409 100644 --- a/tools/quake2/qdata_heretic2/qcommon/resourcemanager.c +++ b/tools/quake2/qdata_heretic2/qcommon/resourcemanager.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/qcommon/resourcemanager.h b/tools/quake2/qdata_heretic2/qcommon/resourcemanager.h index 579931ae..be82d786 100644 --- a/tools/quake2/qdata_heretic2/qcommon/resourcemanager.h +++ b/tools/quake2/qdata_heretic2/qcommon/resourcemanager.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/qcommon/skeletons.c b/tools/quake2/qdata_heretic2/qcommon/skeletons.c index 7025ceb5..453cb77a 100644 --- a/tools/quake2/qdata_heretic2/qcommon/skeletons.c +++ b/tools/quake2/qdata_heretic2/qcommon/skeletons.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/qcommon/skeletons.h b/tools/quake2/qdata_heretic2/qcommon/skeletons.h index aba4a0c8..9d7fe961 100644 --- a/tools/quake2/qdata_heretic2/qcommon/skeletons.h +++ b/tools/quake2/qdata_heretic2/qcommon/skeletons.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/qd_fmodel.h b/tools/quake2/qdata_heretic2/qd_fmodel.h index bd4a03da..286fb071 100644 --- a/tools/quake2/qdata_heretic2/qd_fmodel.h +++ b/tools/quake2/qdata_heretic2/qd_fmodel.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/qd_skeletons.c b/tools/quake2/qdata_heretic2/qd_skeletons.c index 4001078d..97e2a1f8 100644 --- a/tools/quake2/qdata_heretic2/qd_skeletons.c +++ b/tools/quake2/qdata_heretic2/qd_skeletons.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/qd_skeletons.h b/tools/quake2/qdata_heretic2/qd_skeletons.h index 55ef01b0..7765c579 100644 --- a/tools/quake2/qdata_heretic2/qd_skeletons.h +++ b/tools/quake2/qdata_heretic2/qd_skeletons.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/qdata.c b/tools/quake2/qdata_heretic2/qdata.c index 3e1f8f04..5ec53a9e 100644 --- a/tools/quake2/qdata_heretic2/qdata.c +++ b/tools/quake2/qdata_heretic2/qdata.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/qdata.h b/tools/quake2/qdata_heretic2/qdata.h index 67d97547..0cfa6067 100644 --- a/tools/quake2/qdata_heretic2/qdata.h +++ b/tools/quake2/qdata_heretic2/qdata.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/sprites.c b/tools/quake2/qdata_heretic2/sprites.c index 098e6a14..ecb9d096 100644 --- a/tools/quake2/qdata_heretic2/sprites.c +++ b/tools/quake2/qdata_heretic2/sprites.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/svdcmp.c b/tools/quake2/qdata_heretic2/svdcmp.c index 63811395..14865af3 100644 --- a/tools/quake2/qdata_heretic2/svdcmp.c +++ b/tools/quake2/qdata_heretic2/svdcmp.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/tables.c b/tools/quake2/qdata_heretic2/tables.c index f42128be..ad86c1ee 100644 --- a/tools/quake2/qdata_heretic2/tables.c +++ b/tools/quake2/qdata_heretic2/tables.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/tmix.c b/tools/quake2/qdata_heretic2/tmix.c index 75674a01..58cc369f 100644 --- a/tools/quake2/qdata_heretic2/tmix.c +++ b/tools/quake2/qdata_heretic2/tmix.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake2/qdata_heretic2/video.c b/tools/quake2/qdata_heretic2/video.c index 8ebb5fe2..51bf4620 100644 --- a/tools/quake2/qdata_heretic2/video.c +++ b/tools/quake2/qdata_heretic2/video.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/common/aselib.c b/tools/quake3/common/aselib.c index 314fdc5e..4961647e 100644 --- a/tools/quake3/common/aselib.c +++ b/tools/quake3/common/aselib.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/common/aselib.h b/tools/quake3/common/aselib.h index 2f5f015a..f9a254db 100644 --- a/tools/quake3/common/aselib.h +++ b/tools/quake3/common/aselib.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/common/bspfile.c b/tools/quake3/common/bspfile.c index 8bc0fc8d..4fc45bd6 100644 --- a/tools/quake3/common/bspfile.c +++ b/tools/quake3/common/bspfile.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/common/bspfile.h b/tools/quake3/common/bspfile.h index 1f08a2d5..a6f8679e 100644 --- a/tools/quake3/common/bspfile.h +++ b/tools/quake3/common/bspfile.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/common/cmdlib.c b/tools/quake3/common/cmdlib.c index 6ff815ab..b74c7b33 100644 --- a/tools/quake3/common/cmdlib.c +++ b/tools/quake3/common/cmdlib.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/common/cmdlib.h b/tools/quake3/common/cmdlib.h index 9cbb5e50..b57c81a9 100644 --- a/tools/quake3/common/cmdlib.h +++ b/tools/quake3/common/cmdlib.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/common/imagelib.c b/tools/quake3/common/imagelib.c index 3a590292..73abf2de 100644 --- a/tools/quake3/common/imagelib.c +++ b/tools/quake3/common/imagelib.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/common/imagelib.h b/tools/quake3/common/imagelib.h index 8c00f7ce..2c028bfd 100644 --- a/tools/quake3/common/imagelib.h +++ b/tools/quake3/common/imagelib.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/common/inout.c b/tools/quake3/common/inout.c index f05b0bc9..58d42ed5 100644 --- a/tools/quake3/common/inout.c +++ b/tools/quake3/common/inout.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. @@ -152,7 +152,7 @@ void xml_Select( char *msg, int entitynum, int brushnum, qboolean bError ){ xmlNodeSetContent( node, (xmlChar*)buf ); level[0] = (int)'0' + ( bError ? SYS_ERR : SYS_WRN ) ; level[1] = 0; - xmlSetProp( node, (xmlChar*)"level", (xmlChar *)&level ); + xmlSetProp( node, (xmlChar*)"level", (xmlChar*)&level ); // a 'select' information sprintf( buf, "%i %i", entitynum, brushnum ); select = xmlNewNode( NULL, (xmlChar*)"brush" ); diff --git a/tools/quake3/common/inout.h b/tools/quake3/common/inout.h index 10d399f7..eae54d3b 100644 --- a/tools/quake3/common/inout.h +++ b/tools/quake3/common/inout.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/common/l3dslib.c b/tools/quake3/common/l3dslib.c index 5d775e80..5e340b9d 100644 --- a/tools/quake3/common/l3dslib.c +++ b/tools/quake3/common/l3dslib.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/common/l3dslib.h b/tools/quake3/common/l3dslib.h index cc5cddab..98ed5028 100644 --- a/tools/quake3/common/l3dslib.h +++ b/tools/quake3/common/l3dslib.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/common/mutex.c b/tools/quake3/common/mutex.c index 1d0a354e..d4422676 100644 --- a/tools/quake3/common/mutex.c +++ b/tools/quake3/common/mutex.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/common/mutex.h b/tools/quake3/common/mutex.h index ca8da18d..cbc23f66 100644 --- a/tools/quake3/common/mutex.h +++ b/tools/quake3/common/mutex.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/common/polylib.c b/tools/quake3/common/polylib.c index c7b85dd3..bef8fbd4 100644 --- a/tools/quake3/common/polylib.c +++ b/tools/quake3/common/polylib.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. @@ -19,7 +19,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ - #include "cmdlib.h" #include "mathlib.h" #include "inout.h" @@ -542,7 +541,7 @@ winding_t *ReverseWinding( winding_t *w ){ ============= */ void ClipWindingEpsilonStrict( winding_t *in, vec3_t normal, vec_t dist, - vec_t epsilon, winding_t **front, winding_t **back ){ + vec_t epsilon, winding_t **front, winding_t **back ){ vec_t dists[MAX_POINTS_ON_WINDING + 4]; int sides[MAX_POINTS_ON_WINDING + 4]; int counts[3]; diff --git a/tools/quake3/common/polylib.h b/tools/quake3/common/polylib.h index 19603649..08bf9aaf 100644 --- a/tools/quake3/common/polylib.h +++ b/tools/quake3/common/polylib.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/common/polyset.h b/tools/quake3/common/polyset.h index 62114f36..089d0e6c 100644 --- a/tools/quake3/common/polyset.h +++ b/tools/quake3/common/polyset.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/common/qfiles.h b/tools/quake3/common/qfiles.h index ddb36314..202351c3 100644 --- a/tools/quake3/common/qfiles.h +++ b/tools/quake3/common/qfiles.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/common/qthreads.h b/tools/quake3/common/qthreads.h index 624cebde..823cb63a 100644 --- a/tools/quake3/common/qthreads.h +++ b/tools/quake3/common/qthreads.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/common/scriplib.c b/tools/quake3/common/scriplib.c index f41d5303..3c91386c 100644 --- a/tools/quake3/common/scriplib.c +++ b/tools/quake3/common/scriplib.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/common/scriplib.h b/tools/quake3/common/scriplib.h index 330e2f65..dc9b2348 100644 --- a/tools/quake3/common/scriplib.h +++ b/tools/quake3/common/scriplib.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/common/surfaceflags.h b/tools/quake3/common/surfaceflags.h index e9f1b5cc..12b9c256 100644 --- a/tools/quake3/common/surfaceflags.h +++ b/tools/quake3/common/surfaceflags.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/common/threads.c b/tools/quake3/common/threads.c index 537732fb..4f8951f1 100644 --- a/tools/quake3/common/threads.c +++ b/tools/quake3/common/threads.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. @@ -627,7 +627,6 @@ void ThreadUnlock( void ){ ============= */ void RunThreadsOn( int workcnt, qboolean showpacifier, void ( *func )( int ) ){ - int i; int start, end; dispatch = 0; diff --git a/tools/quake3/common/trilib.c b/tools/quake3/common/trilib.c index 76d35dce..5f403418 100644 --- a/tools/quake3/common/trilib.c +++ b/tools/quake3/common/trilib.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/common/trilib.h b/tools/quake3/common/trilib.h index ad14dec8..47dc14bf 100644 --- a/tools/quake3/common/trilib.h +++ b/tools/quake3/common/trilib.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/q3data/3dslib.c b/tools/quake3/q3data/3dslib.c index 296bba4e..7419a749 100644 --- a/tools/quake3/q3data/3dslib.c +++ b/tools/quake3/q3data/3dslib.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/q3data/3dslib.h b/tools/quake3/q3data/3dslib.h index 68c3c24f..89ceea69 100644 --- a/tools/quake3/q3data/3dslib.h +++ b/tools/quake3/q3data/3dslib.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/q3data/compress.c b/tools/quake3/q3data/compress.c index e09975b2..ce442ced 100644 --- a/tools/quake3/q3data/compress.c +++ b/tools/quake3/q3data/compress.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/q3data/images.c b/tools/quake3/q3data/images.c index 54e75e4f..bae43f75 100644 --- a/tools/quake3/q3data/images.c +++ b/tools/quake3/q3data/images.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/q3data/md3lib.c b/tools/quake3/q3data/md3lib.c index 4ad23e49..93b1dfe0 100644 --- a/tools/quake3/q3data/md3lib.c +++ b/tools/quake3/q3data/md3lib.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/q3data/md3lib.h b/tools/quake3/q3data/md3lib.h index 17cd86b1..b899d6a7 100644 --- a/tools/quake3/q3data/md3lib.h +++ b/tools/quake3/q3data/md3lib.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/q3data/models.c b/tools/quake3/q3data/models.c index 5f4d2026..b7492628 100644 --- a/tools/quake3/q3data/models.c +++ b/tools/quake3/q3data/models.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/q3data/oldstuff.c b/tools/quake3/q3data/oldstuff.c index 00cd5742..02088c7c 100644 --- a/tools/quake3/q3data/oldstuff.c +++ b/tools/quake3/q3data/oldstuff.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/q3data/p3dlib.c b/tools/quake3/q3data/p3dlib.c index 2abcea61..97cc3f6a 100644 --- a/tools/quake3/q3data/p3dlib.c +++ b/tools/quake3/q3data/p3dlib.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/q3data/p3dlib.h b/tools/quake3/q3data/p3dlib.h index 4b2fcf19..e35a9963 100644 --- a/tools/quake3/q3data/p3dlib.h +++ b/tools/quake3/q3data/p3dlib.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/q3data/polyset.c b/tools/quake3/q3data/polyset.c index 3b6433b7..d8a9f617 100644 --- a/tools/quake3/q3data/polyset.c +++ b/tools/quake3/q3data/polyset.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/q3data/q3data.c b/tools/quake3/q3data/q3data.c index 0544076b..331f6138 100644 --- a/tools/quake3/q3data/q3data.c +++ b/tools/quake3/q3data/q3data.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/q3data/q3data.h b/tools/quake3/q3data/q3data.h index d852369a..a8086ad5 100644 --- a/tools/quake3/q3data/q3data.h +++ b/tools/quake3/q3data/q3data.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/q3data/stripper.c b/tools/quake3/q3data/stripper.c index 2e90bcef..a7a51373 100644 --- a/tools/quake3/q3data/stripper.c +++ b/tools/quake3/q3data/stripper.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/q3data/video.c b/tools/quake3/q3data/video.c index ae67138e..2fa7cee2 100644 --- a/tools/quake3/q3data/video.c +++ b/tools/quake3/q3data/video.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2006 Id Software, Inc. and contributors. + Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. diff --git a/tools/quake3/q3map2/brush.c b/tools/quake3/q3map2/brush.c index 4e3a37a0..c6400cbc 100644 --- a/tools/quake3/q3map2/brush.c +++ b/tools/quake3/q3map2/brush.c @@ -93,7 +93,6 @@ brush_t *AllocBrush( int numSides ){ brush_t *bb; size_t c; - /* allocate and clear */ if ( numSides <= 0 ) { Error( "AllocBrush called with numsides = %d", numSides ); @@ -282,6 +281,8 @@ void SnapWeldVector( vec3_t a, vec3_t b, vec3_t out ){ } } + + /* ================== SnapWeldVectorAccu @@ -329,6 +330,8 @@ void SnapWeldVectorAccu( vec3_accu_t a, vec3_accu_t b, vec3_accu_t out ){ } } + + /* FixWinding() - ydnar removes degenerate edges from a winding @@ -1041,8 +1044,9 @@ void SplitBrush( brush_t *brush, int planenum, brush_t **front, brush_t **back ) if ( !w ) { continue; } + /* strict, in parallel case we get the face back because it also is the midwinding */ ClipWindingEpsilonStrict( w, plane->normal, plane->dist, - 0 /*PLANESIDE_EPSILON*/, &cw[0], &cw[1] ); /* strict, in parallel case we get the face back because it also is the midwinding */ + 0 /*PLANESIDE_EPSILON*/, &cw[0], &cw[1] ); for ( j = 0 ; j < 2 ; j++ ) { if ( !cw[j] ) { diff --git a/tools/quake3/q3map2/bsp.c b/tools/quake3/q3map2/bsp.c index 4b181c17..9164c4c2 100644 --- a/tools/quake3/q3map2/bsp.c +++ b/tools/quake3/q3map2/bsp.c @@ -44,6 +44,7 @@ ------------------------------------------------------------------------------- */ + /* ProcessAdvertisements() copies advertisement info into the BSP structures diff --git a/tools/quake3/q3map2/bspfile_abstract.c b/tools/quake3/q3map2/bspfile_abstract.c index eb9bc432..fb8af399 100644 --- a/tools/quake3/q3map2/bspfile_abstract.c +++ b/tools/quake3/q3map2/bspfile_abstract.c @@ -581,6 +581,8 @@ void ParseEntities( void ){ numBSPEntities = numEntities; } + + /* * must be called before UnparseEntities */ @@ -622,6 +624,8 @@ void InjectCommandLine( char **argv, int beginArgs, int endArgs ){ SetKeyValue( &entities[0], "_q3map2_version", Q3MAP_VERSION ); } + + /* UnparseEntities() generates the dentdata string from all the entities. @@ -748,6 +752,8 @@ void SetKeyValue( entity_t *ent, const char *key, const char *value ){ ep->value = copystring( value ); } + + /* KeyExists() returns true if entity has this key @@ -768,6 +774,8 @@ qboolean KeyExists( const entity_t *ent, const char *key ){ return qfalse; } + + /* ValueForKey() gets the value for an entity key diff --git a/tools/quake3/q3map2/facebsp.c b/tools/quake3/q3map2/facebsp.c index e35f2892..aabc2bcc 100644 --- a/tools/quake3/q3map2/facebsp.c +++ b/tools/quake3/q3map2/facebsp.c @@ -90,8 +90,6 @@ static void SelectSplitPlaneNum( node_t *node, face_t *list, int *splitPlaneNum, int planenum; float sizeBias; - //int frontC,backC,splitsC,facingC; - /* ydnar: set some defaults */ *splitPlaneNum = -1; /* leaf */ @@ -179,10 +177,6 @@ static void SelectSplitPlaneNum( node_t *node, face_t *list, int *splitPlaneNum, if ( value > bestValue ) { bestValue = value; bestSplit = split; - //frontC=front; - //backC=back; - //splitsC=splits; - //facingC=facing; } } @@ -191,24 +185,10 @@ static void SelectSplitPlaneNum( node_t *node, face_t *list, int *splitPlaneNum, return; } - //Sys_FPrintf (SYS_VRB, "F: %d B:%d S:%d FA:%ds\n",frontC,backC,splitsC,facingC ); - /* set best split data */ *splitPlaneNum = bestSplit->planenum; *compileFlags = bestSplit->compileFlags; -#if 0 - if ( bestSplit->compileFlags & C_DETAIL ) { - for ( split = list; split; split = split->next ) - if ( !( split->compileFlags & C_DETAIL ) ) { - Sys_FPrintf( SYS_ERR, "DON'T DO SUCH SPLITS (1)\n" ); - } - } - if ( ( node->compileFlags & C_DETAIL ) && !( bestSplit->compileFlags & C_DETAIL ) ) { - Sys_FPrintf( SYS_ERR, "DON'T DO SUCH SPLITS (2)\n" ); - } -#endif - if ( *splitPlaneNum > -1 ) { mapplanes[ *splitPlaneNum ].counter++; } @@ -248,9 +228,6 @@ void BuildFaceTree_r( node_t *node, face_t *list ){ winding_t *frontWinding, *backWinding; int i; int splitPlaneNum, compileFlags; -#if 0 - qboolean isstruct = qfalse; -#endif /* count faces left */ @@ -286,19 +263,14 @@ void BuildFaceTree_r( node_t *node, face_t *list ){ continue; } -#if 0 - if ( !( split->compileFlags & C_DETAIL ) ) { - isstruct = 1; - } -#endif - /* determine which side the face falls on */ side = WindingOnPlaneSide( split->w, plane->normal, plane->dist ); /* switch on side */ if ( side == SIDE_CROSS ) { + /* strict; if no winding is left, we have a "virtually identical" plane and don't want to split by it */ ClipWindingEpsilonStrict( split->w, plane->normal, plane->dist, CLIP_EPSILON * 2, - &frontWinding, &backWinding ); /* strict; if no winding is left, we have a "virtually identical" plane and don't want to split by it */ + &frontWinding, &backWinding ); if ( frontWinding ) { newFace = AllocBspFace(); newFace->w = frontWinding; @@ -351,25 +323,10 @@ void BuildFaceTree_r( node_t *node, face_t *list ){ } } -#if 0 - if ( ( node->compileFlags & C_DETAIL ) && isstruct ) { - Sys_FPrintf( SYS_ERR, "I am detail, my child is structural, this is a wtf1\n", node->has_structural_children ); - } -#endif - for ( i = 0 ; i < 2 ; i++ ) { BuildFaceTree_r( node->children[i], childLists[i] ); node->has_structural_children |= node->children[i]->has_structural_children; } - -#if 0 - if ( ( node->compileFlags & C_DETAIL ) && !( node->children[0]->compileFlags & C_DETAIL ) && node->children[0]->planenum != PLANENUM_LEAF ) { - Sys_FPrintf( SYS_ERR, "I am detail, my child is structural\n", node->has_structural_children ); - } - if ( ( node->compileFlags & C_DETAIL ) && isstruct ) { - Sys_FPrintf( SYS_ERR, "I am detail, my child is structural, this is a wtf2\n", node->has_structural_children ); - } -#endif } diff --git a/tools/quake3/q3map2/game__null.h b/tools/quake3/q3map2/game__null.h index 78b6d598..a8bbec9c 100644 --- a/tools/quake3/q3map2/game__null.h +++ b/tools/quake3/q3map2/game__null.h @@ -55,36 +55,36 @@ NULL, /* unix home sub-dir */ NULL, /* magic path word */ NULL, /* shader directory */ - 0, /* max lightmapped surface verts */ - 0, /* max surface verts */ - 0, /* max surface indexes */ + 0, /* max lightmapped surface verts */ + 0, /* max surface verts */ + 0, /* max surface indexes */ qfalse, /* flares */ NULL, /* default flare shader */ qfalse, /* wolf lighting model? */ - 0, /* lightmap width/height */ - 0, /* lightmap gamma */ + 0, /* lightmap width/height */ + 0, /* lightmap gamma */ qfalse, /* lightmap sRGB */ qfalse, /* texture sRGB */ qfalse, /* color sRGB */ - 0, /* lightmap exposure */ - 0, /* lightmap compensate */ - 0, /* lightgrid scale */ - 0, /* lightgrid ambient scale */ + 0, /* lightmap exposure */ + 0, /* lightmap compensate */ + 0, /* lightgrid scale */ + 0, /* lightgrid ambient scale */ qfalse, /* light angle attenuation uses half-lambert curve */ qfalse, /* disable shader lightstyles hack */ qfalse, /* keep light entities on bsp */ - 0, /* default patchMeta subdivisions tolerance */ + 0, /* default patchMeta subdivisions tolerance */ qfalse, /* patch casting enabled */ qfalse, /* compile deluxemaps */ - 0, /* deluxemaps default mode */ - 0, /* minimap size */ - 0, /* minimap sharpener */ - 0, /* minimap border */ + 0, /* deluxemaps default mode */ + 0, /* minimap size */ + 0, /* minimap sharpener */ + 0, /* minimap border */ qfalse, /* minimap keep aspect */ MINIMAP_MODE_GRAY, /* minimap mode */ NULL, /* minimap name format */ NULL, /* bsp file prefix */ - 0, /* bsp file version */ + 0, /* bsp file version */ qfalse, /* cod-style lump len/ofs order */ NULL, /* bsp load function */ NULL, /* bsp write function */ diff --git a/tools/quake3/q3map2/image.c b/tools/quake3/q3map2/image.c index 16c3304a..6ae88ca7 100644 --- a/tools/quake3/q3map2/image.c +++ b/tools/quake3/q3map2/image.c @@ -123,7 +123,6 @@ static void LoadPNGBuffer( byte *buffer, int size, byte **pixels, int *width, in png_struct *png; png_info *info, *end; pngBuffer_t pb; - //pngBuffer_t *pb = (pngBuffer_t*) png_get_io_ptr( png ); int bitDepth, colorType; png_uint_32 w, h, i; byte **rowPointers; @@ -170,7 +169,6 @@ static void LoadPNGBuffer( byte *buffer, int size, byte **pixels, int *width, in pb.size = size; pb.offset = 0; png_set_read_fn( png, &pb, PNGReadData ); - //png->io_ptr = &pb; /* hack! */ /* set error longjmp */ if ( setjmp( png_jmpbuf(png) ) ) { diff --git a/tools/quake3/q3map2/light.c b/tools/quake3/q3map2/light.c index 756b7731..f410226f 100644 --- a/tools/quake3/q3map2/light.c +++ b/tools/quake3/q3map2/light.c @@ -1159,7 +1159,7 @@ int LightContributionToSample( trace_t *trace ){ /* return to sender */ return 1; } - else{ + else { Error( "Light of undefined type!" ); } @@ -1913,6 +1913,7 @@ void LightWorld( const char *BSPFilePath, qboolean fastAllocate ){ if ( VectorLength( color ) == 0.0f ) { VectorSet( color, 1.0, 1.0, 1.0 ); } + if ( colorsRGB ) { color[0] = Image_LinearFloatFromsRGBFloat( color[0] ); color[1] = Image_LinearFloatFromsRGBFloat( color[1] ); @@ -2485,6 +2486,7 @@ int LightMain( int argc, char **argv ){ } i++; } + else if ( !strcmp( argv[ i ], "-deluxe" ) || !strcmp( argv[ i ], "-deluxemap" ) ) { deluxemap = qtrue; Sys_Printf( "Generating deluxemaps for average light direction\n" ); diff --git a/tools/quake3/q3map2/light_bounce.c b/tools/quake3/q3map2/light_bounce.c index 37d8c4e5..9fe00ef6 100644 --- a/tools/quake3/q3map2/light_bounce.c +++ b/tools/quake3/q3map2/light_bounce.c @@ -552,7 +552,7 @@ static void RadSubdivideDiffuseLight( int lightmapNum, bspDrawSurface_t *ds, raw light->falloffTolerance = falloffTolerance; /* bouncing light? */ - if ( !bouncing ) { + if ( bouncing == qfalse ) { /* This is weird. This actually handles surfacelight and not * bounces. */ diff --git a/tools/quake3/q3map2/light_trace.c b/tools/quake3/q3map2/light_trace.c index cb22bb44..f58bd4ac 100644 --- a/tools/quake3/q3map2/light_trace.c +++ b/tools/quake3/q3map2/light_trace.c @@ -56,7 +56,8 @@ #define GROW_TRACE_NODES 16384 //% 16384 #define GROW_NODE_ITEMS 16 //% 256 -#define MAX_TW_VERTS 24 // vortex: increased from 12 to 24 for ability co compile some insane maps with large curve count +// vortex: increased from 12 to 24 for ability co compile some insane maps with large curve count +#define MAX_TW_VERTS 24 #define TRACE_ON_EPSILON 0.1f @@ -198,9 +199,6 @@ static int AllocTraceNode( void ){ memset( &traceNodes[ numTraceNodes ], 0, sizeof( traceNode_t ) ); traceNodes[ numTraceNodes ].type = TRACE_LEAF; ClearBounds( traceNodes[ numTraceNodes ].mins, traceNodes[ numTraceNodes ].maxs ); - - /* Sys_Printf("alloc node %d\n", numTraceNodes); */ - numTraceNodes++; /* return the count */ @@ -406,8 +404,6 @@ static int SetupTraceNodes_r( int bspNodeNum ){ } } - /* Sys_Printf("node %d children: %d %d\n", nodeNum, traceNodes[ nodeNum ].children[0], traceNodes[ nodeNum ].children[1]); */ - /* return node number */ return nodeNum; } diff --git a/tools/quake3/q3map2/light_ydnar.c b/tools/quake3/q3map2/light_ydnar.c index b63d14b2..a6def142 100644 --- a/tools/quake3/q3map2/light_ydnar.c +++ b/tools/quake3/q3map2/light_ydnar.c @@ -1740,7 +1740,7 @@ static qboolean SubmapRawLuxel( rawLightmap_t *lm, int x, int y, float bx, float origin2 = SUPER_ORIGIN( x, y ); //% normal2 = SUPER_NORMAL( x, y ); } - else{ + else { Sys_FPrintf( SYS_WRN, "WARNING: Spurious lightmap S vector\n" ); } @@ -1764,16 +1764,13 @@ static qboolean SubmapRawLuxel( rawLightmap_t *lm, int x, int y, float bx, float origin2 = SUPER_ORIGIN( x, y ); //% normal2 = SUPER_NORMAL( x, y ); } - else{ + else { Sys_FPrintf( SYS_WRN, "WARNING: Spurious lightmap T vector\n" ); } VectorSubtract( origin2, origin, originVecs[ 1 ] ); - //% VectorSubtract( normal2, normal, normalVecs[ 1 ] ); /* calculate new origin */ - //% VectorMA( origin, bx, originVecs[ 0 ], sampleOrigin ); - //% VectorMA( sampleOrigin, by, originVecs[ 1 ], sampleOrigin ); for ( i = 0; i < 3; i++ ) sampleOrigin[ i ] = sampleOrigin[ i ] + ( bx * originVecs[ 0 ][ i ] ) + ( by * originVecs[ 1 ][ i ] ); @@ -1784,10 +1781,6 @@ static qboolean SubmapRawLuxel( rawLightmap_t *lm, int x, int y, float bx, float } /* calculate new normal */ - //% VectorMA( normal, bx, normalVecs[ 0 ], sampleNormal ); - //% VectorMA( sampleNormal, by, normalVecs[ 1 ], sampleNormal ); - //% if( VectorNormalize( sampleNormal, sampleNormal ) <= 0.0f ) - //% return qfalse; normal = SUPER_NORMAL( x, y ); VectorCopy( normal, sampleNormal ); @@ -2247,42 +2240,31 @@ void IlluminateRawLightmap( int rawLightmapNum ){ normal = SUPER_NORMAL( x, y ); flag = SUPER_FLAG( x, y ); -#if 0 - ////////// 27's temp hack for testing edge clipping //// - if ( origin[0] == 0 && origin[1] == 0 && origin[2] == 0 ) { - lightLuxel[ 1 ] = 255; - lightLuxel[ 3 ] = 1.0f; - totalLighted++; - } - else -#endif - { - /* set contribution count */ - lightLuxel[ 3 ] = 1.0f; + /* set contribution count */ + lightLuxel[ 3 ] = 1.0f; - /* setup trace */ - trace.cluster = *cluster; - VectorCopy( origin, trace.origin ); - VectorCopy( normal, trace.normal ); + /* setup trace */ + trace.cluster = *cluster; + VectorCopy( origin, trace.origin ); + VectorCopy( normal, trace.normal ); - /* get light for this sample */ - LightContributionToSample( &trace ); - VectorCopy( trace.color, lightLuxel ); + /* get light for this sample */ + LightContributionToSample( &trace ); + VectorCopy( trace.color, lightLuxel ); - /* add the contribution to the deluxemap */ - if ( deluxemap ) { - VectorCopy( trace.directionContribution, lightDeluxel ); - } + /* add the contribution to the deluxemap */ + if ( deluxemap ) { + VectorCopy( trace.directionContribution, lightDeluxel ); + } - /* check for evilness */ - if ( trace.forceSubsampling > 1.0f && ( lightSamples > 1 || lightRandomSamples ) && luxelFilterRadius == 0 ) { - totalLighted++; - *flag |= FLAG_FORCE_SUBSAMPLING; /* force */ - } - /* add to count */ - else if ( trace.color[ 0 ] || trace.color[ 1 ] || trace.color[ 2 ] ) { + /* check for evilness */ + if ( trace.forceSubsampling > 1.0f && ( lightSamples > 1 || lightRandomSamples ) && luxelFilterRadius == 0 ) { totalLighted++; - } + *flag |= FLAG_FORCE_SUBSAMPLING; /* force */ + } + /* add to count */ + else if ( trace.color[ 0 ] || trace.color[ 1 ] || trace.color[ 2 ] ) { + totalLighted++; } } } @@ -2610,8 +2592,6 @@ void IlluminateRawLightmap( int rawLightmapNum ){ { /* get cluster */ cluster = SUPER_CLUSTER( x, y ); - //% if( *cluster < 0 ) // TODO why not do this check? These pixels should be zero anyway - //% continue; /* get particulars */ luxel = SUPER_LUXEL( lightmapNum, x, y ); @@ -2735,45 +2715,6 @@ void IlluminateRawLightmap( int rawLightmapNum ){ } } } - - -#if 0 - // audit pass - for ( lightmapNum = 0; lightmapNum < MAX_LIGHTMAPS; lightmapNum++ ) - { - /* early out */ - if ( lm->superLuxels[ lightmapNum ] == NULL ) { - continue; - } - for ( y = 0; y < lm->sh; y++ ) - for ( x = 0; x < lm->sw; x++ ) - { - /* get cluster */ - cluster = SUPER_CLUSTER( x, y ); - luxel = SUPER_LUXEL( lightmapNum, x, y ); - deluxel = SUPER_DELUXEL( x, y ); - if ( !luxel || !deluxel || !cluster ) { - Sys_FPrintf( SYS_VRB, "WARNING: I got NULL'd.\n" ); - continue; - } - else if ( *cluster < 0 ) { - // unmapped pixel - // should have neither deluxemap nor lightmap - if ( deluxel[3] ) { - Sys_FPrintf( SYS_VRB, "WARNING: I have written deluxe to an unmapped luxel. Sorry.\n" ); - } - } - else - { - // mapped pixel - // should have both deluxemap and lightmap - if ( deluxel[3] ) { - Sys_FPrintf( SYS_VRB, "WARNING: I forgot to write deluxe to a mapped luxel. Sorry.\n" ); - } - } - } - } -#endif } diff --git a/tools/quake3/q3map2/lightmaps_ydnar.c b/tools/quake3/q3map2/lightmaps_ydnar.c index c437bcaf..8b44eaf3 100644 --- a/tools/quake3/q3map2/lightmaps_ydnar.c +++ b/tools/quake3/q3map2/lightmaps_ydnar.c @@ -2342,6 +2342,8 @@ static int CompareRawLightmap( const void *a, const void *b ){ return 0; } + + void FillOutLightmap( outLightmap_t *olm ){ int x, y; int ofs; @@ -2454,6 +2456,8 @@ void FillOutLightmap( outLightmap_t *olm ){ } } + + /* StoreSurfaceLightmaps() stores the surface lightmaps into the bsp as byte rgb triplets @@ -2477,8 +2481,8 @@ void StoreSurfaceLightmaps( qboolean fastAllocate ){ char dirname[ 1024 ], filename[ 1024 ]; shaderInfo_t *csi; char lightmapName[ 128 ]; - const char *rgbGenValues[ 256 ]; - const char *alphaGenValues[ 256 ]; + const char *rgbGenValues[ 256 ]; + const char *alphaGenValues[ 256 ]; /* note it */ diff --git a/tools/quake3/q3map2/main.c b/tools/quake3/q3map2/main.c index 85f2f491..bcda949b 100644 --- a/tools/quake3/q3map2/main.c +++ b/tools/quake3/q3map2/main.c @@ -37,7 +37,6 @@ #include "q3map2.h" #include - /* Random() returns a pseudorandom number between 0 and 1 @@ -80,6 +79,7 @@ char *Q_strncat( char *dst, size_t dlen, const char *src, size_t slen ) { return Q_strncpyz( dst + n, src, MIN( slen, dlen - n ) ); } + /* ExitQ3Map() cleanup routine @@ -92,6 +92,7 @@ static void ExitQ3Map( void ){ } } + /* main() q3map mojo... diff --git a/tools/quake3/q3map2/model.c b/tools/quake3/q3map2/model.c index f1b4fdc4..c8558a3f 100644 --- a/tools/quake3/q3map2/model.c +++ b/tools/quake3/q3map2/model.c @@ -741,7 +741,6 @@ void AddTriangleModels( entity_t *e ){ } } - /* walk the entity list */ for ( num = 1; num < numEntities; num++ ) { diff --git a/tools/quake3/q3map2/path_init.c b/tools/quake3/q3map2/path_init.c index 0520d332..ef346f70 100644 --- a/tools/quake3/q3map2/path_init.c +++ b/tools/quake3/q3map2/path_init.c @@ -101,7 +101,7 @@ char *LokiGetHomeDir( void ){ */ void LokiInitPaths( char *argv0 ){ - char *home; + char *home; if ( !homePath ) { /* get home dir */ @@ -121,9 +121,10 @@ void LokiInitPaths( char *argv0 ){ /* this is kinda crap, but hey */ strcpy( installPath, "../" ); #else + char temp[ MAX_OS_PATH ]; - char *path; - char *last; + char *path; + char *last; qboolean found; @@ -175,7 +176,6 @@ void LokiInitPaths( char *argv0 ){ path++; } - /* concatenate */ if ( last > ( path + 1 ) ) { // +1 hack: Q_strncat calls Q_strncpyz that expects a len including '\0' diff --git a/tools/quake3/q3map2/portals.c b/tools/quake3/q3map2/portals.c index 209ad60d..676fa315 100644 --- a/tools/quake3/q3map2/portals.c +++ b/tools/quake3/q3map2/portals.c @@ -409,8 +409,9 @@ void SplitNodePortals( node_t *node ){ // // cut the portal into two portals, one on each side of the cut plane // + /* not strict, we want to always keep one of them even if coplanar */ ClipWindingEpsilon( p->winding, plane->normal, plane->dist, - SPLIT_WINDING_EPSILON, &frontwinding, &backwinding ); /* not strict, we want to always keep one of them even if coplanar */ + SPLIT_WINDING_EPSILON, &frontwinding, &backwinding ); if ( frontwinding && WindingIsTiny( frontwinding ) ) { if ( !f->tinyportals ) { diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h index f38d5679..7d6cb9a4 100644 --- a/tools/quake3/q3map2/q3map2.h +++ b/tools/quake3/q3map2/q3map2.h @@ -41,8 +41,6 @@ #define Q3MAP_MOTD "Your map saw the pretty lights from q3map2's BFG" - - /* ------------------------------------------------------------------------------- dependencies @@ -200,7 +198,7 @@ #define HINT_PRIORITY 1000 /* ydnar: force hint splits first and antiportal/areaportal splits last */ #define ANTIPORTAL_PRIORITY -1000 #define AREAPORTAL_PRIORITY -1000 -#define DETAIL_PRIORITY -3000 +#define DETAIL_PRIORITY -3000 #define PSIDE_FRONT 1 #define PSIDE_BACK 2 @@ -273,7 +271,7 @@ #define RAD_LUXEL_SIZE 3 #define SUPER_LUXEL_SIZE 4 #define SUPER_FLAG_SIZE 4 -#define FLAG_FORCE_SUBSAMPLING 1 +#define FLAG_FORCE_SUBSAMPLING 1 #define FLAG_ALREADY_SUBSAMPLED 2 #define SUPER_ORIGIN_SIZE 3 #define SUPER_NORMAL_SIZE 4 @@ -826,7 +824,7 @@ typedef struct face_s struct face_s *next; int planenum; int priority; - //qboolean checked; + //qboolean checked; int compileFlags; winding_t *w; } @@ -958,8 +956,9 @@ typedef struct parseMesh_s shaderInfo_t *shaderInfo; shaderInfo_t *celShader; /* :) */ + /* jal : entity based _lightmapsamplesize */ + int lightmapSampleSize; /* ydnar: gs mods */ - int lightmapSampleSize; /* jal : entity based _lightmapsamplesize */ float lightmapScale; vec3_t eMins, eMaxs; indexMap_t *im; @@ -1467,7 +1466,7 @@ typedef struct rawLightmap_s float *bspLuxels[ MAX_LIGHTMAPS ]; float *radLuxels[ MAX_LIGHTMAPS ]; float *superLuxels[ MAX_LIGHTMAPS ]; - unsigned char *superFlags; + unsigned char *superFlags; float *superOrigins; float *superNormals; int *superClusters; @@ -1523,15 +1522,19 @@ void HelpMain(const char* arg); game_t *GetGame( char *arg ); void InitPaths( int *argc, char **argv ); + /* fixaas.c */ int FixAASMain( int argc, char **argv ); + /* bsp.c */ int BSPMain( int argc, char **argv ); + /* bsp_analyze.c */ int AnalyzeBSPMain( int argc, char **argv ); + /* bsp_info.c */ int BSPInfoMain( int count, char **fileNames ); @@ -1544,6 +1547,7 @@ int MiniMapBSPMain( int argc, char **argv ); /* convert_bsp.c */ int ConvertBSPMain( int argc, char **argv ); + /* convert_map.c */ int ConvertBSPToMap( char *bspName ); int ConvertBSPToMap_BP( char *bspName ); diff --git a/tools/quake3/q3map2/surface.c b/tools/quake3/q3map2/surface.c index c8c6e4f4..e47f2567 100644 --- a/tools/quake3/q3map2/surface.c +++ b/tools/quake3/q3map2/surface.c @@ -2051,6 +2051,8 @@ int FilterPointIntoTree_r( vec3_t point, mapDrawSurface_t *ds, node_t *node ){ return AddReferenceToLeaf( ds, node ); } + + /* FilterPointConvexHullIntoTree_r() - ydnar filters the convex hull of multiple points from a surface into the tree @@ -2101,6 +2103,7 @@ int FilterPointConvexHullIntoTree_r( vec3_t **points, int npoints, mapDrawSurfac } + /* FilterWindingIntoTree_r() - ydnar filters a winding from a drawsurface into the tree @@ -2183,7 +2186,7 @@ int FilterWindingIntoTree_r( winding_t *w, mapDrawSurface_t *ds, node_t *node ){ if ( DotProduct( plane1, reverse ) > 0.999f && fabs( plane1[ 3 ] - reverse[ 3 ] ) < 0.001f ) { return FilterWindingIntoTree_r( w, ds, node->children[ 1 ] ); } - #else + #else (void) plane2; /* div0: this is the cholera (doesn't hit enough) */ @@ -2590,6 +2593,8 @@ void EmitFlareSurface( mapDrawSurface_t *ds ){ numSurfacesByType[ ds->type ]++; } + + /* EmitPatchSurface() emits a bsp patch drawsurface @@ -2697,6 +2702,8 @@ void EmitPatchSurface( entity_t *e, mapDrawSurface_t *ds ){ numSurfacesByType[ ds->type ]++; } + + /* OptimizeTriangleSurface() - ydnar optimizes the vertex/index data in a triangle surface @@ -2967,6 +2974,7 @@ static void EmitFaceSurface( mapDrawSurface_t *ds ){ } + /* MakeDebugPortalSurfs_r() - ydnar generates drawsurfaces for passable portals in the bsp diff --git a/tools/quake3/q3map2/surface_extra.c b/tools/quake3/q3map2/surface_extra.c index f184a005..93ee30ec 100644 --- a/tools/quake3/q3map2/surface_extra.c +++ b/tools/quake3/q3map2/surface_extra.c @@ -337,7 +337,7 @@ void LoadSurfaceExtraFile( const char *surfaceFilePath ){ } /* parse the file */ - ParseFromMemory( (char *) buffer, size ); + ParseFromMemory( (char*) buffer, size ); /* tokenize it */ while ( 1 ) diff --git a/tools/quake3/q3map2/surface_meta.c b/tools/quake3/q3map2/surface_meta.c index 2c9641bc..145e1961 100644 --- a/tools/quake3/q3map2/surface_meta.c +++ b/tools/quake3/q3map2/surface_meta.c @@ -341,6 +341,7 @@ void TriangulatePatchSurface( entity_t *e, mapDrawSurface_t *ds ){ if ( ds->numVerts == 0 || ds->type != SURFACE_PATCH || ( patchMeta == qfalse && !forcePatchMeta ) ) { return; } + /* make a mesh from the drawsurf */ src.width = ds->patchWidth; src.height = ds->patchHeight; @@ -419,6 +420,8 @@ void TriangulatePatchSurface( entity_t *e, mapDrawSurface_t *ds ){ ClassifySurfaces( 1, ds ); } + + #define TINY_AREA 1.0f #define MAXAREA_MAXTRIES 8 int MaxAreaIndexes( bspDrawVert_t *vert, int cnt, int *indexes ){ @@ -589,6 +592,8 @@ int MaxAreaIndexes( bspDrawVert_t *vert, int cnt, int *indexes ){ return -1; } + + /* MaxAreaFaceSurface() - divVerent creates a triangle list using max area indexes @@ -631,6 +636,7 @@ void MaxAreaFaceSurface( mapDrawSurface_t *ds ){ } + /* FanFaceSurface() - ydnar creates a tri-fan from a brush face winding @@ -835,6 +841,7 @@ void StripFaceSurface( mapDrawSurface_t *ds ){ } + /* EmitMetaStatictics vortex: prints meta statistics in general output @@ -851,6 +858,8 @@ void EmitMetaStats(){ Sys_Printf( "%9d meta triangles\n", numMetaTriangles ); } + + /* MakeEntityMetaTriangles() builds meta triangles from brush faces (tristrips and fans) @@ -1468,8 +1477,6 @@ static int AddMetaTriangleToSurface( mapDrawSurface_t *ds, metaTriangle_t *tri, } } - - if ( metaMaxBBoxDistance >= 0 ) { if ( ds->numIndexes > 0 ) { VectorCopy( ds->mins, mins ); diff --git a/tools/quake3/q3map2/tjunction.c b/tools/quake3/q3map2/tjunction.c index c405d317..1929e3e8 100644 --- a/tools/quake3/q3map2/tjunction.c +++ b/tools/quake3/q3map2/tjunction.c @@ -55,7 +55,8 @@ typedef struct edgeLine_s { vec3_t origin; vec3_t dir; - edgePoint_t *chain; // unused element of doubly linked list + // unused element of doubly linked list + edgePoint_t *chain; } edgeLine_t; typedef struct { @@ -67,8 +68,7 @@ originalEdge_t *originalEdges = NULL; int numOriginalEdges; int allocatedOriginalEdges = 0; - -edgeLine_t *edgeLines = NULL; +edgeLine_t *edgeLines = NULL; int numEdgeLines; int allocatedEdgeLines = 0; @@ -373,7 +373,7 @@ void FixSurfaceJunctions( mapDrawSurface_t *ds ) { p = e->chain->prev; } - for ( ; p != e->chain ; ) { + for ( ; p != e->chain ; ) { if ( start < end ) { if ( p->intercept > end - ON_EPSILON ) { break; diff --git a/tools/quake3/q3map2/vis.c b/tools/quake3/q3map2/vis.c index f5f3c348..97d8b1f9 100644 --- a/tools/quake3/q3map2/vis.c +++ b/tools/quake3/q3map2/vis.c @@ -163,7 +163,9 @@ int LeafVectorFromPortalVector( byte *portalbits, byte *leafbits ){ Merges the portal visibility for a leaf =============== */ + static int clustersizehistogram[MAX_MAP_LEAFS] = {0}; + void ClusterMerge( int leafnum ){ leaf_t *leaf; byte portalvector[MAX_PORTALS / 8]; diff --git a/tools/quake3/q3map2/writebsp.c b/tools/quake3/q3map2/writebsp.c index 8ae50098..4b3e53fe 100644 --- a/tools/quake3/q3map2/writebsp.c +++ b/tools/quake3/q3map2/writebsp.c @@ -70,8 +70,6 @@ int EmitShader( const char *shader, int *contentFlags, int *surfaceFlags ){ } } - // i == numBSPShaders - /* get shaderinfo */ si = ShaderInfoForShader( shader );