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

Fix gcc-4.6 piggy build

Browse source 
gcc-4.6 warns about the transition to new for scope rules; later gcc
does not warn.

Replace the loops with range-based for.
This commit is contained in:
Kp 2015-05-22 03:33:20 +00:00
parent 3298802b3d
commit 6615aff8a4
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
similar/main/piggy.cpp
View file

@ -1697,8 +1697,6 @@ static void free_bitmap_replacements()
void load_bitmap_replacements(const char *level_name)
{
char ifile_name[FILENAME_LEN];
int i;
//first, free up data allocated for old bitmaps
free_bitmap_replacements();
@ -1727,9 +1725,10 @@ void load_bitmap_replacements(const char *level_name)
bitmap_data_size = PHYSFS_fileLength(ifile) - PHYSFS_tell(ifile) - sizeof(DiskBitmapHeader) * n_bitmaps;
Bitmap_replacement_data = make_unique<ubyte[]>(bitmap_data_size);
for (i=0;i<n_bitmaps;i++) {
range_for (const auto i, unchecked_partial_range(indices.get(), n_bitmaps))
{
DiskBitmapHeader bmh;
grs_bitmap *bm = &GameBitmaps[indices[i]];
grs_bitmap *bm = &GameBitmaps[i];
int width;
DiskBitmapHeader_read(&bmh, ifile);
@ -1742,14 +1741,14 @@ void load_bitmap_replacements(const char *level_name)
gr_set_bitmap_flags(*bm, bmh.flags & BM_FLAGS_TO_COPY);
GameBitmapOffset[indices[i]] = 0; // don't try to read bitmap from current pigfile
GameBitmapOffset[i] = 0; // don't try to read bitmap from current pigfile
}
PHYSFS_read(ifile,Bitmap_replacement_data,1,bitmap_data_size);
for (i = 0; i < n_bitmaps; i++)
range_for (const auto i, unchecked_partial_range(indices.get(), n_bitmaps))
{
grs_bitmap *bm = &GameBitmaps[indices[i]];
grs_bitmap *bm = &GameBitmaps[i];
gr_set_bitmap_data(*bm, &Bitmap_replacement_data[(size_t) bm->bm_data]);
}
last_palette_loaded_pig[0]= 0; //force pig re-load