From 6edcc44e285efd93cadeb2833113141cdafeadde Mon Sep 17 00:00:00 2001 From: James R Date: Fri, 3 Jan 2020 17:05:15 -0800 Subject: [PATCH] Give V_DrawFadeFill the V_LockBlend tech --- src/v_video.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/v_video.c b/src/v_video.c index 40326ed86..903c8fb2b 100644 --- a/src/v_video.c +++ b/src/v_video.c @@ -1784,6 +1784,7 @@ void V_DrawFadeFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c, UINT16 color, U { UINT8 *dest; const UINT8 *deststop; + UINT8 *sauc; INT32 u; UINT8 *fadetable; UINT8 perplayershuffle = 0; @@ -1923,9 +1924,13 @@ void V_DrawFadeFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c, UINT16 color, U if (y + h > vid.height) h = vid.height-y; - dest = screens[0] + y*vid.width + x; + x = y * vid.width + x; + + dest = screens[0] + x; deststop = screens[0] + vid.rowbytes * vid.height; + sauc = v_blendscreen + x; + c &= 255; fadetable = ((color & 0xFF00) // Color is not palette index? @@ -1936,9 +1941,10 @@ void V_DrawFadeFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c, UINT16 color, U u = 0; while (u < w) { - dest[u] = fadetable[dest[u]]; + dest[u] = fadetable[sauc[u]]; u++; } + sauc += vid.width; } }