From a81c3ca115b6cbc2158caed6d98d27616057804c Mon Sep 17 00:00:00 2001
From: toasterbabe <rollerorbital@gmail.com>
Date: Wed, 23 Aug 2017 17:41:16 +0100
Subject: [PATCH] Update V_DrawCroppedPatch to match V_DrawFixedPatch's fixes.
---
src/v_video.c | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/src/v_video.c b/src/v_video.c
index 9858e118f0..b0d8fc52b0 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -808,36 +808,40 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_
y = FixedMul(y,dupy<<FRACBITS);
x >>= FRACBITS;
y >>= FRACBITS;
- desttop += (y*vid.width) + x;
// Center it if necessary
if (!(scrn & V_SCALEPATCHMASK))
{
+ // if it's meant to cover the whole screen, black out the rest
+ if (x == 0 && SHORT(patch->width) == BASEVIDWIDTH && y == 0 && SHORT(patch->height) == BASEVIDHEIGHT)
+ {
+ column = (const column_t *)((const UINT8 *)(patch) + LONG(patch->columnofs[0]));
+ source = (const UINT8 *)(column) + 3;
+ V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, (column->topdelta == 0xff ? 31 : source[0]));
+ }
+
if (vid.width != BASEVIDWIDTH * dupx)
{
// dupx adjustments pretend that screen width is BASEVIDWIDTH * dupx,
// so center this imaginary screen
if (scrn & V_SNAPTORIGHT)
- desttop += (vid.width - (BASEVIDWIDTH * dupx));
+ x += (vid.width - (BASEVIDWIDTH * dupx));
else if (!(scrn & V_SNAPTOLEFT))
- desttop += (vid.width - (BASEVIDWIDTH * dupx)) / 2;
+ x += (vid.width - (BASEVIDWIDTH * dupx)) / 2;
}
if (vid.height != BASEVIDHEIGHT * dupy)
{
// same thing here
- if (scrn & V_SNAPTOBOTTOM)
- desttop += (vid.height - (BASEVIDHEIGHT * dupy)) * vid.width;
+ if ((scrn & (V_SPLITSCREEN|V_SNAPTOBOTTOM)) == (V_SPLITSCREEN|V_SNAPTOBOTTOM))
+ y += (vid.height/2 - (BASEVIDHEIGHT/2 * dupy));
+ else if (scrn & V_SNAPTOBOTTOM)
+ y += (vid.height - (BASEVIDHEIGHT * dupy));
else if (!(scrn & V_SNAPTOTOP))
- desttop += (vid.height - (BASEVIDHEIGHT * dupy)) * vid.width / 2;
- }
- // if it's meant to cover the whole screen, black out the rest
- if (x == 0 && SHORT(patch->width) == BASEVIDWIDTH && y == 0 && SHORT(patch->height) == BASEVIDHEIGHT)
- {
- column = (const column_t *)((const UINT8 *)(patch) + LONG(patch->columnofs[0]));
- source = (const UINT8 *)(column) + 3;
- V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, (column->topdelta == 0xff ? 31 : source[0]));
+ y += (vid.height - (BASEVIDHEIGHT * dupy)) / 2;
}
}
+
+ desttop += (y*vid.width) + x;
}
for (col = sx<<FRACBITS; (col>>FRACBITS) < SHORT(patch->width) && (col>>FRACBITS) < w; col += colfrac, ++x, desttop++)
--
GitLab