From aa2431dc7db0e0ed813104bcc70aa3c2f8d22044 Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Wed, 28 Jan 2015 03:42:53 +0000
Subject: [PATCH] Use range_for in load_bitmap_replacements

---
 similar/main/piggy.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/similar/main/piggy.cpp b/similar/main/piggy.cpp
index 46fe105a1..751f197e7 100644
--- a/similar/main/piggy.cpp
+++ b/similar/main/piggy.cpp
@@ -57,8 +57,10 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "byteutil.h"
 #include "makesig.h"
 #include "console.h"
+#include "compiler-range_for.h"
 #include "compiler-make_unique.h"
 #include "compiler-static_assert.h"
+#include "partial_range.h"
 
 #if defined(DXX_BUILD_DESCENT_I)
 #include "custom.h"
@@ -1722,7 +1724,8 @@ void load_bitmap_replacements(const char *level_name)
 	change_filename_extension(ifile_name, level_name, ".POG" );
 	if (auto ifile = PHYSFSX_openReadBuffered(ifile_name))
 	{
-		int id,version,n_bitmaps;
+		int id,version;
+		unsigned n_bitmaps;
 		int bitmap_data_size;
 
 		id = PHYSFSX_readInt(ifile);
@@ -1737,8 +1740,8 @@ void load_bitmap_replacements(const char *level_name)
 		RAIIdmem<uint16_t[]> indices;
 		MALLOC( indices, uint16_t[], n_bitmaps );
 
-		for (i = 0; i < n_bitmaps; i++)
-			indices[i] = PHYSFSX_readShort(ifile);
+		range_for (auto &i, unchecked_partial_range(indices.get(), n_bitmaps))
+			i = PHYSFSX_readShort(ifile);
 
 		bitmap_data_size = PHYSFS_fileLength(ifile) - PHYSFS_tell(ifile) - sizeof(DiskBitmapHeader) * n_bitmaps;
 		Bitmap_replacement_data = make_unique<ubyte[]>(bitmap_data_size);