From 7c6765b8e56a9775bf05d188dfa906b3707001c0 Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Sun, 22 May 2016 17:49:31 +0000
Subject: [PATCH] Fix -Wshadow warnings in ab_load

---
 d1x-rebirth/main/bmread.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/d1x-rebirth/main/bmread.cpp b/d1x-rebirth/main/bmread.cpp
index 4f78f15cb..43977a657 100644
--- a/d1x-rebirth/main/bmread.cpp
+++ b/d1x-rebirth/main/bmread.cpp
@@ -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);