From 20163c49bc263a831252a649d4d82824dcbc4fd8 Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Sat, 28 May 2016 17:31:27 +0000
Subject: [PATCH] Fold gr_remap_bitmap_good call in D2 ab_load

---
 d2x-rebirth/main/bmread.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/d2x-rebirth/main/bmread.cpp b/d2x-rebirth/main/bmread.cpp
index b1886246b..a3289d785 100644
--- a/d2x-rebirth/main/bmread.cpp
+++ b/d2x-rebirth/main/bmread.cpp
@@ -259,10 +259,7 @@ static void ab_load(int skip, const char * filename, array<bitmap_index, MAX_BIT
 
 	for (i=0;i< *nframes; i++)	{
 		snprintf( tempname, sizeof(tempname), "%.*s#%d", (int)(path.base_end - path.base_start), path.base_start, i );
-		if ( iff_has_transparency )
-			gr_remap_bitmap_good(*bm[i].get(), newpal, iff_transparent_color, SuperX);
-		else
-			gr_remap_bitmap_good(*bm[i].get(), newpal, -1, SuperX);
+		gr_remap_bitmap_good(*bm[i].get(), newpal, iff_has_transparency ? iff_transparent_color : -1, SuperX);
 
 		bm[i]->avg_color = compute_average_pixel(bm[i].get());
 		bmp[i] = piggy_register_bitmap( bm[i].get(), tempname, 0 );