Fix -Wshadow warnings in med_load_group
This commit is contained in:
parent
4572b313b9
commit
9fd62715c1
|
@ -1111,7 +1111,7 @@ static int med_load_group( const char *filename, group::vertex_array_type_t &ver
|
||||||
short tmap_xlate;
|
short tmap_xlate;
|
||||||
int translate=0;
|
int translate=0;
|
||||||
char *temptr;
|
char *temptr;
|
||||||
int i, j;
|
int j;
|
||||||
segment tseg;
|
segment tseg;
|
||||||
auto LoadFile = PHYSFSX_openReadBuffered(filename);
|
auto LoadFile = PHYSFSX_openReadBuffered(filename);
|
||||||
if (!LoadFile)
|
if (!LoadFile)
|
||||||
|
@ -1213,7 +1213,8 @@ static int med_load_group( const char *filename, group::vertex_array_type_t &ver
|
||||||
Error( "Error seeking to vertex_offset in group.c" );
|
Error( "Error seeking to vertex_offset in group.c" );
|
||||||
|
|
||||||
vertex_ids.clear();
|
vertex_ids.clear();
|
||||||
for (i=0;i<group_header.num_vertices;i++) {
|
for (unsigned i = 0; i< group_header.num_vertices; ++i)
|
||||||
|
{
|
||||||
vertex tvert;
|
vertex tvert;
|
||||||
if (PHYSFS_read( LoadFile, &tvert, sizeof(tvert),1 )!=1)
|
if (PHYSFS_read( LoadFile, &tvert, sizeof(tvert),1 )!=1)
|
||||||
Error( "Error reading tvert in group.c" );
|
Error( "Error reading tvert in group.c" );
|
||||||
|
@ -1230,7 +1231,8 @@ static int med_load_group( const char *filename, group::vertex_array_type_t &ver
|
||||||
Error( "Error seeking to segment_offset in group.c" );
|
Error( "Error seeking to segment_offset in group.c" );
|
||||||
|
|
||||||
segment_ids.clear();
|
segment_ids.clear();
|
||||||
for (i=0;i<group_header.num_segments;i++) {
|
for (unsigned i = 0; i < group_header.num_segments; ++i)
|
||||||
|
{
|
||||||
if (PHYSFS_read( LoadFile, &tseg, sizeof(segment),1 )!=1)
|
if (PHYSFS_read( LoadFile, &tseg, sizeof(segment),1 )!=1)
|
||||||
Error( "Error reading tseg in group.c" );
|
Error( "Error reading tseg in group.c" );
|
||||||
|
|
||||||
|
@ -1298,7 +1300,8 @@ static int med_load_group( const char *filename, group::vertex_array_type_t &ver
|
||||||
hashtable ht;
|
hashtable ht;
|
||||||
// Remove all the file extensions in the textures list
|
// Remove all the file extensions in the textures list
|
||||||
|
|
||||||
for (i=0;i<NumTextures;i++) {
|
for (unsigned i = 0; i < NumTextures; ++i)
|
||||||
|
{
|
||||||
temptr = strchr(&TmapInfo[i].filename[0u], '.');
|
temptr = strchr(&TmapInfo[i].filename[0u], '.');
|
||||||
if (temptr) *temptr = '\0';
|
if (temptr) *temptr = '\0';
|
||||||
hashtable_insert( &ht, &TmapInfo[i].filename[0u], i );
|
hashtable_insert( &ht, &TmapInfo[i].filename[0u], i );
|
||||||
|
|
Loading…
Reference in a new issue