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.

src/blitter/32bpp_anim.cpp

@@ -218,7 +218,7 @@ inline void Blitter_32bppAnim::Draw(const Blitter::BlitterParams *bp, ZoomLevel
 					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++;

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++;

src/blitter/32bpp_optimized.cpp

@@ -209,7 +209,7 @@ inline void Blitter_32bppOptimized::Draw(const Blitter::BlitterParams *bp, ZoomL
 					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 {

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++;

src/blitter/40bpp_anim.cpp

@@ -267,9 +267,9 @@ inline void Blitter_40bppAnim::Draw(const Blitter::BlitterParams *bp, ZoomLevel
 						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++;

src/script/script_gui.cpp

@@ -899,8 +899,19 @@ struct ScriptDebugWindow : public Window {
 		ScriptLogTypes::LogData &log = this->GetLogData();
 		if (log.empty()) return;
 
-		Rect br = r.Shrink(WidgetDimensions::scaled.bevel);
-		Rect tr = r.Shrink(WidgetDimensions::scaled.framerect);
+		Rect fr = r.Shrink(WidgetDimensions::scaled.framerect);
+
+		/* Setup a clipping rectangle... */
+		DrawPixelInfo tmp_dpi;
+		if (!FillDrawPixelInfo(&tmp_dpi, fr)) return;
+		/* ...but keep coordinates relative to the window. */
+		tmp_dpi.left += fr.left;
+		tmp_dpi.top += fr.top;
+
+		AutoRestoreBackup dpi_backup(_cur_dpi, &tmp_dpi);
+
+		fr.left -= this->hscroll->GetPosition();
+
 		for (int i = this->vscroll->GetPosition(); this->vscroll->IsVisible(i) && (size_t)i < log.size(); i++) {
 			const ScriptLogTypes::LogLine &line = log[i];
 
@@ -916,12 +927,13 @@ struct ScriptDebugWindow : public Window {
 
 			/* Check if the current line should be highlighted */
 			if (i == this->highlight_row) {
-				GfxFillRect(br.left, tr.top, br.right, tr.top + this->resize.step_height - 1, PC_BLACK);
+				fr.bottom = fr.top + this->resize.step_height - 1;
+				GfxFillRect(fr, PC_BLACK);
 				if (colour == TC_BLACK) colour = TC_WHITE; // Make black text readable by inverting it to white.
 			}
 
-			DrawString(-this->hscroll->GetPosition(), tr.right, tr.top, line.text, colour, SA_LEFT | SA_FORCE);
-			tr.top += this->resize.step_height;
+			DrawString(fr, line.text, colour, SA_LEFT | SA_FORCE);
+			fr.top += this->resize.step_height;
 		}
 	}
 

src/spritecache.cpp

@@ -397,6 +397,12 @@ static bool ResizeSprites(SpriteLoader::SpriteCollection &sprite, uint8_t sprite
 		if (!HasBit(sprite_avail, zoom)) ResizeSpriteOut(sprite, zoom);
 	}
 
+	/* Upscale to desired sprite_min_zoom if provided sprite only had zoomed in versions. */
+	if (first_avail < _settings_client.gui.sprite_zoom_min) {
+		if (_settings_client.gui.sprite_zoom_min >= ZOOM_LVL_OUT_4X) ResizeSpriteIn(sprite, ZOOM_LVL_OUT_4X, ZOOM_LVL_OUT_2X);
+		if (_settings_client.gui.sprite_zoom_min >= ZOOM_LVL_OUT_2X) ResizeSpriteIn(sprite, ZOOM_LVL_OUT_2X, ZOOM_LVL_NORMAL);
+	}
+
 	return  true;
 }
 

src/window_type.h

@@ -657,7 +657,7 @@ enum WindowClass {
 
 	/**
 	 * Script debug window; %Window numbers:
-	 *   - 0 = #ScriptDebugWidgets
+	 *   - Ascending value = #ScriptDebugWidgets
 	 */
 	WC_SCRIPT_DEBUG,