TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix -Wshadow warnings in ab_load

Browse source
This commit is contained in:
Kp 2016-05-22 17:49:31 +00:00
parent 2635d64e4b
commit 7c6765b8e5
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
d1x-rebirth/main/bmread.cpp
View file

@ -201,7 +201,6 @@ static bitmap_index bm_load_sub(int skip, const char * filename)
static void ab_load(int skip, const char * filename, array<bitmap_index, MAX_BITMAPS_PER_BRUSH> &bmp, unsigned *nframes )
{
bitmap_index bi;
int i;
int iff_error; //reference parm to avoid warning message
palette_array_t newpal;
char fname[20];
@ -217,6 +216,8 @@ static void ab_load(int skip, const char * filename, array<bitmap_index, MAX_BIT
removeext( filename, fname );
{
unsigned i;
for (i=0; i<MAX_BITMAPS_PER_BRUSH; i++ ) {
snprintf(tempname, sizeof(tempname), "%s#%d", fname, i);
bi = piggy_find_bitmap( tempname );
@ -229,6 +230,7 @@ static void ab_load(int skip, const char * filename, array<bitmap_index, MAX_BIT
*nframes = i;
return;
}
}
array<std::unique_ptr<grs_main_bitmap>, MAX_BITMAPS_PER_BRUSH> bm;
iff_error = iff_read_animbrush(filename,bm,nframes,newpal);