# HG changeset patch
# User Peter Nelson <peter1138@openttd.org>
# Date 2023-12-25 20:59:37
# Node ID e41ee4d6fc7cf61f60f61d777711f2684ee293d1
# Parent  19d577fdcc296afbc3a12d18c4201594e35dd6da

Fix 9ce1626b: Some blitters have `bp->remap` aliased to `remap` for performance. (#11626)

While this probably doesn't make a huge difference for the custom transparent remap code path, the alias is there so use it.

diff --git a/src/blitter/32bpp_anim.cpp b/src/blitter/32bpp_anim.cpp
--- a/src/blitter/32bpp_anim.cpp
+++ b/src/blitter/32bpp_anim.cpp
@@ -218,7 +218,7 @@ inline void Blitter_32bppAnim::Draw(cons
 					if (src_px->a != 0) {
 						src_px += n;
 						do {
-							*dst = this->LookupColourInPalette(bp->remap[GetNearestColourIndex(*dst)]);
+							*dst = this->LookupColourInPalette(remap[GetNearestColourIndex(*dst)]);
 							*anim = 0;
 							anim++;
 							dst++;
diff --git a/src/blitter/32bpp_anim_sse4.cpp b/src/blitter/32bpp_anim_sse4.cpp
--- a/src/blitter/32bpp_anim_sse4.cpp
+++ b/src/blitter/32bpp_anim_sse4.cpp
@@ -322,7 +322,7 @@ bmcr_alpha_blend_single:
 				/* Apply custom transparency remap. */
 				for (uint x = (uint) bp->width; x > 0; x--) {
 					if (src->a != 0) {
-						*dst = this->LookupColourInPalette(bp->remap[GetNearestColourIndex(*dst)]);
+						*dst = this->LookupColourInPalette(remap[GetNearestColourIndex(*dst)]);
 						*anim = 0;
 					}
 					src_mv++;
diff --git a/src/blitter/32bpp_optimized.cpp b/src/blitter/32bpp_optimized.cpp
--- a/src/blitter/32bpp_optimized.cpp
+++ b/src/blitter/32bpp_optimized.cpp
@@ -209,7 +209,7 @@ inline void Blitter_32bppOptimized::Draw
 					if (src_px->a != 0) {
 						src_px += n;
 						do {
-							*dst = this->LookupColourInPalette(bp->remap[GetNearestColourIndex(*dst)]);
+							*dst = this->LookupColourInPalette(remap[GetNearestColourIndex(*dst)]);
 							dst++;
 						} while (--n != 0);
 					} else {
diff --git a/src/blitter/32bpp_sse_func.hpp b/src/blitter/32bpp_sse_func.hpp
--- a/src/blitter/32bpp_sse_func.hpp
+++ b/src/blitter/32bpp_sse_func.hpp
@@ -396,7 +396,7 @@ bmcr_alpha_blend_single:
 				/* Apply custom transparency remap. */
 				for (uint x = (uint) bp->width; x > 0; x--) {
 					if (src->a != 0) {
-						*dst = this->LookupColourInPalette(bp->remap[GetNearestColourIndex(*dst)]);
+						*dst = this->LookupColourInPalette(remap[GetNearestColourIndex(*dst)]);
 					}
 					src_mv++;
 					dst++;
diff --git a/src/blitter/40bpp_anim.cpp b/src/blitter/40bpp_anim.cpp
--- a/src/blitter/40bpp_anim.cpp
+++ b/src/blitter/40bpp_anim.cpp
@@ -267,9 +267,9 @@ inline void Blitter_40bppAnim::Draw(cons
 						src_px += n;
 						do {
 							if (*anim != 0) {
-								*anim = bp->remap[*anim];
+								*anim = remap[*anim];
 							} else {
-								*dst = this->LookupColourInPalette(bp->remap[GetNearestColourIndex(*dst)]);
+								*dst = this->LookupColourInPalette(remap[GetNearestColourIndex(*dst)]);
 								*anim = 0;
 							}
 							anim++;