quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more warnings be gone

Browse Source
This commit is contained in:
Rudolf Polzer 2011-06-05 19:43:21 +02:00
parent 148c7d50d5
commit 7db8ac9952
5 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/quake3/q3map2/facebsp.c
View File

@ -244,7 +244,9 @@ void BuildFaceTree_r( node_t *node, face_t *list )
winding_t *frontWinding, *backWinding; winding_t *frontWinding, *backWinding;
int i; int i;
int splitPlaneNum, compileFlags; int splitPlaneNum, compileFlags;
#if 0
qboolean isstruct = qfalse; qboolean isstruct = qfalse;
#endif
/* count faces left */ /* count faces left */
@ -282,8 +284,10 @@ void BuildFaceTree_r( node_t *node, face_t *list )
continue; continue;
} }
#if 0
if(!(split->compileFlags & C_DETAIL)) if(!(split->compileFlags & C_DETAIL))
isstruct = 1; isstruct = 1;
#endif
/* determine which side the face falls on */ /* determine which side the face falls on */
side = WindingOnPlaneSide( split->w, plane->normal, plane->dist ); side = WindingOnPlaneSide( split->w, plane->normal, plane->dist );

5
tools/quake3/q3map2/image.c
View File

@ -127,7 +127,7 @@ static void LoadPNGBuffer( byte *buffer, int size, byte **pixels, int *width, in
png_struct *png; png_struct *png;
png_info *info, *end; png_info *info, *end;
pngBuffer_t pb; pngBuffer_t pb;
int bitDepth, colorType, channels; int bitDepth, colorType;
png_uint_32 w, h, i; png_uint_32 w, h, i;
byte **rowPointers; byte **rowPointers;
@ -196,9 +196,6 @@ static void LoadPNGBuffer( byte *buffer, int size, byte **pixels, int *width, in
png_get_IHDR( png, info, png_get_IHDR( png, info,
&w, &h, &bitDepth, &colorType, NULL, NULL, NULL ); &w, &h, &bitDepth, &colorType, NULL, NULL, NULL );
/* read number of channels */
channels = png_get_channels( png, info );
/* the following will probably bork on certain types of png images, but hey... */ /* the following will probably bork on certain types of png images, but hey... */
/* force indexed/gray/trans chunk to rgb */ /* force indexed/gray/trans chunk to rgb */

5
tools/quake3/q3map2/light.c
View File

@ -148,7 +148,6 @@ static void CreateSkyLights( vec3_t color, float value, int iterations, float fi
int angleSteps, elevationSteps; int angleSteps, elevationSteps;
float angle, elevation; float angle, elevation;
float angleStep, elevationStep; float angleStep, elevationStep;
float step, start;
sun_t sun; sun_t sun;
@ -156,10 +155,6 @@ static void CreateSkyLights( vec3_t color, float value, int iterations, float fi
if( value <= 0.0f || iterations < 2 ) if( value <= 0.0f || iterations < 2 )
return; return;
/* calculate some stuff */
step = 2.0f / (iterations - 1);
start = -1.0f;
/* basic sun setup */ /* basic sun setup */
VectorCopy( color, sun.color ); VectorCopy( color, sun.color );
sun.deviance = 0.0f; sun.deviance = 0.0f;

13
tools/quake3/q3map2/map.c
View File

@ -490,7 +490,7 @@ void SetBrushContents( brush_t *b )
int contentFlags, compileFlags; int contentFlags, compileFlags;
side_t *s; side_t *s;
int i; int i;
qboolean mixed; //% qboolean mixed;
/* get initial compile flags from first side */ /* get initial compile flags from first side */
@ -498,7 +498,7 @@ void SetBrushContents( brush_t *b )
contentFlags = s->contentFlags; contentFlags = s->contentFlags;
compileFlags = s->compileFlags; compileFlags = s->compileFlags;
b->contentShader = s->shaderInfo; b->contentShader = s->shaderInfo;
mixed = qfalse; //% mixed = qfalse;
/* get the content/compile flags for every side in the brush */ /* get the content/compile flags for every side in the brush */
for( i = 1; i < b->numsides; i++, s++ ) for( i = 1; i < b->numsides; i++, s++ )
@ -506,8 +506,8 @@ void SetBrushContents( brush_t *b )
s = &b->sides[ i ]; s = &b->sides[ i ];
if( s->shaderInfo == NULL ) if( s->shaderInfo == NULL )
continue; continue;
if( s->contentFlags != contentFlags || s->compileFlags != compileFlags ) //% if( s->contentFlags != contentFlags || s->compileFlags != compileFlags )
mixed = qtrue; //% mixed = qtrue;
contentFlags |= s->contentFlags; contentFlags |= s->contentFlags;
compileFlags |= s->compileFlags; compileFlags |= s->compileFlags;
@ -1196,9 +1196,6 @@ parses a brush out of a map file and sets it up
static void ParseBrush( qboolean onlyLights, qboolean noCollapseGroups ) static void ParseBrush( qboolean onlyLights, qboolean noCollapseGroups )
{ {
brush_t *b;
/* parse the brush out of the map */ /* parse the brush out of the map */
ParseRawBrush( onlyLights ); ParseRawBrush( onlyLights );
@ -1241,7 +1238,7 @@ static void ParseBrush( qboolean onlyLights, qboolean noCollapseGroups )
} }
/* finish the brush */ /* finish the brush */
b = FinishBrush(noCollapseGroups); FinishBrush(noCollapseGroups);
} }

2
tools/quake3/q3map2/model.c
View File

@ -208,7 +208,7 @@ adds a picomodel into the bsp
void InsertModel( const char *name, int skin, int frame, m4x4_t transform, remap_t *remap, shaderInfo_t *celShader, int eNum, int castShadows, int recvShadows, int spawnFlags, float lightmapScale, int lightmapSampleSize, float shadeAngle ) void InsertModel( const char *name, int skin, int frame, m4x4_t transform, remap_t *remap, shaderInfo_t *celShader, int eNum, int castShadows, int recvShadows, int spawnFlags, float lightmapScale, int lightmapSampleSize, float shadeAngle )
{ {
int i, j, k, s, numSurfaces; int i, j, s, numSurfaces;
m4x4_t identity, nTransform; m4x4_t identity, nTransform;
picoModel_t *model; picoModel_t *model;
picoShader_t *shader; picoShader_t *shader;