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

more warnings done. Now q3map2 is warning free apart from libpng deprecation problems.

Browse Source
This commit is contained in:
Rudolf Polzer 2011-06-05 19:47:08 +02:00
parent 7db8ac9952
commit bf4ab34b0a
6 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/picomodel/lwo/lwo2.c
View File

@ -272,7 +272,7 @@ Fail:
int lwValidateObject( const char *filename, picoMemStream_t *fp, unsigned int *failID, int *failpos )
{
unsigned int id, formsize, type;
unsigned int id, type;
/* open the file */
@ -282,7 +282,7 @@ int lwValidateObject( const char *filename, picoMemStream_t *fp, unsigned int *f
set_flen( 0 );
id = getU4( fp );
formsize = getU4( fp );
/* formsize = */ getU4( fp );
type = getU4( fp );
if ( 12 != get_flen() ) {
return PICO_PMV_ERROR_SIZE;

4
libs/picomodel/lwo/lwob.c
View File

@ -712,7 +712,7 @@ Fail:
int lwValidateObject5( const char *filename, picoMemStream_t *fp, unsigned int *failID, int *failpos )
{
unsigned int id, formsize, type;
unsigned int id, type;
/* open the file */
@ -723,7 +723,7 @@ int lwValidateObject5( const char *filename, picoMemStream_t *fp, unsigned int *
set_flen( 0 );
id = getU4( fp );
formsize = getU4( fp );
/* formsize = */ getU4( fp );
type = getU4( fp );
if ( 12 != get_flen() ) {
return PICO_PMV_ERROR_SIZE;

2
libs/picomodel/pm_fm.c
View File

@ -208,7 +208,6 @@ static picoModel_t *_fm_load( PM_PARAMS_LOAD )
{
int i, j, dups, dup_index;
int fm_file_pos;
short tot_numVerts;
index_LUT_t *p_index_LUT, *p_index_LUT2, *p_index_LUT3;
index_DUP_LUT_t *p_index_LUT_DUPS;
@ -458,7 +457,6 @@ static picoModel_t *_fm_load( PM_PARAMS_LOAD )
}
// Fill in Look Up Table, and allocate/fill Linked List from vert array as needed for dup STs per Vert.
tot_numVerts = fm_head->numXYZ;
dups = 0;
triangle = tri_verts;

2
libs/picomodel/pm_md2.c
View File

@ -329,7 +329,6 @@ static int _md2_canload( PM_PARAMS_CANLOAD )
static picoModel_t *_md2_load( PM_PARAMS_LOAD )
{
int i, j, dups, dup_index;
short tot_numVerts;
index_LUT_t *p_index_LUT, *p_index_LUT2, *p_index_LUT3;
index_DUP_LUT_t *p_index_LUT_DUPS;
md2Triangle_t *p_md2Triangle;
@ -491,7 +490,6 @@ static picoModel_t *_md2_load( PM_PARAMS_LOAD )
}
// Fill in Look Up Table, and allocate/fill Linked List from vert array as needed for dup STs per Vert.
tot_numVerts = md2->numXYZ;
dups = 0;
for(i=0; i<md2->numTris; i++)
{

3
tools/quake3/common/imagelib.c
View File

@ -678,7 +678,6 @@ void LoadBMP (const char *filename, byte **pic, byte **palette, int *width, int
{
byte *out;
int i;
int bfSize;
int bfOffBits;
int structSize;
int bcWidth;
@ -701,7 +700,7 @@ void LoadBMP (const char *filename, byte **pic, byte **palette, int *width, int
Error ("%s is not a bmp file", filename);
}
bfSize = bufLittleLong (in, len, &pos);
/* bfSize = */ bufLittleLong (in, len, &pos);
bufLittleShort(in, len, &pos);
bufLittleShort(in, len, &pos);
bfOffBits = bufLittleLong (in, len, &pos);

3
tools/quake3/common/scriplib.c
View File

@ -296,12 +296,11 @@ Returns qtrue if there is another token on the line
==============
*/
qboolean TokenAvailable (void) {
int oldLine, oldScriptLine;
int oldLine;
qboolean r;
/* save */
oldLine = scriptline;
oldScriptLine = script->line;
/* test */
r = GetToken( qtrue );