From 84f0dcc2b293f919653d21735e31bc6c3ad12fc5 Mon Sep 17 00:00:00 2001 From: Sam V Date: Wed, 16 Mar 2022 14:31:44 +0100 Subject: [PATCH] Fix "hides previous local/global declaration" warnings #138 --- utils/common/wadlib.cpp | 2 +- utils/common/wadlib.h | 1 - utils/makefont/makefont.cpp | 8 ++++---- utils/qbsp2/bsp5.h | 2 +- utils/qbsp2/qbsp.cpp | 18 +++++++++--------- utils/qbsp2/writebsp.cpp | 2 +- utils/qcsg/qcsg.cpp | 16 ++++++++-------- utils/qcsg/textures.cpp | 13 ++++++------- utils/qrad/lightmap.cpp | 5 ++--- utils/qrad/qrad.cpp | 14 +++++++------- utils/studiomdl/studiomdl.cpp | 6 +++--- utils/studiomdl/write.cpp | 22 +++++++++++----------- 12 files changed, 53 insertions(+), 56 deletions(-) diff --git a/utils/common/wadlib.cpp b/utils/common/wadlib.cpp index ec9278888..41179dc9f 100644 --- a/utils/common/wadlib.cpp +++ b/utils/common/wadlib.cpp @@ -38,7 +38,6 @@ lumpinfo_t *lumpinfo; // location of each lump on disk int numlumps; -wadinfo_t header; FILE *wadhandle; @@ -49,6 +48,7 @@ W_OpenWad */ void W_OpenWad (char *filename) { + wadinfo_t header; lumpinfo_t *lump_p; int length; diff --git a/utils/common/wadlib.h b/utils/common/wadlib.h index 64b6a7dbf..bebf20029 100644 --- a/utils/common/wadlib.h +++ b/utils/common/wadlib.h @@ -42,7 +42,6 @@ typedef struct extern lumpinfo_t *lumpinfo; // location of each lump on disk extern int numlumps; -extern wadinfo_t header; void W_OpenWad (char *filename); int W_CheckNumForName (char *name); diff --git a/utils/makefont/makefont.cpp b/utils/makefont/makefont.cpp index a6fc2a51c..802a369fb 100644 --- a/utils/makefont/makefont.cpp +++ b/utils/makefont/makefont.cpp @@ -25,10 +25,6 @@ #define FONT_TAG 6 // Font's are the 6th tag after the TYP_LUMPY base ( 64 )...i.e., type == 70 -BOOL bItalic = FALSE; -BOOL bBold = FALSE; -BOOL bUnderline = FALSE; - char fontname[ 256 ]; int pointsize[3] = { 9, 11, 15 }; @@ -395,6 +391,10 @@ int main(int argc, char* argv[]) qfont_t *fonts[ 3 ]; + BOOL bItalic = FALSE; + BOOL bBold = FALSE; + BOOL bUnderline = FALSE; + strcpy( fontname, DEFAULT_FONT ); printf("makefont.exe Version 1.0 by valve (%s)\n", __DATE__ ); diff --git a/utils/qbsp2/bsp5.h b/utils/qbsp2/bsp5.h index daf9e4cf5..d97c1a489 100644 --- a/utils/qbsp2/bsp5.h +++ b/utils/qbsp2/bsp5.h @@ -237,7 +237,7 @@ void qprintf (char *fmt, ...); // only prints if verbose extern int valid; extern char portfilename[1024]; -extern char bspfilename[1024]; +extern char g_bspfilename[1024]; extern char pointfilename[1024]; extern qboolean worldmodel; diff --git a/utils/qbsp2/qbsp.cpp b/utils/qbsp2/qbsp.cpp index 77fd67309..6d49caded 100644 --- a/utils/qbsp2/qbsp.cpp +++ b/utils/qbsp2/qbsp.cpp @@ -26,7 +26,7 @@ qboolean watervis; int subdivide_size = 240; -char bspfilename[1024]; +char g_bspfilename[1024]; char pointfilename[1024]; char portfilename[1024]; @@ -770,7 +770,7 @@ ReadSurfs surfchain_t *ReadSurfs (FILE *file) { int r; - int planenum, texinfo, contents, numpoints; + int planenum, texturenum, contents, numpoints; face_t *f; int i; double v[3]; @@ -778,7 +778,7 @@ surfchain_t *ReadSurfs (FILE *file) // read in the polygons while (1) { - r = fscanf (file, "%i %i %i %i\n", &planenum, &texinfo, &contents, &numpoints); + r = fscanf(file, "%i %i %i %i\n", &planenum, &texturenum, &contents, &numpoints); if (r == 0 || r == -1) return NULL; if (planenum == -1) // end of model @@ -789,13 +789,13 @@ surfchain_t *ReadSurfs (FILE *file) Error ("ReadSurfs: %i > MAXPOINTS", numpoints); if (planenum > numplanes) Error ("ReadSurfs: %i > numplanes", planenum); - if (texinfo > numtexinfo) - Error ("ReadSurfs: %i > numtexinfo", texinfo); + if (texturenum > numtexinfo) + Error("ReadSurfs: %i > numtexinfo", texturenum); f = AllocFace (); f->planenum = planenum; - f->texturenum = texinfo; + f->texturenum = texturenum; f->contents = contents; f->numpoints = numpoints; f->next = validfaces[planenum]; @@ -1002,15 +1002,15 @@ int main (int argc, char **argv) ThreadSetDefault (); SetQdirFromPath (); - strcpy (bspfilename, ExpandArg(argv[i])); - StripExtension (bspfilename); + strcpy(g_bspfilename, ExpandArg(argv[i])); + StripExtension(g_bspfilename); // // do it! // start = I_FloatTime (); - ProcessFile (bspfilename); + ProcessFile(g_bspfilename); end = I_FloatTime (); printf ("%5.0f seconds elapsed\n", end-start); diff --git a/utils/qbsp2/writebsp.cpp b/utils/qbsp2/writebsp.cpp index 5702ee929..9bd59fa52 100644 --- a/utils/qbsp2/writebsp.cpp +++ b/utils/qbsp2/writebsp.cpp @@ -283,6 +283,6 @@ void FinishBSPFile (void) if (verbose) PrintBSPFileSizes (); - WriteBSPFile (bspfilename); + WriteBSPFile (g_bspfilename); } diff --git a/utils/qcsg/qcsg.cpp b/utils/qcsg/qcsg.cpp index 526788327..3e0e56946 100644 --- a/utils/qcsg/qcsg.cpp +++ b/utils/qcsg/qcsg.cpp @@ -812,9 +812,9 @@ int main (int argc, char **argv) // if (onlyents && !glview) { - char out[1024]; - sprintf (out, "%s.bsp", source); - LoadBSPFile (out); + char outFileName[1024]; + sprintf(outFileName, "%s.bsp", source); + LoadBSPFile(outFileName); // Get the new entity data from the map file LoadMapFile (name); @@ -840,15 +840,15 @@ int main (int argc, char **argv) for (i=0 ; iiTexFile], dest, sizeof(miptex_t) ); for( i=0; ioffsets[i] = 0; + newMiptex->offsets[i] = 0; return sizeof(miptex_t); } else @@ -282,7 +282,7 @@ void WriteMiptex(void) { using clock = std::chrono::high_resolution_clock; - int i, len, texsize, totaltexsize = 0; + int len, texsize, totaltexsize = 0; byte *data; dmiptexlump_t *l; char *path; @@ -314,7 +314,7 @@ void WriteMiptex(void) start = clock::now(); { - for (i=0; imiptex; tx->miptex = FindMiptex( miptex_name ); @@ -353,7 +352,7 @@ void WriteMiptex(void) l = (dmiptexlump_t *)dtexdata; data = (byte *)&l->dataofs[nummiptex]; l->nummiptex = nummiptex; - for (i=0 ; idataofs[i] = data - (byte *)l; len = LoadLump (miptex+i, data, &texsize); diff --git a/utils/qrad/lightmap.cpp b/utils/qrad/lightmap.cpp index bab606be9..139288acc 100644 --- a/utils/qrad/lightmap.cpp +++ b/utils/qrad/lightmap.cpp @@ -1357,7 +1357,6 @@ void BuildFacelights (int facenum) vec3_t sampled[MAXLIGHTMAPS]; lightinfo_t l; int i, j, k; - sample_t *s; float *spot; patch_t *patch; byte pvs[(MAX_MAP_LEAFS+7)/8]; @@ -1518,7 +1517,7 @@ void BuildFacelights (int facenum) { if ( f->styles[j] == 0 ) { - s = facelight[facenum].samples[j]; + auto s = facelight[facenum].samples[j]; for (i=0 ; ilight, ambient, s->light); break; @@ -1536,7 +1535,7 @@ void BuildFacelights (int facenum) { if ( f->styles[j] == 0 ) { - s = facelight[facenum].samples[j]; + auto s = facelight[facenum].samples[j]; for (i=0 ; ilight, face_patches[facenum]->baselight, s->light ); break; diff --git a/utils/qrad/qrad.cpp b/utils/qrad/qrad.cpp index ce836f630..89200dee3 100644 --- a/utils/qrad/qrad.cpp +++ b/utils/qrad/qrad.cpp @@ -53,7 +53,7 @@ char global_lights[MAX_PATH] = ""; char designer_lights[MAX_PATH] = ""; char level_lights[MAX_PATH] = ""; -char transferfile[MAX_PATH] = ""; +char g_transferfile[MAX_PATH] = ""; char vismatfile[_MAX_PATH] = ""; char incrementfile[_MAX_PATH] = ""; qboolean incremental = 0; @@ -1161,22 +1161,22 @@ readtransfers(char *transferfile, long numpatches) void MakeAllScales (void) { - strcpy(transferfile, source); - StripExtension( transferfile ); - DefaultExtension( transferfile, ".r2" ); + strcpy(g_transferfile, source); + StripExtension(g_transferfile); + DefaultExtension(g_transferfile, ".r2"); if ( !incremental || !IsIncremental(incrementfile) - || (unsigned)readtransfers(transferfile, num_patches) != num_patches ) + || (unsigned)readtransfers(g_transferfile, num_patches) != num_patches ) { // determine visibility between patches BuildVisMatrix (); RunThreadsOn (num_patches, true, MakeScales); if ( incremental ) - writetransfers(transferfile, num_patches); + writetransfers(g_transferfile, num_patches); else - unlink(transferfile); + unlink(g_transferfile); // release visibility matrix FreeVisMatrix (); diff --git a/utils/studiomdl/studiomdl.cpp b/utils/studiomdl/studiomdl.cpp index 50964dd1c..11433cc73 100644 --- a/utils/studiomdl/studiomdl.cpp +++ b/utils/studiomdl/studiomdl.cpp @@ -2018,7 +2018,7 @@ int Grab_Nodes( s_node_t *pnodes ) int index; char name[1024]; int parent; - int numbones = 0; + int numnodebones = 0; int i; while (fgets( line, sizeof( line ), input ) != NULL) @@ -2036,7 +2036,7 @@ int Grab_Nodes( s_node_t *pnodes ) strcpyn( pnodes[index].name, name ); pnodes[index].parent = parent; - numbones = index; + numnodebones = index; // check for mirrored bones; for (i = 0; i < nummirrored; i++) { @@ -2050,7 +2050,7 @@ int Grab_Nodes( s_node_t *pnodes ) } else { - return numbones + 1; + return numnodebones + 1; } } Error( "Unexpected EOF at line %d\n", linecount ); diff --git a/utils/studiomdl/write.cpp b/utils/studiomdl/write.cpp index b2e03eed3..bb2d850c1 100644 --- a/utils/studiomdl/write.cpp +++ b/utils/studiomdl/write.cpp @@ -276,7 +276,7 @@ void WriteSequenceInfo( ) } -byte *WriteAnimations( byte *pData, byte *pStart, int group ) +byte *WriteAnimations( byte *pAnimData, byte *pAnimStart, int group ) { int i, j, k; int q, n; @@ -285,19 +285,19 @@ byte *WriteAnimations( byte *pData, byte *pStart, int group ) mstudioanimvalue_t *panimvalue; // hack for seqgroup 0 - // pseqgroup->data = (pData - pStart); + // pseqgroup->data = (pAnimData - pAnimStart); for (i = 0; i < numseq; i++) { if (sequence[i].seqgroup == group) { // save animations - panim = (mstudioanim_t *)pData; - sequence[i].animindex = (pData - pStart); - pData += sequence[i].numblends * numbones * sizeof( mstudioanim_t ); - ALIGN( pData ); + panim = (mstudioanim_t*)pAnimData; + sequence[i].animindex = (pAnimData - pAnimStart); + pAnimData += sequence[i].numblends * numbones * sizeof(mstudioanim_t); + ALIGN(pAnimData); - panimvalue = (mstudioanimvalue_t *)pData; + panimvalue = (mstudioanimvalue_t*)pAnimData; for (q = 0; q < sequence[i].numblends; q++) { // save animation value info @@ -325,12 +325,12 @@ byte *WriteAnimations( byte *pData, byte *pStart, int group ) } } - // printf("raw bone data %d : %s\n", (byte *)panimvalue - pData, sequence[i].name); - pData = (byte *)panimvalue; - ALIGN( pData ); + // printf("raw bone data %d : %s\n", (byte *)panimvalue - pAnimData, sequence[i].name); + pAnimData = (byte*)panimvalue; + ALIGN(pAnimData); } } - return pData; + return pAnimData; } void WriteTextures( )